Index: applications/editors/josm/i18n/po/ar.po
===================================================================
--- applications/editors/josm/i18n/po/ar.po	(revision 17655)
+++ applications/editors/josm/i18n/po/ar.po	(revision 17697)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-12 18:11+0200\n"
-"PO-Revision-Date: 2009-09-06 13:30+0000\n"
+"POT-Creation-Date: 2009-09-19 13:00+0200\n"
+"PO-Revision-Date: 2009-09-15 04:39+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
 "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2009-09-12 16:05+0000\n"
+"X-Launchpad-Export-Date: 2009-09-19 10:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -43,10 +43,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:543
 #: ../core/src/org/openstreetmap/josm/Main.java:551
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -71,5 +71,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -87,6 +87,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:358
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
@@ -102,6 +102,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
@@ -125,10 +125,10 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
 msgid "Save and Exit"
 msgstr "حفظ و خروج"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
 msgid "Discard and Exit"
 msgstr "تجاهل و خروج"
@@ -139,4 +139,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
@@ -144,27 +145,28 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:296
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:258
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:613
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
@@ -172,5 +174,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -190,6 +192,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
@@ -206,17 +208,17 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:654
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1528
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -227,6 +229,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
@@ -279,9 +281,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:607
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:609
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -341,5 +343,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
 msgid "Plugins"
@@ -389,5 +391,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr ""
@@ -475,5 +477,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -486,4 +488,5 @@
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -519,6 +522,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
@@ -527,6 +530,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:346
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
@@ -634,4 +637,42 @@
 msgstr "لا  تناقضات للتكبير عليها"
 
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+msgid "Close open changesets"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+msgid "Closes open changesets"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
+#: ../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:114
+#, java-format
+msgid "File: {0}"
+msgstr "الملف : {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
+msgid "There are no open changesets"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
+msgid "No open changesets"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
+#, fuzzy
+msgid "Downloading open changesets ..."
+msgstr "جاري تنزيل معطيات أو.أس.أم"
+
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
@@ -723,10 +764,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:123
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
@@ -769,31 +811,30 @@
 msgstr "وزع العقد المختارة على مسافاة متساوية على طول خط."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
 msgid "Download from OSM..."
 msgstr "نزّل من أو.أس.أم ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
 msgid "Download map data from the OSM server."
 msgstr "نزّل معطيات خريطة من الخادم أو.أس.أم"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
-#, java-format
-msgid "File: {0}"
-msgstr "الملف : {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
 msgid "Download"
 msgstr "نزّل"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "مُوافق"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
 msgid "Please select at least one task to download"
 msgstr "الرجاء تحديد على الأقل مهمة لتنزيلها"
@@ -814,5 +855,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1527
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307
@@ -832,6 +873,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:376
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1415
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
 msgid "Duplicate"
 msgstr "نسخة مطابقة"
@@ -903,10 +944,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
@@ -990,25 +1032,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 msgid "Merge Nodes"
 msgstr "إدمج العقد"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
 msgid "Merge nodes into the oldest one."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
 msgid "Please select at least two nodes to merge."
 msgstr "الرجاء إختيار على الأقل عقدتين للدمج."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:394
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
@@ -1024,8 +1067,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -1051,6 +1094,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
@@ -1059,9 +1106,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr "غير قادر على دمج العقد: فسيتم محو طريق هو قيد الإستعمال."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283
 #, java-format
 msgid "Merge {0} nodes"
@@ -1133,5 +1180,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "New"
 msgstr "جديد"
@@ -1401,14 +1448,15 @@
 msgstr "المساعدة: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
 msgid "Status Report"
 msgstr "تقرير عن الحالة"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 msgid "Copy to clipboard and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
@@ -1487,25 +1535,4 @@
 msgstr "أقسم الطريق {0} إلى {1} قطع"
 
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24
-msgid "Close current changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-msgid "Close the current changeset ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41
-msgid "There is currently no changeset open."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42
-msgid "No open changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60
-msgid "Closing changeset"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
@@ -1665,14 +1692,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "حمّل إلى أو.أس.أم ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 msgid "Upload all changes to the OSM server."
 msgstr "حمّل كل التغييرات إلى الخادم أو.أس.أم ."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
 #, java-format
 msgid ""
@@ -1681,23 +1708,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
 msgid "Nothing to upload. Get some data first."
 msgstr "لا شيء للتحميل. إحصل على بعض المعطيات أولاً"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 msgid "No changes to upload."
 msgstr "لا يوجد تغييرات للتحميل."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
 msgid "Synchronize entire dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
 #, java-format
 msgid ""
@@ -1711,17 +1738,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
 msgid "Conflict detected"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:267
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
 #, java-format
 msgid ""
@@ -1732,28 +1759,40 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
+msgid ""
+"<html>Uploading <strong>failed</strong> because you've been "
+"using<br>changeset {0} which was already closed at {1}.<br>Please upload "
+"again with a new or an existing open changeset."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+#, fuzzy
+msgid "Changeset closed"
+msgstr "غيّر القيم ؟"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
 msgid "Upload to OSM API failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1970,14 +2009,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:930
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:932
 msgid "Create new node."
 msgstr "انشئ عقدة جديدة"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
 msgid "Select node under cursor."
 msgstr "إختر العقدة الموجودة تحت المزلاق."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939
 #, java-format
 msgid "Insert new node into way."
@@ -1986,14 +2025,14 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
 msgid "Start new way from last node."
 msgstr "إبدء طريق جديدة من العقدة الأخيرة."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951
 msgid "Continue way from last node."
 msgstr "تابع طريق من العقدة الأخيرة."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:972
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:974
 msgid "Finish drawing."
 msgstr "إنهي الرسم."
@@ -2106,60 +2145,70 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "بحث..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "بحث عن أغراض."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
 msgid "Can't search because there is no loaded data."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
+#, fuzzy
+msgid "Please enter a filter string."
+msgstr "الرجاء إدخال مصطلحات البحث."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
 msgid "Please enter a search string."
 msgstr "الرجاء إدخال مصطلحات البحث."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
 msgid "replace selection"
 msgstr "إستبدل الخيار"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72
 msgid "add to selection"
 msgstr "أضف إلى اخيار"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73
 msgid "remove from selection"
 msgstr "أحذف من الخيار"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
+#, fuzzy
+msgid "find in selection"
+msgstr "أضف إلى اخيار"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81
 msgid "case sensitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82
 msgid "regular expression"
 msgstr "عبارة منتظمة"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
 msgstr "<b>\"شارع الفران\"</b> - 'شارع الفران' في أي مفتاح أو إسم."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid ""
 "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
@@ -2167,109 +2216,126 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
 msgid "<u>Special targets:</u>"
 msgstr "<u>الأهداف المميزة:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr "<b>النوع:</b> - نوع الغرض (<b>عقدة</b>, <b>طريق</b>, <b>علاقة</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>المستخدم:</b>... - كلّ الأغراض اللتي قام المستخدم بتغييرها"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 msgid "<b>nodes:</b>... - object with given number of nodes"
 msgstr "<b>العقد:</b>... - الغرض ذات عدد العقد المحدد"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>مغيير</b> - كلّ الأغراض المغييرة"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>المختارة</b> - كلّ الأغراض المختارة"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>غير المكتملة</b> - كلّ الأغراض غير المكتملة"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>غير المسمات</b> - كلّ الأغراض غير المسمات"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "إستعمل <b>|</b> أو <b>أو</b> للدمج بالأو المنطقي"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
+msgid "Filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "إبحث"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
+msgid "Submit filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "Start Search"
 msgstr "إبدء البحث"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "لم أجد شيء مطابق لِــ ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#, java-format
+msgid "Nothing find in selection by searching for ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262
 #, java-format
 msgid "Found {0} matches"
 msgstr "وجدتُ {0} مطابقات"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CS"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CI"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283
 msgid "RX"
 msgstr ""
@@ -2452,5 +2518,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
 msgid "Double conflict"
 msgstr ""
@@ -2690,4 +2756,5 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:134
 msgid "Old value"
 msgstr "القيمة السابقة"
@@ -2851,26 +2918,56 @@
 
 #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
 msgid "E"
 msgstr "ش."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:59
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:203
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
 msgid "Changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:323
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:325
-#, java-format
-msgid "paramete''{0}'' must not be null"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331
-#, java-format
-msgid "unsupported value ''{0}'' or parameter ''{1}''"
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "H"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "Text"
+msgstr "النص"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "C"
+msgstr "مراحيض"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "I"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "M"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+msgid "R"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+msgid "A"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+msgid "D"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+msgid "F"
 msgstr ""
 
@@ -2885,29 +2982,29 @@
 msgstr "تحذير: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
 #, java-format
 msgid "expected id >= 0. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:257
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
 msgid "a primitive with id=0 can't be invisible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:293
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
 #, java-format
 msgid "id > 0 expected. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
 msgid "version > 0 expected. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
 msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
 msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
@@ -2974,9 +3071,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:247
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:249
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:478
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:482
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
@@ -2985,118 +3082,118 @@
 #. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
 #. TODO Remove useless nullcheck when RelationMember.member is encalupsed
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:851
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855
 msgid "Empty member in relation."
 msgstr "عضو فارغ في العلاقة."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:853
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "أمحي العضو ''{0}'' في العلاقة."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:864
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "للطريق ''{0}'' أقل من نقطتين."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "دور غير معروف ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "نوع عضو غير معروف لِــ ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"from\" way found."
 msgstr "لم أجد طريق \"من\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"to\" way found."
 msgstr "لم أجد طريق \"إلى\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652
 msgid "No \"via\" node or way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:885
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:943
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1032
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1044
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "الطريق الداخلية ''{0}''موجودة في الخارج."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1097
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1123
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1327
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331
 msgid "untagged"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1328
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332
 msgid "text"
 msgstr "النص"
@@ -3117,5 +3214,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
@@ -3144,5 +3241,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
@@ -3195,5 +3292,5 @@
 msgstr "حزام لامبيرت (فرنسا)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
 msgid "Lambert Zone (Estonia)"
 msgstr "حزام لامبيرت (أستونيا)"
@@ -3235,9 +3332,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:38
 msgid "Do not show again"
 msgstr "لا تظهر مرة اخرى"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
 #, java-format
@@ -3245,31 +3342,31 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:91
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:116
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154
 msgid "incomplete"
 msgstr "غير كامل"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
 msgid "highway"
 msgstr "من النوع طريق"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
-#: build/trans_presets.java:3144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: build/trans_presets.java:3156
 msgid "railway"
 msgstr "خط سكة حديد"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
 msgid "waterway"
 msgstr "مجرى مياه"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "landuse"
 msgstr "إستعمال الأرض"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:474
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
@@ -3283,5 +3380,5 @@
 msgstr[5] "{0} عقد"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
 #, java-format
 msgid "{0} member"
@@ -3326,10 +3423,5 @@
 msgstr "أخبار اليوم غير متوفرة"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67
-#, java-format
-msgid "- running version is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:95
 msgid "Downloading \"Message of the day\""
 msgstr "جاري تنزيل \"أخبار اليوم\""
@@ -3395,10 +3487,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:162
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
 msgid "Username"
 msgstr "إسم المستخدم"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
 msgid "Password"
 msgstr "كلمة‌المرور"
@@ -3519,5 +3611,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226
 msgid "Presets"
 msgstr "التعيينات المسبقة"
@@ -3591,38 +3683,49 @@
 msgstr "المقياس"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
 msgid "The geographic longitude at the mouse pointer."
 msgstr "خطّ الطول عند مؤشر الفأرة."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The name of the object at the mouse pointer."
 msgstr "إسم الغرض عند مؤشر الفأرة."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The geographic latitude at the mouse pointer."
 msgstr "خطّ العرض عند مؤشر الفأرة."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The angle between the previous and the current way segment."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The (compass) heading of the line segment being drawn."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The length of the new way segment being drawn."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199
+msgid ""
+"Middle click again to cycle through.<br>Hold CTRL to select directly from "
+"this list with the mouse.<hr>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290
 msgid "(no object)"
 msgstr "(لا يوجد أي غرض)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:301
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418
+#, fuzzy
+msgid "User:"
+msgstr "المستخدِم"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
 msgid "layer not in list."
 msgstr "الطبقة ليست في اللائحة."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:488
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3692,7 +3795,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:224
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Tags"
 msgstr ""
@@ -3707,5 +3810,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
@@ -3886,4 +3989,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
 msgid "Up"
 msgstr ""
@@ -3894,4 +3998,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Down"
 msgstr ""
@@ -3904,5 +4009,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
@@ -4325,23 +4430,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:236
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239
 msgid "No conflicts to resolve"
-msgstr "لا  تناقضات للتكبير عليها"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:295
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254
 msgid "Cancel conflict resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:310
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269
 msgid "Apply resolved conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Apply"
 msgstr ""
@@ -4353,5 +4457,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "all"
 msgstr "الكلّ"
@@ -4395,7 +4499,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
-msgid "not yet decided"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:213
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
@@ -4422,7 +4523,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
@@ -4436,7 +4537,7 @@
 msgstr[5] "{0} طريق"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:152
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
@@ -4446,20 +4547,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "Paste ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "From ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:372
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "To ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:428
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
 #, java-format
 msgid "{0} tag"
@@ -4475,13 +4576,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
-#, fuzzy
 msgid "Remove this relation member from the relation"
-msgstr "أزل العضو في سطر الجدول الحالي من هذه العلاقة"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-#, fuzzy
 msgid "Replace"
-msgstr "المكان"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
@@ -4497,5 +4596,5 @@
 #. --- role editing
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:56
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510
 msgid "Role:"
 msgstr ""
@@ -4511,7 +4610,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70
-#, fuzzy
 msgid "Value:"
-msgstr "القيمة"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86
@@ -4528,7 +4626,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
-#, fuzzy
 msgid "Decision"
-msgstr "مراجعة"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -4544,6 +4641,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
@@ -4632,169 +4730,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-msgid "History"
-msgstr "الخط الزمني"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-msgid "Display the history of all selected items."
-msgstr "أعرض الخط الزمني للبنود المختارة."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
-#, java-format
-msgid "index out of bounds Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
-msgid "History item"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "إعادة تعبئة كلّ الأغراض المختارة حالياً ثم أنعش اللائحة."
-
-#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
-msgid "Show"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
-msgid "Dialog not created yet. Invoke createInstance() first"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
-msgid "Layers"
-msgstr "الطبقات"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-msgid "Open a list of all loaded layers."
-msgstr "إفتح لائحة بكلّ التبقات المحملة."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:297
-msgid "Delete the selected layer."
-msgstr "أمحي الطبقة المختارة."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:367
-msgid "Show/Hide"
-msgstr "عرض/إخفاء"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:378
-msgid "Toggle visible state of the selected layer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:420
-msgid "Activate the selected layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:475
-msgid "Merge this layer into another layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:581
-msgid "Move the selected layer one row up."
-msgstr "أنقل الطبقة المختارة صفّ إلى الأعلى."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:600
-msgid "Move the selected layer one row down."
-msgstr "أنقل الطبقة المختارة صفّ إلى الأسفل."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
-msgid "Information about layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
-#, java-format
-msgid "This will change up to {0} object."
-msgid_plural "This will change up to {0} objects."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
-msgid "An empty value deletes the key."
-msgstr "قيمة فارغة ستمحي المفتاح."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
-msgid "<different>"
-msgstr "<مختلف>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
-msgid "Change values?"
-msgstr "غيّر القيم ؟"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
-#, java-format
-msgid "Change properties of up to {0} object"
-msgid_plural "Change properties of up to {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
-msgid "Please select a key"
-msgstr "الرجاء إختيار مفتاح"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
-msgid "Please select a value"
-msgstr "الرجاء إختيار قيمة"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
-msgid "Please select the objects you want to change properties for."
-msgstr "الرجاء إختيار الأغراض اللتي تريد تغيير خصائصها."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
-msgid "Properties/Memberships"
-msgstr "خصائص/عضويات"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-msgid "Properties for selected objects."
-msgstr "خصائص الأغراض المختارة."
-
-#. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-msgid "Member Of"
-msgstr "عضو من"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
-msgid "Add Properties"
-msgstr "أضف صفة"
-
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+msgid "Filter objects and hide/disable them."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
@@ -4808,4 +4750,212 @@
 msgstr "أضِف"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#, fuzzy
+msgid "Add filter."
+msgstr "أضف الإختيار"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
+#, fuzzy
+msgid "Edit filter."
+msgstr "حرّر رصيف ميناء"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#, fuzzy
+msgid "Delete filter."
+msgstr "أمحي الطبقة"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
+#, fuzzy
+msgid "Move filter up."
+msgstr "حرّك إلى الأعلى"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
+#, fuzzy
+msgid "Move filter down."
+msgstr "حرّك إلى الأسفل"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128
+msgid "Enable filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
+#, fuzzy
+msgid "Hide elements"
+msgstr "حرّر الفلق الخارجي"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
+msgid "Apply also for children"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
+msgid "Inverse filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
+#, fuzzy
+msgid "Filter mode"
+msgstr "نمط المحو"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
+msgid "History"
+msgstr "الخط الزمني"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+msgid "Display the history of all selected items."
+msgstr "أعرض الخط الزمني للبنود المختارة."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
+msgid "History item"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
+msgid "Reload all currently selected objects and refresh the list."
+msgstr "إعادة تعبئة كلّ الأغراض المختارة حالياً ثم أنعش اللائحة."
+
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
+msgid "Show"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
+msgid "Display the history of the selected primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84
+msgid "Dialog not created yet. Invoke createInstance() first"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
+msgid "Layers"
+msgstr "الطبقات"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+msgid "Open a list of all loaded layers."
+msgstr "إفتح لائحة بكلّ التبقات المحملة."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294
+msgid "Delete the selected layer."
+msgstr "أمحي الطبقة المختارة."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364
+msgid "Show/Hide"
+msgstr "عرض/إخفاء"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375
+msgid "Toggle visible state of the selected layer."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgid "Activate"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417
+msgid "Activate the selected layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472
+msgid "Merge this layer into another layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578
+msgid "Move the selected layer one row up."
+msgstr "أنقل الطبقة المختارة صفّ إلى الأعلى."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597
+msgid "Move the selected layer one row down."
+msgstr "أنقل الطبقة المختارة صفّ إلى الأسفل."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+msgid "Information about layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+#, java-format
+msgid "This will change up to {0} object."
+msgid_plural "This will change up to {0} objects."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+msgid "An empty value deletes the key."
+msgstr "قيمة فارغة ستمحي المفتاح."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+msgid "<different>"
+msgstr "<مختلف>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+msgid "Change values?"
+msgstr "غيّر القيم ؟"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#, java-format
+msgid "Change properties of up to {0} object"
+msgid_plural "Change properties of up to {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+msgid "Please select a key"
+msgstr "الرجاء إختيار مفتاح"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+msgid "Please select a value"
+msgstr "الرجاء إختيار قيمة"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
+msgid "Please select the objects you want to change properties for."
+msgstr "الرجاء إختيار الأغراض اللتي تريد تغيير خصائصها."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
+msgid "Properties/Memberships"
+msgstr "خصائص/عضويات"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+msgid "Properties for selected objects."
+msgstr "خصائص الأغراض المختارة."
+
+#. setting up the membership table
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+msgid "Member Of"
+msgstr "عضو من"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
+msgid "Add Properties"
+msgstr "أضف صفة"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574
 msgid "Add a new key/value pair to all objects"
@@ -4847,10 +4997,9 @@
 
 #. item "Land use/Quarry" text "Name"
-#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
-#: build/trans_presets.java:3109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168
+#: build/trans_presets.java:3121
 msgid "Relations"
 msgstr "العلاقات"
@@ -4860,23 +5009,23 @@
 msgstr "إفتح لائحة بكل العلاقات."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166
 #, java-format
 msgid "Relations: {0}"
 msgstr "العلاقات: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276
 msgid "Open an editor for the selected relation"
 msgstr "إفتح محرر نص للعلاقة المحددة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
 msgid "Delete the selected relation"
 msgstr "أمحي العلاقة المحددة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349
 msgid "Create a new relation"
 msgstr "أنشئ علاقة جديدة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:373
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1412
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
@@ -4909,5 +5058,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4919,14 +5068,14 @@
 msgstr "الخيار: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441
 msgid "Undock the panel"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr "أغلق هذه اللوحة. يمكنك إعادة فتحها في شريط الأدوات اليساري."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:457
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "أنقر لتكبير/تصغير محتويات اللوحة"
@@ -4987,5 +5136,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5009,5 +5158,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1502
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1370
 msgid "Download relation members"
 msgstr ""
@@ -5037,5 +5186,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -5043,18 +5192,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
 msgid "Tags and Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:167
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5063,14 +5212,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613
 #, java-format
 msgid ""
@@ -5080,9 +5229,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid ""
@@ -5092,15 +5241,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5108,5 +5257,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5114,20 +5263,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849
 #, java-format
 msgid ""
@@ -5136,57 +5285,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:961
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909
 msgid "Move the currently selected members up"
 msgstr "حرّك الأعضاء المختارة حالياً إلى الأعلى"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:979
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:912
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928
 msgid "Move the currently selected members down"
 msgstr "حرّك الأعضاء المختارة حالياً إلى الأسفل"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:998
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:931
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5195,9 +5344,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1058
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
 #, java-format
 msgid ""
@@ -5206,56 +5355,41 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090
+msgid "Apply the current updates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123
+msgid "Apply the updates and close the dialog"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
-msgid "Apply the current updates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
-msgid "Apply the updates and close the dialog"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "مُوافق"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
-msgid "Delete the currently selected tags"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "نزّل كلّ من العقد و الطرقات الغير مكتملة في العلاقة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 msgid "Download Members"
 msgstr "نزّل الأعضاء"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1208
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1211
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1356
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 #, java-format
 msgid ""
@@ -5265,13 +5399,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1229
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1367
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
 msgid "Confirm empty role"
 msgstr ""
@@ -5358,37 +5492,37 @@
 msgstr "إشارات مرجعية"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:82
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
 msgid "Please enter the desired coordinates first."
 msgstr "الرجاء إدخال الأحداثيات المرغوبة أولاً."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
 msgid "Please enter a name for the location."
 msgstr "الرجاء إدخال إسم للموقع."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:107
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
 msgid "Select a bookmark first."
 msgstr "إختر أولاً إشارة مرجعية"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
 msgid "min lat"
 msgstr "خ. العرض الأدنى"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
 msgid "min lon"
 msgstr "خ. الطول الأدنى"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid "max lat"
 msgstr "خ. العرض الأقصى"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
 msgid "max lon"
 msgstr "خ. الطول الأقصى"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5396,26 +5530,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
 msgid "Bounding Box"
 msgstr "العلبة المحاطة"
 
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
 msgid "Data Sources and Types"
 msgstr "مصادر المعطيات و نوعيتها"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
 msgid "Download as new layer"
 msgstr "نزّل كطبقة جديدة"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
 msgid "Download Area"
 msgstr "نزّل المساحة"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
 msgid "Download area too large; will probably be rejected by server"
 msgstr "المساحة المطلوبة ضخمة جداً، إحتمال أن ترفض من قبل الخادم"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
 msgid "Download area ok, size probably acceptable to server"
 msgstr "هذه المساحة ممكن تنزيلها، القياس مقبول من الخادم"
@@ -5440,7 +5574,7 @@
 msgstr "أدخل إسم المكان للبحث عنه:"
 
-#. <separator/>
+#. group "Geography"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2759
 msgid "Places"
 msgstr "الأماكن"
@@ -5487,21 +5621,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "type"
 msgstr "النوع"
@@ -5981,4 +6115,6 @@
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
 #. <key key="historic" value="wayside_shrine" />
+#. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
+#. <key key="historic" value="boundary_stone" />
 #. item "Leisure/Water Park" label "Edit Water Park"
 #. <key key="leisure" value="water_park" />
@@ -6350,153 +6486,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/trans_presets.java:66 build/trans_presets.java:102
-#: build/trans_presets.java:142 build/trans_presets.java:179
-#: build/trans_presets.java:199 build/trans_presets.java:217
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:272 build/trans_presets.java:305
-#: build/trans_presets.java:351 build/trans_presets.java:371
-#: build/trans_presets.java:386 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:463 build/trans_presets.java:482
-#: build/trans_presets.java:502 build/trans_presets.java:522
-#: build/trans_presets.java:543 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627 build/trans_presets.java:658
-#: build/trans_presets.java:679 build/trans_presets.java:692
-#: build/trans_presets.java:705 build/trans_presets.java:718
-#: build/trans_presets.java:731 build/trans_presets.java:744
-#: build/trans_presets.java:755 build/trans_presets.java:764
-#: build/trans_presets.java:811 build/trans_presets.java:832
-#: build/trans_presets.java:841 build/trans_presets.java:901
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1067 build/trans_presets.java:1075
-#: build/trans_presets.java:1085 build/trans_presets.java:1093
-#: build/trans_presets.java:1098 build/trans_presets.java:1105
-#: build/trans_presets.java:1112 build/trans_presets.java:1117
-#: build/trans_presets.java:1125 build/trans_presets.java:1134
-#: build/trans_presets.java:1140 build/trans_presets.java:1146
-#: build/trans_presets.java:1151 build/trans_presets.java:1157
-#: build/trans_presets.java:1163 build/trans_presets.java:1172
-#: build/trans_presets.java:1181 build/trans_presets.java:1188
-#: build/trans_presets.java:1196 build/trans_presets.java:1209
-#: build/trans_presets.java:1215 build/trans_presets.java:1224
-#: build/trans_presets.java:1230 build/trans_presets.java:1236
-#: build/trans_presets.java:1244 build/trans_presets.java:1299
-#: build/trans_presets.java:1346 build/trans_presets.java:1352
-#: build/trans_presets.java:1358 build/trans_presets.java:1364
-#: build/trans_presets.java:1370 build/trans_presets.java:1381
-#: build/trans_presets.java:1390 build/trans_presets.java:1405
-#: build/trans_presets.java:1412 build/trans_presets.java:1418
-#: build/trans_presets.java:1426 build/trans_presets.java:1433
-#: build/trans_presets.java:1442 build/trans_presets.java:1450
-#: build/trans_presets.java:1457 build/trans_presets.java:1468
-#: build/trans_presets.java:1478 build/trans_presets.java:1488
-#: build/trans_presets.java:1508 build/trans_presets.java:1520
-#: build/trans_presets.java:1531 build/trans_presets.java:1548
-#: build/trans_presets.java:1555 build/trans_presets.java:1570
-#: build/trans_presets.java:1577 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1594
-#: build/trans_presets.java:1599 build/trans_presets.java:1605
-#: build/trans_presets.java:1611 build/trans_presets.java:1619
-#: build/trans_presets.java:1627 build/trans_presets.java:1635
-#: build/trans_presets.java:1642 build/trans_presets.java:1648
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1670 build/trans_presets.java:1677
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1712 build/trans_presets.java:1719
-#: build/trans_presets.java:1736 build/trans_presets.java:1744
-#: build/trans_presets.java:1759 build/trans_presets.java:1769
-#: build/trans_presets.java:1781 build/trans_presets.java:1788
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:1809 build/trans_presets.java:1817
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1841
-#: build/trans_presets.java:1846 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1864
-#: build/trans_presets.java:1872 build/trans_presets.java:1881
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1908 build/trans_presets.java:1914
-#: build/trans_presets.java:1922 build/trans_presets.java:1928
-#: build/trans_presets.java:1934 build/trans_presets.java:1940
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2013
-#: build/trans_presets.java:2022 build/trans_presets.java:2030
-#: build/trans_presets.java:2036 build/trans_presets.java:2042
-#: build/trans_presets.java:2048 build/trans_presets.java:2054
-#: build/trans_presets.java:2060 build/trans_presets.java:2066
-#: build/trans_presets.java:2072 build/trans_presets.java:2078
-#: build/trans_presets.java:2084 build/trans_presets.java:2090
-#: build/trans_presets.java:2096 build/trans_presets.java:2102
-#: build/trans_presets.java:2108 build/trans_presets.java:2114
-#: build/trans_presets.java:2120 build/trans_presets.java:2126
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2158
-#: build/trans_presets.java:2165 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2186
-#: build/trans_presets.java:2192 build/trans_presets.java:2198
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2218 build/trans_presets.java:2225
-#: build/trans_presets.java:2232 build/trans_presets.java:2239
-#: build/trans_presets.java:2247 build/trans_presets.java:2279
-#: build/trans_presets.java:2284 build/trans_presets.java:2289
-#: build/trans_presets.java:2294 build/trans_presets.java:2300
-#: build/trans_presets.java:2306 build/trans_presets.java:2312
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2354
-#: build/trans_presets.java:2451 build/trans_presets.java:2458
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2485 build/trans_presets.java:2492
-#: build/trans_presets.java:2498 build/trans_presets.java:2504
-#: build/trans_presets.java:2526 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2553 build/trans_presets.java:2559
-#: build/trans_presets.java:2565 build/trans_presets.java:2571
-#: build/trans_presets.java:2577 build/trans_presets.java:2583
-#: build/trans_presets.java:2590 build/trans_presets.java:2597
-#: build/trans_presets.java:2604 build/trans_presets.java:2610
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2661
-#: build/trans_presets.java:2667 build/trans_presets.java:2677
-#: build/trans_presets.java:2686 build/trans_presets.java:2701
-#: build/trans_presets.java:2707 build/trans_presets.java:2715
-#: build/trans_presets.java:2722 build/trans_presets.java:2742
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2783
-#: build/trans_presets.java:2790 build/trans_presets.java:2797
-#: build/trans_presets.java:2803 build/trans_presets.java:2809
-#: build/trans_presets.java:2817 build/trans_presets.java:2824
-#: build/trans_presets.java:2831 build/trans_presets.java:2838
-#: build/trans_presets.java:2844 build/trans_presets.java:2851
-#: build/trans_presets.java:2858 build/trans_presets.java:2867
-#: build/trans_presets.java:2873 build/trans_presets.java:2879
-#: build/trans_presets.java:2885 build/trans_presets.java:2891
-#: build/trans_presets.java:2900 build/trans_presets.java:2910
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2948
-#: build/trans_presets.java:2957 build/trans_presets.java:2963
-#: build/trans_presets.java:2969 build/trans_presets.java:2975
-#: build/trans_presets.java:2981 build/trans_presets.java:2987
-#: build/trans_presets.java:2993 build/trans_presets.java:3000
-#: build/trans_presets.java:3006 build/trans_presets.java:3011
-#: build/trans_presets.java:3018 build/trans_presets.java:3025
-#: build/trans_presets.java:3031 build/trans_presets.java:3040
-#: build/trans_presets.java:3048 build/trans_presets.java:3054
-#: build/trans_presets.java:3060 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3080
-#: build/trans_presets.java:3086 build/trans_presets.java:3092
-#: build/trans_presets.java:3098 build/trans_presets.java:3104
-#: build/trans_presets.java:3117 build/trans_presets.java:3131
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:67 build/trans_presets.java:103
+#: build/trans_presets.java:143 build/trans_presets.java:180
+#: build/trans_presets.java:200 build/trans_presets.java:218
+#: build/trans_presets.java:235 build/trans_presets.java:253
+#: build/trans_presets.java:273 build/trans_presets.java:306
+#: build/trans_presets.java:352 build/trans_presets.java:372
+#: build/trans_presets.java:387 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:503 build/trans_presets.java:523
+#: build/trans_presets.java:544 build/trans_presets.java:565
+#: build/trans_presets.java:586 build/trans_presets.java:607
+#: build/trans_presets.java:628 build/trans_presets.java:659
+#: build/trans_presets.java:680 build/trans_presets.java:693
+#: build/trans_presets.java:706 build/trans_presets.java:719
+#: build/trans_presets.java:732 build/trans_presets.java:745
+#: build/trans_presets.java:756 build/trans_presets.java:765
+#: build/trans_presets.java:812 build/trans_presets.java:833
+#: build/trans_presets.java:842 build/trans_presets.java:902
+#: build/trans_presets.java:1053 build/trans_presets.java:1061
+#: build/trans_presets.java:1069 build/trans_presets.java:1077
+#: build/trans_presets.java:1087 build/trans_presets.java:1095
+#: build/trans_presets.java:1100 build/trans_presets.java:1107
+#: build/trans_presets.java:1114 build/trans_presets.java:1119
+#: build/trans_presets.java:1127 build/trans_presets.java:1136
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1153 build/trans_presets.java:1159
+#: build/trans_presets.java:1165 build/trans_presets.java:1174
+#: build/trans_presets.java:1183 build/trans_presets.java:1190
+#: build/trans_presets.java:1198 build/trans_presets.java:1211
+#: build/trans_presets.java:1217 build/trans_presets.java:1226
+#: build/trans_presets.java:1232 build/trans_presets.java:1238
+#: build/trans_presets.java:1246 build/trans_presets.java:1302
+#: build/trans_presets.java:1349 build/trans_presets.java:1355
+#: build/trans_presets.java:1361 build/trans_presets.java:1367
+#: build/trans_presets.java:1373 build/trans_presets.java:1384
+#: build/trans_presets.java:1393 build/trans_presets.java:1408
+#: build/trans_presets.java:1415 build/trans_presets.java:1421
+#: build/trans_presets.java:1429 build/trans_presets.java:1436
+#: build/trans_presets.java:1445 build/trans_presets.java:1453
+#: build/trans_presets.java:1460 build/trans_presets.java:1471
+#: build/trans_presets.java:1481 build/trans_presets.java:1491
+#: build/trans_presets.java:1511 build/trans_presets.java:1523
+#: build/trans_presets.java:1534 build/trans_presets.java:1551
+#: build/trans_presets.java:1558 build/trans_presets.java:1574
+#: build/trans_presets.java:1581 build/trans_presets.java:1586
+#: build/trans_presets.java:1592 build/trans_presets.java:1598
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1646 build/trans_presets.java:1652
+#: build/trans_presets.java:1659 build/trans_presets.java:1666
+#: build/trans_presets.java:1674 build/trans_presets.java:1681
+#: build/trans_presets.java:1689 build/trans_presets.java:1696
+#: build/trans_presets.java:1702 build/trans_presets.java:1709
+#: build/trans_presets.java:1716 build/trans_presets.java:1723
+#: build/trans_presets.java:1740 build/trans_presets.java:1748
+#: build/trans_presets.java:1763 build/trans_presets.java:1773
+#: build/trans_presets.java:1785 build/trans_presets.java:1792
+#: build/trans_presets.java:1798 build/trans_presets.java:1808
+#: build/trans_presets.java:1813 build/trans_presets.java:1821
+#: build/trans_presets.java:1828 build/trans_presets.java:1834
+#: build/trans_presets.java:1840 build/trans_presets.java:1845
+#: build/trans_presets.java:1850 build/trans_presets.java:1855
+#: build/trans_presets.java:1862 build/trans_presets.java:1868
+#: build/trans_presets.java:1873 build/trans_presets.java:1882
+#: build/trans_presets.java:1891 build/trans_presets.java:1900
+#: build/trans_presets.java:1909 build/trans_presets.java:1918
+#: build/trans_presets.java:1924 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 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:2023 build/trans_presets.java:2032
+#: build/trans_presets.java:2040 build/trans_presets.java:2046
+#: build/trans_presets.java:2052 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 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:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2150
+#: build/trans_presets.java:2156 build/trans_presets.java:2162
+#: build/trans_presets.java:2169 build/trans_presets.java:2176
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2197 build/trans_presets.java:2203
+#: build/trans_presets.java:2209 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2229
+#: build/trans_presets.java:2236 build/trans_presets.java:2243
+#: build/trans_presets.java:2250 build/trans_presets.java:2258
+#: build/trans_presets.java:2290 build/trans_presets.java:2295
+#: build/trans_presets.java:2300 build/trans_presets.java:2305
+#: build/trans_presets.java:2311 build/trans_presets.java:2317
+#: build/trans_presets.java:2323 build/trans_presets.java:2331
+#: build/trans_presets.java:2337 build/trans_presets.java:2343
+#: build/trans_presets.java:2349 build/trans_presets.java:2355
+#: build/trans_presets.java:2365 build/trans_presets.java:2462
+#: build/trans_presets.java:2469 build/trans_presets.java:2483
+#: build/trans_presets.java:2489 build/trans_presets.java:2496
+#: build/trans_presets.java:2503 build/trans_presets.java:2509
+#: build/trans_presets.java:2515 build/trans_presets.java:2537
+#: build/trans_presets.java:2544 build/trans_presets.java:2551
+#: build/trans_presets.java:2557 build/trans_presets.java:2564
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2594 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2615
+#: build/trans_presets.java:2621 build/trans_presets.java:2627
+#: build/trans_presets.java:2633 build/trans_presets.java:2639
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2672 build/trans_presets.java:2678
+#: build/trans_presets.java:2688 build/trans_presets.java:2697
+#: build/trans_presets.java:2712 build/trans_presets.java:2718
+#: build/trans_presets.java:2726 build/trans_presets.java:2733
+#: build/trans_presets.java:2753 build/trans_presets.java:2764
+#: build/trans_presets.java:2770 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2788
+#: build/trans_presets.java:2795 build/trans_presets.java:2802
+#: build/trans_presets.java:2809 build/trans_presets.java:2815
+#: build/trans_presets.java:2821 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2912
+#: build/trans_presets.java:2922 build/trans_presets.java:2931
+#: build/trans_presets.java:2937 build/trans_presets.java:2943
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 build/trans_presets.java:2981
+#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:2999 build/trans_presets.java:3005
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3023 build/trans_presets.java:3030
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3066 build/trans_presets.java:3072
+#: build/trans_presets.java:3079 build/trans_presets.java:3085
+#: build/trans_presets.java:3092 build/trans_presets.java:3098
+#: build/trans_presets.java:3104 build/trans_presets.java:3110
+#: build/trans_presets.java:3116 build/trans_presets.java:3129
+#: build/trans_presets.java:3143 build/trans_presets.java:3157
 msgid "Name"
 msgstr "الإسم"
@@ -6530,4 +6667,56 @@
 msgid "Version"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
+#, fuzzy
+msgid "Changeset id:"
+msgstr "غيّر العلاقة"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
+#, fuzzy
+msgid "Created at:"
+msgstr "أنشئ مساحات"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
+#, fuzzy
+msgid "Changeset comment:"
+msgstr "أودع الملاحظات"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
+msgid "No open changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48
+#, fuzzy
+msgid "<html>Please select the changesets you want to close</html>"
+msgstr "الرجاء إختيار الأغراض اللتي تريد تغيير خصائصها."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
+msgid "Open changesets"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101
+#, fuzzy
+msgid "Close changesets"
+msgstr "حمّل التغييرات"
+
+#. putValue(SMALL_ICON, ImageProvider.get("cancel"));
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
+#, fuzzy
+msgid "Close the selected open changesets"
+msgstr "امحي الأغراض المختارة."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126
+msgid "Cancel closeing of changesets"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37
+msgid "Closing changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77
+#, fuzzy, java-format
+msgid "Closing changeset {0}"
+msgstr "آخر تغيير في {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
@@ -6556,5 +6745,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be uploaded"
+msgid "Layer ''{0}'' has no modifications to be uploaded."
 msgstr ""
 
@@ -6562,5 +6751,5 @@
 #, java-format
 msgid ""
-"Layer ''{0}'' has modifications which should be saved to its assoicated file "
+"Layer ''{0}'' has modifications which should be saved to its associated file "
 "''{1}''."
 msgstr ""
@@ -6568,5 +6757,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be saved"
+msgid "Layer ''{0}'' has no modifications to be saved."
 msgstr ""
 
@@ -6600,17 +6789,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113
 msgid "Unsaved changes - Save/Upload before exiting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194
 #, java-format
 msgid ""
@@ -6623,9 +6812,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205
 msgid "Unsaved data and conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212
 #, java-format
 msgid ""
@@ -6639,9 +6828,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223
 msgid "Unsaved data and missing associated file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230
 #, java-format
 msgid ""
@@ -6656,42 +6845,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243
 msgid "Unsaved data non-writable files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
 msgid "Close this dialog and resume editing in JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322
+msgid "Discard and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
-msgid "Discard and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354
+msgid "Save and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
-msgid "Save and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
 msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402
 #, java-format
 msgid "Preparing layer ''{0}'' for upload ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
@@ -6699,5 +6888,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491
 msgid "Incomplete upload and/or save"
 msgstr ""
@@ -6737,21 +6926,21 @@
 #. item "Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:200
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:278
-#: build/trans_presets.java:311 build/trans_presets.java:357
-#: build/trans_presets.java:372 build/trans_presets.java:387
-#: build/trans_presets.java:409 build/trans_presets.java:429
-#: build/trans_presets.java:450 build/trans_presets.java:470
-#: build/trans_presets.java:489 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:549
-#: build/trans_presets.java:570 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:633
-#: build/trans_presets.java:664 build/trans_presets.java:1060
-#: build/trans_presets.java:1068 build/trans_presets.java:1076
-#: build/trans_presets.java:1086 build/trans_presets.java:1305
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:242
+#: build/trans_presets.java:260 build/trans_presets.java:279
+#: build/trans_presets.java:312 build/trans_presets.java:358
+#: build/trans_presets.java:373 build/trans_presets.java:388
+#: build/trans_presets.java:410 build/trans_presets.java:430
+#: build/trans_presets.java:451 build/trans_presets.java:471
+#: build/trans_presets.java:490 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:665 build/trans_presets.java:1062
+#: build/trans_presets.java:1070 build/trans_presets.java:1078
+#: build/trans_presets.java:1088 build/trans_presets.java:1308
 msgid "Layer"
 msgstr ""
@@ -6770,67 +6959,32 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:200
 msgid "Upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-msgid "Use a new changeset and close it"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
-msgid ""
-"Select to upload the data using a new changeset and to close the changeset "
-"after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
-msgid "Use a new changeset and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
-msgid ""
-"Select to upload the data using a new changeset and to leave the changeset "
-"open after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
-msgid "Upload to a new or to an existing changeset?"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
-msgid "upload all changes in one request"
+msgid "Settings"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
-msgid ""
-"Enable to upload all changes in one request, disable to use one request per "
-"changed primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "الرجاء التزويد ببعض الملاحظات في ما يخص التغييرات اللتي تريد إرسالها:"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:216
-msgid "Settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908
 msgid "Tags of new changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:221
 msgid "Objects to add:"
 msgstr "الأغراض اللتي يجب إضافتها:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:227
 msgid "Objects to modify:"
 msgstr "الأغراض اللتي يجب تغييرها:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:233
 msgid "Objects to delete:"
 msgstr "الأغراض اللتي يجب حذفها:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
 #, java-format
 msgid "{0} object to add:"
@@ -6839,5 +6993,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:277
 #, java-format
 msgid "{0} object to modifiy:"
@@ -6846,5 +7000,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:286
 #, java-format
 msgid "{0} object to delete:"
@@ -6853,53 +7007,86 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422
-#, java-format
-msgid "Use the existing changeset {0} and close it after upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:423
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to close the changeset "
-"after this upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426
-#, java-format
-msgid "Use the existing changeset {0} and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:427
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to leave the changeset "
-"open for further uploads"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
-#, java-format
-msgid "Tags of changeset {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:470
 msgid "Upload Changes"
 msgstr "حمّل التغييرات"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472
+msgid "Upload the changed primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
+msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:479
+msgid "Illegal upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
+msgid "Cancel the upload and resume editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606
 #, fuzzy
-msgid "Upload the changed primitives"
-msgstr "حمّل هذه التغييرات :"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592
+msgid "Upload all changes in one request"
+msgstr "حمّل كل التغييرات إلى الخادم أو.أس.أم ."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607
+msgid ""
+"Enable to upload all changes in one request, disable to use one request per "
+"changed primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:617
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "الرجاء التزويد ببعض الملاحظات في ما يخص التغييرات اللتي تريد إرسالها:"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672
+msgid "Open a new changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
+msgid "Open a new changeset and use it in the next upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
 #, fuzzy
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "الرجاء إدخال إسم للموقع."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:593
-msgid "Illegal upload comment"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
-msgid "Cancel the upload and resume editing"
+msgid "Use an open changeset"
+msgstr "التغييرات غير المحفوظة"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
+msgid "Upload data to an already opened changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
+#, fuzzy
+msgid "Close changeset after upload"
+msgstr "لا يوجد تغييرات للتحميل."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
+msgid "Select to close the changeset after the next upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922
+#, java-format
+msgid "Tags of changeset {0}"
+msgstr ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
+#, fuzzy
+msgid "Load the list of your open changesets from the server"
+msgstr "حمّل التفضيلات الحالية إلى الخادم"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
+#, fuzzy
+msgid "Close the currently selected open changeset"
+msgstr "حرّك الأعضاء المختارة حالياً إلى الأعلى"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
+#, java-format
+msgid "changeset id > 0 expected. Got {1}"
 msgstr ""
 
@@ -6982,5 +7169,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
@@ -7018,5 +7205,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
@@ -7024,30 +7211,30 @@
 msgstr "نقطة gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
 msgid "Customize line drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
 msgid "Use global settings."
 msgstr "إستعمل الإعدادات العامة."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Draw lines between points for this layer."
 msgstr "أرسم خطوط بين النقاط لهذه الطبقة."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Do not draw lines between points for this layer."
 msgstr "لا ترسم خطوط بين النقاط لهذه الطبقة."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 msgid "Select line drawing options"
 msgstr "حدد خيارات رسم الخطوط"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7055,5 +7242,5 @@
 msgstr "خصّص اللون"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7062,5 +7249,5 @@
 msgstr "الغيابي"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7069,38 +7256,79 @@
 msgstr "إختر لون"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
 msgid "Import Audio"
 msgstr "إستورد صوت مسجل"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
 msgid "Wave Audio files (*.wav)"
 msgstr "ملفات صوتيت (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "العلامات الصوتية من {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
 msgid "Import images"
 msgstr "إستورد صور"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#, java-format
+msgid "Name: {0}"
+msgstr "الإسم: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#, java-format
+msgid "Description: {0}"
+msgstr "الوصف: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#, fuzzy, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
+msgstr[0] "مسلك واحد"
+msgstr[1] "مسلكين"
+msgstr[2] "ثلاثة مسالك"
+msgstr[3] "مسالك"
+msgstr[4] "مسالك"
+msgstr[5] "مسالك"
+
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
+#: build/trans_presets.java:3160
+msgid "Description"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#, fuzzy
+msgid "Timespan"
+msgstr "الفترة الزمنية "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#, fuzzy
+msgid "Length"
+msgstr "الطول: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
+msgid "URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+msgid "Length: "
+msgstr "الطول: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
 #, java-format
 msgid "{0} route, "
@@ -7109,5 +7337,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 #, java-format
 msgid "{0} waypoint"
@@ -7116,29 +7344,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
-#, java-format
-msgid "Name: {0}"
-msgstr "الإسم: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
-#, java-format
-msgid "Description: {0}"
-msgstr "الوصف: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
-msgid "Timespan: "
-msgstr "الفترة الزمنية "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
-msgid "Length: "
-msgstr "الطول: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7148,10 +7357,10 @@
 "مضرة.<br>أنظر هنا إذا أردت تحميل بعض الأثرات:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -7162,29 +7371,29 @@
 msgstr "محوّل من: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
 msgid "Download from OSM along this track"
 msgstr "نزّل من أو.أس.أم على طول هذا المسلك"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
 msgid "Download everything within:"
 msgstr "نزّل كلّ شيئ بين:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
 #, java-format
 msgid "{0} meters"
 msgstr "{0} أمتار"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 msgid "Maximum area per request:"
 msgstr "المساحة القصوى للمطلب:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} كلم²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
 #, java-format
 msgid ""
@@ -7193,13 +7402,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
 msgid "Download data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7207,5 +7416,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7256,30 +7465,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
-#, fuzzy
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
 "<br>If you want to upload traces, look here:</html>"
 msgstr ""
-"<html>إنّ تحميل معطيات جهاز تحديد المواقع العالمي غير المعالجة مسبقاً قد تكون "
-"مضرة.<br>أنظر هنا إذا أردت تحميل بعض الأثرات:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "track"
 msgid_plural "tracks"
@@ -7426,4 +7632,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
@@ -7650,13 +7857,18 @@
 msgstr "أرسم نقاط عريضة لجهاز تحديد المواقع العالمي."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+msgid "Draw a circle form HDOP value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "السرعة ( أحمر = بطيء، أخضر= سريع)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "ضوبان الموقع (أحمر=عالي،أخضر=منخفض، عندما تكون متوفرة)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -7664,6 +7876,6 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1374
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:1377
 msgid "Car"
 msgstr "السيارة"
@@ -7684,14 +7896,14 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:324 build/trans_presets.java:650
-#: build/trans_presets.java:857 build/trans_presets.java:876
-#: build/trans_presets.java:890 build/trans_presets.java:912
-#: build/trans_presets.java:949 build/trans_presets.java:962
-#: build/trans_presets.java:974 build/trans_presets.java:986
-#: build/trans_presets.java:998 build/trans_presets.java:1010
-#: build/trans_presets.java:1020 build/trans_presets.java:1029
-#: build/trans_presets.java:1038 build/trans_presets.java:1437
-#: build/trans_presets.java:1510
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:325 build/trans_presets.java:651
+#: build/trans_presets.java:858 build/trans_presets.java:877
+#: build/trans_presets.java:891 build/trans_presets.java:913
+#: build/trans_presets.java:950 build/trans_presets.java:963
+#: build/trans_presets.java:975 build/trans_presets.java:987
+#: build/trans_presets.java:999 build/trans_presets.java:1011
+#: build/trans_presets.java:1021 build/trans_presets.java:1030
+#: build/trans_presets.java:1039 build/trans_presets.java:1440
+#: build/trans_presets.java:1513
 msgid "Bicycle"
 msgstr "الدراجة"
@@ -7724,62 +7936,62 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:325 build/trans_presets.java:649
-#: build/trans_presets.java:856 build/trans_presets.java:875
-#: build/trans_presets.java:889 build/trans_presets.java:911
-#: build/trans_presets.java:948 build/trans_presets.java:961
-#: build/trans_presets.java:973 build/trans_presets.java:985
-#: build/trans_presets.java:997 build/trans_presets.java:1009
-#: build/trans_presets.java:1019 build/trans_presets.java:1028
-#: build/trans_presets.java:1037
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:326 build/trans_presets.java:650
+#: build/trans_presets.java:857 build/trans_presets.java:876
+#: build/trans_presets.java:890 build/trans_presets.java:912
+#: build/trans_presets.java:949 build/trans_presets.java:962
+#: build/trans_presets.java:974 build/trans_presets.java:986
+#: build/trans_presets.java:998 build/trans_presets.java:1010
+#: build/trans_presets.java:1020 build/trans_presets.java:1029
+#: build/trans_presets.java:1038
 msgid "Foot"
 msgstr "المشي"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "أرسم أسهم الإتجاه"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "رسم سريع ( أقل جودة)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
-msgid "Only interesting direction hints (e.g. with oneway tag)."
-msgstr ""
-
-#. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+msgid "Only interesting direction hints (e.g. with oneway tag)."
+msgstr ""
+
+#. only on the head of a way
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Only on the head of a way."
 msgstr "فقط على رأس الطريق."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:82
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -7787,29 +7999,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length (meters)"
 msgstr "الطول الأقصى (أمتار)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:129
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:135
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -7817,5 +8029,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:141
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -7823,13 +8035,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:144
 msgid "Minimum distance (pixels)"
 msgstr "المسافة الأدنى (نقاط)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Draw larger dots for the GPS points."
 msgstr "أرسم نقاط أكبر لجهاز تحديد المواقع العالمي."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -7837,9 +8049,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -7847,46 +8059,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid "Track and Point Coloring"
 msgstr "تلوين الأثر و النقطة"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202
 msgid "GPS Points"
 msgstr "نقاط جهاز تحديد المواقع العالمي"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:237
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257
 msgid "Draw the inactive data layers in a different color."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "OSM Data"
 msgstr "المعطيات أو.أس.أم"
@@ -7965,45 +8177,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Configure available plugins."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50
+#. buttons at the bottom
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
 msgid "Download List"
 msgstr "لائحة التنزيل."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:100
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 msgid "Update"
 msgstr "حدّث"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Configure Sites..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:125
 msgid "Add JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:126
 msgid "Enter URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:162
 msgid "Please select an entry."
 msgstr "الرجاء إختيار خانة."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:147
 msgid "Edit JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:148
 msgid "JOSM Plugin description URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:175
 msgid "Configure Plugin Sites"
 msgstr ""
@@ -8332,6 +8545,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:369
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341
 #, java-format
 msgid "Remove old keys from up to {0} object"
@@ -8340,9 +8553,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135
 msgid "Add a new tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160
 msgid "Delete the selection in the tag table"
 msgstr ""
@@ -8377,7 +8590,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:68
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:75
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -8425,4 +8638,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24
+#, fuzzy, java-format
+msgid "Preset group ''{0}'' of group ''{1}''"
+msgstr "المجموعة المسبقة التعريف ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
 #, java-format
 msgid "Preset group ''{0}''"
@@ -8443,4 +8661,10 @@
 msgstr "جاري تحميل النقاط {0} إلى {1}..."
 
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, java-format
+msgid "parameter ''{0}'' > 0 expected. Got {1}"
+msgstr ""
+
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8547,5 +8771,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
 msgid "Parse error: invalid document structure for gpx document"
 msgstr ""
@@ -8665,10 +8889,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -8676,75 +8901,79 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315
 msgid "Creating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
 #, java-format
 msgid "Successfully opened changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#, java-format
+msgid "id of changeset > 0 required. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
-#, java-format
-msgid "Changeset {0} is unchanged. Skipping update."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
 #, java-format
 msgid "Updating changeset {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
-msgid ""
-"Failed to update changeset. Either there is no current changeset or the id "
-"of the current changeset is 0"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
 msgid "Closing changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
-#, java-format
-msgid "Closing changeset {0}..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
-#, java-format
-msgid "Leaving changeset {0} open..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
 msgid "No changeset present for diff upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414
 msgid "Preparing..."
 msgstr "اعداد..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419
 msgid "Uploading..."
 msgstr "جاري الإرسال..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438
 msgid "Waiting 10 seconds ... "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449
 msgid "OK - trying again."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:485
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517
 #, java-format
 msgid "Starting retry {0} of {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
+msgid "current changeset is null. Can't upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
+#, java-format
+msgid "id of current changeset > required. Current id is {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
+#, java-format
+msgid "Open changeset expected. Got closed changeset with id {0}"
 msgstr ""
 
@@ -8770,50 +8999,108 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
+#, java-format
+msgid "missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:128
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:134
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
+#, java-format
+msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
+#, java-format
+msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
+#, java-format
+msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#, java-format
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#, java-format
+msgid "Unsupported version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:176
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Aborting."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#, java-format
+msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
+msgid "Parsing list of changesets..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
 msgid "Incorrect password or username."
 msgstr "الإسم أو كلمة المرور خطأ"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:168
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Warning: The password is transferred unencrypted."
 msgstr "تحذير: يتم نقل كلمة المرور بدون تعتيم"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Save user and password (unencrypted)"
 msgstr "إحفظ المستخدم و كلمة المرور (غير معتمة)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
 msgid "Enter Password"
 msgstr "أدخل كلمة المرور"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 msgid "Login"
 msgstr "دخول"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:242
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
 msgid "The base URL for the OSM server (REST API)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr "كلمة المرور للحساب أو.أس.أم. أترك فراغ كي لا يتم حفظ أي كلمة مرور."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
 msgid "Base Server URL"
 msgstr "URL الخادم الأساسي"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
 msgid "OSM password"
 msgstr "كلمة المرور أو.أس.أم"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -8822,5 +9109,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:51
+#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #, java-format
 msgid "(at line {0}, column {1})"
@@ -8910,20 +9197,5 @@
 msgstr "خطأ تحليل نحوي"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124
-#, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
-#, java-format
-msgid "Missing mandatory attribute ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
-#, fuzzy, java-format
-msgid "Unsupported version: {0}"
-msgstr "محوّل من: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:155
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -8932,38 +9204,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
 msgid "found XML element <nd> element not as direct child of element <way>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
 msgid "Found XML element <member> not as direct child of element <relation>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
 #, java-format
 msgid ""
@@ -8971,24 +9243,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
 msgid "Incomplete <member> specification with ref=0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
-#, java-format
-msgid "Warning: Undefined element ''{0}'' found in input stream. Skipping."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
-#, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Skipping."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
 msgid "Illegal object with id=0"
 msgstr "غرض غير مسموح به معروف بــ id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #, java-format
 msgid ""
@@ -8996,5 +9263,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:303
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
 #, java-format
 msgid ""
@@ -9003,5 +9270,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
 #, java-format
 msgid ""
@@ -9010,5 +9277,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
@@ -9018,25 +9285,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:316
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with id {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
 #, java-format
 msgid ""
@@ -9044,5 +9311,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
 #, java-format
 msgid ""
@@ -9051,5 +9318,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
 #, java-format
 msgid ""
@@ -9057,5 +9324,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
 #, java-format
 msgid ""
@@ -9064,17 +9331,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
 msgid "Prepare OSM data..."
 msgstr "حضّر المعطيات أو.أس.أم ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 msgid "Parsing OSM data..."
-msgstr "حضّر المعطيات أو.أس.أم ..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
 msgid "Preparing data set..."
-msgstr "جاري تحضير المعطيات..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
@@ -9095,4 +9360,24 @@
 msgid "Downloading referring relations ..."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51
+#, fuzzy
+msgid "Reading changesets..."
+msgstr "جاري قراءة {0}..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
+#, fuzzy
+msgid "Downloading changesets ..."
+msgstr "جاري التنزيل..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85
+#, fuzzy, java-format
+msgid "Reading changeset {0} ..."
+msgstr "جاري قراءة {0}..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91
+#, fuzzy, java-format
+msgid "Downloading changeset {0} ..."
+msgstr "جاري تحميل النقاط {0} إلى {1}..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
@@ -9109,43 +9394,66 @@
 msgstr "جاري الإتصال بلخادم"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
 msgid "Failed to open connection to API {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
+msgid "Error: failed to add authentication credentials to the connection."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
 msgstr "إستحالة الإتصال بلخادم أو.أس.أم. الرجاء فحص إتصالات الإنترنت."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+msgid "XML tag <user> is missing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
+#, java-format
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
+#, java-format
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
 msgid "Starting to upload with one request per primitive ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
 msgid "Starting to upload in one request ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:171
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135
 msgid "Uploading data ..."
-msgstr "جاري الإرسال..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:178
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
 msgid ""
 "WARNING: no API version defined for data to upload. Falling back to version "
@@ -9153,5 +9461,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147
 #, java-format
 msgid ""
@@ -9161,10 +9469,10 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
 msgid "Update Plugins"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 msgid "Download Plugins"
 msgstr ""
@@ -9312,5 +9620,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -9319,18 +9627,18 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
 msgid "No plugin information found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:93
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
 msgid "All installed plugins are up to date."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
 #, java-format
 msgid ""
@@ -9340,9 +9648,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
 msgid "Download missing plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
 #, java-format
 msgid ""
@@ -9354,43 +9662,43 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
 msgid "unknown"
 msgstr "مجهول"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: الإصدار {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 msgid "Plugin bundled with JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:357
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -9695,10 +10003,4 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:140
 msgid "(What does that mean?)"
-msgstr ""
-
-#. item "Relations/Route" text "Symbol description"
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3148
-msgid "Description"
 msgstr ""
 
@@ -10449,6 +10751,7 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
-msgid "Set "
-msgstr ""
+#, fuzzy, java-format
+msgid "Set {0} Lambert coordinates"
+msgstr "إحداثيات 0 "
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -11066,6 +11369,6 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 #: build/trans_style.java:990 build/trans_style.java:1007
-#: build/trans_style.java:1023 build/trans_style.java:3392
-#: build/trans_style.java:3400
+#: build/trans_style.java:1023 build/trans_style.java:3400
+#: build/trans_style.java:3408
 msgid "water"
 msgstr "الماء"
@@ -11350,4 +11653,55 @@
 msgstr ""
 
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Michigan Left"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Adds no left turn for sets of 4 or 5 ways."
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45
+#, fuzzy
+msgid "Please select 4 or 5 ways to assign no left turns."
+msgstr "الرجاء إختر على الأقل طريقتين للدمج."
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61
+#, fuzzy, java-format
+msgid "{0} extrem nodes."
+msgstr "{0} عقدة"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69
+#, java-format
+msgid "Via node {0}, {1}"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75
+#, fuzzy, java-format
+msgid "{0} via nodes."
+msgstr "{0} عقدة"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78
+msgid "Unable to find via nodes. Please check your selection"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98
+#, fuzzy, java-format
+msgid "MIddle way: {0}"
+msgstr "النمط: {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121
+msgid "Create Michigan left turn restriction"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129
+#, fuzzy, java-format
+msgid "Processing {0}"
+msgstr "الإصدار {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142
+#, java-format
+msgid "Relation: from {0} to {1} via {2}"
+msgstr ""
+
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
 msgid "OpenLayers"
@@ -11493,7 +11847,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
-#, fuzzy
 msgid "create new objects"
-msgstr "انشئ عقدة جديدة"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
@@ -11813,5 +12166,5 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:158
 msgid "JOSM Tag Editor Plugin"
 msgstr ""
@@ -11821,5 +12174,5 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:370
 #, java-format
 msgid "Updating properties of up to {0} object"
@@ -11828,18 +12181,4 @@
 msgstr[1] ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44
-msgid "INFO: entering compatibilty mode for JOSM with Main.ds"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47
-msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49
-msgid ""
-"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-"found."
-msgstr ""
-
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
 msgid "Group"
@@ -11848,9 +12187,4 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
 msgid "Item"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-msgid "Filter"
 msgstr ""
 
@@ -11937,5 +12271,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2272
 msgid "Street name"
 msgstr "إسم الشارع"
@@ -12096,8 +12430,4 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88
 msgid "Zoom (in metres)"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
-msgid "URL"
 msgstr ""
 
@@ -12301,7 +12631,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501
-#, fuzzy
 msgid "Updating map ..."
-msgstr "جاري الإرسال..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69
@@ -12785,7 +13114,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
-#: build/trans_style.java:4179
+#: build/trans_style.java:4159 build/trans_style.java:4166
+#: build/trans_style.java:4173 build/trans_style.java:4180
+#: build/trans_style.java:4187
 msgid "building"
 msgstr ""
@@ -12799,5 +13128,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4186
+#: build/trans_style.java:4194
 msgid "area"
 msgstr ""
@@ -12924,10 +13253,10 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:148
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:155
 msgid "Reached a junction"
 msgstr ""
@@ -13215,7 +13544,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
-#, fuzzy
 msgid "Overlap tiles"
-msgstr "ملفات الخادم أو.أس.أم"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
@@ -13368,6 +13696,11 @@
 msgstr ""
 
+#. Plugin michigan_left
+#: build/trans_plugins.java:35
+msgid "Adds no left turn for sets of 4 or 5 ways"
+msgstr ""
+
 #. Plugin nearclick
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid ""
 "Simulates a click when you do a small and short drag. This is usefull for "
@@ -13377,15 +13710,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13393,5 +13726,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13399,5 +13732,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13406,15 +13739,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Let other applications send commands to JOSM."
 msgstr "إسمح لتطبيقات أخرى بإرسال أوامر إلى د.أو.أس.أم."
 
 #. Plugin routes
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13423,10 +13756,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13435,15 +13768,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -13453,10 +13786,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin usertools
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -13465,5 +13798,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -13472,5 +13805,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -13479,5 +13812,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -13486,10 +13819,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -13545,4 +13878,10 @@
 #. <annotations>
 #: build/trans_presets.java:57
+#, fuzzy
+msgid "Highways"
+msgstr "من النوع طريق"
+
+#. group "Highways"
+#: build/trans_presets.java:58
 msgid "Streets"
 msgstr ""
@@ -13553,5 +13892,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:58 build/trans_surveyor.java:72
+#: build/trans_presets.java:59 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr ""
@@ -13560,5 +13899,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:61
+#: build/trans_presets.java:62
 msgid "Edit Motorway"
 msgstr ""
@@ -13585,8 +13924,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:120 build/trans_presets.java:140
-#: build/trans_presets.java:177 build/trans_presets.java:197
-#: build/trans_presets.java:1557 build/trans_presets.java:3146
+#: build/trans_presets.java:65 build/trans_presets.java:101
+#: build/trans_presets.java:121 build/trans_presets.java:141
+#: build/trans_presets.java:178 build/trans_presets.java:198
+#: build/trans_presets.java:1560 build/trans_presets.java:3158
 msgid "Reference"
 msgstr ""
@@ -13600,8 +13939,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:358
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:359
 msgid "Lanes"
 msgstr ""
@@ -13618,15 +13957,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:224 build/trans_presets.java:280
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:373 build/trans_presets.java:388
-#: build/trans_presets.java:412 build/trans_presets.java:431
-#: build/trans_presets.java:452 build/trans_presets.java:472
-#: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1307
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:225 build/trans_presets.java:281
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:374 build/trans_presets.java:389
+#: build/trans_presets.java:413 build/trans_presets.java:432
+#: build/trans_presets.java:453 build/trans_presets.java:473
+#: build/trans_presets.java:511 build/trans_presets.java:667
+#: build/trans_presets.java:1310
 msgid "Max. speed (km/h)"
 msgstr ""
@@ -13663,16 +14002,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:293 build/trans_presets.java:306
-#: build/trans_presets.java:320 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:464
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:659 build/trans_presets.java:1300
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:294 build/trans_presets.java:307
+#: build/trans_presets.java:321 build/trans_presets.java:353
+#: build/trans_presets.java:405 build/trans_presets.java:425
+#: build/trans_presets.java:445 build/trans_presets.java:465
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:660 build/trans_presets.java:1303
 msgid "Oneway"
 msgstr ""
@@ -13714,19 +14053,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:353
-#: build/trans_presets.java:362 build/trans_presets.java:405
-#: build/trans_presets.java:425 build/trans_presets.java:445
-#: build/trans_presets.java:465 build/trans_presets.java:485
-#: build/trans_presets.java:504 build/trans_presets.java:523
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:586 build/trans_presets.java:607
-#: build/trans_presets.java:628 build/trans_presets.java:660
-#: build/trans_presets.java:1301 build/trans_surveyor.java:12
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:354
+#: build/trans_presets.java:363 build/trans_presets.java:406
+#: build/trans_presets.java:426 build/trans_presets.java:446
+#: build/trans_presets.java:466 build/trans_presets.java:486
+#: build/trans_presets.java:505 build/trans_presets.java:524
+#: build/trans_presets.java:545 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629 build/trans_presets.java:661
+#: build/trans_presets.java:1304 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr ""
@@ -13762,19 +14101,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:354
-#: build/trans_presets.java:378 build/trans_presets.java:406
-#: build/trans_presets.java:426 build/trans_presets.java:446
-#: build/trans_presets.java:466 build/trans_presets.java:486
-#: build/trans_presets.java:505 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629 build/trans_presets.java:661
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:355
+#: build/trans_presets.java:379 build/trans_presets.java:407
+#: build/trans_presets.java:427 build/trans_presets.java:447
+#: build/trans_presets.java:467 build/trans_presets.java:487
+#: build/trans_presets.java:506 build/trans_presets.java:525
+#: build/trans_presets.java:546 build/trans_presets.java:567
+#: build/trans_presets.java:588 build/trans_presets.java:609
+#: build/trans_presets.java:630 build/trans_presets.java:662
+#: build/trans_presets.java:1305
 msgid "Tunnel"
 msgstr ""
@@ -13808,18 +14147,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:73 build/trans_presets.java:90
-#: build/trans_presets.java:110 build/trans_presets.java:129
-#: build/trans_presets.java:150 build/trans_presets.java:166
-#: build/trans_presets.java:186 build/trans_presets.java:205
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:355
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:467
-#: build/trans_presets.java:487 build/trans_presets.java:506
-#: build/trans_presets.java:525 build/trans_presets.java:546
-#: build/trans_presets.java:567 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:630
-#: build/trans_presets.java:662 build/trans_presets.java:1303
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:356
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:468
+#: build/trans_presets.java:488 build/trans_presets.java:507
+#: build/trans_presets.java:526 build/trans_presets.java:547
+#: build/trans_presets.java:568 build/trans_presets.java:589
+#: build/trans_presets.java:610 build/trans_presets.java:631
+#: build/trans_presets.java:663 build/trans_presets.java:1306
 msgid "Cutting"
 msgstr ""
@@ -13853,18 +14192,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:74 build/trans_presets.java:91
-#: build/trans_presets.java:111 build/trans_presets.java:130
-#: build/trans_presets.java:151 build/trans_presets.java:167
-#: build/trans_presets.java:187 build/trans_presets.java:206
-#: build/trans_presets.java:222 build/trans_presets.java:240
-#: build/trans_presets.java:258 build/trans_presets.java:277
-#: build/trans_presets.java:310 build/trans_presets.java:356
-#: build/trans_presets.java:408 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:468
-#: build/trans_presets.java:488 build/trans_presets.java:507
-#: build/trans_presets.java:526 build/trans_presets.java:547
-#: build/trans_presets.java:568 build/trans_presets.java:589
-#: build/trans_presets.java:610 build/trans_presets.java:631
-#: build/trans_presets.java:663 build/trans_presets.java:1304
+#: build/trans_presets.java:75 build/trans_presets.java:92
+#: build/trans_presets.java:112 build/trans_presets.java:131
+#: build/trans_presets.java:152 build/trans_presets.java:168
+#: build/trans_presets.java:188 build/trans_presets.java:207
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:357
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:469
+#: build/trans_presets.java:489 build/trans_presets.java:508
+#: build/trans_presets.java:527 build/trans_presets.java:548
+#: build/trans_presets.java:569 build/trans_presets.java:590
+#: build/trans_presets.java:611 build/trans_presets.java:632
+#: build/trans_presets.java:664 build/trans_presets.java:1307
 msgid "Embankment"
 msgstr ""
@@ -13872,5 +14211,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Motorway Link"
 msgstr ""
@@ -13879,5 +14218,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:80
+#: build/trans_presets.java:81
 msgid "Edit Motorway Link"
 msgstr ""
@@ -13885,5 +14224,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:94
+#: build/trans_presets.java:95
 msgid "Trunk"
 msgstr ""
@@ -13892,5 +14231,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:97
+#: build/trans_presets.java:98
 msgid "Edit Trunk"
 msgstr ""
@@ -13900,6 +14239,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
 msgid "Motorroad"
 msgstr ""
@@ -13907,5 +14246,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:114
+#: build/trans_presets.java:115
 msgid "Trunk Link"
 msgstr ""
@@ -13914,5 +14253,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:117
+#: build/trans_presets.java:118
 msgid "Edit Trunk Link"
 msgstr ""
@@ -13925,5 +14264,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:134 build/trans_surveyor.java:76
+#: build/trans_presets.java:135 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr ""
@@ -13932,5 +14271,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:137
+#: build/trans_presets.java:138
 msgid "Edit Primary Road"
 msgstr ""
@@ -13938,10 +14277,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:154
+#: build/trans_presets.java:155
 msgid "Primary Link"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:155
+#: build/trans_presets.java:156
 msgid "Edit Primary Link"
 msgstr ""
@@ -13953,5 +14292,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:170 build/trans_surveyor.java:80
+#: build/trans_presets.java:171 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr ""
@@ -13961,5 +14300,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:174
+#: build/trans_presets.java:175
 msgid "Edit Secondary Road"
 msgstr ""
@@ -13967,5 +14306,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:190
+#: build/trans_presets.java:191
 msgid "Tertiary"
 msgstr ""
@@ -13975,5 +14314,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:194
+#: build/trans_presets.java:195
 msgid "Edit Tertiary Road"
 msgstr ""
@@ -13985,5 +14324,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:209 build/trans_surveyor.java:84
+#: build/trans_presets.java:210 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr ""
@@ -13993,5 +14332,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:213
+#: build/trans_presets.java:214
 msgid "Edit Unclassified Road"
 msgstr ""
@@ -14018,19 +14357,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:225 build/trans_presets.java:243
-#: build/trans_presets.java:261 build/trans_presets.java:281
-#: build/trans_presets.java:314 build/trans_presets.java:359
-#: build/trans_presets.java:375 build/trans_presets.java:389
-#: build/trans_presets.java:413 build/trans_presets.java:432
-#: build/trans_presets.java:453 build/trans_presets.java:473
-#: build/trans_presets.java:491 build/trans_presets.java:511
-#: build/trans_presets.java:532 build/trans_presets.java:553
-#: build/trans_presets.java:574 build/trans_presets.java:595
-#: build/trans_presets.java:616 build/trans_presets.java:637
-#: build/trans_presets.java:667 build/trans_presets.java:680
-#: build/trans_presets.java:693 build/trans_presets.java:706
-#: build/trans_presets.java:719 build/trans_presets.java:732
-#: build/trans_presets.java:745 build/trans_presets.java:1308
-#: build/trans_presets.java:1498 build/trans_presets.java:1540
+#: build/trans_presets.java:226 build/trans_presets.java:244
+#: build/trans_presets.java:262 build/trans_presets.java:282
+#: build/trans_presets.java:315 build/trans_presets.java:360
+#: build/trans_presets.java:376 build/trans_presets.java:390
+#: build/trans_presets.java:414 build/trans_presets.java:433
+#: build/trans_presets.java:454 build/trans_presets.java:474
+#: build/trans_presets.java:492 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:554
+#: build/trans_presets.java:575 build/trans_presets.java:596
+#: build/trans_presets.java:617 build/trans_presets.java:638
+#: build/trans_presets.java:668 build/trans_presets.java:681
+#: build/trans_presets.java:694 build/trans_presets.java:707
+#: build/trans_presets.java:720 build/trans_presets.java:733
+#: build/trans_presets.java:746 build/trans_presets.java:1311
+#: build/trans_presets.java:1501 build/trans_presets.java:1543
 msgid "Width (meters)"
 msgstr ""
@@ -14042,5 +14381,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:228 build/trans_surveyor.java:88
+#: build/trans_presets.java:229 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr ""
@@ -14049,5 +14388,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:231
+#: build/trans_presets.java:232
 msgid "Edit Residential Street"
 msgstr ""
@@ -14072,14 +14411,14 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:611
-#: build/trans_presets.java:632 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "Surface"
 msgstr ""
@@ -14100,53 +14439,53 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paved"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "unpaved"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
 msgid "metal"
 msgstr ""
@@ -14160,22 +14499,22 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
-#: build/trans_style.java:3367
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
+#: build/trans_style.java:3375
 msgid "wood"
 msgstr "غابة/حرش"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paving_stones"
 msgstr ""
@@ -14183,77 +14522,77 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "cobblestone"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "gravel"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "grass"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "sand"
 msgstr ""
@@ -14261,13 +14600,13 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "ground"
 msgstr ""
@@ -14275,5 +14614,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:246
+#: build/trans_presets.java:247
 msgid "Living Street"
 msgstr ""
@@ -14282,5 +14621,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:249
+#: build/trans_presets.java:250
 msgid "Edit Living Street"
 msgstr ""
@@ -14288,5 +14627,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:264
+#: build/trans_presets.java:265
 msgid "Service"
 msgstr ""
@@ -14295,5 +14634,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:267
+#: build/trans_presets.java:268
 msgid "Edit Serviceway"
 msgstr ""
@@ -14303,18 +14642,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "parking_aisle"
 msgstr ""
@@ -14322,5 +14661,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:284
+#: build/trans_presets.java:285
 msgid "Parking Aisle"
 msgstr ""
@@ -14330,5 +14669,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:288
+#: build/trans_presets.java:289
 msgid "Edit Parking Aisle"
 msgstr ""
@@ -14336,5 +14675,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:298
+#: build/trans_presets.java:299
 msgid "Road (Unknown Type)"
 msgstr ""
@@ -14343,5 +14682,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Edit Road of unknown type"
 msgstr ""
@@ -14350,20 +14689,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:318
+#: build/trans_presets.java:319
 msgid "Road Restrictions"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:319
+#: build/trans_presets.java:320
 msgid "Edit Road Restrictions"
 msgstr ""
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:321
+#: build/trans_presets.java:322
 msgid "Toll"
 msgstr ""
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:322
+#: build/trans_presets.java:323
 msgid "No exit (cul-de-sac)"
 msgstr ""
@@ -14376,8 +14715,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:323 build/trans_presets.java:529
-#: build/trans_presets.java:550 build/trans_presets.java:571
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:634
+#: build/trans_presets.java:324 build/trans_presets.java:530
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:593 build/trans_presets.java:614
+#: build/trans_presets.java:635
 msgid "Access"
 msgstr ""
@@ -14431,29 +14770,29 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1397
-#: build/trans_presets.java:1398 build/trans_presets.java:1399
-#: build/trans_presets.java:1763 build/trans_presets.java:1773
-#: build/trans_presets.java:2397 build/trans_presets.java:2433
-#: build/trans_presets.java:2442 build/trans_presets.java:2443
-#: build/trans_presets.java:2444 build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:1396
+#: build/trans_presets.java:1397 build/trans_presets.java:1400
+#: build/trans_presets.java:1401 build/trans_presets.java:1402
+#: build/trans_presets.java:1767 build/trans_presets.java:1777
+#: build/trans_presets.java:2408 build/trans_presets.java:2444
+#: build/trans_presets.java:2453 build/trans_presets.java:2454
+#: build/trans_presets.java:2455 build/trans_presets.java:2725
 msgid "yes"
 msgstr ""
@@ -14466,40 +14805,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:212
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:212
 msgid "private"
 msgstr ""
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655
 msgid "designated"
 msgstr ""
@@ -14512,19 +14851,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:219
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:219
 msgid "destination"
 msgstr ""
@@ -14547,71 +14886,71 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:205
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:205
 msgid "permissive"
 msgstr ""
 
-#: build/trans_presets.java:323 build/trans_presets.java:327
-#: build/trans_presets.java:330 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636
+#: build/trans_presets.java:324 build/trans_presets.java:328
+#: build/trans_presets.java:331 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637
 msgid "agricultural"
 msgstr ""
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
-#: build/trans_presets.java:2433 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1396 build/trans_presets.java:1397
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
+#: build/trans_presets.java:2444 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
+#: build/trans_presets.java:2725
 msgid "no"
 msgstr ""
 
-#: build/trans_presets.java:326
+#: build/trans_presets.java:327
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:327
+#: build/trans_presets.java:328
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -14626,10 +14965,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:328 build/trans_presets.java:651
-#: build/trans_presets.java:858 build/trans_presets.java:891
-#: build/trans_presets.java:913 build/trans_presets.java:950
-#: build/trans_presets.java:963 build/trans_presets.java:975
-#: build/trans_presets.java:987 build/trans_presets.java:999
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:329 build/trans_presets.java:652
+#: build/trans_presets.java:859 build/trans_presets.java:892
+#: build/trans_presets.java:914 build/trans_presets.java:951
+#: build/trans_presets.java:964 build/trans_presets.java:976
+#: build/trans_presets.java:988 build/trans_presets.java:1000
+#: build/trans_presets.java:1040
 msgid "Horse"
 msgstr ""
@@ -14645,13 +14984,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:329 build/trans_presets.java:530
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:635 build/trans_presets.java:859
-#: build/trans_presets.java:877 build/trans_presets.java:892
-#: build/trans_presets.java:914 build/trans_presets.java:951
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:330 build/trans_presets.java:531
+#: build/trans_presets.java:552 build/trans_presets.java:573
+#: build/trans_presets.java:594 build/trans_presets.java:615
+#: build/trans_presets.java:636 build/trans_presets.java:860
+#: build/trans_presets.java:878 build/trans_presets.java:893
+#: build/trans_presets.java:915 build/trans_presets.java:952
+#: build/trans_presets.java:965 build/trans_presets.java:977
+#: build/trans_presets.java:989 build/trans_presets.java:1001
+#: build/trans_presets.java:1041
 msgid "Motorcycle"
 msgstr "الدراجة النارية"
@@ -14666,30 +15005,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:330 build/trans_presets.java:531
-#: build/trans_presets.java:552 build/trans_presets.java:573
-#: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:636 build/trans_presets.java:654
-#: build/trans_presets.java:878 build/trans_presets.java:893
-#: build/trans_presets.java:915 build/trans_presets.java:952
-#: build/trans_presets.java:965 build/trans_presets.java:977
-#: build/trans_presets.java:989 build/trans_presets.java:1001
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:331 build/trans_presets.java:532
+#: build/trans_presets.java:553 build/trans_presets.java:574
+#: build/trans_presets.java:595 build/trans_presets.java:616
+#: build/trans_presets.java:637 build/trans_presets.java:655
+#: build/trans_presets.java:879 build/trans_presets.java:894
+#: build/trans_presets.java:916 build/trans_presets.java:953
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1042
 msgid "Motorcar"
 msgstr ""
 
-#: build/trans_presets.java:331
+#: build/trans_presets.java:332
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
-#: build/trans_presets.java:332
+#: build/trans_presets.java:333
 msgid "Motorboat"
 msgstr ""
 
-#: build/trans_presets.java:333
+#: build/trans_presets.java:334
 msgid "Boat"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:336
 msgid "Min. speed (km/h)"
 msgstr ""
@@ -14697,25 +15036,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:336 build/trans_presets.java:374
+#: build/trans_presets.java:337 build/trans_presets.java:375
 msgid "Max. weight (tonnes)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:337
+#: build/trans_presets.java:338
 msgid "Max. Height (meters)"
 msgstr "الإرتفاع الأقصى (أمتار)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:339
+#: build/trans_presets.java:340
 msgid "Max. Length (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:341
+#: build/trans_presets.java:342
 msgid "Roundabout"
 msgstr ""
@@ -14726,5 +15065,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:346
+#: build/trans_presets.java:347
 msgid "Edit Junction"
 msgstr ""
@@ -14746,9 +15085,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:349 build/trans_presets.java:648
-#: build/trans_presets.java:788 build/trans_presets.java:1135
-#: build/trans_presets.java:1392 build/trans_presets.java:2353
-#: build/trans_presets.java:2901 build/trans_presets.java:2911
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:350 build/trans_presets.java:649
+#: build/trans_presets.java:789 build/trans_presets.java:1137
+#: build/trans_presets.java:1395 build/trans_presets.java:2364
+#: build/trans_presets.java:2913 build/trans_presets.java:2923
+#: build/trans_presets.java:2932
 msgid "Type"
 msgstr "النوع"
@@ -14768,10 +15107,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:547
+#: build/trans_presets.java:350 build/trans_style.java:547
 #: build/trans_style.java:555
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "motorway_link"
 msgstr ""
@@ -14793,10 +15132,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:563
+#: build/trans_presets.java:350 build/trans_style.java:563
 #: build/trans_style.java:571
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "trunk_link"
 msgstr ""
@@ -14818,10 +15157,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:579
+#: build/trans_presets.java:350 build/trans_style.java:579
 #: build/trans_style.java:587
 msgid "primary"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "primary_link"
 msgstr ""
@@ -14843,5 +15182,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:595
+#: build/trans_presets.java:350 build/trans_style.java:595
 #: build/trans_style.java:603
 msgid "secondary"
@@ -14856,9 +15195,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:349 build/trans_style.java:611
+#: build/trans_presets.java:350 build/trans_style.java:611
 msgid "tertiary"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "unclassified"
 msgstr ""
@@ -14872,9 +15211,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:349 build/trans_style.java:3143
+#: build/trans_presets.java:350 build/trans_style.java:3151
 msgid "residential"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "living_street"
 msgstr "شارع سكني"
@@ -14904,10 +15243,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:349 build/trans_style.java:667
-#: build/trans_style.java:4244
+#: build/trans_presets.java:350 build/trans_style.java:667
+#: build/trans_style.java:4252
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "bus_guideway"
 msgstr ""
@@ -14937,6 +15276,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:349 build/trans_style.java:877
-#: build/trans_style.java:3208 build/trans_style.java:3209
+#: build/trans_presets.java:350 build/trans_style.java:877
+#: build/trans_style.java:3216 build/trans_style.java:3217
 msgid "construction"
 msgstr ""
@@ -14947,10 +15286,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Edit Bridge"
 msgstr "حرّر جسر"
 
 #. item
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "Edit Tunnel"
 msgstr "حرّر خندق"
@@ -14958,19 +15297,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:393
+#: build/trans_presets.java:394
 msgid "Ways"
 msgstr ""
 
 #. group "Ways"
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Construction"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:395
+#: build/trans_presets.java:396
 msgid "Edit Highway Under Construction"
 msgstr ""
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "Junction"
 msgstr ""
@@ -14986,5 +15325,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:411 build/trans_style.java:895
+#: build/trans_presets.java:412 build/trans_style.java:895
 msgid "roundabout"
 msgstr ""
@@ -14993,5 +15332,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:417
+#: build/trans_presets.java:418
 msgid "Bridleway"
 msgstr ""
@@ -14999,5 +15338,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:419
+#: build/trans_presets.java:420
 msgid "Edit Bridleway"
 msgstr ""
@@ -15005,5 +15344,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:435
+#: build/trans_presets.java:436
 msgid "Cycleway"
 msgstr ""
@@ -15013,10 +15352,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:439
+#: build/trans_presets.java:440
 msgid "Edit Cycleway"
 msgstr "حرّر طريق للدراجات"
 
 #. item "Ways/Cycleway" check "Embankment"
-#: build/trans_presets.java:449
+#: build/trans_presets.java:450
 msgid "Pedestrians"
 msgstr ""
@@ -15024,5 +15363,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Footway"
 msgstr "طريق قدم"
@@ -15031,10 +15370,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Footway"
 msgstr "حرّر طريق قدم"
 
 #. item "Ways/Footway" check "Embankment"
-#: build/trans_presets.java:469
+#: build/trans_presets.java:470
 msgid "Bikes"
 msgstr ""
@@ -15042,5 +15381,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:476
+#: build/trans_presets.java:477
 msgid "Pedestrian"
 msgstr "المشاة"
@@ -15049,5 +15388,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Edit Pedestrian Street"
 msgstr "حرّر شارع للمشاة"
@@ -15055,5 +15394,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:494
+#: build/trans_presets.java:495
 msgid "Steps"
 msgstr "درجات"
@@ -15063,5 +15402,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:498
+#: build/trans_presets.java:499
 msgid "Edit Flight of Steps"
 msgstr ""
@@ -15070,5 +15409,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:515
+#: build/trans_presets.java:516
 msgid "Track"
 msgstr ""
@@ -15077,5 +15416,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:518
+#: build/trans_presets.java:519
 msgid "Edit Track"
 msgstr ""
@@ -15083,5 +15422,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:535
+#: build/trans_presets.java:536
 msgid "Track Grade 1"
 msgstr ""
@@ -15090,5 +15429,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:538
+#: build/trans_presets.java:539
 msgid "Edit Track of grade 1"
 msgstr ""
@@ -15096,5 +15435,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:556
+#: build/trans_presets.java:557
 msgid "Track Grade 2"
 msgstr ""
@@ -15103,5 +15442,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:559
+#: build/trans_presets.java:560
 msgid "Edit Track of grade 2"
 msgstr ""
@@ -15109,5 +15448,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:577
+#: build/trans_presets.java:578
 msgid "Track Grade 3"
 msgstr ""
@@ -15116,5 +15455,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:580
+#: build/trans_presets.java:581
 msgid "Edit Track of grade 3"
 msgstr ""
@@ -15122,5 +15461,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:598
+#: build/trans_presets.java:599
 msgid "Track Grade 4"
 msgstr ""
@@ -15129,5 +15468,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:601
+#: build/trans_presets.java:602
 msgid "Edit Track of grade 4"
 msgstr ""
@@ -15135,5 +15474,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:619
+#: build/trans_presets.java:620
 msgid "Track Grade 5"
 msgstr ""
@@ -15142,5 +15481,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:622
+#: build/trans_presets.java:623
 msgid "Edit Track of grade 5"
 msgstr ""
@@ -15149,5 +15488,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:641
+#: build/trans_presets.java:642
 msgid "Path"
 msgstr ""
@@ -15156,13 +15495,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:644
+#: build/trans_presets.java:645
 msgid "Edit Path"
 msgstr ""
 
-#: build/trans_presets.java:652
+#: build/trans_presets.java:653
 msgid "Ski"
 msgstr ""
 
-#: build/trans_presets.java:653
+#: build/trans_presets.java:654
 msgid "Snowmobile"
 msgstr ""
@@ -15172,6 +15511,6 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:670 build/trans_presets.java:1725
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:671 build/trans_presets.java:1729
+#: build/trans_presets.java:1752
 msgid "Hiking"
 msgstr ""
@@ -15181,5 +15520,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:674
+#: build/trans_presets.java:675
 msgid "Edit Hiking"
 msgstr ""
@@ -15187,5 +15526,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:683
+#: build/trans_presets.java:684
 msgid "Mountain Hiking"
 msgstr ""
@@ -15195,5 +15534,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:687
+#: build/trans_presets.java:688
 msgid "Edit Mountain Hiking"
 msgstr ""
@@ -15201,5 +15540,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:696
+#: build/trans_presets.java:697
 msgid "Demanding Mountain Hiking"
 msgstr ""
@@ -15209,5 +15548,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:700
+#: build/trans_presets.java:701
 msgid "Edit Demanding Mountain Hiking"
 msgstr ""
@@ -15215,5 +15554,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:709
+#: build/trans_presets.java:710
 msgid "Alpine Hiking"
 msgstr ""
@@ -15223,5 +15562,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:713
+#: build/trans_presets.java:714
 msgid "Edit Alpine Hiking"
 msgstr ""
@@ -15229,5 +15568,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:723
 msgid "Demanding Alpine Hiking"
 msgstr ""
@@ -15237,5 +15576,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:726
+#: build/trans_presets.java:727
 msgid "Edit Demanding Alpine Hiking"
 msgstr ""
@@ -15243,5 +15582,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:735
+#: build/trans_presets.java:736
 msgid "Difficult Alpine Hiking"
 msgstr ""
@@ -15251,5 +15590,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:739
+#: build/trans_presets.java:740
 msgid "Edit Difficult Alpine Hiking"
 msgstr ""
@@ -15257,10 +15596,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:749
+#: build/trans_presets.java:750
 msgid "Waypoints"
 msgstr ""
 
 #. group "Waypoints"
-#: build/trans_presets.java:750
+#: build/trans_presets.java:751
 msgid "Motorway Junction"
 msgstr "تقاطع طرقات سريعة"
@@ -15268,15 +15607,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:752
+#: build/trans_presets.java:753
 msgid "Edit Motorway Junction"
 msgstr "حرّر تقاطع طرقات سريعة"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:757
 msgid "Number"
 msgstr "الرقم"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:759
 msgid "Services"
 msgstr "الخدمات"
@@ -15284,5 +15623,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:761
 msgid "Edit Service Station"
 msgstr "حرّر محطة خدمات"
@@ -15320,15 +15659,15 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:765 build/trans_presets.java:902
-#: build/trans_presets.java:1382 build/trans_presets.java:1406
-#: build/trans_presets.java:1413 build/trans_presets.java:1419
-#: build/trans_presets.java:1427 build/trans_presets.java:1434
-#: build/trans_presets.java:1761 build/trans_presets.java:1771
-#: build/trans_presets.java:2361 build/trans_presets.java:2368
-#: build/trans_presets.java:2384 build/trans_presets.java:2395
-#: build/trans_presets.java:2403 build/trans_presets.java:2410
-#: build/trans_presets.java:2464 build/trans_presets.java:2512
-#: build/trans_presets.java:2678 build/trans_presets.java:2693
-#: build/trans_presets.java:2732 build/trans_presets.java:3151
+#: build/trans_presets.java:766 build/trans_presets.java:903
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
+#: build/trans_presets.java:1416 build/trans_presets.java:1422
+#: build/trans_presets.java:1430 build/trans_presets.java:1437
+#: build/trans_presets.java:1765 build/trans_presets.java:1775
+#: build/trans_presets.java:2372 build/trans_presets.java:2379
+#: build/trans_presets.java:2395 build/trans_presets.java:2406
+#: build/trans_presets.java:2414 build/trans_presets.java:2421
+#: build/trans_presets.java:2475 build/trans_presets.java:2523
+#: build/trans_presets.java:2689 build/trans_presets.java:2704
+#: build/trans_presets.java:2743 build/trans_presets.java:3163
 msgid "Operator"
 msgstr "شركة الإدارة"
@@ -15337,5 +15676,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:769
+#: build/trans_presets.java:770
 msgid "Traffic Signal"
 msgstr "إشارة سير"
@@ -15345,5 +15684,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:774
 msgid "Pedestrian crossing type"
 msgstr "نوع التقاطع للمشاة"
@@ -15352,27 +15691,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "traffic_signals"
 msgstr "إشارات_السير"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "island"
 msgstr "جزيرة"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:774 build/trans_presets.java:790
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:775 build/trans_presets.java:791
+#: build/trans_presets.java:1334
 msgid "Cross on horseback"
 msgstr ""
@@ -15380,6 +15719,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:775 build/trans_presets.java:789
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:776 build/trans_presets.java:790
+#: build/trans_presets.java:1335
 msgid "Cross by bicycle"
 msgstr ""
@@ -15388,11 +15727,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:776 build/trans_presets.java:791
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:1336
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:778
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -15400,30 +15739,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "toucan"
 msgstr "طير الطوقان"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "tiger"
 msgstr "نمر"
 
 #. </optional>
-#: build/trans_presets.java:780
+#: build/trans_presets.java:781
 msgid "Stop"
 msgstr "إشارة وقوف"
@@ -15431,5 +15770,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:783
+#: build/trans_presets.java:784
 msgid "Pedestrian Crossing"
 msgstr "تقاطع مشاة"
@@ -15438,14 +15777,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:786
+#: build/trans_presets.java:787
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:793
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:795
 msgid "Mini-roundabout"
 msgstr "مستديرة صغيرة"
@@ -15456,14 +15795,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "Direction"
 msgstr "الإتجاه"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "clockwise"
 msgstr "إتجاه عقارب الساعة"
 
-#: build/trans_presets.java:801
+#: build/trans_presets.java:802
 msgid "Turning Circle"
 msgstr ""
@@ -15473,20 +15812,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:806
+#: build/trans_presets.java:807
 msgid "City Limit"
 msgstr "حدود المدينة"
 
 #. item
-#: build/trans_presets.java:807
+#: build/trans_presets.java:808
 msgid "Edit City Limit Sign"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:812
+#: build/trans_presets.java:813
 msgid "Second Name"
 msgstr "الإسم الثاني"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:814
+#: build/trans_presets.java:815
 msgid "Speed Camera"
 msgstr "كاميرا مراقبة السير"
@@ -15494,5 +15833,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:817
+#: build/trans_presets.java:818
 msgid "Emergency Phone"
 msgstr "هاتف طوارئ"
@@ -15500,5 +15839,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:820
+#: build/trans_presets.java:821
 msgid "Incline"
 msgstr ""
@@ -15506,5 +15845,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:823
+#: build/trans_presets.java:824
 msgid "Incline Steep"
 msgstr ""
@@ -15513,10 +15852,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:827
+#: build/trans_presets.java:828
 msgid "Ford"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:828
+#: build/trans_presets.java:829
 msgid "Edit Ford"
 msgstr ""
@@ -15524,5 +15863,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:835
+#: build/trans_presets.java:836
 msgid "Mountain Pass"
 msgstr ""
@@ -15530,5 +15869,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:837
+#: build/trans_presets.java:838
 msgid "Edit Mountain Pass"
 msgstr ""
@@ -15540,7 +15879,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:842 build/trans_presets.java:1600
-#: build/trans_presets.java:1745 build/trans_presets.java:2845
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:843 build/trans_presets.java:1604
+#: build/trans_presets.java:1749 build/trans_presets.java:2857
+#: build/trans_presets.java:2864 build/trans_presets.java:2871
 msgid "Elevation"
 msgstr "إرتفاع"
@@ -15548,5 +15887,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:846
+#: build/trans_presets.java:847
 msgid "Barriers"
 msgstr "حواجز"
@@ -15554,5 +15893,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:849
+#: build/trans_presets.java:850
 msgid "Bollard"
 msgstr ""
@@ -15560,5 +15899,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:852
 msgid "Edit Bollard"
 msgstr ""
@@ -15603,16 +15942,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:854 build/trans_presets.java:873
-#: build/trans_presets.java:887 build/trans_presets.java:909
-#: build/trans_presets.java:946 build/trans_presets.java:959
-#: build/trans_presets.java:971 build/trans_presets.java:983
-#: build/trans_presets.java:995 build/trans_presets.java:1007
-#: build/trans_presets.java:1017 build/trans_presets.java:1026
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:855 build/trans_presets.java:874
+#: build/trans_presets.java:888 build/trans_presets.java:910
+#: build/trans_presets.java:947 build/trans_presets.java:960
+#: build/trans_presets.java:972 build/trans_presets.java:984
+#: build/trans_presets.java:996 build/trans_presets.java:1008
+#: build/trans_presets.java:1018 build/trans_presets.java:1027
+#: build/trans_presets.java:1036
 msgid "Allowed traffic:"
 msgstr "السير المسموح:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:861
+#: build/trans_presets.java:862
 msgid "Cycle Barrier"
 msgstr "حاجز دراجة"
@@ -15621,5 +15960,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:865
+#: build/trans_presets.java:866
 msgid "Block"
 msgstr ""
@@ -15627,5 +15966,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:868
+#: build/trans_presets.java:869
 msgid "Cattle Grid"
 msgstr ""
@@ -15633,10 +15972,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:870
+#: build/trans_presets.java:871
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:880
+#: build/trans_presets.java:881
 msgid "Bus Trap"
 msgstr ""
@@ -15644,15 +15983,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:883
+#: build/trans_presets.java:884
 msgid "Spikes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:884
+#: build/trans_presets.java:885
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:896
 msgid "Toll Booth"
 msgstr ""
@@ -15660,5 +15999,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:897
+#: build/trans_presets.java:898
 msgid "Edit Toll Booth"
 msgstr ""
@@ -15666,10 +16005,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:905
+#: build/trans_presets.java:906
 msgid "Border Control"
 msgstr "مراقبة الحدود"
 
 #. item
-#: build/trans_presets.java:906
+#: build/trans_presets.java:907
 msgid "Edit Border Control"
 msgstr "حرّر مراقبة الحدود"
@@ -15679,5 +16018,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:920
+#: build/trans_presets.java:921
 msgid "Hedge"
 msgstr ""
@@ -15686,5 +16025,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:925
 msgid "Fence"
 msgstr ""
@@ -15693,5 +16032,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:929
 msgid "Wall"
 msgstr "حائط/جدار"
@@ -15699,5 +16038,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:931
+#: build/trans_presets.java:932
 msgid "City Wall"
 msgstr "حائط/جدار مدينة"
@@ -15706,5 +16045,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:935
+#: build/trans_presets.java:936
 msgid "Retaining Wall"
 msgstr ""
@@ -15716,15 +16055,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:942
+#: build/trans_presets.java:943
 msgid "Entrance"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:943
+#: build/trans_presets.java:944
 msgid "Edit Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:954
+#: build/trans_presets.java:955
 msgid "Gate"
 msgstr ""
@@ -15732,50 +16071,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:956
+#: build/trans_presets.java:957
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:967
+#: build/trans_presets.java:968
 msgid "Lift Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:968
+#: build/trans_presets.java:969
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:979
+#: build/trans_presets.java:980
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:980
+#: build/trans_presets.java:981
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:991
+#: build/trans_presets.java:992
 msgid "Bump Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:992
+#: build/trans_presets.java:993
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:1003
+#: build/trans_presets.java:1004
 msgid "Kissing Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1004
+#: build/trans_presets.java:1005
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1013
 msgid "Stile"
 msgstr ""
@@ -15783,25 +16122,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1014
+#: build/trans_presets.java:1015
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1023
 msgid "Turnstile"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1024
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1032
 msgid "Sally Port"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1033
 msgid "Edit Sally Port"
 msgstr ""
@@ -15809,13 +16148,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #.
-#. <separator/>
+#. group "Water"
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1046 build/trans_presets.java:1089
+#: build/trans_presets.java:1047 build/trans_presets.java:1048
+#: build/trans_presets.java:1091
 msgid "Water"
 msgstr "الماء"
 
 #. group "Water"
-#: build/trans_presets.java:1047
+#: build/trans_presets.java:1049
 msgid "Spring"
 msgstr "نبع"
@@ -15823,5 +16163,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1049
+#: build/trans_presets.java:1051
 msgid "Edit Spring"
 msgstr "حرّر نبع"
@@ -15829,5 +16169,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1056
 msgid "Drain"
 msgstr "مسرب"
@@ -15835,10 +16175,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1058
 msgid "Edit Drain"
 msgstr "حرّر مسرب"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1064
 msgid "Stream"
 msgstr "جدول نهر"
@@ -15846,10 +16186,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1066
 msgid "Edit Stream"
 msgstr "حرّر جدول نهر"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1072
 msgid "Canal"
 msgstr "قناة"
@@ -15857,10 +16197,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1074
 msgid "Edit Canal"
 msgstr "حرّر قناة"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1080
 msgid "River"
 msgstr "نهر"
@@ -15870,5 +16210,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1084
 msgid "Edit River"
 msgstr "نهر"
@@ -15876,15 +16216,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1093
 msgid "Edit Water"
 msgstr "حرّر الماء"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1097
 msgid "Land"
 msgstr "الأرض اليابسة"
 
 #. item
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1098
 msgid "Edit Land"
 msgstr "حرّر الأرض اليابسة"
@@ -15892,15 +16232,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1103
 msgid "Basin"
 msgstr "حوض"
 
 #. item
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1104
 msgid "Edit Basin Landuse"
 msgstr "حرّر حوض"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1109
 msgid "Reservoir"
 msgstr "خزان"
@@ -15908,15 +16248,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1109
+#: build/trans_presets.java:1111
 msgid "Edit Reservoir Landuse"
 msgstr "حرّر خزان"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1116
 msgid "Covered Reservoir"
 msgstr "خزان مغطى"
 
 #. item
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1117
 msgid "Edit Covered Reservoir"
 msgstr "حرّر خزان مغطى"
@@ -15924,5 +16264,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1120
+#: build/trans_presets.java:1122
 msgid "Riverbank"
 msgstr "ضفة نهر"
@@ -15931,10 +16271,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1125
 msgid "Edit Riverbank"
 msgstr "حرّر ضفة نهر"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1127
+#: build/trans_presets.java:1129
 msgid "Wetland"
 msgstr "أراضي رطبة"
@@ -15945,14 +16285,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1134
 msgid "Edit Wetland"
 msgstr "حرّ أراضي رطبة"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "swamp"
 msgstr "مستنقع"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "bog"
 msgstr ""
@@ -15966,35 +16306,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1135 build/trans_style.java:3384
+#: build/trans_presets.java:1137 build/trans_style.java:3392
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "mangrove"
 msgstr "شجر إستوائي"
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1139
 msgid "Mud"
 msgstr "وحل"
 
 #. item
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1140
 msgid "Edit Mud"
 msgstr "حرّر وحل"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1144
 msgid "Beach"
 msgstr "شاطئ بحر"
@@ -16002,20 +16342,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1144
+#: build/trans_presets.java:1146
 msgid "Edit Beach"
 msgstr "حرّر شاطئ بحر"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1150
 msgid "Bay"
 msgstr "خليج"
 
 #. item
-#: build/trans_presets.java:1149
+#: build/trans_presets.java:1151
 msgid "Edit Bay"
 msgstr "حرّر خليج"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1155
 msgid "Cliff"
 msgstr "منحدر صخري"
@@ -16023,10 +16363,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1157
 msgid "Edit Cliff"
 msgstr "حرّر منحدر صخري"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1159
+#: build/trans_presets.java:1161
 msgid "Coastline"
 msgstr "شاطئ"
@@ -16034,5 +16374,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1163
 msgid "Edit Coastline"
 msgstr "حرّر شاطئ"
@@ -16040,5 +16380,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1168
 msgid "Ferry Route"
 msgstr ""
@@ -16046,5 +16386,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1170
 msgid "Edit Ferry"
 msgstr ""
@@ -16053,5 +16393,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1176
+#: build/trans_presets.java:1178
 msgid "Boatyard"
 msgstr "حوض سفن"
@@ -16059,10 +16399,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:1180
 msgid "Edit Boatyard"
 msgstr "حرّر حوض سفن"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1185
 msgid "Dock"
 msgstr "مرسى"
@@ -16070,5 +16410,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1187
 msgid "Edit Dock"
 msgstr "حرّر مرسى"
@@ -16076,5 +16416,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1193
 msgid "Dam"
 msgstr "سدّ"
@@ -16082,15 +16422,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1195
 msgid "Edit Dam"
 msgstr "حرّر سدّ"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1199
+#: build/trans_presets.java:1201
 msgid "Waterway Point"
 msgstr "نقطة مجرى ماء"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1202
 msgid "Lock Gate"
 msgstr ""
@@ -16099,5 +16439,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1206
 msgid "Weir"
 msgstr "سدّ (صغير)"
@@ -16105,20 +16445,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1208
 msgid "Edit Weir"
 msgstr "سدّ (صغير)"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1213
 msgid "Waterfall"
 msgstr "شلال ماء"
 
 #. item
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1214
 msgid "Edit Waterfall"
 msgstr "حرّر شلال ماء"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1219
 msgid "Turning Point"
 msgstr ""
@@ -16127,15 +16467,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1221
+#: build/trans_presets.java:1223
 msgid "Marina"
 msgstr "مارينا"
 
 #. item
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1224
 msgid "Edit Marina"
 msgstr "حرّر مارينا"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1228
 msgid "Pier"
 msgstr "رصيف ميناء"
@@ -16143,10 +16483,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1230
 msgid "Edit Pier"
 msgstr "حرّر رصيف ميناء"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1234
 msgid "Ferry Terminal"
 msgstr ""
@@ -16154,10 +16494,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1236
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1240
 msgid "Slipway"
 msgstr ""
@@ -16167,16 +16507,21 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1244
 msgid "Edit Slipway"
 msgstr ""
 
 #. item "Waterway Point/Slipway" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1250
+#, fuzzy
+msgid "Transport"
+msgstr "النقل المشترك"
+
+#. group "Transport"
+#: build/trans_presets.java:1251
 msgid "Railway"
 msgstr "سكة حديدية"
 
 #. group "Railway"
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1252
 msgid "Rail"
 msgstr "سكة"
@@ -16184,5 +16529,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:1254
 msgid "Edit Rail"
 msgstr "حرّر سكة"
@@ -16212,8 +16557,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "Optional Types"
 msgstr ""
@@ -16227,35 +16572,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1259
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1257
+#: build/trans_presets.java:1260
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1265
 msgid "Monorail"
 msgstr "قطار ذات سكة حديد واحدة"
@@ -16263,45 +16608,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1267
 msgid "Edit Monorail"
 msgstr "حرّر قطار ذات سكة حديد واحدة"
 
-#: build/trans_presets.java:1269
+#: build/trans_presets.java:1272
 msgid "Preserved"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1273
 msgid "Edit Preserved Railway"
 msgstr ""
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1278
 msgid "Light Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1279
 msgid "Edit Light Rail"
 msgstr ""
 
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1284
 msgid "Subway"
 msgstr "قطار نفقي"
 
 #. item
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1285
 msgid "Edit Subway"
 msgstr "حرّر قطار نفقي"
 
-#: build/trans_presets.java:1287
+#: build/trans_presets.java:1290
 msgid "Tram"
 msgstr "ترام"
 
 #. item
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1291
 msgid "Edit Tram"
 msgstr "حرّر ترام"
 
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1296
 msgid "Bus Guideway"
 msgstr ""
@@ -16309,5 +16654,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1295
+#: build/trans_presets.java:1298
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -16316,14 +16661,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1315
 msgid "Disused Rail"
 msgstr "سكة حديد غير مستعملة"
 
 #. item
-#: build/trans_presets.java:1313
+#: build/trans_presets.java:1316
 msgid "Edit Disused Railway"
 msgstr "حرّر سكة حديد غير مستعملة"
 
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1321
 msgid "Abandoned Rail"
 msgstr "سكة حديد مهجورة"
@@ -16332,5 +16677,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1325
 msgid "Level Crossing"
 msgstr ""
@@ -16339,5 +16684,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1329
 msgid "Crossing"
 msgstr ""
@@ -16347,5 +16692,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1333
 msgid "Crossing type"
 msgstr ""
@@ -16353,5 +16698,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1339
 msgid "Turntable"
 msgstr ""
@@ -16360,10 +16705,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1344
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1345
 msgid "Chair Lift"
 msgstr "مصعد كرسي"
@@ -16371,10 +16716,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1347
 msgid "Edit Chair Lift"
 msgstr "حرّر مصعد كرسي"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1351
 msgid "Drag Lift"
 msgstr ""
@@ -16382,10 +16727,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1353
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1357
 msgid "Cable Car"
 msgstr ""
@@ -16393,10 +16738,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1359
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1360
+#: build/trans_presets.java:1363
 msgid "Gondola"
 msgstr ""
@@ -16404,5 +16749,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1365
 msgid "Edit Gondola"
 msgstr ""
@@ -16410,5 +16755,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1366 build/trans_presets.java:1461
+#: build/trans_presets.java:1369 build/trans_presets.java:1464
 msgid "Station"
 msgstr "محطة"
@@ -16419,10 +16764,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1368 build/trans_presets.java:1464
+#: build/trans_presets.java:1371 build/trans_presets.java:1467
 msgid "Edit Station"
 msgstr "حرّر محطة"
 
 #. group "Car"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1378
 msgid "Fuel"
 msgstr "وقود"
@@ -16432,5 +16777,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1382
 msgid "Edit Fuel"
 msgstr "حرّر وقود"
@@ -16488,32 +16833,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1671 build/trans_presets.java:1678
-#: build/trans_presets.java:1686 build/trans_presets.java:1699
-#: build/trans_presets.java:1713 build/trans_presets.java:1810
-#: build/trans_presets.java:1818 build/trans_presets.java:1909
-#: build/trans_presets.java:1915 build/trans_presets.java:2226
-#: build/trans_presets.java:2250 build/trans_presets.java:2465
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1703
+#: build/trans_presets.java:1717 build/trans_presets.java:1814
+#: build/trans_presets.java:1822 build/trans_presets.java:1919
+#: build/trans_presets.java:1925 build/trans_presets.java:2237
+#: build/trans_presets.java:2261 build/trans_presets.java:2476
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Opening Hours"
 msgstr "أزقات الإفتتاح"
@@ -16572,91 +16917,91 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -16671,5 +17016,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1385 build/trans_presets.java:1438
+#: build/trans_presets.java:1388 build/trans_presets.java:1441
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -16679,5 +17024,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1391
 msgid "Edit Parking"
 msgstr "موقف سيارات"
@@ -16688,24 +17033,24 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1391 build/trans_presets.java:1762
-#: build/trans_presets.java:1772 build/trans_presets.java:2396
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:1394 build/trans_presets.java:1766
+#: build/trans_presets.java:1776 build/trans_presets.java:2407
+#: build/trans_presets.java:2524
 msgid "Reference number"
 msgstr "الرقم المرجعي"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "multi-storey"
 msgstr "متعدد الطوابق"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "surface"
 msgstr "مساحة"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "underground"
 msgstr "تحت الأرض"
 
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1396
 msgid "Park and Ride"
 msgstr ""
@@ -16714,38 +17059,38 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1394 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
+#: build/trans_presets.java:1397 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
 msgid "Fee"
 msgstr "رسم دخول/إجرة"
 
 #. <space />
-#: build/trans_presets.java:1396
+#: build/trans_presets.java:1399
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1400
 msgid "Spaces for Disabled"
 msgstr ""
 
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1401
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1402
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1403
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1405
 msgid "Wash"
 msgstr "غسيل سيارات"
 
 #. item
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1406
 msgid "Edit Car Wash"
 msgstr "حرّر غسيل سيارات"
@@ -16753,5 +17098,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1408 build/trans_presets.java:1452
+#: build/trans_presets.java:1411 build/trans_presets.java:1455
 msgid "Shop"
 msgstr ""
@@ -16759,15 +17104,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1413
 msgid "Edit Car Shop"
 msgstr "حرّر متجر سيارات"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1418
 msgid "Repair"
 msgstr "تصليح سيارات"
 
 #. item
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1419
 msgid "Edit Car Repair"
 msgstr "حرّر تصليح سيارات"
@@ -16775,5 +17120,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1421 build/trans_presets.java:1445
+#: build/trans_presets.java:1424 build/trans_presets.java:1448
 msgid "Rental"
 msgstr "إستئجار سيارة"
@@ -16782,10 +17127,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1427
 msgid "Edit Car Rental"
 msgstr "حرّر إستئجار سيارة"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1432
 msgid "Sharing"
 msgstr "مشاركة السيارة"
@@ -16793,5 +17138,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1434
 msgid "Edit Car Sharing"
 msgstr "حرّر مشاركة السيارة"
@@ -16799,10 +17144,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Parking"
 msgstr "حرّر موقف دراجة"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1446
 msgid "Capacity"
 msgstr "إستيعاب"
@@ -16811,5 +17156,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1448
+#: build/trans_presets.java:1451
 msgid "Edit Bicycle Rental"
 msgstr "حرر إستأجار دراجة"
@@ -16818,15 +17163,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1458
 msgid "Edit Bicycle Shop"
 msgstr "حرر مبيع قطع دراجات"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1463
 msgid "Public Transport"
 msgstr "النقل المشترك"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:1472
 msgid "UIC-Reference"
 msgstr ""
@@ -16834,5 +17179,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1475
 msgid "Railway Halt"
 msgstr "موقف قطار"
@@ -16840,5 +17185,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1477
 msgid "Edit Halt"
 msgstr "حرّر موقف"
@@ -16846,5 +17191,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1484
 msgid "Tram Stop"
 msgstr "موقف ترام"
@@ -16853,5 +17198,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1484
+#: build/trans_presets.java:1487
 msgid "Edit Tram Stop"
 msgstr "حرر موقف ترام"
@@ -16859,5 +17204,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1494
 msgid "Railway Platform"
 msgstr "رصيف محطة القطار"
@@ -16866,5 +17211,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1497
 msgid "Edit Railway Platform"
 msgstr "حرّر رصيف محطة القطار"
@@ -16876,5 +17221,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1497 build/trans_presets.java:1539
+#: build/trans_presets.java:1500 build/trans_presets.java:1542
 msgid "Reference (track number)"
 msgstr ""
@@ -16882,10 +17227,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1499 build/trans_presets.java:1541
+#: build/trans_presets.java:1502 build/trans_presets.java:1544
 msgid "Area"
 msgstr "مساحة"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1504
 msgid "Subway Entrance"
 msgstr "مدخل قطار نفقي"
@@ -16894,10 +17239,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1507
 msgid "Edit Subway Entrance"
 msgstr "حرّر مدخل قطار نفقي"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1512
 msgid "Wheelchair"
 msgstr "مناسب لكرسي المقعدين"
@@ -16906,5 +17251,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1517
 msgid "Bus Station"
 msgstr "محطة حافلة نقل جماعي (باص)"
@@ -16913,5 +17258,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1520
 msgid "Edit Bus Station"
 msgstr "حرّر محطة حافلة نقل جماعي (باص)"
@@ -16919,5 +17264,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1526
 msgid "Bus Stop"
 msgstr "موقف محطة حافلة نقل جماعي"
@@ -16927,5 +17272,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1530
 msgid "Edit Bus Stop"
 msgstr "حرّر موقفحافلة نقل جماعي (باص)"
@@ -16934,6 +17279,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1532 build/trans_presets.java:1785
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:1535 build/trans_presets.java:1789
+#: build/trans_presets.java:2453
 msgid "Shelter"
 msgstr "ملجأ"
@@ -16941,10 +17286,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1538
 msgid "Bus Platform"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1539
 msgid "Edit Bus Platform"
 msgstr ""
@@ -16952,5 +17297,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1547
 msgid "Taxi"
 msgstr "تاكسي"
@@ -16958,5 +17303,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1549
 msgid "Edit Taxi station"
 msgstr "حرّر موقف تاكسي"
@@ -16964,5 +17309,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1554
 msgid "Airport"
 msgstr "مطار"
@@ -16970,15 +17315,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1556
 msgid "Edit Airport"
 msgstr ""
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1561
 msgid "IATA"
 msgstr ""
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1559
+#: build/trans_presets.java:1562
 msgid "ICAO"
 msgstr ""
@@ -16986,6 +17331,11 @@
 #. item "Public Transport/Airport" text "ICAO"
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1567
+#, fuzzy
+msgid "Travel"
+msgstr "إحفَظ"
+
+#. group "Travel"
+#: build/trans_presets.java:1568
 msgid "Accomodation"
 msgstr "مكان المبيت"
@@ -16997,5 +17347,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1565 build/trans_surveyor.java:43
+#: build/trans_presets.java:1569 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "فندق"
@@ -17004,15 +17354,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:1568
+#: build/trans_presets.java:1572
 msgid "Edit Hotel"
 msgstr "حرّر فندق"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1575
 msgid "Stars"
 msgstr "النجوم"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1577
 msgid "Motel"
 msgstr "فندق (رخيص)"
@@ -17020,20 +17370,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1579
 msgid "Edit Motel"
 msgstr "حرّر فندق (رخيص)"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1583
 msgid "Guest House"
 msgstr "بيت ضيافة"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1584
 msgid "Edit Guest House"
 msgstr "حرّر بيت ضيافة"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1588
 msgid "Chalet"
 msgstr "كوخ"
@@ -17041,10 +17391,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1590
 msgid "Edit Chalet"
 msgstr "حرّر كوخ"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1594
 msgid "Hostel"
 msgstr "نزل"
@@ -17052,30 +17402,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1592
+#: build/trans_presets.java:1596
 msgid "Edit Hostel"
 msgstr "حرّر نزل"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1600
 msgid "Alpine Hut"
 msgstr "كوخ جبلي"
 
 #. item
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1601
 msgid "Edit Alpine Hut"
 msgstr "حرّر كوخ جبلي"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1606
 msgid "Caravan Site"
 msgstr "موقع قافلة"
 
 #. item
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1607
 msgid "Edit Caravan Site"
 msgstr "حرّر موقع قافلة"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1611
 msgid "Camping Site"
 msgstr "موقع تخييم"
@@ -17083,10 +17433,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1613
 msgid "Edit Camping Site"
 msgstr "حرّر موقع تخييم"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1618
 msgid "Food+Drinks"
 msgstr "طعام و شراب"
@@ -17097,5 +17447,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1615 build/trans_surveyor.java:47
+#: build/trans_presets.java:1619 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "مطعم"
@@ -17103,5 +17453,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1621
 msgid "Edit Restaurant"
 msgstr "حرّر مطعم"
@@ -17109,5 +17459,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "Cuisine"
 msgstr "الطبخ"
@@ -17115,61 +17465,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "italian"
 msgstr "إيطالي"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "chinese"
 msgstr "صيني"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "pizza"
 msgstr "معجنات إيطالية (بيزا)"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "burger"
 msgstr "هامبرغر"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "greek"
 msgstr "يوناني"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "german"
 msgstr "ألماني"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "indian"
 msgstr "هندي"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "regional"
 msgstr "محلي/إقليمي"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "kebab"
 msgstr "كباب / شورما"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "turkish"
 msgstr "تركي"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "asian"
 msgstr "آسيوي"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "thai"
 msgstr "تايلاندي"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "mexican"
 msgstr "مكسيكي"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "japanese"
 msgstr "ياباني"
 
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1627
 msgid "Fast Food"
 msgstr "وجبات سريعة"
@@ -17177,9 +17527,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1629
 msgid "Edit Fast Food Restaurant"
 msgstr "حرّر مطعم وجبات السريعة"
 
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1635
 msgid "Cafe"
 msgstr "مقهى إستراحة"
@@ -17187,9 +17537,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1633
+#: build/trans_presets.java:1637
 msgid "Edit Cafe"
 msgstr "حرّر مقهى إستراحة"
 
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1642
 msgid "Pub"
 msgstr "حانة"
@@ -17197,18 +17547,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1644
 msgid "Edit Pub"
 msgstr "حرّر حانة"
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1649
 msgid "Biergarten"
 msgstr "حانة شرب الجعة"
 
 #. item
-#: build/trans_presets.java:1646
+#: build/trans_presets.java:1650
 msgid "Edit Biergarten"
 msgstr "حرّر حانة شرب الجعة"
 
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1655
 msgid "Bar"
 msgstr "حانة"
@@ -17216,9 +17566,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1657
 msgid "Edit Bar"
 msgstr "حرّر حانة"
 
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1662
 msgid "Nightclub"
 msgstr "نادي سهر / نادي ليلي"
@@ -17226,24 +17576,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1664
 msgid "Edit Nightclub"
 msgstr "حرّر نادي سهر/ نادي ليلي"
 
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1670
 msgid "Tourism"
 msgstr "سياحة"
 
 #. group "Tourism"
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1671
 msgid "Attraction"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1672
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1677
 msgid "Museum"
 msgstr "متحف"
@@ -17251,9 +17601,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1679
 msgid "Edit Museum"
 msgstr "حرّر متحف"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1684
 msgid "Zoo"
 msgstr "حديقة حيوانات"
@@ -17262,9 +17612,9 @@
 #. <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:1683
+#: build/trans_presets.java:1687
 msgid "Edit Zoo"
 msgstr "حرّر حديقة حيوانات"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1692
 msgid "Viewpoint"
 msgstr "موقع كاشف"
@@ -17272,24 +17622,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1694
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1697
 msgid "Look-Out Tower"
 msgstr "برج مراقبة"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1699
 msgid "Theme Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1700
 msgid "Edit Theme Park"
 msgstr ""
 
-#: build/trans_presets.java:1701
+#: build/trans_presets.java:1705
 msgid "Artwork"
 msgstr "أعمال فنية"
@@ -17297,5 +17647,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1707
 msgid "Edit Artwork"
 msgstr "حرّر أعمال فنية"
@@ -17303,19 +17653,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1712
 msgid "Information Office"
 msgstr "مكتب إستعلامات"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1719
 msgid "Map"
 msgstr "الخريطة"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "topo"
 msgstr ""
@@ -17353,5 +17703,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1720 build/trans_style.java:619
+#: build/trans_presets.java:1724 build/trans_style.java:619
 #: build/trans_style.java:635 build/trans_style.java:651
 #: build/trans_style.java:659
@@ -17359,28 +17709,28 @@
 msgstr "شارع"
 
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1722 build/trans_presets.java:1738
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1726 build/trans_presets.java:1742
+#: build/trans_presets.java:1786
 msgid "Closer Description"
 msgstr ""
@@ -17390,5 +17740,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1724 build/trans_presets.java:1747
+#: build/trans_presets.java:1728 build/trans_presets.java:1751
 msgid "Routes shown for:"
 msgstr ""
@@ -17396,6 +17746,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1726 build/trans_presets.java:1749
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1965
 msgid "Cycling"
 msgstr "ركب الدراجة"
@@ -17403,5 +17753,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1727 build/trans_presets.java:1750
+#: build/trans_presets.java:1731 build/trans_presets.java:1754
 msgid "Mountainbiking"
 msgstr ""
@@ -17409,6 +17759,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1728 build/trans_presets.java:1751
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:1732 build/trans_presets.java:1755
+#: build/trans_presets.java:2019
 msgid "Skiing"
 msgstr "تزلّج"
@@ -17416,5 +17766,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1729 build/trans_presets.java:1752
+#: build/trans_presets.java:1733 build/trans_presets.java:1756
 msgid "Riding"
 msgstr ""
@@ -17422,46 +17772,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1734 build/trans_presets.java:1757
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1736
 msgid "Information Board"
 msgstr "لوحة معلومات"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "history"
 msgstr "التاريخ"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "nature"
 msgstr "الطبيعة"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "wildlife"
 msgstr "الحيوانات الضارة"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1744
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1759
 msgid "Information Terminal"
 msgstr ""
@@ -17469,29 +17819,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1760 build/trans_presets.java:1770
+#: build/trans_presets.java:1764 build/trans_presets.java:1774
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1769
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1779
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1780
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1778
+#: build/trans_presets.java:1782
 msgid "Other Information Points"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1790
 msgid "Edit Shelter"
 msgstr "حرّر ملجأ"
@@ -17499,25 +17849,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1789 build/trans_presets.java:1795
+#: build/trans_presets.java:1793 build/trans_presets.java:1799
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1791
+#: build/trans_presets.java:1795
 msgid "Picnic Site"
 msgstr "موقع تنزه"
 
 #. item
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1796
 msgid "Edit Picnic Site"
 msgstr "حرّر موقع تنزه"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1802
 msgid "Historic Places"
 msgstr "مواقع تاريخية"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1799
+#: build/trans_presets.java:1803
 msgid "Castle"
 msgstr "قلعة"
@@ -17526,19 +17876,19 @@
 #. <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:1802
+#: build/trans_presets.java:1806
 msgid "Edit Castle"
 msgstr "حرّر قلعة"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1810
 msgid "Ruins"
 msgstr "أطلال"
 
 #. item
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1811
 msgid "Edit Ruins"
 msgstr "حرّر أطلال"
 
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1816
 msgid "Archaeological Site"
 msgstr "موقع أثري"
@@ -17547,9 +17897,9 @@
 #. <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:1815
+#: build/trans_presets.java:1819
 msgid "Edit Archaeological Site"
 msgstr "حرّر موقع أثري"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1824
 msgid "Battlefield"
 msgstr "ساحة معركة"
@@ -17557,5 +17907,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1826
 msgid "Edit Battlefield"
 msgstr "حرّر ساحة معركة"
@@ -17563,15 +17913,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1831
 msgid "Monument"
 msgstr "نصب تذكاري"
 
 #. item
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1832
 msgid "Edit Monument"
 msgstr "حرّر نصب تذكاري"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1836
 msgid "Memorial"
 msgstr "نصب تذكاري"
@@ -17579,45 +17929,57 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1838
 msgid "Edit Memorial"
 msgstr "حرّر نصب تذكاري"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1842
 msgid "Wayside Cross"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1843
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1847
 msgid "Wayside Shrine"
 msgstr "ضريح/مزار"
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1848
 msgid "Edit Wayside Shrine"
 msgstr "حرّر مزار/ضريح"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1852
+#, fuzzy
+msgid "Boundary Stone"
+msgstr "الحدود"
+
+#. item
+#: build/trans_presets.java:1853
+#, fuzzy
+msgid "Edit Boundary Stone"
+msgstr "حرّر موقفحافلة نقل جماعي (باص)"
+
+#. item "Historic Places/Boundary Stone" text "Name"
+#: build/trans_presets.java:1858
 msgid "Leisure"
 msgstr "وقت الفراغ"
 
 #. group "Leisure"
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1859
 msgid "Water Park"
 msgstr "حديقة ألعاب مائية"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1860
 msgid "Edit Water Park"
 msgstr "حرّر حديقة ألعاب مائية"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1864
 msgid "Playground"
 msgstr "ملعب"
@@ -17625,31 +17987,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1866
 msgid "Edit Playground"
 msgstr "حرّر ملعب"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1870
 msgid "Fishing"
 msgstr "صيد السمك"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1871
 msgid "Edit Fishing"
 msgstr "حرّر صيد السمك"
 
 #. item "Leisure/Fishing" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1877 build/trans_presets.java:2669
+msgid "Sports"
+msgstr ""
+
+#. group "Sports"
+#: build/trans_presets.java:1878
 msgid "Sport Facilities"
 msgstr "المرافق الرياضية"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1879
 msgid "Stadium"
 msgstr "مدرج ألعاب رياضية"
 
 #. item
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1880
 msgid "Edit Stadium"
 msgstr "حرّر مدرج ألعاب رياضية"
@@ -17663,6 +18029,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1874 build/trans_presets.java:1883
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1902 build/trans_presets.java:1911
 msgid "select sport:"
 msgstr "إختر الرياضة :"
@@ -18054,30 +18420,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884 build/trans_style.java:3892
-#: build/trans_style.java:3900 build/trans_style.java:3908
-#: build/trans_style.java:3916 build/trans_style.java:3924
-#: build/trans_style.java:3932
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_style.java:3572 build/trans_style.java:3580
+#: build/trans_style.java:3588 build/trans_style.java:3596
+#: build/trans_style.java:3604 build/trans_style.java:3612
+#: build/trans_style.java:3620 build/trans_style.java:3628
+#: build/trans_style.java:3636 build/trans_style.java:3644
+#: build/trans_style.java:3652 build/trans_style.java:3660
+#: build/trans_style.java:3668 build/trans_style.java:3676
+#: build/trans_style.java:3684 build/trans_style.java:3692
+#: build/trans_style.java:3700 build/trans_style.java:3708
+#: build/trans_style.java:3716 build/trans_style.java:3724
+#: build/trans_style.java:3732 build/trans_style.java:3740
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3764 build/trans_style.java:3772
+#: build/trans_style.java:3780 build/trans_style.java:3788
+#: build/trans_style.java:3796 build/trans_style.java:3804
+#: build/trans_style.java:3812 build/trans_style.java:3820
+#: build/trans_style.java:3828 build/trans_style.java:3836
+#: build/trans_style.java:3844 build/trans_style.java:3852
+#: build/trans_style.java:3860 build/trans_style.java:3868
+#: build/trans_style.java:3876 build/trans_style.java:3884
+#: build/trans_style.java:3892 build/trans_style.java:3900
+#: build/trans_style.java:3908 build/trans_style.java:3916
+#: build/trans_style.java:3924 build/trans_style.java:3932
+#: build/trans_style.java:3940
 msgid "sport"
 msgstr "الرياضة"
@@ -18087,225 +18453,225 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "multi"
 msgstr "متعدد"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "archery"
 msgstr "أسلحة الرماية"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "australian_football"
 msgstr "كرة القدم الأوسترالية"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "baseball"
 msgstr "كرة المضرب"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "basketball"
 msgstr "كرة السلّة"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "climbing"
 msgstr "التسلق"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cycling"
 msgstr "ركوب الدراجة"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "dog_racing"
 msgstr "سبق الكلاب"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "equestrian"
 msgstr "ركوب الخيل"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "football"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "golf"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "gymnastics"
 msgstr "الجمباز"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "horse_racing"
 msgstr "سبق الخيل"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "motor"
 msgstr "رياضة المحركات"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "rugby"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skiing"
 msgstr "التزلج"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "soccer"
 msgstr "كرة القدم"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "swimming"
 msgstr "السباحة"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "table_tennis"
 msgstr "تنس الطاولة"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "tennis"
 msgstr "التنس"
 
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1888
 msgid "Sports Centre"
 msgstr "مركز/نادي  رياضي"
 
 #. item
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1889
 msgid "Edit Sports Centre"
 msgstr "حرّر مركز/نادي رياضي"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1897
 msgid "Pitch"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1898
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1906
 msgid "Racetrack"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1907
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1915
 msgid "Golf Course"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1916
 msgid "Edit Golf Course"
 msgstr ""
 
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1921
 msgid "Miniature Golf"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1922
 msgid "Edit Miniature Golf"
 msgstr ""
 
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1928
 msgid "Sport"
 msgstr "رياضة"
 
 #. group "Sport"
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1929
 msgid "Multi"
 msgstr "متعدد"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1930
 msgid "Edit Multi"
 msgstr ""
@@ -18344,183 +18710,183 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "sports_centre"
 msgstr "مركز/نادي رياضي"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "stadium"
 msgstr "مدرج ألعاب رياضية"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1935
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1936
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1941
 msgid "Athletics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1942
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1947
 msgid "Archery"
 msgstr "سلاح الرامي"
 
 #. item
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1948
 msgid "Edit Archery"
 msgstr "حرّر سلاح الرامي"
 
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1953
 msgid "Climbing"
 msgstr "تسلق"
 
 #. item
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:1954
 msgid "Edit Climbing"
 msgstr "حرّر تسلق"
 
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1959
 msgid "Canoeing"
 msgstr "غدف"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1960
 msgid "Edit Canoeing"
 msgstr "حرّر غدف"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1966
 msgid "Edit Cycling"
 msgstr "حرّر ركب الدراجة"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1971
 msgid "Dog Racing"
 msgstr "سباق الكلاب"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1972
 msgid "Edit Dog Racing"
 msgstr "حرّر سباق الكلاب"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1977
 msgid "Equestrian"
 msgstr "فروسي"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1978
 msgid "Edit Equestrian"
 msgstr "حرّر فروسي"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1983
 msgid "Horse Racing"
 msgstr "سباق الخيل"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1984
 msgid "Edit Horse Racing"
 msgstr "حرّر سباق الخيل"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1989
 msgid "Gymnastics"
 msgstr "رياضة بدنية"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1990
 msgid "Edit Gymnastics"
 msgstr "حرّر رياضة بدنية"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1995
 msgid "Motor Sports"
 msgstr "رياضة المحركات"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1996
 msgid "Edit Motor Sports"
 msgstr "حرّر رياضة المحركات"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2001
 msgid "Skating"
 msgstr "تزحلق"
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2002
 msgid "Edit Skating"
 msgstr "حرّر تزحلق"
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2007
 msgid "Skateboard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2008
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2013
 msgid "Swimming"
 msgstr "سباحة"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2014
 msgid "Edit Swimming"
 msgstr "حرّر سباحة"
@@ -18528,56 +18894,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2021
 msgid "Edit Skiing"
 msgstr "حرّر تزلّج"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "downhill"
 msgstr "نزولاً"
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "nordic"
 msgstr "شمالي"
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "Difficulty"
 msgstr "الصعوبة"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "novice"
 msgstr "مبتدئ"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "easy"
 msgstr "سهل"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "expert"
 msgstr "خبير"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2028
 msgid "Shooting"
 msgstr "رماية"
@@ -18585,178 +18951,183 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2030
 msgid "Edit Shooting"
 msgstr "حرّر رماية"
 
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2036
 msgid "Sport (Ball)"
 msgstr "رياضة (كرة)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2037
 msgid "Soccer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2038
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2043
 msgid "Football"
 msgstr "كرة القدم"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2044
 msgid "Edit Football"
 msgstr "حرّر كرة القدم"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2049
 msgid "Australian Football"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2050
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2055
 msgid "Baseball"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2056
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2061
 msgid "Basketball"
 msgstr "كرة السلّة"
 
 #. item
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2062
 msgid "Edit Basketball"
 msgstr "حرّر كرة السلّة"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2067
 msgid "Golf"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2068
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2071
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2073
 msgid "Boule"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2074
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2079
 msgid "Bowls"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2080
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2085
 msgid "Cricket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2086
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2091
 msgid "Cricket Nets"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2092
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2097
 msgid "Croquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2098
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2103
 msgid "Hockey"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2104
 msgid "Edit Hockey"
 msgstr ""
 
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2109
 msgid "Pelota"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2110
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2105
+#: build/trans_presets.java:2115
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2116
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2121
 msgid "Rugby"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2122
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2127
 msgid "Table Tennis"
 msgstr "تنس الطاولة"
 
 #. item
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2128
 msgid "Edit Table Tennis"
 msgstr "حرّر تنس الطاولة"
 
-#: build/trans_presets.java:2123
+#: build/trans_presets.java:2133
 msgid "Tennis"
 msgstr "تنس"
 
 #. item
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2134
 msgid "Edit Tennis"
 msgstr "حرّر تنس"
 
-#. <separator/>
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2141
+#, fuzzy
+msgid "Man-Made"
+msgstr "من صنع الإنسان"
+
+#. group "Man-Made"
+#: build/trans_presets.java:2142
 msgid "Buildings"
 msgstr "مباني"
 
 #. group "Buildings"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2143
 msgid "Building"
 msgstr "مبنى"
@@ -18764,5 +19135,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Public Building"
 msgstr "مبنى عام"
@@ -18770,10 +19141,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2148
 msgid "Edit Public Building"
 msgstr "حرّر مبنى عام"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2152
 msgid "Town hall"
 msgstr "مبنى البلدية"
@@ -18781,10 +19152,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2154
 msgid "Edit Town hall"
 msgstr "حرّر مبنى البلدية"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:2158
 msgid "Embassy"
 msgstr "سفارة"
@@ -18792,10 +19163,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Edit Embassy"
 msgstr "حرّر سفارة"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2164
 msgid "Courthouse"
 msgstr "محكمة"
@@ -18804,10 +19175,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:2156
+#: build/trans_presets.java:2167
 msgid "Edit Courthouse"
 msgstr "حرّر محكمة"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2171
 msgid "Prison"
 msgstr "سجن"
@@ -18816,10 +19187,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:2163
+#: build/trans_presets.java:2174
 msgid "Edit Prison"
 msgstr "حرّر سجن"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2178
 msgid "Police"
 msgstr "شرطة"
@@ -18829,10 +19200,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:2171
+#: build/trans_presets.java:2182
 msgid "Edit Police"
 msgstr "حرّر شرطة"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2186
 msgid "Fire Station"
 msgstr "فوج إطفاء"
@@ -18841,10 +19212,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:2178
+#: build/trans_presets.java:2189
 msgid "Edit Fire Station"
 msgstr "حرّر فوج إطفاء"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "Post Office"
 msgstr "مكتب البريد"
@@ -18852,5 +19223,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Edit Post Office"
 msgstr "حرّر مكتب البريد"
@@ -18858,15 +19229,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2200
 msgid "Kindergarten"
 msgstr "حضانة أطفال"
 
 #. item
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Kindergarten"
 msgstr "حرّر حضانة أطفال"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2205
 msgid "School"
 msgstr "مدرسة"
@@ -18874,10 +19245,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Edit School"
 msgstr "حرّر مدرسة"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2211
 msgid "University"
 msgstr "جامعة"
@@ -18885,10 +19256,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit University"
 msgstr "حرّر جامعة"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "College"
 msgstr "كلّية"
@@ -18896,5 +19267,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2219
 msgid "Edit College"
 msgstr "حرّر كلّية"
@@ -18902,5 +19273,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2224
 msgid "Cinema"
 msgstr "سينما"
@@ -18909,10 +19280,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:2216
+#: build/trans_presets.java:2227
 msgid "Edit Cinema"
 msgstr "حرّر سينما"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2231
 msgid "Library"
 msgstr "مكتبة"
@@ -18921,9 +19292,9 @@
 #. <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:2223
+#: build/trans_presets.java:2234
 msgid "Edit Library"
 msgstr "حرّر مكتبة"
 
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Arts Centre"
 msgstr "مركز ثقافي"
@@ -18931,10 +19302,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Arts Centre"
 msgstr "حرّر مركز ثقافي"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Theatre"
 msgstr "مسرح"
@@ -18943,10 +19314,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:2237
+#: build/trans_presets.java:2248
 msgid "Edit Theatre"
 msgstr "حرّر مسرح"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2252
 msgid "Place of Worship"
 msgstr "معبد"
@@ -18956,5 +19327,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:2245
+#: build/trans_presets.java:2256
 msgid "Edit Place of Worship"
 msgstr "حرّر معبد"
@@ -18963,6 +19334,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "Religion"
 msgstr "الديانة"
@@ -18971,66 +19342,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "bahai"
 msgstr "بهائي"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "buddhist"
 msgstr "بوذي"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "christian"
 msgstr "نصراني"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "hindu"
 msgstr "هندوس"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jewish"
 msgstr "يهودي"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "muslim"
 msgstr "مسلم"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "sikh"
 msgstr "سيخ"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "spiritualist"
 msgstr "روحاني"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "Denomination"
 msgstr "الطقوس الدينية"
@@ -19039,81 +19410,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "baptist"
 msgstr "معمداني"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "catholic"
 msgstr "كثليك"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "evangelical"
 msgstr "إنجيلي"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "jehovahs_witness"
 msgstr "شهود يهوه"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "lutheran"
 msgstr "لوثري"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "methodist"
 msgstr "منهجي"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "orthodox"
 msgstr "أرثدكس"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "protestant"
 msgstr "بروتستاني"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "shia"
 msgstr "شيعي"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "sunni"
 msgstr "سنّي"
 
 #. <separator/>
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2264
 msgid "Addresses"
 msgstr "عناوين"
@@ -19122,5 +19493,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:2256
+#: build/trans_presets.java:2267
 msgid "Edit Address Information"
 msgstr "حرّر معلومات عنوان"
@@ -19128,5 +19499,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2269
 msgid "House number"
 msgstr "رقم المنزل"
@@ -19134,20 +19505,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "House name"
 msgstr "تسمية المنزل"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "City name"
 msgstr "إسم المدينة"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2274
 msgid "Post code"
 msgstr "الرمز البريدي"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2275
 msgid "Country code"
 msgstr "رمز البلد"
@@ -19155,5 +19526,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Address Interpolation"
 msgstr "إستيفاء العنوان"
@@ -19162,5 +19533,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:2270
+#: build/trans_presets.java:2281
 msgid "Edit Address Interpolation"
 msgstr "حرّر إستيفاء العنوان"
@@ -19168,67 +19539,67 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "Numbering scheme"
 msgstr "مخطط الترقيم"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "odd"
 msgstr "مفرد"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "even"
 msgstr "مثنى"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2286
 msgid "Man Made"
 msgstr "من صنع الإنسان"
 
 #. group "Man Made"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Works"
 msgstr "المصانع"
 
 #. item
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2288
 msgid "Edit Works"
 msgstr "حرّر المصانع"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2292
 msgid "Tower"
 msgstr "برج"
 
 #. item
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2293
 msgid "Edit Tower"
 msgstr "حرّر برج"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Water Tower"
 msgstr "خزان / برج مياه"
 
 #. item
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2298
 msgid "Edit Water Tower"
 msgstr "حرّر خزان/برج مياه"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Gasometer"
 msgstr "خزان محروقات"
 
 #. item
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2303
 msgid "Edit Gasometer"
 msgstr "حرّر خزان المحروقات"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Lighthouse"
 msgstr "منارة"
@@ -19236,10 +19607,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2309
 msgid "Edit Lighthouse"
 msgstr "حرّر منارة"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Windmill"
 msgstr "طاحونة هوائية"
@@ -19247,10 +19618,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2315
 msgid "Edit Windmill"
 msgstr "حرّر طاحونة هوائية"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2319
 msgid "Pipeline"
 msgstr "خط أنابيب"
@@ -19258,10 +19629,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Edit Pipeline"
 msgstr "حرّر خط أنابيب"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2325
 msgid "Wastewater Plant"
 msgstr "محطّة تكرير مياه"
@@ -19271,10 +19642,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:2318
+#: build/trans_presets.java:2329
 msgid "Edit Wastewater Plant"
 msgstr "حرّر محطّة تكرير مياه"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2333
 msgid "Crane"
 msgstr "ونش"
@@ -19282,10 +19653,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2335
 msgid "Edit Crane"
 msgstr "حرّر ونش"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Beacon"
 msgstr "عمود إضائة"
@@ -19293,10 +19664,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2341
 msgid "Edit Beacon"
 msgstr "حرّر عمود إضاءة"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2345
 msgid "Survey Point"
 msgstr "نقطة رؤية"
@@ -19304,10 +19675,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Edit Survey Point"
 msgstr "حرّر نقطة رؤية"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2351
 msgid "Surveillance"
 msgstr "مراقبة"
@@ -19315,5 +19686,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2353
 msgid "Edit Surveillance Camera"
 msgstr "حرّر كامرة مراقبة"
@@ -19321,5 +19692,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Power Generator"
 msgstr "مولد طاقة"
@@ -19329,39 +19700,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:2351
+#: build/trans_presets.java:2362
 msgid "Edit Power Generator"
 msgstr "حرّر مولد طاقة"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "wind"
 msgstr "أرياح"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "hydro"
 msgstr "مائية"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "fossil"
 msgstr "طاقة أحفورية"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "nuclear"
 msgstr "نووية"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "coal"
 msgstr "فحم"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "photovoltaic"
 msgstr "كهرباء شمسية"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "gas"
 msgstr "غاز"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2367
 msgid "Power Station"
 msgstr "محطة توليد طاقة"
@@ -19370,10 +19741,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:2359
+#: build/trans_presets.java:2370
 msgid "Edit Power Station"
 msgstr "حرّر محطة توليد طاقة"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2374
 msgid "Power Sub Station"
 msgstr "محطة طاقة فرعية"
@@ -19382,5 +19753,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:2366
+#: build/trans_presets.java:2377
 msgid "Edit Power Sub Station"
 msgstr "حرّر محطة طاقة فرعية"
@@ -19388,10 +19759,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2369 build/trans_presets.java:2385
+#: build/trans_presets.java:2380 build/trans_presets.java:2396
 msgid "Line reference"
 msgstr "رقم الخط"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2382
 msgid "Power Tower"
 msgstr "عمود كهربائي"
@@ -19402,5 +19773,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:2376
+#: build/trans_presets.java:2387
 msgid "Edit Power Tower"
 msgstr "حرّر عمود كهربائي"
@@ -19408,5 +19779,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2390
 msgid "Power Line"
 msgstr "سلك/خط كهربائي"
@@ -19415,40 +19786,40 @@
 #. <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:2382
+#: build/trans_presets.java:2393
 msgid "Edit Power Line"
 msgstr "حرّر عمود كهربائي"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Voltage"
 msgstr "التوتر"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2398
 msgid "Amount of Wires"
 msgstr "عدد الأسلاك"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Amenities"
 msgstr "خدمات/نافعات"
 
 #. group "Amenities"
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2402
 msgid "Toilets"
 msgstr "مراحيض"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2398 build/trans_presets.java:2514
+#: build/trans_presets.java:2409 build/trans_presets.java:2525
 msgid "Note"
 msgstr "الملاحظة"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2411
 msgid "Post Box"
 msgstr "صندوق بريد"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2416
 msgid "Telephone"
 msgstr "هاتف"
@@ -19457,5 +19828,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:2408
+#: build/trans_presets.java:2419
 msgid "Edit Telephone"
 msgstr "حرّر هاتف"
@@ -19463,5 +19834,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2411 build/trans_presets.java:2515
+#: build/trans_presets.java:2422 build/trans_presets.java:2526
 msgid "Coins"
 msgstr "عملات معدنية"
@@ -19469,5 +19840,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2412 build/trans_presets.java:2516
+#: build/trans_presets.java:2423 build/trans_presets.java:2527
 msgid "Notes"
 msgstr "الملاحظات"
@@ -19475,5 +19846,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2413 build/trans_presets.java:2517
+#: build/trans_presets.java:2424 build/trans_presets.java:2528
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -19481,5 +19852,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2414 build/trans_presets.java:2518
+#: build/trans_presets.java:2425 build/trans_presets.java:2529
 msgid "Debit cards"
 msgstr ""
@@ -19487,15 +19858,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2415 build/trans_presets.java:2519
+#: build/trans_presets.java:2426 build/trans_presets.java:2530
 msgid "Credit cards"
 msgstr "بطاقات إعتماد"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2427
 msgid "Telephone cards"
 msgstr "بطاقات هاتفية"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2429
 msgid "Recycling"
 msgstr "إعادة تصنيع الأشياء"
@@ -19504,5 +19875,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:2421
+#: build/trans_presets.java:2432
 msgid "Edit Recycling station"
 msgstr "حرّر إعادة تصنيع الأشياء"
@@ -19510,35 +19881,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Batteries"
 msgstr "بطاريات"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2435
 msgid "Cans"
 msgstr "علب (معدنية)"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Clothes"
 msgstr "ملابس"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2437
 msgid "Glass"
 msgstr "زجاج"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2438
 msgid "Paper"
 msgstr "ورق"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2439
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2441
 msgid "Bench"
 msgstr ""
@@ -19547,40 +19918,33 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2433
-#, fuzzy
+#: build/trans_presets.java:2444
 msgid "Backrest"
-msgstr "السابق"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "Material"
-msgstr "نصب تذكاري"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2434
-#, fuzzy
+#: build/trans_presets.java:2445
 msgid "stone"
-msgstr "المكان"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "plastic"
-msgstr "المكان"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "Colour"
-msgstr "اللون"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "black"
-msgstr "السابق"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "brown"
-msgstr "إلى أسفل"
+msgstr ""
 
 #. color historic
@@ -19649,38 +20013,35 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2435 build/trans_style.java:3055
-#: build/trans_style.java:3063 build/trans_style.java:3071
-#: build/trans_style.java:3079 build/trans_style.java:3127
-#: build/trans_style.java:3135 build/trans_style.java:3233
-#: build/trans_style.java:3241
+#: build/trans_presets.java:2446 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3135
+#: build/trans_style.java:3143 build/trans_style.java:3241
+#: build/trans_style.java:3249
 msgid "green"
 msgstr "خضار"
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2446
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "blue"
-msgstr "القيمة"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "white"
-msgstr "الماء"
-
-#: build/trans_presets.java:2436
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2447
 msgid "Amount of Seats"
-msgstr "عدد الأسلاك"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2449
 msgid "Hunting Stand"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2450
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -19689,30 +20050,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2441 build/trans_presets.java:2902
+#: build/trans_presets.java:2452 build/trans_presets.java:2914
 msgid "Height"
 msgstr "الإرتفاع"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "low"
 msgstr "منخفض"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "half"
 msgstr "نصف"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "full"
 msgstr "ملء"
 
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2454
 msgid "Hide"
 msgstr "مخبئ"
 
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2455
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Fountain"
 msgstr "نافورة"
@@ -19721,10 +20082,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:2449
+#: build/trans_presets.java:2460
 msgid "Edit Fountain"
 msgstr "حرّر نافورة"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2464
 msgid "Drinking Water"
 msgstr "ماء شفة"
@@ -19733,10 +20094,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:2456
+#: build/trans_presets.java:2467
 msgid "Edit Drinking Water"
 msgstr "حرّر ماء شفة"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2471
 msgid "Baby Hatch"
 msgstr ""
@@ -19744,33 +20105,33 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2479
 msgid "Shops"
 msgstr "مَتاجر/دكاكين"
 
 #. group "Shops"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2480
 msgid "Supermarket"
 msgstr "سوبرماركت"
 
 #. item
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2481
 msgid "Edit Supermarket"
 msgstr "حرّر سوبرماركت"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2486
 msgid "Chemist"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2487
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2492
 msgid "Convenience Store"
 msgstr ""
@@ -19778,9 +20139,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2499
 msgid "Kiosk"
 msgstr "كشك"
@@ -19788,27 +20149,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Kiosk"
 msgstr "حرّر كشك"
 
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Book Store"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2507
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2512
 msgid "Travel Agency"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2513
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2518
 msgid "Vending machine"
 msgstr "آلة بيع"
@@ -19816,5 +20177,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Edit Vending machine"
 msgstr ""
@@ -19822,88 +20183,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "Vending products"
 msgstr "نوعية المبيعات"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_tickets"
 msgstr "تذاكر_النقل_العام"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_plans"
 msgstr "خرائط_النقل_العام"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "parking_tickets"
 msgstr "تذاكر_موقف_سيارات"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "food"
 msgstr "مأكولات"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "drinks"
 msgstr "مشروبات"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "sweets"
 msgstr "حلويات"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "cigarettes"
 msgstr "سجائر"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "photos"
 msgstr "صور"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "animal_food"
 msgstr "مأكولات للحيوانات"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "news_papers"
 msgstr "جرائد"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "toys"
 msgstr "ألعاب"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "stamps"
 msgstr "طوابع"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "SIM-cards"
 msgstr "رقائق SIM"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "telephone_vouchers"
 msgstr "قسائم تعبئة هاتفية"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "vouchers"
 msgstr "قسائم"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "condoms"
 msgstr "مانع الحمل"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "tampons"
 msgstr "سدادات قطنية"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Butcher"
 msgstr "جزار"
@@ -19911,9 +20272,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2535
 msgid "Edit Butcher"
 msgstr "حرّر جزار"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2540
 msgid "Baker"
 msgstr "خباز"
@@ -19921,9 +20282,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2542
 msgid "Edit Baker"
 msgstr "حرّر خباز"
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2547
 msgid "Florist"
 msgstr "بائع الزهور"
@@ -19931,18 +20292,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Florist"
 msgstr "حرّر بائع الزهور"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2554
 msgid "Organic"
 msgstr "مأكولات عضوية"
 
 #. item
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Edit Organic Shop"
 msgstr "حرّر مبيع مأكولات عضوية"
 
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2560
 msgid "Alcohol"
 msgstr ""
@@ -19950,54 +20311,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2562
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2567
 msgid "Beverages"
 msgstr "مشروبات"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2568
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2573
 msgid "Computer"
 msgstr "حاسوب"
 
 #. item
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2574
 msgid "Edit Computer Shop"
 msgstr "حرّر مبيع قطع حاسوب"
 
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Electronics"
 msgstr "إلكترونيات"
 
 #. item
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2580
 msgid "Edit Electronics Shop"
 msgstr "حرّر إلكترونيات"
 
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2585
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2586
 msgid "Edit Hifi Shop"
 msgstr "حرّر مبيع Hifi"
 
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2591
 msgid "Furniture"
 msgstr "أثاث/فرش"
 
 #. item
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Edit Furniture Shop"
 msgstr "حرّر مبيع فرش/أثاث"
 
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Garden Centre"
 msgstr ""
@@ -20005,9 +20366,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2599
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Hardware"
 msgstr "خردوات/أدوات منزلية"
@@ -20015,9 +20376,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2606
 msgid "Edit Hardware Store"
 msgstr "حرّر مخزن خردوات/أدوات منزلية"
 
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -20025,54 +20386,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2613
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2618
 msgid "Stationery"
 msgstr "قرطاسية"
 
 #. item
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2619
 msgid "Edit Stationery Shop"
 msgstr "حرّر مبيع قرطاسية"
 
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Hairdresser"
 msgstr "حلاق"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Hairdresser"
 msgstr "حرّر حلاق"
 
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Shoes"
 msgstr "أحذية"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Shoe Shop"
 msgstr "حرّر أحذية"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2636
 msgid "Toys"
 msgstr "ألعاب"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit Toy Shop"
 msgstr "حرّر مبيع ألعاب"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Video"
 msgstr "مرئيّات"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Video Shop"
 msgstr "حرّر مبيع مرئيّات"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "Dry Cleaning"
 msgstr "تنظيف جاف"
@@ -20080,9 +20441,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2650
 msgid "Edit Dry Cleaning"
 msgstr "حرّر تنظيف جاف"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "Laundry"
 msgstr "مصبغة/غسيل"
@@ -20090,9 +20451,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2657
 msgid "Edit Laundry"
 msgstr "حرّر مصبغة/غسيل"
 
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2662
 msgid "Outdoor"
 msgstr "نشاطات في الخلاء"
@@ -20100,32 +20461,28 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2664
 msgid "Edit Outdoor Shop"
 msgstr "حرّر متجر نشاطات في الخلاء"
 
-#: build/trans_presets.java:2658
-msgid "Sports"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2659
+#. item
+#: build/trans_presets.java:2670
 msgid "Edit Sports Shop"
 msgstr "حرّرمبيع  لوازم للأنشطة رياضية"
 
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Optician"
 msgstr "حرّر نظاراتي"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2683
 msgid "Cash"
 msgstr "نقود/أموال"
 
 #. group "Cash"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2684
 msgid "Bank"
 msgstr "مصرف"
@@ -20133,14 +20490,14 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2686
 msgid "Edit Bank"
 msgstr "حرّر مصرف"
 
-#: build/trans_presets.java:2680 build/trans_presets.java:2689
+#: build/trans_presets.java:2691 build/trans_presets.java:2700
 msgid "Automated Teller Machine"
 msgstr "صرّاف آلي"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2693
 msgid "Money Exchange"
 msgstr "صرّاف"
@@ -20148,5 +20505,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Edit Money Exchange"
 msgstr "حرّر صرّاف"
@@ -20154,15 +20511,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2691
+#: build/trans_presets.java:2702
 msgid "Edit Automated Teller Machine"
 msgstr "حرّر صراف آلي"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2707
 msgid "Health"
 msgstr "صحة"
 
 #. group "Health"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2708
 msgid "Doctors"
 msgstr "أطباء"
@@ -20170,18 +20527,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2710
 msgid "Edit Doctors"
 msgstr "حرّر أطباء"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2715
 msgid "Dentist"
 msgstr "طبيب أسنان"
 
 #. item
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Edit Dentist"
 msgstr "حرّر طبيب أسنان"
 
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2721
 msgid "Pharmacy"
 msgstr "صيدلية"
@@ -20189,5 +20546,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Edit Pharmacy"
 msgstr "حرّر صيدلية"
@@ -20195,9 +20552,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2729
 msgid "Hospital"
 msgstr "مستشفى"
@@ -20205,10 +20562,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Edit Hospital"
 msgstr "حرّر مستشفى"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2735
 msgid "Emergency Access Point"
 msgstr "نقطة دخول طوارئ"
@@ -20217,5 +20574,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:2727
+#: build/trans_presets.java:2738
 msgid "Edit Emergency Access Point"
 msgstr "حرّر نقطة دخول طوارئ"
@@ -20224,20 +20581,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2741
 msgid "Point Number"
 msgstr "رقم النقطة"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2742
 msgid "Point Name"
 msgstr "إسم النقطة"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Phone Number"
 msgstr "رقم الهاتف"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "(Use international code, like +12-345-67890)"
 msgstr "إستعمل رمز دولي مثل 12-345-67890"
@@ -20245,5 +20602,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2748
 msgid "Veterinary"
 msgstr "بيطري"
@@ -20252,55 +20609,59 @@
 #. <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:2740
+#: build/trans_presets.java:2751
 msgid "Edit Veterinary"
 msgstr "حرّر بيطري"
 
+#: build/trans_presets.java:2758
+msgid "Geography"
+msgstr ""
+
 #. group "Places"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2760
 msgid "Continent"
 msgstr "قارة"
 
 #. item
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2761
 msgid "Edit Continent"
 msgstr "حرّر قارة"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2766
 msgid "Country"
 msgstr "وطن"
 
 #. item
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2767
 msgid "Edit Country"
 msgstr "حرّر وطن"
 
 #. item "Places/Country" text "Name"
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2772
 msgid "State"
 msgstr "دولة/ولاية"
 
 #. item
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2773
 msgid "Edit State"
 msgstr "حرّر دولة/ولاية"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2778
 msgid "Region"
 msgstr "قطر/منطقة"
 
 #. item
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2779
 msgid "Edit Region"
 msgstr "حرّر قطر/منطقة"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2784
 msgid "County"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2785
 msgid "Edit County"
 msgstr ""
@@ -20308,15 +20669,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2791
 msgid "City"
 msgstr "مدينة"
 
 #. item
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2792
 msgid "Edit City"
 msgstr "حرّر مدينة"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2797
 msgid "Town"
 msgstr "بلدة"
@@ -20324,10 +20685,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2799
 msgid "Edit Town"
 msgstr "حرّر بلدة"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2804
 msgid "Suburb"
 msgstr "ضاحية"
@@ -20335,25 +20696,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2806
 msgid "Edit Suburb"
 msgstr "حرّر ضاحية"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2811
 msgid "Village"
 msgstr "قرية"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2812
 msgid "Edit Village"
 msgstr "حرّر قرية"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2817
 msgid "Hamlet"
 msgstr "قرية صغيرة"
 
 #. item
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2818
 msgid "Edit Hamlet"
 msgstr "حرّر قرية صغيرة"
@@ -20361,5 +20722,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2824
 msgid "Locality"
 msgstr "محلة"
@@ -20367,10 +20728,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2826
 msgid "Edit Locality"
 msgstr "حرّر محلة"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2831
 msgid "Island"
 msgstr "جزيرة"
@@ -20378,10 +20739,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2833
 msgid "Edit Island"
 msgstr "حرّر جزيرة"
 
 #. item "Places/Island" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2838
 msgid "Islet"
 msgstr ""
@@ -20389,5 +20750,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2840
 msgid "Edit Islet"
 msgstr ""
@@ -20395,5 +20756,5 @@
 #. item "Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2846
 msgid "Cave Entrance"
 msgstr "مدخل كهف"
@@ -20401,10 +20762,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2848
 msgid "Edit Cave Entrance"
 msgstr "حرّر مدخل كهف"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2852
 msgid "Peak"
 msgstr "قمّة"
@@ -20412,10 +20773,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2854
 msgid "Edit Peak"
 msgstr "حرّر قمّة"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2859
 msgid "Glacier"
 msgstr "جليد"
@@ -20423,10 +20784,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2861
 msgid "Edit Glacier"
 msgstr "حرّر جليد"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2854
+#: build/trans_presets.java:2866
 msgid "Volcano"
 msgstr "بركان"
@@ -20434,70 +20795,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2868
 msgid "Edit Volcano"
 msgstr "حرّر بركان"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2874
 msgid "Boundaries"
 msgstr "الحدود"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2875
 msgid "National"
 msgstr "دولية"
 
 #. item
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2876
 msgid "Edit National Boundary"
 msgstr "حرّر حدود دولية"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2881
 msgid "Administrative"
 msgstr "إدارية"
 
 #. item
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2882
 msgid "Edit Administrative Boundary"
 msgstr "حرّر حدود إدارية"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:2887
 msgid "Civil"
 msgstr "مدنية"
 
 #. item
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2888
 msgid "Edit Civil Boundary"
 msgstr "حرّر حدود إدارية"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2893
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2894
 msgid "Edit Political Boundary"
 msgstr "حرّر الحدود السياسية"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2899
 msgid "National park"
 msgstr "محمية وطنية (بيئية)"
 
 #. item
-#: build/trans_presets.java:2888
+#: build/trans_presets.java:2900
 msgid "Edit National Park Boundary"
 msgstr "حرّر محمية وطنية (التنوع البيئي)"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2906
 msgid "Land use"
 msgstr "إستعمال الأرض"
 
 #. group "Land use"
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2907
 msgid "Tree"
 msgstr "شجرة"
@@ -20506,15 +20867,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:2898
+#: build/trans_presets.java:2910
 msgid "Edit Tree"
 msgstr "حرّر شجرة"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2915
 msgid "Botanical Name"
 msgstr "حرّر اإسم النباتي"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2917
 msgid "Wood"
 msgstr "حرج"
@@ -20523,5 +20884,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:2908
+#: build/trans_presets.java:2920
 msgid "Edit Wood"
 msgstr "حرّر حرج"
@@ -20529,17 +20890,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "coniferous"
 msgstr "صنوبري الثمر"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "mixed"
 msgstr "مختلط"
 
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2925
 msgid "Forest"
 msgstr "غابة"
@@ -20548,14 +20909,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:2916
+#: build/trans_presets.java:2928
 msgid "Edit Forest Landuse"
 msgstr "حرّر غابة"
 
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2934
 msgid "Nature Reserve"
 msgstr "محمية طبيعية"
 
 #. item
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2935
 msgid "Edit Nature Reserve"
 msgstr "حرّر محمية طبيعية"
@@ -20563,25 +20924,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2940
 msgid "Scree"
 msgstr "حصاة"
 
 #. item
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2941
 msgid "Edit Scree"
 msgstr "حرّر حصاة"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2945
 msgid "Scrub"
 msgstr "أشجار منخفضة"
 
 #. item
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2946
 msgid "Edit Scrub"
 msgstr "حرّر أشجار منخفضة"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2950
 msgid "Fell"
 msgstr ""
@@ -20589,10 +20950,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2952
 msgid "Edit Fell"
 msgstr "هوّة"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2956
 msgid "Heath"
 msgstr ""
@@ -20600,5 +20961,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2958
 msgid "Edit Heath"
 msgstr "حرّر أرض بور"
@@ -20606,5 +20967,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2963
 msgid "Farmyard"
 msgstr "فناء مزرعة"
@@ -20613,45 +20974,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:2954
+#: build/trans_presets.java:2966
 msgid "Edit Farmyard Landuse"
 msgstr "حرّر فناء مزرعة"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2971
 msgid "Farmland"
 msgstr "أرض زراعية"
 
 #. item
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2972
 msgid "Edit Farmland Landuse"
 msgstr "حرّر أرض زراعية"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2977
 msgid "Meadow"
 msgstr "مرج"
 
 #. item
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2978
 msgid "Edit Meadow Landuse"
 msgstr "حرّر مرج"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2983
 msgid "Vineyard"
 msgstr "كرم عنب"
 
 #. item
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2984
 msgid "Edit Vineyard Landuse"
 msgstr "حرّر كرم عنب"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:2989
 msgid "Allotments"
 msgstr "حصص سكنية"
 
 #. item
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2990
 msgid "Edit Allotments Landuse"
 msgstr "حرّر حصص سكنية"
@@ -20659,25 +21020,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2996
 msgid "Garden"
 msgstr "حديقة"
 
 #. item
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2997
 msgid "Edit Garden"
 msgstr "حرّر حديقة"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3001
 msgid "Grass"
 msgstr "عشب"
 
 #. item
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3002
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3007
 msgid "Village Green"
 msgstr ""
@@ -20685,10 +21046,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3009
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3014
 msgid "Common"
 msgstr "شائع"
@@ -20696,20 +21057,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3004
+#: build/trans_presets.java:3016
 msgid "Edit Common"
 msgstr "حرّر شائع"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3020
 msgid "Park"
 msgstr "متنزه"
 
 #. item
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3021
 msgid "Edit Park"
 msgstr "حرّر متنزه"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3025
 msgid "Recreation Ground"
 msgstr "ميدان ألعاب"
@@ -20717,5 +21078,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3027
 msgid "Edit Recreation Ground Landuse"
 msgstr "حرّر ميدان ألعاب"
@@ -20723,15 +21084,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3033
 msgid "Residential area"
 msgstr "منطقة سكنية"
 
 #. item
-#: build/trans_presets.java:3022
+#: build/trans_presets.java:3034
 msgid "Edit Residential Landuse"
 msgstr "حرّر منطقة سكنية"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3039
 msgid "Graveyard"
 msgstr "مقبرة"
@@ -20739,9 +21100,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3029
+#: build/trans_presets.java:3041
 msgid "Edit Graveyard"
 msgstr "حرّر مقبرة"
 
-#: build/trans_presets.java:3035
+#: build/trans_presets.java:3047
 msgid "Cemetery"
 msgstr "مقبرة"
@@ -20749,39 +21110,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3049
 msgid "Edit Cemetery Landuse"
 msgstr "حرّر إستعمال الأرض كمقبرة"
 
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3056
 msgid "Retail"
 msgstr "بيع بلمفرق"
 
 #. item
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3057
 msgid "Edit Retail Landuse"
 msgstr "حرّر بيع بلمفرق"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3062
 msgid "Commercial"
 msgstr "تجاري"
 
 #. item
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3063
 msgid "Edit Commercial Landuse"
 msgstr "حرّر إستعمال تجاري للأرض"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3056
+#: build/trans_presets.java:3068
 msgid "Industrial"
 msgstr "صناعي"
 
 #. item
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3069
 msgid "Edit Industrial Landuse"
 msgstr "حرّر الإستعمال الصناعي"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3074
 msgid "Railway land"
 msgstr "أرض سكة حديد"
@@ -20789,15 +21150,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3076
 msgid "Edit Railway Landuse"
 msgstr "حرّر أرض سكة حديد"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3081
 msgid "Military"
 msgstr "عسكري"
 
 #. item
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3082
 msgid "Edit Military Landuse"
 msgstr "حرّر الإستخدام العسكري للأرض"
@@ -20805,55 +21166,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3088
 msgid "Construction area"
 msgstr "موقع ورشة إعمار"
 
 #. item
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3089
 msgid "Edit Construction Landuse"
 msgstr "حرّر موقع ورشة إعمار"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3094
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3095
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3100
 msgid "Greenfield"
 msgstr "حقل أخضر"
 
 #. item
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3101
 msgid "Edit Greenfield Landuse"
 msgstr "حرّر إستعمال الأرض كحقل أخضر"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3106
 msgid "Landfill"
 msgstr "مطمر نفايات"
 
 #. item
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3107
 msgid "Edit Landfill Landuse"
 msgstr "حرّر مطمر نفايات"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3112
 msgid "Quarry"
 msgstr "كسّارة، مقلع حجارة"
 
 #. item
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3113
 msgid "Edit Quarry Landuse"
 msgstr "حرّر كسّارة / مقلع حجارة"
 
 #. group "Relations"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3122
 msgid "Multipolygon"
 msgstr "متعدد الضلوع"
@@ -20863,5 +21224,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:3114
+#: build/trans_presets.java:3126
 msgid "Edit Multipolygon"
 msgstr "حرّر متعدد الضلوع"
@@ -20870,10 +21231,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3132
 msgid "outer segment"
 msgstr "الفلق الخارجي"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3133
 msgid "inner segment"
 msgstr "حرّر الفلق الخارجي"
@@ -20881,5 +21242,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3136
 msgid "Turn restriction"
 msgstr "حصر الإنعطاف"
@@ -20888,5 +21249,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3139
 msgid "Edit Turn Restriction"
 msgstr "حرّر حصر الإنعطاف"
@@ -20894,34 +21255,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "Restriction"
 msgstr "حصر"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_left_turn"
 msgstr "إنعطاف_يسار_ممنوع"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_right_turn"
 msgstr "إنعطاف_يمين_ممنوع"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_straight_on"
 msgstr "على_الطول_ممنوع"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_u_turn"
 msgstr "رجوع_ممنوع"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_right_turn"
 msgstr "إنعطاف_يميني_فقط"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_left_turn"
 msgstr "إنعطاف_يسار_ممنوع"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_straight_on"
 msgstr "على_الطول_فقط"
@@ -20930,15 +21291,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3146
 msgid "from way"
 msgstr "من الطريق"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3147
 msgid "via node or way"
 msgstr "مروراً بلعقدة أو الطريق"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3148
 msgid "to way"
 msgstr "إلى الطريق"
@@ -20946,5 +21307,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3151
 msgid "Route"
 msgstr "الطريق"
@@ -20953,5 +21314,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3154
 msgid "Edit Route"
 msgstr "حرّر طريق"
@@ -20959,5 +21320,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "Route type"
 msgstr "نوع الطريق"
@@ -21029,5 +21390,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3144 build/trans_style.java:233
+#: build/trans_presets.java:3156 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -21036,17 +21397,17 @@
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "bus"
 msgstr "حافلة (باص)"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "road"
 msgstr "الطريق"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ferry"
 msgstr "عبارة بحرية"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ski"
 msgstr ""
@@ -21099,5 +21460,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3144 build/trans_style.java:247
+#: build/trans_presets.java:3156 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -21106,13 +21467,13 @@
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "tram"
 msgstr "ترام"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "detour"
 msgstr ""
@@ -21126,10 +21487,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3144 build/trans_style.java:1206
+#: build/trans_presets.java:3156 build/trans_style.java:1206
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3159
 msgid "Symbol description"
 msgstr "وصف الرمز"
@@ -21137,31 +21498,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3162
 msgid "Network"
 msgstr "الشبكة"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "proposed"
 msgstr "المقترح"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "alternate"
 msgstr "البديل"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "temporary"
 msgstr "المؤقت"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "connection"
 msgstr "الإتصال"
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "Color (hex)"
 msgstr "اللون (hex)"
@@ -21170,30 +21531,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3168
 msgid "route segment"
 msgstr "فلق الطريق"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3169
 msgid "forward segment"
 msgstr "الفلق الأمامي"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3170
 msgid "backward segment"
 msgstr "الفلق الخلفي"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3171
 msgid "halt point"
 msgstr "نقطة التوقف"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3172
 msgid "forward halt point"
 msgstr "نقطة التوقف الأمامية"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3173
 msgid "backward halt point"
 msgstr "نقطة التوقف الخلفية"
@@ -21631,11 +21992,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3375 build/trans_style.java:3376
-#: build/trans_style.java:3946 build/trans_style.java:4254
-#: build/trans_style.java:4263 build/trans_style.java:4272
-#: build/trans_style.java:4281 build/trans_style.java:4290
-#: build/trans_style.java:4299 build/trans_style.java:4308
-#: build/trans_style.java:4309 build/trans_style.java:4318
-#: build/trans_style.java:4327
+#: build/trans_style.java:3383 build/trans_style.java:3384
+#: build/trans_style.java:3954 build/trans_style.java:4262
+#: build/trans_style.java:4271 build/trans_style.java:4280
+#: build/trans_style.java:4289 build/trans_style.java:4298
+#: build/trans_style.java:4307 build/trans_style.java:4316
+#: build/trans_style.java:4317 build/trans_style.java:4326
+#: build/trans_style.java:4335
 msgid "deprecated"
 msgstr "مهجور"
@@ -23659,5 +24020,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3294
+#: build/trans_style.java:3302
 msgid "light_water"
 msgstr ""
@@ -24339,8 +24700,17 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="boundary_stone"/>
+#. <icon annotate="true" src="historic/boundary_stone.png"/>
 #: build/trans_style.java:2990 build/trans_style.java:2998
 #: build/trans_style.java:3006 build/trans_style.java:3014
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
+#: build/trans_style.java:3054
 msgid "historic"
 msgstr "تاريخي"
@@ -24354,5 +24724,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3095
 msgid "quarry"
 msgstr "كسارة / مقلع حجارة"
@@ -24366,5 +24736,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "landfill"
 msgstr ""
@@ -24386,5 +24756,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3103 build/trans_style.java:3111
+#: build/trans_style.java:3111 build/trans_style.java:3119
 msgid "basin"
 msgstr "حوض"
@@ -24398,5 +24768,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3127
 msgid "forest"
 msgstr "غابة"
@@ -24410,5 +24780,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3159
 msgid "farmyard"
 msgstr "فناء مزرعة"
@@ -24431,5 +24801,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3160 build/trans_style.java:3168
+#: build/trans_style.java:3168 build/trans_style.java:3176
 msgid "retail"
 msgstr "بيع بلمفرق"
@@ -24443,5 +24813,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3176
+#: build/trans_style.java:3184
 msgid "industrial"
 msgstr "صناعي"
@@ -24455,5 +24825,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "brownfield"
 msgstr ""
@@ -24467,5 +24837,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "greenfield"
 msgstr "حقل خضار"
@@ -24479,5 +24849,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "railland"
 msgstr ""
@@ -24534,7 +24904,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3217 build/trans_style.java:3252
-#: build/trans_style.java:3260 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3225 build/trans_style.java:3260
+#: build/trans_style.java:3268 build/trans_style.java:3276
+#: build/trans_style.java:3284 build/trans_style.java:3292
 msgid "military"
 msgstr "عسكري"
@@ -24548,5 +24918,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3225
+#: build/trans_style.java:3233
 msgid "cemetery"
 msgstr "مقبرة/جبانة"
@@ -24559,5 +24929,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3301
+#: build/trans_style.java:3309
 msgid "peak"
 msgstr "قمّة"
@@ -24572,5 +24942,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3310
+#: build/trans_style.java:3318
 msgid "glacier"
 msgstr "نهر الجليد"
@@ -24584,5 +24954,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "volcano"
 msgstr "بركان"
@@ -24637,8 +25007,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3326 build/trans_style.java:3327
-#: build/trans_style.java:3335 build/trans_style.java:3351
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440
+#: build/trans_style.java:3334 build/trans_style.java:3335
+#: build/trans_style.java:3343 build/trans_style.java:3359
+#: build/trans_style.java:3432 build/trans_style.java:3440
+#: build/trans_style.java:3448
 msgid "natural"
 msgstr "طبيعي"
@@ -24652,5 +25022,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3343
+#: build/trans_style.java:3351
 msgid "scrub"
 msgstr "أشجار منخفضة"
@@ -24664,5 +25034,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3359
+#: build/trans_style.java:3367
 msgid "heath"
 msgstr "أرض بور"
@@ -24676,5 +25046,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3408
+#: build/trans_style.java:3416
 msgid "mud"
 msgstr "طين"
@@ -24688,5 +25058,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "beach"
 msgstr "شاطئ"
@@ -24764,8 +25134,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
-#: build/trans_style.java:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496 build/trans_style.java:3504
+#: build/trans_style.java:3512 build/trans_style.java:3520
 msgid "route"
 msgstr "طريق"
@@ -24813,7 +25183,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3522 build/trans_style.java:3530
-#: build/trans_style.java:3538 build/trans_style.java:3546
-#: build/trans_style.java:3554
+#: build/trans_style.java:3530 build/trans_style.java:3538
+#: build/trans_style.java:3546 build/trans_style.java:3554
+#: build/trans_style.java:3562
 msgid "boundary"
 msgstr "الحدود"
@@ -24963,11 +25333,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090
+#: build/trans_style.java:4002 build/trans_style.java:4010
+#: build/trans_style.java:4018 build/trans_style.java:4026
+#: build/trans_style.java:4034 build/trans_style.java:4042
+#: build/trans_style.java:4050 build/trans_style.java:4058
+#: build/trans_style.java:4066 build/trans_style.java:4074
+#: build/trans_style.java:4082 build/trans_style.java:4090
+#: build/trans_style.java:4098
 msgid "place"
 msgstr "المكان"
@@ -25015,6 +25385,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4207 build/trans_style.java:4214
-#: build/trans_style.java:4221 build/trans_style.java:4228
+#: build/trans_style.java:4215 build/trans_style.java:4222
+#: build/trans_style.java:4229 build/trans_style.java:4236
 msgid "address"
 msgstr "العنوان"
@@ -25322,45 +25692,33 @@
 msgstr ""
 
-#~ msgid "All the ways were empty"
-#~ msgstr "كل الطرقات كانت فارغة"
+#~ msgid "Unknown version"
+#~ msgstr "نسخة مجهولة"
+
+#~ msgid "Aborting..."
+#~ msgstr "إجهاض..."
+
+#~ msgid "false"
+#~ msgstr "خاطئ"
+
+#~ msgid "true"
+#~ msgstr "حقيقي"
+
+#~ msgid "different"
+#~ msgstr "مختلف"
+
+#~ msgid "Rotate"
+#~ msgstr "أدر"
+
+#~ msgid "Change"
+#~ msgstr "غيّر"
+
+#~ msgid "Move"
+#~ msgstr "حرك"
+
+#~ msgid "unnamed"
+#~ msgstr "غيرمسمى"
 
 #~ msgid "Merge nodes with different memberships?"
 #~ msgstr "دمج العقد رغم عضويتها المختلفة ؟"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "ادمجعلى كلّ حال"
-
-#~ msgid "Unknown version"
-#~ msgstr "نسخة مجهولة"
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "لا يوجد لــ <nd>  أي مرجع"
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "ضذوذ تكوين معرف العقدة"
-
-#~ msgid "Aborting..."
-#~ msgstr "إجهاض..."
-
-#~ msgid "false"
-#~ msgstr "خاطئ"
-
-#~ msgid "true"
-#~ msgstr "حقيقي"
-
-#~ msgid "different"
-#~ msgstr "مختلف"
-
-#~ msgid "Rotate"
-#~ msgstr "أدر"
-
-#~ msgid "Change"
-#~ msgstr "غيّر"
-
-#~ msgid "Move"
-#~ msgstr "حرك"
-
-#~ msgid "unnamed"
-#~ msgstr "غيرمسمى"
 
 #~ msgid "No document open so nothing to save."
@@ -25388,6 +25746,9 @@
 #~ "ردّ الخادم بخطأ داخلي. حاول مرة ثانية بمنطقة أصغر أو إنتظر بعض الوقت."
 
-#~ msgid "Commit comment"
-#~ msgstr "أودع الملاحظات"
+#~ msgid "<nd> has zero ref"
+#~ msgstr "لا يوجد لــ <nd>  أي مرجع"
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "ضذوذ تكوين معرف العقدة"
 
 #~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
@@ -25397,7 +25758,4 @@
 #~ msgstr "الأساسي"
 
-#~ msgid "Add Selected"
-#~ msgstr "أضف الإختيار"
-
 #~ msgid "Date"
 #~ msgstr "التاريخ"
@@ -25430,7 +25788,4 @@
 #~ msgstr "خطأ عند التحليل النحوي لردّ المخدم."
 
-#~ msgid "Delete Layer"
-#~ msgstr "أمحي الطبقة"
-
 #~ msgid "Conflicts: {0}"
 #~ msgstr "التناقضات: {0}"
@@ -25462,4 +25817,10 @@
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "غير قادر على فتح دليل التفضيلات: {0}"
+
+#~ msgid "All the ways were empty"
+#~ msgstr "كل الطرقات كانت فارغة"
+
+#~ msgid "Merge Anyway"
+#~ msgstr "ادمجعلى كلّ حال"
 
 #~ msgid "Some of the nodes are (almost) in the line"
Index: applications/editors/josm/i18n/po/bg.po
===================================================================
--- applications/editors/josm/i18n/po/bg.po	(revision 17655)
+++ applications/editors/josm/i18n/po/bg.po	(revision 17697)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-12 18:11+0200\n"
-"PO-Revision-Date: 2009-09-12 15:43+0000\n"
-"Last-Translator: pl71 <Unknown>\n"
+"POT-Creation-Date: 2009-09-19 13:00+0200\n"
+"PO-Revision-Date: 2009-09-19 03:42+0000\n"
+"Last-Translator: LandShark <Unknown>\n"
 "Language-Team: Bulgarian <bg@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-09-12 16:04+0000\n"
+"X-Launchpad-Export-Date: 2009-09-19 10:43+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -43,10 +43,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:543
 #: ../core/src/org/openstreetmap/josm/Main.java:551
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -71,5 +71,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -87,6 +87,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:358
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
@@ -102,6 +102,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
@@ -127,10 +127,10 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
 msgid "Save and Exit"
 msgstr "Запис и Изход"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
 msgid "Discard and Exit"
 msgstr "Откажи промените и Изход"
@@ -141,4 +141,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
@@ -146,27 +147,28 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:296
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:258
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:613
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
@@ -174,5 +176,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -192,6 +194,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
@@ -208,17 +210,17 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:654
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1528
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -229,6 +231,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
@@ -282,9 +284,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:607
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:609
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -344,5 +346,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
 msgid "Plugins"
@@ -373,4 +375,6 @@
 "user will probably fail. API base URL is: ''{0}''"
 msgstr ""
+"ВНИМАНИЕ: неочакван формат на базовия API адрес. Пренасочването към личната "
+"страница на OSM-потребителя невъзможно. Базовият API адрес: ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94
@@ -397,5 +401,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Обединение"
@@ -485,5 +489,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -496,4 +500,5 @@
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -529,6 +534,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
@@ -537,6 +542,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:346
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
@@ -650,4 +655,46 @@
 msgstr "Няма конфликти за показване."
 
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#, fuzzy
+msgid "Close open changesets"
+msgstr "Няма отворен сисък с промени."
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#, fuzzy
+msgid "Closes open changesets"
+msgstr "Няма отворен сисък с промени."
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
+#: ../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:114
+#, java-format
+msgid "File: {0}"
+msgstr "Файл: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
+#, fuzzy
+msgid "There are no open changesets"
+msgstr "Няма отворен сисък с промени."
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
+#, fuzzy
+msgid "No open changesets"
+msgstr "Няма отворен сисък с промени."
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
+#, fuzzy
+msgid "Downloading open changesets ..."
+msgstr "Затваряне на списък промени по версии..."
+
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
@@ -745,10 +792,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:123
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
@@ -792,31 +840,30 @@
 "Разпределяне на избраните точки на равни разстояния по дължината на линия"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
 msgid "Download from OSM..."
 msgstr "Сваляне от OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
 msgid "Download map data from the OSM server."
 msgstr "Сваляне на картографски данни от OSM сървър."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
-#, java-format
-msgid "File: {0}"
-msgstr "Файл: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
 msgid "Download"
 msgstr "Сваляне"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "ОК"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
 msgid "Please select at least one task to download"
 msgstr "Моля изберете поне един тип данни за сваляне."
@@ -837,5 +884,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1527
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307
@@ -855,6 +902,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:376
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1415
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
 msgid "Duplicate"
 msgstr "Дублиране"
@@ -927,10 +974,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
@@ -1018,25 +1066,26 @@
 msgstr "Обединява текущия слой в друг слой"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 msgid "Merge Nodes"
 msgstr "Обедини точки"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
 msgid "Merge nodes into the oldest one."
 msgstr "Обедини точките в най-старата от тях."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
 msgid "Please select at least two nodes to merge."
 msgstr "Моля, изберете поне две точки за обединение."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:394
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
@@ -1052,8 +1101,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -1079,6 +1128,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
@@ -1087,5 +1140,5 @@
 msgstr "параметърът ''{0}'' не трябва да е празен"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
@@ -1093,5 +1146,5 @@
 "използва."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283
 #, java-format
 msgid "Merge {0} nodes"
@@ -1163,5 +1216,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "New"
 msgstr "Нов"
@@ -1442,14 +1495,15 @@
 msgstr "Помощ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
 msgid "Status Report"
 msgstr "Статус Репорт"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 msgid "Copy to clipboard and close"
 msgstr "Копиране в клипборда и затваряне"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
@@ -1520,4 +1574,6 @@
 "should verify this and correct it when necessary.</html>"
 msgstr ""
+"<html>Ролевото членство в релация беше копирано за всички нови пътища."
+"<br>Трябва да го проверите и коригирате ако е необходимо.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:351
@@ -1526,4 +1582,6 @@
 "this and correct it when necessary.</html>"
 msgstr ""
+"<html>Членството в релация беше копирано за всички нови пътища.<br>Трябва да "
+"го проверите и коригирате ако е необходимо.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:357
@@ -1531,25 +1589,4 @@
 msgid "Split way {0} into {1} parts"
 msgstr "Разделяне път {0} на {1} части"
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24
-msgid "Close current changeset"
-msgstr "Затваряне на текущия списък с промени"
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-msgid "Close the current changeset ..."
-msgstr "Затваряне на текущия списък с промени..."
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41
-msgid "There is currently no changeset open."
-msgstr "Няма отворен сисък с промени."
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42
-msgid "No open changeset"
-msgstr "Няма отворен сисък с промени."
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60
-msgid "Closing changeset"
-msgstr "Затваряне на сисъка с промени."
 
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
@@ -1718,41 +1755,41 @@
 msgstr "Няма нищо избрано."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Качи на OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 msgid "Upload all changes to the OSM server."
 msgstr "Качване на всички промени на OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#, java-format
 msgid ""
 "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
 "resolve them first.</html>"
 msgstr ""
-"<html>Няма слоеве към които слоя източник<br>''{0}''.<br>би могъл да се "
-"обедини.</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155
+"<html>Има неразрешени конфликти в слой ''{0}''.<br>Трябва да ги разрешите.</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
 msgid "Nothing to upload. Get some data first."
 msgstr "Нищо за качване. Първо създайте някакви данни."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 msgid "No changes to upload."
 msgstr "Няма промени за качване."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Синхронизирани само {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
 msgid "Synchronize entire dataset"
 msgstr "Синхронизиране на целия набор данни"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
 #, java-format
 msgid ""
@@ -1765,18 +1802,26 @@
 "<strong>{6}</strong> to abort and continue editing.<br></html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278
+"<html>Качването се <strong>провали</strong> понеже на сървъра има по-нова "
+"версия на един<br>от вашите възли, пътища или релации.<br>Причина за "
+"конфликта се явява <strong>{0}</strong> с id <strong>{1}</strong>,<br>версия "
+"на сървъра {2}, а ваша версия {3}.<br><br>Натиснете <strong>{4}</strong> за "
+"да синхронизирате само конфликтните примитиви.<br>Натиснете <strong>{5}</"
+"strong> за да синхронизирате целия локален набор данни с сървъра."
+"<br>Натиснете <strong>{6}</strong> за да прекратите и продължите "
+"редактирането.<br></html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
 msgid "Conflict detected"
 msgstr "Забелязан е конфликт."
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr "неочаквана върната стойност {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:267
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
 #, java-format
 msgid ""
@@ -1792,5 +1837,17 @@
 "<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
+msgid ""
+"<html>Uploading <strong>failed</strong> because you've been "
+"using<br>changeset {0} which was already closed at {1}.<br>Please upload "
+"again with a new or an existing open changeset."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+#, fuzzy
+msgid "Changeset closed"
+msgstr "набори от промени"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
@@ -1799,5 +1856,5 @@
 "\"!"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
@@ -1806,18 +1863,18 @@
 "\"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr "<html>Качването <strong>не стана</strong>.<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
 msgid "Upload to OSM API failed"
 msgstr "Качването към OSM API пропадна."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
 msgid "Updating primitive"
 msgstr "Обновяване на примитива."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -2038,14 +2095,14 @@
 msgstr "Добавяне на точка към път и съединяване"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:930
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:932
 msgid "Create new node."
 msgstr "Създаване нов възел."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
 msgid "Select node under cursor."
 msgstr "Избиране на точката под курсора."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939
 #, java-format
 msgid "Insert new node into way."
@@ -2054,14 +2111,14 @@
 msgstr[1] "Вмъкване на нов възел в {0} пътя."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
 msgid "Start new way from last node."
 msgstr "Започване на нов път от последния възел."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951
 msgid "Continue way from last node."
 msgstr "Продължаване на път от последния възел."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:972
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:974
 msgid "Finish drawing."
 msgstr "Завършване на чертането."
@@ -2185,60 +2242,70 @@
 "десния бутон на мишката"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Търсене..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Търсене на обекти."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
 msgid "Can't search because there is no loaded data."
 msgstr "Не може да се търси защото няма заредени данни"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
+#, fuzzy
+msgid "Please enter a filter string."
+msgstr "Моля, въведете низ за търсене."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
 msgid "Please enter a search string."
 msgstr "Моля, въведете низ за търсене."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
 msgid "replace selection"
 msgstr "замени селекцията"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72
 msgid "add to selection"
 msgstr "добави към селекцията"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73
 msgid "remove from selection"
 msgstr "изтрий от селекцията"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
+#, fuzzy
+msgid "find in selection"
+msgstr "добави към селекцията"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81
 msgid "case sensitive"
 msgstr "чувствителност към регистъра"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82
 msgid "regular expression"
 msgstr "регулярен израз"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
 msgstr "<b>Baker Street</b> - 'Baker' и 'Street' в кой да е ключ или име."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
 msgstr "<b>\"Baker Street\"</b> - 'Baker Street' в кой да е ключ или име."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
 msgstr "<b>name:Bak</b> - 'Bak' където и да е в името."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
 msgstr "<b>type=route</b> - ключ 'type' със стойност именно 'route'."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid ""
 "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
@@ -2248,55 +2315,56 @@
 "<b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
 msgstr "<b>-name:Bak</b> - няма 'Bak' в името."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - ключ=foot, независимо от стойността."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
 msgid "<u>Special targets:</u>"
 msgstr "<u>Специални цели:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr "<b>тип:</b> - тип на обекта (<b>възел</b>, <b>път</b>, <b>връзка</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - всички обекти, променени от зададения потребител"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
+msgstr "<b>id:</b>... - обект с дадено ID (0 за нови обекти)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 msgid "<b>nodes:</b>... - object with given number of nodes"
 msgstr "<b>nodes:</b>... - обекти с дадено количество възели / точки"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - всички променени обекти"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - всички избрани обекти"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - всички непълни обекти"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - всички немаркирани обекти"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
+"<b>child <i>израз</i></b> - всички обекти наследници, отговарящи на израза"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2304,9 +2372,9 @@
 "<b>parent <i>израз</i></b> - все предки объектов, соответствующие выражению"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Използвайте <b>|</b> или <b>OR</b> за да обедините в логическо \"ИЛИ\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
@@ -2314,46 +2382,63 @@
 "ключ съдържа двоеточие)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Използвайте <b>(</b> и <b>)</b> за да групирате изрази"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
+msgid "Filter"
+msgstr "Филтър"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Търсене"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
+msgid "Submit filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "Start Search"
 msgstr "Стартиране търсене"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Не е намерено съвпадение за ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Нищо не е добавено към селекцията в резултат на търсенето за ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Нищо не е премахнато от селекцията в резултат на търсенето за ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#, fuzzy, java-format
+msgid "Nothing find in selection by searching for ''{0}''"
+msgstr "Нищо не е добавено към селекцията в резултат на търсенето за ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262
 #, java-format
 msgid "Found {0} matches"
 msgstr "Намерени са {0} съвпадения"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283
 msgid "RX"
 msgstr "RX"
@@ -2416,4 +2501,6 @@
 "nodes or range, for example nodes:10-20"
 msgstr ""
+"Некоректна стойност на оператора за възли: {0}. Операторът за възли очаква "
+"числова стойност, възел или диапазон, например, 10-20"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:621
@@ -2479,5 +2566,5 @@
 #, java-format
 msgid "Change relation {0}"
-msgstr ""
+msgstr "Промяна на релация {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
@@ -2545,5 +2632,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
 msgid "Double conflict"
 msgstr "Двоен конфликт"
@@ -2626,4 +2713,6 @@
 "from relation?</html>"
 msgstr ""
+"<html>Избраният обект \"{0}\" е част от релация \"{1}\" с роля {2}.<br>Да го "
+"изтрием ли от релацията?</html>"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213
@@ -2633,4 +2722,6 @@
 "</html>"
 msgstr ""
+"<html>Избраният обект \"{0}\" е част от релация \"{1}\".<br>Да го изтрием ли "
+"от релацията?</html>"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446
@@ -2698,15 +2789,15 @@
 #, java-format
 msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
+msgstr "Изтриване на възел ''{0}'' на позиция {1} от релация ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:70
 #, java-format
 msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
+msgstr "Изтриване на път ''{0}'' на позиция {1} от релация ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:71
 #, java-format
 msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
+msgstr "Изтриване на релация ''{0}'' на позиция {1} от релация ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:141
@@ -2724,15 +2815,15 @@
 #, java-format
 msgid "Resolve {0} tag conflicts in node {1}"
-msgstr ""
+msgstr "Разрешаване {0} конфликтиращи маркери във възел {1}"
 
 #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70
 #, java-format
 msgid "Resolve {0} tag conflicts in way {1}"
-msgstr ""
+msgstr "Разрешаване {0} конфликтиращи маркери в път {1}"
 
 #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71
 #, java-format
 msgid "Resolve {0} tag conflicts in relation {1}"
-msgstr ""
+msgstr "Разрешаване {0} конфликтиращи маркери в релация {1}"
 
 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66
@@ -2744,5 +2835,5 @@
 #, java-format
 msgid "Resolve version conflicts for node {0}"
-msgstr ""
+msgstr "Разрешаване конфликт на версиите за възел {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42
@@ -2795,4 +2886,5 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:134
 msgid "Old value"
 msgstr "Стара стойност"
@@ -2861,4 +2953,6 @@
 "preference directory: {0}"
 msgstr ""
+"Внимание: Грешка при инициализация на предпочитанията. Неуспешно създаване "
+"на липсваща директория за параметри: {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:391
@@ -2868,4 +2962,6 @@
 "preference directory: {0}</html>"
 msgstr ""
+"<html>Грешка при инициализация на предпочитанията.<br>Неуспешно създаване на "
+"липсваща директория за параметри: {0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
@@ -2958,27 +3054,59 @@
 
 #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
 msgid "E"
 msgstr "И"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:59
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:203
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
 msgid "Changeset {0}"
 msgstr "Списък с промени {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:323
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
 msgstr "параметърът {0} трябва да е > 0. Сега е {1}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:325
-#, fuzzy, java-format
-msgid "paramete''{0}'' must not be null"
-msgstr "параметърът ''{0}'' не трябва да е празен"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331
-#, fuzzy, java-format
-msgid "unsupported value ''{0}'' or parameter ''{1}''"
-msgstr "Няма подходяща роля ''{0}'' за Път ''{1}''."
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "H"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "Text"
+msgstr "текст"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "C"
+msgstr "CS"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "I"
+msgstr "CI"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "M"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#, fuzzy
+msgid "R"
+msgstr "RX"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+msgid "A"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+msgid "D"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+msgid "F"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
@@ -2992,29 +3120,29 @@
 msgstr "Предупреждение: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
+#, java-format
 msgid "expected id >= 0. Got {0}"
-msgstr "неочаквана върната стойност {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:257
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
 msgid "a primitive with id=0 can't be invisible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:293
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
+#, java-format
 msgid "id > 0 expected. Got {0}"
-msgstr "Неочакван знак: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
+#, java-format
 msgid "version > 0 expected. Got {0}"
-msgstr "Неочакван знак: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
 msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
 msgstr "параметърът ''{0}'' не е валиден тип на име, имаме: ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
 msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
@@ -3081,9 +3209,9 @@
 msgstr "параметърът {0} не е в интервала 0..{1}, той е {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:247
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:249
 msgid "Area style way is not closed."
 msgstr "Път, обознаващ граница на област, не е затворен."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:478
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:482
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
@@ -3092,118 +3220,118 @@
 #. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
 #. TODO Remove useless nullcheck when RelationMember.member is encalupsed
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:851
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855
 msgid "Empty member in relation."
 msgstr "В релацията има празен член."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:853
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "В релацията има член ''{0}'', който е бил изтрит."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:864
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Пътя ''{0}'' е с по-малко от две точки."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "More than one \"from\" way found."
 msgstr "Повече от един път \"от\" са намерени."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "More than one \"to\" way found."
 msgstr "Повече от един път \"до\" са намерени."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "More than one \"via\" found."
 msgstr "Повече от един \"през\" са открити."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Неизвестна роля ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Неизвестен тип членство за ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"from\" way found."
 msgstr "Не е намерен път \"от\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"to\" way found."
 msgstr "Не е намерен път \"до\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652
 msgid "No \"via\" node or way found."
 msgstr "Не е открит възел или път \"през\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "Пътят \"от\" не започва или не завършва във възел \"през\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "Пътят \"до\" не започва или свършва във възел \"през\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "Пътят \"от\" не започва или свършва във възел \"през\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "Пътят \"до\" не започва или свършва в път \"през\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Стил за ограничение {0} не е намерен."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Няма подходяща роля ''{0}'' за Път ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:885
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Не-Път ''{0}'' в мултиполигон."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:943
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Липсва външен път за мултиполигон ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1032
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Пресичане между пътища ''{0}'' и ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1044
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Вътрешният път ''{0}'' се намира отвън."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1097
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Стилът за вътрешния път ''{0}'' се равнява на мултиполигон."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1123
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Стилът за външния път ''{0}'' се разминава."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1327
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331
 msgid "untagged"
 msgstr "немаркиран"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1328
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332
 msgid "text"
 msgstr "текст"
@@ -3224,5 +3352,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
@@ -3243,5 +3371,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
@@ -3296,5 +3424,5 @@
 msgstr "Ламбертова зона (Франция)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
 msgid "Lambert Zone (Estonia)"
 msgstr "Ламбертова Зона (Естония)"
@@ -3338,9 +3466,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:38
 msgid "Do not show again"
 msgstr "Да не се показва повече"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
 #, java-format
@@ -3348,31 +3476,31 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:91
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:116
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154
 msgid "incomplete"
 msgstr "непълен"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
 msgid "highway"
 msgstr "път / магистрала"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
-#: build/trans_presets.java:3144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: build/trans_presets.java:3156
 msgid "railway"
 msgstr "железопътна линия"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
 msgid "waterway"
 msgstr "водоеми"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "landuse"
 msgstr "земеползване"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:474
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
@@ -3382,5 +3510,5 @@
 msgstr[1] "{0} точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
 #, java-format
 msgid "{0} member"
@@ -3410,7 +3538,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
-#, fuzzy
 msgid "Bad Request"
-msgstr "Редактирай ракет"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144
@@ -3426,10 +3553,5 @@
 msgstr "Съобщение за деня не е налично"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67
-#, java-format
-msgid "- running version is {0}"
-msgstr "- изпълняващата се версия е {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:95
 msgid "Downloading \"Message of the day\""
 msgstr "Зареждане на \"Съобщение на деня\""
@@ -3501,10 +3623,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:162
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
 msgid "Username"
 msgstr "Потребителско име"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
 msgid "Password"
 msgstr "Парола"
@@ -3627,5 +3749,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226
 msgid "Presets"
 msgstr "Шаблони"
@@ -3699,38 +3821,49 @@
 msgstr "мащаб"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Географската дължина на показалеца на мишката."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The name of the object at the mouse pointer."
 msgstr "Название на обекта сочен от показалеца на мишката."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Географска ширина на показалеца на мишката."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The angle between the previous and the current way segment."
 msgstr "Ъгъл между предишния и текущия сегмент от пътя"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "Направлението на създавания линеен сегмент."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The length of the new way segment being drawn."
 msgstr "Дължина на новосъздавания линеен сегмент."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199
+msgid ""
+"Middle click again to cycle through.<br>Hold CTRL to select directly from "
+"this list with the mouse.<hr>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290
 msgid "(no object)"
 msgstr "(няма обект)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:301
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418
+#, fuzzy
+msgid "User:"
+msgstr "Потребител"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
 msgid "layer not in list."
 msgstr "слоя не е в списъка."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:488
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3801,7 +3934,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:224
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Tags"
 msgstr "Маркери"
@@ -3816,5 +3949,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
@@ -3997,4 +4130,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
 msgid "Up"
 msgstr "Нагоре"
@@ -4005,4 +4139,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Down"
 msgstr "Надолу"
@@ -4015,5 +4150,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
@@ -4443,23 +4578,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:236
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239
 msgid "No conflicts to resolve"
-msgstr "Няма чакащи tag конфликти за разрешаване"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:295
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254
 msgid "Cancel conflict resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:310
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269
 msgid "Apply resolved conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Apply"
 msgstr "Приложи"
@@ -4471,5 +4605,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "all"
 msgstr "всички"
@@ -4513,7 +4647,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
-msgid "not yet decided"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:213
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
@@ -4540,7 +4671,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
@@ -4550,7 +4681,7 @@
 msgstr[1] "{0} пътя"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:152
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
@@ -4560,25 +4691,25 @@
 msgstr[1] "{0} релации"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "Paste ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+msgstr "Поставяне..."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "From ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:372
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+msgstr "От..."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "To ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:428
+msgstr "На..."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
 #, java-format
 msgid "{0} tag"
 msgid_plural "{0} tags"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} етикет"
+msgstr[1] "{0} етикета"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
@@ -4589,13 +4720,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
-#, fuzzy
 msgid "Remove this relation member from the relation"
-msgstr "Премахване на текущо избраните членове от тази връзка"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-#, fuzzy
 msgid "Replace"
-msgstr "място"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
@@ -4606,11 +4735,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
-#, fuzzy
 msgid "Undecided"
-msgstr "<неопределено>"
+msgstr ""
 
 #. --- role editing
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:56
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510
 msgid "Role:"
 msgstr "Роля:"
@@ -4626,7 +4754,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70
-#, fuzzy
 msgid "Value:"
-msgstr "Стойност"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86
@@ -4639,12 +4766,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51
-#, fuzzy
 msgid "Orig. Way"
-msgstr "Еднопосочна"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
-#, fuzzy
 msgid "Decision"
-msgstr "Ревизия"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -4660,6 +4785,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
@@ -4748,169 +4874,13 @@
 msgstr "Разрешаване на конфликти за ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-msgid "History"
-msgstr "История"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-msgid "Display the history of all selected items."
-msgstr "Показване историята на всички избрани обекти."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
-#, java-format
-msgid "index out of bounds Got {0}"
-msgstr "индекс извън границите. Имаме: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr "Възел {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
-msgid "History item"
-msgstr "Точка от историята"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Презареждане на всички текущо избрани обекти и опресняване на списъка."
-
-#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
-msgid "Show"
-msgstr "Покажи"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
-msgstr "Показване историята на избрания примитив"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
-msgid "Dialog not created yet. Invoke createInstance() first"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
-msgid "Layers"
-msgstr "Слоеве"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-msgid "Open a list of all loaded layers."
-msgstr "Отваряне списъка с всички заредени слоеве."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:297
-msgid "Delete the selected layer."
-msgstr "Изтриване избрания слой."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:367
-msgid "Show/Hide"
-msgstr "Показване/скриване"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:378
-msgid "Toggle visible state of the selected layer."
-msgstr "Превключване видимостта на избрания слой."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414
-msgid "Activate"
-msgstr "Активиране"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:420
-msgid "Activate the selected layer"
-msgstr "Активиране на избрания слой"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:475
-msgid "Merge this layer into another layer"
-msgstr "Обедини този слой с друг слой"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:581
-msgid "Move the selected layer one row up."
-msgstr "Преместване избрания слой един ред нагоре."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:600
-msgid "Move the selected layer one row down."
-msgstr "Преместване избрания слой един ред надолу."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
-msgid "Information about layer"
-msgstr "Информация за слоя"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
-#, java-format
-msgid "This will change up to {0} object."
-msgid_plural "This will change up to {0} objects."
-msgstr[0] "Това ще промени до {0} обект."
-msgstr[1] "Това ще промени до {0} обекта"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
-msgid "An empty value deletes the key."
-msgstr "Празна стойност изтрива ключа."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
-msgid "<different>"
-msgstr "<различни>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
-msgid "Change values?"
-msgstr "Промени стойностите?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
-#, java-format
-msgid "Change properties of up to {0} object"
-msgid_plural "Change properties of up to {0} objects"
-msgstr[0] "Промяна параметрите на {0} обект"
-msgstr[1] "Промяна параметрите на {0} обекта"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
-msgid "Please select a key"
-msgstr "Моля, изберете ключ"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
-msgid "Please select a value"
-msgstr "Изберете стойност"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
-msgid "Please select the objects you want to change properties for."
-msgstr "Моля, изберете обектите, чиито параметри искате да промените."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
-msgid "Properties/Memberships"
-msgstr "Параметри/Отношения"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-msgid "Properties for selected objects."
-msgstr "Параметри на избраните обекти"
-
-#. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-msgid "Member Of"
-msgstr "Член на"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
-msgid "Add Properties"
-msgstr "Добавяне на параметри"
-
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+msgid "Filter objects and hide/disable them."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
@@ -4924,4 +4894,212 @@
 msgstr "Добави"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#, fuzzy
+msgid "Add filter."
+msgstr "Добавяне на избраните"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
+#, fuzzy
+msgid "Edit filter."
+msgstr "Редактирай кей"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#, fuzzy
+msgid "Delete filter."
+msgstr "Изтриване на моите"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
+#, fuzzy
+msgid "Move filter up."
+msgstr "Премести нагоре"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
+#, fuzzy
+msgid "Move filter down."
+msgstr "Премести надолу"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128
+msgid "Enable filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
+#, fuzzy
+msgid "Hide elements"
+msgstr "Отделни елементи"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
+msgid "Apply also for children"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
+msgid "Inverse filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
+#, fuzzy
+msgid "Filter mode"
+msgstr "Филтър"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
+msgid "History"
+msgstr "История"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+msgid "Display the history of all selected items."
+msgstr "Показване историята на всички избрани обекти."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr "индекс извън границите. Имаме: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr "Възел {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr "Път {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr "Връзка {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
+msgid "History item"
+msgstr "Точка от историята"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
+msgid "Reload all currently selected objects and refresh the list."
+msgstr "Презареждане на всички текущо избрани обекти и опресняване на списъка."
+
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
+msgid "Show"
+msgstr "Покажи"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
+msgid "Display the history of the selected primitive"
+msgstr "Показване историята на избрания примитив"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84
+msgid "Dialog not created yet. Invoke createInstance() first"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
+msgid "Layers"
+msgstr "Слоеве"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+msgid "Open a list of all loaded layers."
+msgstr "Отваряне списъка с всички заредени слоеве."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294
+msgid "Delete the selected layer."
+msgstr "Изтриване избрания слой."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364
+msgid "Show/Hide"
+msgstr "Показване/скриване"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375
+msgid "Toggle visible state of the selected layer."
+msgstr "Превключване видимостта на избрания слой."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgid "Activate"
+msgstr "Активиране"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417
+msgid "Activate the selected layer"
+msgstr "Активиране на избрания слой"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472
+msgid "Merge this layer into another layer"
+msgstr "Обедини този слой с друг слой"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578
+msgid "Move the selected layer one row up."
+msgstr "Преместване избрания слой един ред нагоре."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597
+msgid "Move the selected layer one row down."
+msgstr "Преместване избрания слой един ред надолу."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+msgid "Information about layer"
+msgstr "Информация за слоя"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+#, java-format
+msgid "This will change up to {0} object."
+msgid_plural "This will change up to {0} objects."
+msgstr[0] "Това ще промени до {0} обект."
+msgstr[1] "Това ще промени до {0} обекта"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+msgid "An empty value deletes the key."
+msgstr "Празна стойност изтрива ключа."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+msgid "<different>"
+msgstr "<различни>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+msgid "Change values?"
+msgstr "Промени стойностите?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#, java-format
+msgid "Change properties of up to {0} object"
+msgid_plural "Change properties of up to {0} objects"
+msgstr[0] "Промяна параметрите на {0} обект"
+msgstr[1] "Промяна параметрите на {0} обекта"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+msgid "Please select a key"
+msgstr "Моля, изберете ключ"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+msgid "Please select a value"
+msgstr "Изберете стойност"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
+msgid "Please select the objects you want to change properties for."
+msgstr "Моля, изберете обектите, чиито параметри искате да промените."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
+msgid "Properties/Memberships"
+msgstr "Параметри/Отношения"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+msgid "Properties for selected objects."
+msgstr "Параметри на избраните обекти"
+
+#. setting up the membership table
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+msgid "Member Of"
+msgstr "Член на"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
+msgid "Add Properties"
+msgstr "Добавяне на параметри"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574
 msgid "Add a new key/value pair to all objects"
@@ -4963,10 +5141,9 @@
 
 #. item "Land use/Quarry" text "Name"
-#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
-#: build/trans_presets.java:3109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168
+#: build/trans_presets.java:3121
 msgid "Relations"
 msgstr "Връзки"
@@ -4976,23 +5153,23 @@
 msgstr "Отваряне списъка с всички връзки."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166
 #, java-format
 msgid "Relations: {0}"
 msgstr "Връзки: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276
 msgid "Open an editor for the selected relation"
 msgstr "Отвори редактор за избраната връзка"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
 msgid "Delete the selected relation"
 msgstr "Изтриване на избраната връзка"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349
 msgid "Create a new relation"
 msgstr "Създаване на нова релация"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:373
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1412
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
@@ -5025,5 +5202,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5035,9 +5212,9 @@
 msgstr "Избрано: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441
 msgid "Undock the panel"
 msgstr "Отсъедини панела"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5046,5 +5223,5 @@
 "левия панел."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:457
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Натиснете за да минимизирате/максимизирате съдържанието на панела"
@@ -5064,6 +5241,6 @@
 msgid "{0} Author"
 msgid_plural "{0} Authors"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} Автор"
+msgstr[1] "{0} Автора"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142
@@ -5073,5 +5250,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172
 msgid "Show info"
-msgstr ""
+msgstr "Показване на информация"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173
@@ -5094,5 +5271,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210
 msgid "Missing encoding"
-msgstr ""
+msgstr "Липсваща кодировка"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272
@@ -5105,5 +5282,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5127,5 +5304,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1502
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1370
 msgid "Download relation members"
 msgstr "Свали членовете на връзките"
@@ -5157,5 +5334,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -5163,18 +5340,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
 msgid "Tags and Members"
 msgstr "Етикети и членове"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:167
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5183,14 +5360,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613
 #, java-format
 msgid ""
@@ -5200,9 +5377,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid ""
@@ -5212,15 +5389,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5228,5 +5405,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5234,20 +5411,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849
 #, java-format
 msgid ""
@@ -5256,57 +5433,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:961
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
 msgid "Sort the relation members"
 msgstr "Сортиране на членовете на връзката"
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897
 msgid "Relation Editor: Sort"
 msgstr "Редактор на връзки: Сортиране"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909
 msgid "Move the currently selected members up"
 msgstr "Преместване на текущо избраните членове нагоре"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:979
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:912
 msgid "Relation Editor: Move Up"
 msgstr "Редактор на връзки: Преместване нагоре"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928
 msgid "Move the currently selected members down"
 msgstr "Преместване на текущо избраните членове надолу"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:998
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:931
 msgid "Relation Editor: Move Down"
 msgstr "Редактор на връзки: Преместване надолу"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947
 msgid "Remove the currently selected members from this relation"
 msgstr "Премахване на текущо избраните членове от тази връзка"
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
 msgid "Relation Editor: Remove"
 msgstr "Редактор на връзки: Премахване"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
 msgid "Delete the currently edited relation"
 msgstr "Изтриване на текущо редактираната врзка"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Yes, create a conflict and close"
 msgstr "Да, създай конфликт и затвори"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050
 msgid "No, continue editing"
 msgstr "Не, продължава редактирането"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5315,9 +5492,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1058
 msgid "Conflict in data"
 msgstr "Конфликт в данните"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
 #, java-format
 msgid ""
@@ -5326,56 +5503,41 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090
+msgid "Apply the current updates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123
+msgid "Apply the updates and close the dialog"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
-msgid "Apply the current updates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
-msgid "Apply the updates and close the dialog"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "ОК"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 msgid "Cancel the updates and close the dialog"
 msgstr "Прекъсване на обновяването и затваряне на диалоговия прозорец"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 msgid "Add an empty tag"
 msgstr "Добави празен етикет"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
-msgid "Delete the currently selected tags"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Сваляне всички непълни пътища и възли от връката"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 msgid "Download Members"
 msgstr "Сваляне членове"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Relation Editor: Download Members"
 msgstr "Редактор на връзки: Сваляне на членове"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1208
 msgid "Sets a role for the selected members"
 msgstr "Установява роля за избраните членове"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1211
 msgid "Apply Role"
 msgstr "Приложи роля"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1356
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 #, java-format
 msgid ""
@@ -5385,13 +5547,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228
 msgid "Yes, apply it"
 msgstr "Да, приложи го!"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1229
 msgid "No, don't apply"
 msgstr "Не, не прилагай!"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1367
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
 msgid "Confirm empty role"
 msgstr "Потвърди празна роля"
@@ -5478,37 +5640,37 @@
 msgstr "Отметки"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:82
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
 msgid "Please enter the desired coordinates first."
 msgstr "Моля, въведете първо желаните координати."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
 msgid "Please enter a name for the location."
 msgstr "Моля въведете име на мястото."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:107
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
 msgid "Select a bookmark first."
 msgstr "Изберете първо отметка"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
 msgid "min lat"
 msgstr "мин. ширина"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
 msgid "min lon"
 msgstr "мин. дължина"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid "max lat"
 msgstr "макс. ширина"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
 msgid "max lon"
 msgstr "макс. дължина"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5518,22 +5680,22 @@
 "за сваляне)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
 msgid "Bounding Box"
 msgstr "Рамка"
 
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
 msgid "Data Sources and Types"
 msgstr "Източници и типове данни"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
 msgid "Download as new layer"
 msgstr "Свали като нов слой"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
 msgid "Download Area"
 msgstr "Област за сваляне"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
 msgid "Download area too large; will probably be rejected by server"
 msgstr ""
@@ -5541,5 +5703,5 @@
 "обработка на заявката."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
 msgid "Download area ok, size probably acceptable to server"
 msgstr "Областта за сваляне е ОК, размерът е приемлив за сървъра."
@@ -5564,7 +5726,7 @@
 msgstr "Въведете име на място за търсене:"
 
-#. <separator/>
+#. group "Geography"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2759
 msgid "Places"
 msgstr "Места"
@@ -5611,21 +5773,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "type"
 msgstr "тип"
@@ -5642,5 +5804,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-#, fuzzy
 msgid ""
 "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
@@ -5648,6 +5809,4 @@
 "Hold left mousebutton and draw a frame."
 msgstr ""
-"Мащабиране: с колелцето на мишката или двойно щракване. Преместване на "
-"картата: Задръжте десния бутон на мишката и движете.   Избор: Щракане."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
@@ -6108,4 +6267,6 @@
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
 #. <key key="historic" value="wayside_shrine" />
+#. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
+#. <key key="historic" value="boundary_stone" />
 #. item "Leisure/Water Park" label "Edit Water Park"
 #. <key key="leisure" value="water_park" />
@@ -6477,153 +6638,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/trans_presets.java:66 build/trans_presets.java:102
-#: build/trans_presets.java:142 build/trans_presets.java:179
-#: build/trans_presets.java:199 build/trans_presets.java:217
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:272 build/trans_presets.java:305
-#: build/trans_presets.java:351 build/trans_presets.java:371
-#: build/trans_presets.java:386 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:463 build/trans_presets.java:482
-#: build/trans_presets.java:502 build/trans_presets.java:522
-#: build/trans_presets.java:543 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627 build/trans_presets.java:658
-#: build/trans_presets.java:679 build/trans_presets.java:692
-#: build/trans_presets.java:705 build/trans_presets.java:718
-#: build/trans_presets.java:731 build/trans_presets.java:744
-#: build/trans_presets.java:755 build/trans_presets.java:764
-#: build/trans_presets.java:811 build/trans_presets.java:832
-#: build/trans_presets.java:841 build/trans_presets.java:901
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1067 build/trans_presets.java:1075
-#: build/trans_presets.java:1085 build/trans_presets.java:1093
-#: build/trans_presets.java:1098 build/trans_presets.java:1105
-#: build/trans_presets.java:1112 build/trans_presets.java:1117
-#: build/trans_presets.java:1125 build/trans_presets.java:1134
-#: build/trans_presets.java:1140 build/trans_presets.java:1146
-#: build/trans_presets.java:1151 build/trans_presets.java:1157
-#: build/trans_presets.java:1163 build/trans_presets.java:1172
-#: build/trans_presets.java:1181 build/trans_presets.java:1188
-#: build/trans_presets.java:1196 build/trans_presets.java:1209
-#: build/trans_presets.java:1215 build/trans_presets.java:1224
-#: build/trans_presets.java:1230 build/trans_presets.java:1236
-#: build/trans_presets.java:1244 build/trans_presets.java:1299
-#: build/trans_presets.java:1346 build/trans_presets.java:1352
-#: build/trans_presets.java:1358 build/trans_presets.java:1364
-#: build/trans_presets.java:1370 build/trans_presets.java:1381
-#: build/trans_presets.java:1390 build/trans_presets.java:1405
-#: build/trans_presets.java:1412 build/trans_presets.java:1418
-#: build/trans_presets.java:1426 build/trans_presets.java:1433
-#: build/trans_presets.java:1442 build/trans_presets.java:1450
-#: build/trans_presets.java:1457 build/trans_presets.java:1468
-#: build/trans_presets.java:1478 build/trans_presets.java:1488
-#: build/trans_presets.java:1508 build/trans_presets.java:1520
-#: build/trans_presets.java:1531 build/trans_presets.java:1548
-#: build/trans_presets.java:1555 build/trans_presets.java:1570
-#: build/trans_presets.java:1577 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1594
-#: build/trans_presets.java:1599 build/trans_presets.java:1605
-#: build/trans_presets.java:1611 build/trans_presets.java:1619
-#: build/trans_presets.java:1627 build/trans_presets.java:1635
-#: build/trans_presets.java:1642 build/trans_presets.java:1648
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1670 build/trans_presets.java:1677
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1712 build/trans_presets.java:1719
-#: build/trans_presets.java:1736 build/trans_presets.java:1744
-#: build/trans_presets.java:1759 build/trans_presets.java:1769
-#: build/trans_presets.java:1781 build/trans_presets.java:1788
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:1809 build/trans_presets.java:1817
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1841
-#: build/trans_presets.java:1846 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1864
-#: build/trans_presets.java:1872 build/trans_presets.java:1881
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1908 build/trans_presets.java:1914
-#: build/trans_presets.java:1922 build/trans_presets.java:1928
-#: build/trans_presets.java:1934 build/trans_presets.java:1940
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2013
-#: build/trans_presets.java:2022 build/trans_presets.java:2030
-#: build/trans_presets.java:2036 build/trans_presets.java:2042
-#: build/trans_presets.java:2048 build/trans_presets.java:2054
-#: build/trans_presets.java:2060 build/trans_presets.java:2066
-#: build/trans_presets.java:2072 build/trans_presets.java:2078
-#: build/trans_presets.java:2084 build/trans_presets.java:2090
-#: build/trans_presets.java:2096 build/trans_presets.java:2102
-#: build/trans_presets.java:2108 build/trans_presets.java:2114
-#: build/trans_presets.java:2120 build/trans_presets.java:2126
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2158
-#: build/trans_presets.java:2165 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2186
-#: build/trans_presets.java:2192 build/trans_presets.java:2198
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2218 build/trans_presets.java:2225
-#: build/trans_presets.java:2232 build/trans_presets.java:2239
-#: build/trans_presets.java:2247 build/trans_presets.java:2279
-#: build/trans_presets.java:2284 build/trans_presets.java:2289
-#: build/trans_presets.java:2294 build/trans_presets.java:2300
-#: build/trans_presets.java:2306 build/trans_presets.java:2312
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2354
-#: build/trans_presets.java:2451 build/trans_presets.java:2458
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2485 build/trans_presets.java:2492
-#: build/trans_presets.java:2498 build/trans_presets.java:2504
-#: build/trans_presets.java:2526 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2553 build/trans_presets.java:2559
-#: build/trans_presets.java:2565 build/trans_presets.java:2571
-#: build/trans_presets.java:2577 build/trans_presets.java:2583
-#: build/trans_presets.java:2590 build/trans_presets.java:2597
-#: build/trans_presets.java:2604 build/trans_presets.java:2610
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2661
-#: build/trans_presets.java:2667 build/trans_presets.java:2677
-#: build/trans_presets.java:2686 build/trans_presets.java:2701
-#: build/trans_presets.java:2707 build/trans_presets.java:2715
-#: build/trans_presets.java:2722 build/trans_presets.java:2742
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2783
-#: build/trans_presets.java:2790 build/trans_presets.java:2797
-#: build/trans_presets.java:2803 build/trans_presets.java:2809
-#: build/trans_presets.java:2817 build/trans_presets.java:2824
-#: build/trans_presets.java:2831 build/trans_presets.java:2838
-#: build/trans_presets.java:2844 build/trans_presets.java:2851
-#: build/trans_presets.java:2858 build/trans_presets.java:2867
-#: build/trans_presets.java:2873 build/trans_presets.java:2879
-#: build/trans_presets.java:2885 build/trans_presets.java:2891
-#: build/trans_presets.java:2900 build/trans_presets.java:2910
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2948
-#: build/trans_presets.java:2957 build/trans_presets.java:2963
-#: build/trans_presets.java:2969 build/trans_presets.java:2975
-#: build/trans_presets.java:2981 build/trans_presets.java:2987
-#: build/trans_presets.java:2993 build/trans_presets.java:3000
-#: build/trans_presets.java:3006 build/trans_presets.java:3011
-#: build/trans_presets.java:3018 build/trans_presets.java:3025
-#: build/trans_presets.java:3031 build/trans_presets.java:3040
-#: build/trans_presets.java:3048 build/trans_presets.java:3054
-#: build/trans_presets.java:3060 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3080
-#: build/trans_presets.java:3086 build/trans_presets.java:3092
-#: build/trans_presets.java:3098 build/trans_presets.java:3104
-#: build/trans_presets.java:3117 build/trans_presets.java:3131
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:67 build/trans_presets.java:103
+#: build/trans_presets.java:143 build/trans_presets.java:180
+#: build/trans_presets.java:200 build/trans_presets.java:218
+#: build/trans_presets.java:235 build/trans_presets.java:253
+#: build/trans_presets.java:273 build/trans_presets.java:306
+#: build/trans_presets.java:352 build/trans_presets.java:372
+#: build/trans_presets.java:387 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:503 build/trans_presets.java:523
+#: build/trans_presets.java:544 build/trans_presets.java:565
+#: build/trans_presets.java:586 build/trans_presets.java:607
+#: build/trans_presets.java:628 build/trans_presets.java:659
+#: build/trans_presets.java:680 build/trans_presets.java:693
+#: build/trans_presets.java:706 build/trans_presets.java:719
+#: build/trans_presets.java:732 build/trans_presets.java:745
+#: build/trans_presets.java:756 build/trans_presets.java:765
+#: build/trans_presets.java:812 build/trans_presets.java:833
+#: build/trans_presets.java:842 build/trans_presets.java:902
+#: build/trans_presets.java:1053 build/trans_presets.java:1061
+#: build/trans_presets.java:1069 build/trans_presets.java:1077
+#: build/trans_presets.java:1087 build/trans_presets.java:1095
+#: build/trans_presets.java:1100 build/trans_presets.java:1107
+#: build/trans_presets.java:1114 build/trans_presets.java:1119
+#: build/trans_presets.java:1127 build/trans_presets.java:1136
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1153 build/trans_presets.java:1159
+#: build/trans_presets.java:1165 build/trans_presets.java:1174
+#: build/trans_presets.java:1183 build/trans_presets.java:1190
+#: build/trans_presets.java:1198 build/trans_presets.java:1211
+#: build/trans_presets.java:1217 build/trans_presets.java:1226
+#: build/trans_presets.java:1232 build/trans_presets.java:1238
+#: build/trans_presets.java:1246 build/trans_presets.java:1302
+#: build/trans_presets.java:1349 build/trans_presets.java:1355
+#: build/trans_presets.java:1361 build/trans_presets.java:1367
+#: build/trans_presets.java:1373 build/trans_presets.java:1384
+#: build/trans_presets.java:1393 build/trans_presets.java:1408
+#: build/trans_presets.java:1415 build/trans_presets.java:1421
+#: build/trans_presets.java:1429 build/trans_presets.java:1436
+#: build/trans_presets.java:1445 build/trans_presets.java:1453
+#: build/trans_presets.java:1460 build/trans_presets.java:1471
+#: build/trans_presets.java:1481 build/trans_presets.java:1491
+#: build/trans_presets.java:1511 build/trans_presets.java:1523
+#: build/trans_presets.java:1534 build/trans_presets.java:1551
+#: build/trans_presets.java:1558 build/trans_presets.java:1574
+#: build/trans_presets.java:1581 build/trans_presets.java:1586
+#: build/trans_presets.java:1592 build/trans_presets.java:1598
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1646 build/trans_presets.java:1652
+#: build/trans_presets.java:1659 build/trans_presets.java:1666
+#: build/trans_presets.java:1674 build/trans_presets.java:1681
+#: build/trans_presets.java:1689 build/trans_presets.java:1696
+#: build/trans_presets.java:1702 build/trans_presets.java:1709
+#: build/trans_presets.java:1716 build/trans_presets.java:1723
+#: build/trans_presets.java:1740 build/trans_presets.java:1748
+#: build/trans_presets.java:1763 build/trans_presets.java:1773
+#: build/trans_presets.java:1785 build/trans_presets.java:1792
+#: build/trans_presets.java:1798 build/trans_presets.java:1808
+#: build/trans_presets.java:1813 build/trans_presets.java:1821
+#: build/trans_presets.java:1828 build/trans_presets.java:1834
+#: build/trans_presets.java:1840 build/trans_presets.java:1845
+#: build/trans_presets.java:1850 build/trans_presets.java:1855
+#: build/trans_presets.java:1862 build/trans_presets.java:1868
+#: build/trans_presets.java:1873 build/trans_presets.java:1882
+#: build/trans_presets.java:1891 build/trans_presets.java:1900
+#: build/trans_presets.java:1909 build/trans_presets.java:1918
+#: build/trans_presets.java:1924 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 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:2023 build/trans_presets.java:2032
+#: build/trans_presets.java:2040 build/trans_presets.java:2046
+#: build/trans_presets.java:2052 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 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:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2150
+#: build/trans_presets.java:2156 build/trans_presets.java:2162
+#: build/trans_presets.java:2169 build/trans_presets.java:2176
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2197 build/trans_presets.java:2203
+#: build/trans_presets.java:2209 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2229
+#: build/trans_presets.java:2236 build/trans_presets.java:2243
+#: build/trans_presets.java:2250 build/trans_presets.java:2258
+#: build/trans_presets.java:2290 build/trans_presets.java:2295
+#: build/trans_presets.java:2300 build/trans_presets.java:2305
+#: build/trans_presets.java:2311 build/trans_presets.java:2317
+#: build/trans_presets.java:2323 build/trans_presets.java:2331
+#: build/trans_presets.java:2337 build/trans_presets.java:2343
+#: build/trans_presets.java:2349 build/trans_presets.java:2355
+#: build/trans_presets.java:2365 build/trans_presets.java:2462
+#: build/trans_presets.java:2469 build/trans_presets.java:2483
+#: build/trans_presets.java:2489 build/trans_presets.java:2496
+#: build/trans_presets.java:2503 build/trans_presets.java:2509
+#: build/trans_presets.java:2515 build/trans_presets.java:2537
+#: build/trans_presets.java:2544 build/trans_presets.java:2551
+#: build/trans_presets.java:2557 build/trans_presets.java:2564
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2594 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2615
+#: build/trans_presets.java:2621 build/trans_presets.java:2627
+#: build/trans_presets.java:2633 build/trans_presets.java:2639
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2672 build/trans_presets.java:2678
+#: build/trans_presets.java:2688 build/trans_presets.java:2697
+#: build/trans_presets.java:2712 build/trans_presets.java:2718
+#: build/trans_presets.java:2726 build/trans_presets.java:2733
+#: build/trans_presets.java:2753 build/trans_presets.java:2764
+#: build/trans_presets.java:2770 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2788
+#: build/trans_presets.java:2795 build/trans_presets.java:2802
+#: build/trans_presets.java:2809 build/trans_presets.java:2815
+#: build/trans_presets.java:2821 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2912
+#: build/trans_presets.java:2922 build/trans_presets.java:2931
+#: build/trans_presets.java:2937 build/trans_presets.java:2943
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 build/trans_presets.java:2981
+#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:2999 build/trans_presets.java:3005
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3023 build/trans_presets.java:3030
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3066 build/trans_presets.java:3072
+#: build/trans_presets.java:3079 build/trans_presets.java:3085
+#: build/trans_presets.java:3092 build/trans_presets.java:3098
+#: build/trans_presets.java:3104 build/trans_presets.java:3110
+#: build/trans_presets.java:3116 build/trans_presets.java:3129
+#: build/trans_presets.java:3143 build/trans_presets.java:3157
 msgid "Name"
 msgstr "Име"
@@ -6657,4 +6819,58 @@
 msgid "Version"
 msgstr "Версия"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
+#, fuzzy
+msgid "Changeset id:"
+msgstr "Списък с промени {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
+#, fuzzy
+msgid "Created at:"
+msgstr "Създаване на области"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
+#, fuzzy
+msgid "Changeset comment:"
+msgstr "Списък с промени {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
+msgid "No open changeset"
+msgstr "Няма отворен сисък с промени."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48
+#, fuzzy
+msgid "<html>Please select the changesets you want to close</html>"
+msgstr "Моля, изберете кои промени на параметри желаете да приложите."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
+#, fuzzy
+msgid "Open changesets"
+msgstr "Няма отворен сисък с промени."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101
+#, fuzzy
+msgid "Close changesets"
+msgstr "Затваряне на сисъка с промени."
+
+#. putValue(SMALL_ICON, ImageProvider.get("cancel"));
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
+#, fuzzy
+msgid "Close the selected open changesets"
+msgstr "Затваряне на текущия списък с промени..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126
+#, fuzzy
+msgid "Cancel closeing of changesets"
+msgstr "Затваряне на сисъка с промени."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37
+msgid "Closing changeset"
+msgstr "Затваряне на сисъка с промени."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77
+#, fuzzy, java-format
+msgid "Closing changeset {0}"
+msgstr "Затваряне списък с промени {0}..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
@@ -6683,5 +6899,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be uploaded"
+msgid "Layer ''{0}'' has no modifications to be uploaded."
 msgstr ""
 
@@ -6689,5 +6905,5 @@
 #, java-format
 msgid ""
-"Layer ''{0}'' has modifications which should be saved to its assoicated file "
+"Layer ''{0}'' has modifications which should be saved to its associated file "
 "''{1}''."
 msgstr ""
@@ -6695,5 +6911,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be saved"
+msgid "Layer ''{0}'' has no modifications to be saved."
 msgstr ""
 
@@ -6727,17 +6943,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113
 msgid "Unsaved changes - Save/Upload before exiting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194
 #, java-format
 msgid ""
@@ -6750,10 +6966,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205
 msgid "Unsaved data and conflicts"
-msgstr "Разрешаване на конфликти"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212
 #, java-format
 msgid ""
@@ -6767,9 +6982,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223
 msgid "Unsaved data and missing associated file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230
 #, java-format
 msgid ""
@@ -6784,42 +6999,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243
 msgid "Unsaved data non-writable files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
 msgid "Close this dialog and resume editing in JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322
 msgid "Discard and Delete"
 msgstr "Отхвърляне и изтриване"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354
 msgid "Save and Delete"
 msgstr "Запис и изтриване"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
 msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402
 #, java-format
 msgid "Preparing layer ''{0}'' for upload ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
@@ -6827,5 +7042,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491
 msgid "Incomplete upload and/or save"
 msgstr ""
@@ -6865,21 +7080,21 @@
 #. item "Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:200
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:278
-#: build/trans_presets.java:311 build/trans_presets.java:357
-#: build/trans_presets.java:372 build/trans_presets.java:387
-#: build/trans_presets.java:409 build/trans_presets.java:429
-#: build/trans_presets.java:450 build/trans_presets.java:470
-#: build/trans_presets.java:489 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:549
-#: build/trans_presets.java:570 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:633
-#: build/trans_presets.java:664 build/trans_presets.java:1060
-#: build/trans_presets.java:1068 build/trans_presets.java:1076
-#: build/trans_presets.java:1086 build/trans_presets.java:1305
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:242
+#: build/trans_presets.java:260 build/trans_presets.java:279
+#: build/trans_presets.java:312 build/trans_presets.java:358
+#: build/trans_presets.java:373 build/trans_presets.java:388
+#: build/trans_presets.java:410 build/trans_presets.java:430
+#: build/trans_presets.java:451 build/trans_presets.java:471
+#: build/trans_presets.java:490 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:665 build/trans_presets.java:1062
+#: build/trans_presets.java:1070 build/trans_presets.java:1078
+#: build/trans_presets.java:1088 build/trans_presets.java:1308
 msgid "Layer"
 msgstr "Слой / Ниво"
@@ -6898,69 +7113,32 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:200
 msgid "Upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-msgid "Use a new changeset and close it"
-msgstr "Използване на нов списък с промени и затваряне"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
-msgid ""
-"Select to upload the data using a new changeset and to close the changeset "
-"after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
-msgid "Use a new changeset and leave it open"
-msgstr "Използване на нов списък с промени. Остава отворен."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
-msgid ""
-"Select to upload the data using a new changeset and to leave the changeset "
-"open after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
-msgid "Upload to a new or to an existing changeset?"
-msgstr "Качване в нов или в съществуващ списък с промени?"
-
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
-msgid "upload all changes in one request"
-msgstr "качва всички промени в една заявка"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
-msgid ""
-"Enable to upload all changes in one request, disable to use one request per "
-"changed primitive"
-msgstr ""
-"Активирай за качване на всички промени в една заявка, Изключи за използване "
-"на заявка за всяка променена примитива"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "Опишете измененията на качваните от вас данни:"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:216
 msgid "Settings"
 msgstr "Настройки"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908
 msgid "Tags of new changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:221
 msgid "Objects to add:"
 msgstr "Обекти за добавяне:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:227
 msgid "Objects to modify:"
 msgstr "Променени обекти:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:233
 msgid "Objects to delete:"
 msgstr "Обекти за изтриване:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
 #, java-format
 msgid "{0} object to add:"
@@ -6969,5 +7147,5 @@
 msgstr[1] "{0} обекта за добавяне:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:277
 #, java-format
 msgid "{0} object to modifiy:"
@@ -6976,5 +7154,5 @@
 msgstr[1] "{0} обекта за промяна:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:286
 #, java-format
 msgid "{0} object to delete:"
@@ -6983,58 +7161,92 @@
 msgstr[1] "{0} обекти за изтриване:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422
-#, java-format
-msgid "Use the existing changeset {0} and close it after upload"
-msgstr ""
-"Използване на съществуващия списък с промени {0}. След качване се затваря."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:423
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to close the changeset "
-"after this upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426
-#, java-format
-msgid "Use the existing changeset {0} and leave it open"
-msgstr ""
-"Използване на съществуващия списък с промени {0}. След качване остава "
-"отворен."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:427
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to leave the changeset "
-"open for further uploads"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:470
+msgid "Upload Changes"
+msgstr "Качване на промени"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472
+msgid "Upload the changed primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
+msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:479
+msgid "Illegal upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
+msgid "Cancel the upload and resume editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606
+#, fuzzy
+msgid "Upload all changes in one request"
+msgstr "качва всички промени в една заявка"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607
+msgid ""
+"Enable to upload all changes in one request, disable to use one request per "
+"changed primitive"
+msgstr ""
+"Активирай за качване на всички промени в една заявка, Изключи за използване "
+"на заявка за всяка променена примитива"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:617
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "Опишете измененията на качваните от вас данни:"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672
+#, fuzzy
+msgid "Open a new changeset"
+msgstr "Няма отворен сисък с промени."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
+#, fuzzy
+msgid "Open a new changeset and use it in the next upload"
+msgstr "Използване на нов списък с промени. Остава отворен."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
+#, fuzzy
+msgid "Use an open changeset"
+msgstr "Няма отворен сисък с промени."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
+#, fuzzy
+msgid "Upload data to an already opened changeset"
+msgstr "Качване в нов или в съществуващ списък с промени?"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
+#, fuzzy
+msgid "Close changeset after upload"
+msgstr "Няма промени за качване."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
+msgid "Select to close the changeset after the next upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922
 #, java-format
 msgid "Tags of changeset {0}"
 msgstr "Етикети на списък с промени {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584
-msgid "Upload Changes"
-msgstr "Качване на промени"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
 #, fuzzy
-msgid "Upload the changed primitives"
-msgstr "Качване на тези промени?"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592
+msgid "Load the list of your open changesets from the server"
+msgstr "Качете текущите параметри на сървъра"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
 #, fuzzy
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "Моля въведете име на мястото."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:593
-msgid "Illegal upload comment"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
-#, fuzzy
-msgid "Cancel the upload and resume editing"
-msgstr "Прекъсване на обновяването и затваряне на диалоговия прозорец"
+msgid "Close the currently selected open changeset"
+msgstr "Затваряне на текущия списък с промени..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
+#, fuzzy, java-format
+msgid "changeset id > 0 expected. Got {1}"
+msgstr "параметъра се очаква да е ''{0}'' > 0 , получено ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63
@@ -7112,5 +7324,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
@@ -7148,5 +7360,5 @@
 msgstr "Въведенето време не може да бъде използвано."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
@@ -7154,30 +7366,30 @@
 msgstr "GPS точка"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
 msgid "Customize line drawing"
 msgstr "Настройка рисуването на линии"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
 msgid "Use global settings."
 msgstr "Използвай глобалните настройки."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Draw lines between points for this layer."
 msgstr "Чертай линии между точките на този слой."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Do not draw lines between points for this layer."
 msgstr "Не чертай линии между точките на този слой."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 msgid "Select line drawing options"
 msgstr "Избиране варианти за чертане на линиите."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7185,5 +7397,5 @@
 msgstr "Избор цвят"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7192,5 +7404,5 @@
 msgstr "По подразбиране"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7199,38 +7411,75 @@
 msgstr "Изберете цвят"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
 msgid "Markers From Named Points"
 msgstr "Маркери от наименувани точки."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Наименувани точки от следа от {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
 msgid "Import Audio"
 msgstr "Импорт Аудио"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave аудио файлове (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Аудио маркери от {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
 msgid "Import images"
 msgstr "Импорт на изображения"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#, java-format
+msgid "Name: {0}"
+msgstr "Название: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#, java-format
+msgid "Description: {0}"
+msgstr "Описание: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#, fuzzy, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
 msgstr[0] "{0} следа, "
 msgstr[1] "{0} следи, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
+#: build/trans_presets.java:3160
+msgid "Description"
+msgstr "Описание"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#, fuzzy
+msgid "Timespan"
+msgstr "Времеви интервал: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#, fuzzy
+msgid "Length"
+msgstr "Дължина: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
+msgid "URL"
+msgstr "URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+msgid "Length: "
+msgstr "Дължина: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
 #, java-format
 msgid "{0} route, "
@@ -7239,5 +7488,5 @@
 msgstr[1] "{0} маршрути, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 #, java-format
 msgid "{0} waypoint"
@@ -7246,29 +7495,10 @@
 msgstr[1] "{0} точки на интерес"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
-#, java-format
-msgid "Name: {0}"
-msgstr "Название: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
-#, java-format
-msgid "Description: {0}"
-msgstr "Описание: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
-msgid "Timespan: "
-msgstr "Времеви интервал: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
-msgid "Length: "
-msgstr "Дължина: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Преобразувай в слой данни"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7278,10 +7508,10 @@
 "<br>Ако искате да качвате следи, погледнете тук:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -7292,29 +7522,29 @@
 msgstr "Преобразувано от: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
 msgid "Download from OSM along this track"
 msgstr "Свали от OSM по дължина на тази следа"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
 msgid "Download everything within:"
 msgstr "Свали всичко в пределите на:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
 #, java-format
 msgid "{0} meters"
 msgstr "{0} метри"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 msgid "Maximum area per request:"
 msgstr "Максимална област за една заявка:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} кв. км."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
 #, java-format
 msgid ""
@@ -7325,13 +7555,13 @@
 "Продължаване?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
 msgid "Download data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Няма GPX следа в слоя за да асоциираме звук с нея."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7341,5 +7571,5 @@
 "са пропуснати или преместени в началото."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7392,30 +7622,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
-#, fuzzy
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
 "<br>If you want to upload traces, look here:</html>"
 msgstr ""
-"<html>Качването на необработени GPS данни в картата се смята за вредно."
-"<br>Ако искате да качвате следи, погледнете тук:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "track"
 msgid_plural "tracks"
@@ -7555,4 +7782,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
@@ -7796,14 +8024,19 @@
 msgstr "Изобразявай големи GPS точките."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+msgid "Draw a circle form HDOP value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Скорост (червено = бавно, зелено = бързо)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 "Неточност на позицията (червено = висока, зелено = ниска, ако е приложимо)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Единствен цвят (може да се настройва за наименувани слоеве)"
@@ -7811,6 +8044,6 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1374
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:1377
 msgid "Car"
 msgstr "Автомобил"
@@ -7831,14 +8064,14 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:324 build/trans_presets.java:650
-#: build/trans_presets.java:857 build/trans_presets.java:876
-#: build/trans_presets.java:890 build/trans_presets.java:912
-#: build/trans_presets.java:949 build/trans_presets.java:962
-#: build/trans_presets.java:974 build/trans_presets.java:986
-#: build/trans_presets.java:998 build/trans_presets.java:1010
-#: build/trans_presets.java:1020 build/trans_presets.java:1029
-#: build/trans_presets.java:1038 build/trans_presets.java:1437
-#: build/trans_presets.java:1510
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:325 build/trans_presets.java:651
+#: build/trans_presets.java:858 build/trans_presets.java:877
+#: build/trans_presets.java:891 build/trans_presets.java:913
+#: build/trans_presets.java:950 build/trans_presets.java:963
+#: build/trans_presets.java:975 build/trans_presets.java:987
+#: build/trans_presets.java:999 build/trans_presets.java:1011
+#: build/trans_presets.java:1021 build/trans_presets.java:1030
+#: build/trans_presets.java:1039 build/trans_presets.java:1440
+#: build/trans_presets.java:1513
 msgid "Bicycle"
 msgstr "Вело"
@@ -7871,63 +8104,63 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:325 build/trans_presets.java:649
-#: build/trans_presets.java:856 build/trans_presets.java:875
-#: build/trans_presets.java:889 build/trans_presets.java:911
-#: build/trans_presets.java:948 build/trans_presets.java:961
-#: build/trans_presets.java:973 build/trans_presets.java:985
-#: build/trans_presets.java:997 build/trans_presets.java:1009
-#: build/trans_presets.java:1019 build/trans_presets.java:1028
-#: build/trans_presets.java:1037
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:326 build/trans_presets.java:650
+#: build/trans_presets.java:857 build/trans_presets.java:876
+#: build/trans_presets.java:890 build/trans_presets.java:912
+#: build/trans_presets.java:949 build/trans_presets.java:962
+#: build/trans_presets.java:974 build/trans_presets.java:986
+#: build/trans_presets.java:998 build/trans_presets.java:1010
+#: build/trans_presets.java:1020 build/trans_presets.java:1029
+#: build/trans_presets.java:1038
 msgid "Foot"
 msgstr "Пеш"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Изобразвай направлението със стрелки"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Бързо изрисуване (изглежда по-зле)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
-msgid "Only interesting direction hints (e.g. with oneway tag)."
-msgstr ""
-"Само интересните указатели на посока (примерно, при еднопосочни пътища)."
-
-#. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+msgid "Only interesting direction hints (e.g. with oneway tag)."
+msgstr ""
+"Само интересните указатели на посока (примерно, при еднопосочни пътища)."
+
+#. only on the head of a way
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Only on the head of a way."
 msgstr "Само в началото на път."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Показвай поредния номер на сегментите"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Изобразвай границите на свалените данни."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Изобразявай виртуални възли в режим на избор."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Изобразявай неактивните слоеве в друг цвят"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Изглаждане на линиите (антиалиасинг)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:82
 msgid "Draw lines between raw GPS points"
 msgstr "Свързване с линии на GPS точките"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -7937,9 +8170,9 @@
 "Задайте '-1' за чертаене на всички линии."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
 msgid "Maximum length for local files (meters)"
 msgstr "Максимална дължина за локални файлове (метри)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
@@ -7948,20 +8181,20 @@
 "се рисуват всички линии."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length (meters)"
 msgstr "Максимална дължина (в метри)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "Изобразвай линии, даже ако не е импортирана информация за линии."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:129
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Изобразвай стрелки по посоката на линиите, съединяващи GPS точки."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:135
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -7970,5 +8203,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:141
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -7977,13 +8210,13 @@
 "Не рисувай стрелки, ако те се не са поне на това разстояние една от друга."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:144
 msgid "Minimum distance (pixels)"
 msgstr "Минимално разстояние (в пиксели)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Draw larger dots for the GPS points."
 msgstr "Рисуване на по-големи GPS точките."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -7993,9 +8226,9 @@
 "в мениджър слоеве."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Colors points and track segments by velocity."
 msgstr "Оцветяване точките от следите според скоростта."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -8005,5 +8238,5 @@
 "Вашият приемник трябва да поддържа запис на този тип информация."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
@@ -8011,33 +8244,33 @@
 "скорости."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid "Track and Point Coloring"
 msgstr "Оцветяване на следата"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202
 msgid "GPS Points"
 msgstr "GPS Точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "Draw direction hints for way segments."
 msgstr "Показване на направлението на сегментите на пътя."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:237
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Показване поредните номера на всички сегменти на пътя."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Приложи изглаждане върху картата."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Изобразяване границата на свалената от сървъра област."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -8046,9 +8279,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257
 msgid "Draw the inactive data layers in a different color."
 msgstr "Изобразяване неактивните слоеве с данни в други цветове."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "OSM Data"
 msgstr "OSM Данни"
@@ -8127,45 +8360,46 @@
 msgstr "Използван стил"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Configure available plugins."
 msgstr "Настройка на достъпните разширения."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50
+#. buttons at the bottom
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
 msgid "Download List"
 msgstr "Свали списък"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:100
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 msgid "Update"
 msgstr "Обновяване"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Configure Sites..."
 msgstr "Настройване сайтове..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:125
 msgid "Add JOSM Plugin description URL."
 msgstr "Добавяне на URL за разширение на JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:126
 msgid "Enter URL"
 msgstr "Въведете URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:162
 msgid "Please select an entry."
 msgstr "Моля, изберете елемент."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:147
 msgid "Edit JOSM Plugin description URL."
 msgstr "Редактиране на URL за разширение на JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:148
 msgid "JOSM Plugin description URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:175
 msgid "Configure Plugin Sites"
 msgstr "Настройка сайтове за разширения"
@@ -8522,6 +8756,6 @@
 msgstr "<няколко>"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:369
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341
 #, java-format
 msgid "Remove old keys from up to {0} object"
@@ -8530,9 +8764,9 @@
 msgstr[1] "Премахване стари ключове от {0} обекти"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135
 msgid "Add a new tag"
 msgstr "Добавяне на нов етикет"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160
 msgid "Delete the selection in the tag table"
 msgstr ""
@@ -8567,7 +8801,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:68
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:75
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -8611,4 +8845,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24
+#, fuzzy, java-format
+msgid "Preset group ''{0}'' of group ''{1}''"
+msgstr "Използване шаблон ''{0}'' от група ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
 #, java-format
 msgid "Preset group ''{0}''"
@@ -8629,4 +8868,10 @@
 msgstr "Зареждане точки {0} до {1}..."
 
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, fuzzy, java-format
+msgid "parameter ''{0}'' > 0 expected. Got {1}"
+msgstr "параметъра се очаква да е ''{0}'' > 0 , получено ''{1}''"
+
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8735,5 +8980,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "Грешка при разбор: невалидна структура на gpx документа"
@@ -8855,10 +9100,11 @@
 msgstr "При комуникация с {0} се свързахме използвайки протокол версия {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -8866,75 +9112,79 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315
 msgid "Creating changeset..."
 msgstr "Създаване на списък с промени ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
 #, java-format
 msgid "Successfully opened changeset {0}"
 msgstr "Успешно отворен списък с промени {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#, fuzzy, java-format
+msgid "id of changeset > 0 required. Got {0}"
+msgstr "параметърът {0} трябва да е > 0. Сега е {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
 msgstr "Обновяване списъка с промени ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
-#, java-format
-msgid "Changeset {0} is unchanged. Skipping update."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
 #, java-format
 msgid "Updating changeset {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
-msgid ""
-"Failed to update changeset. Either there is no current changeset or the id "
-"of the current changeset is 0"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
 msgid "Closing changeset..."
 msgstr "Затваряне на списък промени по версии..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
-#, java-format
-msgid "Closing changeset {0}..."
-msgstr "Затваряне списък с промени {0}..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
-#, java-format
-msgid "Leaving changeset {0} open..."
-msgstr "Списъкът с промени {0} се оставя отворен ..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
 msgid "No changeset present for diff upload"
 msgstr "Няма съществуващ набор промени за качване на разлики"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414
 msgid "Preparing..."
 msgstr "Подготвяне…"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419
 msgid "Uploading..."
 msgstr "Качване..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438
 msgid "Waiting 10 seconds ... "
 msgstr "Изчакване 10 секунди "
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449
 msgid "OK - trying again."
 msgstr "ОК - нов опит"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:485
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517
 #, java-format
 msgid "Starting retry {0} of {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
+msgid "current changeset is null. Can't upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
+#, java-format
+msgid "id of current changeset > required. Current id is {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
+#, java-format
+msgid "Open changeset expected. Got closed changeset with id {0}"
 msgstr ""
 
@@ -8960,33 +9210,92 @@
 msgstr "Невалиден bz2 файл."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
+#, java-format
+msgid "missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:128
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:134
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
+#, java-format
+msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
+#, java-format
+msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
+#, java-format
+msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#, java-format
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#, java-format
+msgid "Unsupported version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:176
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Aborting."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#, java-format
+msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
+#, fuzzy
+msgid "Parsing list of changesets..."
+msgstr "Затваряне на списък промени по версии..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
 msgid "Incorrect password or username."
 msgstr "Грешна парола или потребителско име."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:168
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Внимание: Паролата ще бъде предадена нешифрирана."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Save user and password (unencrypted)"
 msgstr "Съхрани потребителското име и паролата (нешифрирано)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
 msgid "Enter Password"
 msgstr "Въведете парола"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 msgid "Login"
 msgstr "Вход"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:242
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Основен URL адрес на OSM сървъра (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -8995,17 +9304,17 @@
 "парола."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
 msgid "Base Server URL"
 msgstr "Основен URL адрес на сървъра"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
 msgid "OSM password"
 msgstr "OSM парола"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -9014,5 +9323,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:51
+#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #, java-format
 msgid "(at line {0}, column {1})"
@@ -9102,20 +9411,5 @@
 msgstr "Грешка при разбор."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124
-#, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
-#, fuzzy, java-format
-msgid "Missing mandatory attribute ''{0}''"
-msgstr "Липсва необходимия атрибут \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
-#, fuzzy, java-format
-msgid "Unsupported version: {0}"
-msgstr "Неизвестна версия: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:155
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -9124,38 +9418,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
 msgid "found XML element <nd> element not as direct child of element <way>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
 msgid "Found XML element <member> not as direct child of element <relation>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
 #, java-format
 msgid ""
@@ -9163,24 +9457,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Непълна спецификация <member> с ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
-#, java-format
-msgid "Warning: Undefined element ''{0}'' found in input stream. Skipping."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
-#, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Skipping."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
 msgid "Illegal object with id=0"
 msgstr "Недопустим обект с id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #, java-format
 msgid ""
@@ -9188,5 +9477,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:303
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
 #, java-format
 msgid ""
@@ -9195,5 +9484,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
 #, java-format
 msgid ""
@@ -9202,5 +9491,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
@@ -9210,25 +9499,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:316
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#, java-format
 msgid "Unknown or unsupported API version. Got {0}"
-msgstr "Неизвестна версия: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with id {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#, java-format
 msgid "Missing required attribute ''{0}''."
-msgstr "Липсва необходимия атрибут \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
 #, java-format
 msgid ""
@@ -9236,5 +9525,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
 #, java-format
 msgid ""
@@ -9243,30 +9532,28 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
+#, java-format
 msgid ""
 "Unknown relation member type ''{0}'' in relation with external id ''{1}''"
-msgstr "Непознат тип на член от връзка - {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#, java-format
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
 "id ''{1}''"
-msgstr "невъзможно сравняването на примитивите с ID=''{0}'' и ID=''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
 msgid "Prepare OSM data..."
 msgstr "Подготовка на OSM данните..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 msgid "Parsing OSM data..."
-msgstr "Подготовка на OSM данните..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
 msgid "Preparing data set..."
-msgstr "Подготвяне на данните..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
@@ -9287,4 +9574,24 @@
 msgid "Downloading referring relations ..."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51
+#, fuzzy
+msgid "Reading changesets..."
+msgstr "Създаване на списък с промени ..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
+#, fuzzy
+msgid "Downloading changesets ..."
+msgstr "Затваряне на списък промени по версии..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85
+#, fuzzy, java-format
+msgid "Reading changeset {0} ..."
+msgstr "Списъкът с промени {0} се оставя отворен ..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91
+#, fuzzy, java-format
+msgid "Downloading changeset {0} ..."
+msgstr "Затваряне списък с промени {0}..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
@@ -9301,10 +9608,14 @@
 msgstr "Свързване със сървъра..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
 msgid "Failed to open connection to API {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
+msgid "Error: failed to add authentication credentials to the connection."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -9312,33 +9623,52 @@
 "Неуспешно свързване с OSM сървъра. Моля проверете вашата връзка към интернет."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+msgid "XML tag <user> is missing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
+#, fuzzy, java-format
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgstr "Използване шаблон ''{0}'' от група ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
+#, java-format
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
 msgid "Starting to upload with one request per primitive ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
 msgid "Starting to upload in one request ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:171
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135
 msgid "Uploading data ..."
-msgstr "Качване..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:178
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
 msgid ""
 "WARNING: no API version defined for data to upload. Falling back to version "
@@ -9346,5 +9676,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147
 #, java-format
 msgid ""
@@ -9354,10 +9684,10 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
 msgid "Update Plugins"
 msgstr "Обновяване разширения"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 msgid "Download Plugins"
 msgstr "Зареждане на разширенията"
@@ -9519,5 +9849,5 @@
 msgstr "Още подробности"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -9526,18 +9856,18 @@
 msgstr[1] "Сваляне на информация за добавките от {0} сайта"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
 msgid "No plugin information found."
 msgstr "Информация за разширението не е намерена."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr "Добавката {0} не е достъпна. Обновяването е пропуснато."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:93
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
 msgid "All installed plugins are up to date."
 msgstr "Всички инсталирани разширения са последна версия."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
 #, java-format
 msgid ""
@@ -9550,9 +9880,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
 msgid "Download missing plugins"
 msgstr "Сваляне на липсващи разширения"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
 #, java-format
 msgid ""
@@ -9567,43 +9897,43 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
 msgid "unknown"
 msgstr "неизвестно"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Версия {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 msgid "Plugin bundled with JOSM"
 msgstr "Разширения доставяни с JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:357
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -9675,4 +10005,7 @@
 "the server URL in your preferences and your internet connection.</html>"
 msgstr ""
+"<html>Пропадна инициализацията на връзката със сървъра на OSM {0}."
+"<br>Проверете URL на сървъра в настройките, а също и Вашата връзка с "
+"Интернет.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:47
@@ -9726,5 +10059,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:165
-#, fuzzy
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -9732,6 +10064,4 @@
 "community."
 msgstr ""
-"Максималният размер на рамката - 0.25. Вие изискахте прекалено голяма "
-"област. Или я намалете, или използвайте planet.osm"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:168
@@ -9930,10 +10260,4 @@
 msgid "(What does that mean?)"
 msgstr ""
-
-#. item "Relations/Route" text "Symbol description"
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3148
-msgid "Description"
-msgstr "Описание"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
@@ -10713,6 +11037,7 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
-msgid "Set "
-msgstr ""
+#, fuzzy, java-format
+msgid "Set {0} Lambert coordinates"
+msgstr "Запазване на техните координати"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -11342,6 +11667,6 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 #: build/trans_style.java:990 build/trans_style.java:1007
-#: build/trans_style.java:1023 build/trans_style.java:3392
-#: build/trans_style.java:3400
+#: build/trans_style.java:1023 build/trans_style.java:3400
+#: build/trans_style.java:3408
 msgid "water"
 msgstr "вода"
@@ -11641,4 +11966,56 @@
 msgstr "Измервания"
 
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Michigan Left"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Adds no left turn for sets of 4 or 5 ways."
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45
+#, fuzzy
+msgid "Please select 4 or 5 ways to assign no left turns."
+msgstr ""
+"Моля, изберете един или повече затворени пътя, състоящи се от поне 4 точки."
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61
+#, fuzzy, java-format
+msgid "{0} extrem nodes."
+msgstr "{0} точка"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69
+#, fuzzy, java-format
+msgid "Via node {0}, {1}"
+msgstr "Промени {0} {1}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75
+#, fuzzy, java-format
+msgid "{0} via nodes."
+msgstr "{0} точка"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78
+msgid "Unable to find via nodes. Please check your selection"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98
+#, fuzzy, java-format
+msgid "MIddle way: {0}"
+msgstr "Добавяне на път {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121
+msgid "Create Michigan left turn restriction"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129
+#, fuzzy, java-format
+msgid "Processing {0}"
+msgstr "Версия {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142
+#, fuzzy, java-format
+msgid "Relation: from {0} to {1} via {2}"
+msgstr "Версия {0} създадена на {1} от {2}"
+
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
 msgid "OpenLayers"
@@ -11794,7 +12171,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
-#, fuzzy
 msgid "create new objects"
-msgstr "Създаване нов възел."
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
@@ -11860,8 +12236,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
-#, fuzzy
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
-"Дистанционното управление получи заявка за зареждане на данни от API-то."
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
@@ -12124,5 +12498,5 @@
 msgstr "Стартира редактора за маркери"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:158
 msgid "JOSM Tag Editor Plugin"
 msgstr "JOSM Редактор за маркери"
@@ -12132,5 +12506,5 @@
 msgstr "Подчертване"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:370
 #, java-format
 msgid "Updating properties of up to {0} object"
@@ -12139,18 +12513,4 @@
 msgstr[1] "Обновяване свойствата на {0} обекти"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44
-msgid "INFO: entering compatibilty mode for JOSM with Main.ds"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47
-msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49
-msgid ""
-"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-"found."
-msgstr ""
-
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
 msgid "Group"
@@ -12160,9 +12520,4 @@
 msgid "Item"
 msgstr "Обект"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-msgid "Filter"
-msgstr "Филтър"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63
@@ -12252,5 +12607,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2272
 msgid "Street name"
 msgstr "Име на улица"
@@ -12418,8 +12773,4 @@
 msgid "Zoom (in metres)"
 msgstr "Мащаб (в метри)"
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
-msgid "URL"
-msgstr "URL"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -12620,7 +12971,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:460
-#, fuzzy
 msgid "Fixing errors ..."
-msgstr "Изчакване 10 секунди "
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:484
@@ -12630,7 +12980,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501
-#, fuzzy
 msgid "Updating map ..."
-msgstr "Обновяване списъка с промени ..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69
@@ -13130,7 +13479,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
-#: build/trans_style.java:4179
+#: build/trans_style.java:4159 build/trans_style.java:4166
+#: build/trans_style.java:4173 build/trans_style.java:4180
+#: build/trans_style.java:4187
 msgid "building"
 msgstr "сграда"
@@ -13144,5 +13493,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4186
+#: build/trans_style.java:4194
 msgid "area"
 msgstr "област"
@@ -13271,10 +13620,10 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:148
 msgid "Reached the end of the line"
 msgstr "Достигнат е краят на реда"
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:155
 msgid "Reached a junction"
 msgstr ""
@@ -13570,7 +13919,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
-#, fuzzy
 msgid "Overlap tiles"
-msgstr "Припокриващи се области"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
@@ -13579,7 +13927,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
-#, fuzzy
 msgid "% of north:"
-msgstr "север"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -13744,6 +14091,11 @@
 "измервателни пътища (които могат да бъдат импортнати от gps слой)."
 
+#. Plugin michigan_left
+#: build/trans_plugins.java:35
+msgid "Adds no left turn for sets of 4 or 5 ways"
+msgstr ""
+
 #. Plugin nearclick
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid ""
 "Simulates a click when you do a small and short drag. This is usefull for "
@@ -13756,15 +14108,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid "Displays an OpenLayers background image"
 msgstr "Показва OpenLayers фоново изображение"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Вкарва проблеми от OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13774,5 +14126,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13782,5 +14134,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13791,15 +14143,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Великият JGoodies Plastic Look and Feel."
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Let other applications send commands to JOSM."
 msgstr "Позволява на други приложения да изпращат команди към JOSM."
 
 #. Plugin routes
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13808,10 +14160,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Provides routing capabilities."
 msgstr "Предоставя маршрутизиращи възможности."
 
 #. Plugin slippymap
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13822,15 +14174,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Позволява добавянето на маркери/възли на текущата gps позиция."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Предоставя диалог за редактиране на маркери в табличен вид."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -13844,10 +14196,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Make terraced houses out of single blocks."
 msgstr "Създава терасовидни къщи от един блок."
 
 #. Plugin usertools
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -13859,5 +14211,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -13868,5 +14220,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -13878,5 +14230,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -13885,10 +14237,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -13944,4 +14296,10 @@
 #. <annotations>
 #: build/trans_presets.java:57
+#, fuzzy
+msgid "Highways"
+msgstr "път / магистрала"
+
+#. group "Highways"
+#: build/trans_presets.java:58
 msgid "Streets"
 msgstr "Пътна Мрежа"
@@ -13952,5 +14310,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:58 build/trans_surveyor.java:72
+#: build/trans_presets.java:59 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Автомагистрала"
@@ -13959,5 +14317,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:61
+#: build/trans_presets.java:62
 msgid "Edit Motorway"
 msgstr "Редактиране автомагистрала"
@@ -13984,8 +14342,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:120 build/trans_presets.java:140
-#: build/trans_presets.java:177 build/trans_presets.java:197
-#: build/trans_presets.java:1557 build/trans_presets.java:3146
+#: build/trans_presets.java:65 build/trans_presets.java:101
+#: build/trans_presets.java:121 build/trans_presets.java:141
+#: build/trans_presets.java:178 build/trans_presets.java:198
+#: build/trans_presets.java:1560 build/trans_presets.java:3158
 msgid "Reference"
 msgstr "Означение"
@@ -13999,8 +14357,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:358
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:359
 msgid "Lanes"
 msgstr "Брой платна"
@@ -14017,15 +14375,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:224 build/trans_presets.java:280
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:373 build/trans_presets.java:388
-#: build/trans_presets.java:412 build/trans_presets.java:431
-#: build/trans_presets.java:452 build/trans_presets.java:472
-#: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1307
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:225 build/trans_presets.java:281
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:374 build/trans_presets.java:389
+#: build/trans_presets.java:413 build/trans_presets.java:432
+#: build/trans_presets.java:453 build/trans_presets.java:473
+#: build/trans_presets.java:511 build/trans_presets.java:667
+#: build/trans_presets.java:1310
 msgid "Max. speed (km/h)"
 msgstr "Макс. скорост (км/ч)"
@@ -14062,16 +14420,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:293 build/trans_presets.java:306
-#: build/trans_presets.java:320 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:464
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:659 build/trans_presets.java:1300
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:294 build/trans_presets.java:307
+#: build/trans_presets.java:321 build/trans_presets.java:353
+#: build/trans_presets.java:405 build/trans_presets.java:425
+#: build/trans_presets.java:445 build/trans_presets.java:465
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:660 build/trans_presets.java:1303
 msgid "Oneway"
 msgstr "Еднопосочна"
@@ -14113,19 +14471,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:353
-#: build/trans_presets.java:362 build/trans_presets.java:405
-#: build/trans_presets.java:425 build/trans_presets.java:445
-#: build/trans_presets.java:465 build/trans_presets.java:485
-#: build/trans_presets.java:504 build/trans_presets.java:523
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:586 build/trans_presets.java:607
-#: build/trans_presets.java:628 build/trans_presets.java:660
-#: build/trans_presets.java:1301 build/trans_surveyor.java:12
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:354
+#: build/trans_presets.java:363 build/trans_presets.java:406
+#: build/trans_presets.java:426 build/trans_presets.java:446
+#: build/trans_presets.java:466 build/trans_presets.java:486
+#: build/trans_presets.java:505 build/trans_presets.java:524
+#: build/trans_presets.java:545 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629 build/trans_presets.java:661
+#: build/trans_presets.java:1304 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Мост"
@@ -14161,19 +14519,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:354
-#: build/trans_presets.java:378 build/trans_presets.java:406
-#: build/trans_presets.java:426 build/trans_presets.java:446
-#: build/trans_presets.java:466 build/trans_presets.java:486
-#: build/trans_presets.java:505 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629 build/trans_presets.java:661
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:355
+#: build/trans_presets.java:379 build/trans_presets.java:407
+#: build/trans_presets.java:427 build/trans_presets.java:447
+#: build/trans_presets.java:467 build/trans_presets.java:487
+#: build/trans_presets.java:506 build/trans_presets.java:525
+#: build/trans_presets.java:546 build/trans_presets.java:567
+#: build/trans_presets.java:588 build/trans_presets.java:609
+#: build/trans_presets.java:630 build/trans_presets.java:662
+#: build/trans_presets.java:1305
 msgid "Tunnel"
 msgstr "Тунел"
@@ -14207,18 +14565,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:73 build/trans_presets.java:90
-#: build/trans_presets.java:110 build/trans_presets.java:129
-#: build/trans_presets.java:150 build/trans_presets.java:166
-#: build/trans_presets.java:186 build/trans_presets.java:205
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:355
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:467
-#: build/trans_presets.java:487 build/trans_presets.java:506
-#: build/trans_presets.java:525 build/trans_presets.java:546
-#: build/trans_presets.java:567 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:630
-#: build/trans_presets.java:662 build/trans_presets.java:1303
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:356
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:468
+#: build/trans_presets.java:488 build/trans_presets.java:507
+#: build/trans_presets.java:526 build/trans_presets.java:547
+#: build/trans_presets.java:568 build/trans_presets.java:589
+#: build/trans_presets.java:610 build/trans_presets.java:631
+#: build/trans_presets.java:663 build/trans_presets.java:1306
 msgid "Cutting"
 msgstr "Просека"
@@ -14252,18 +14610,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:74 build/trans_presets.java:91
-#: build/trans_presets.java:111 build/trans_presets.java:130
-#: build/trans_presets.java:151 build/trans_presets.java:167
-#: build/trans_presets.java:187 build/trans_presets.java:206
-#: build/trans_presets.java:222 build/trans_presets.java:240
-#: build/trans_presets.java:258 build/trans_presets.java:277
-#: build/trans_presets.java:310 build/trans_presets.java:356
-#: build/trans_presets.java:408 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:468
-#: build/trans_presets.java:488 build/trans_presets.java:507
-#: build/trans_presets.java:526 build/trans_presets.java:547
-#: build/trans_presets.java:568 build/trans_presets.java:589
-#: build/trans_presets.java:610 build/trans_presets.java:631
-#: build/trans_presets.java:663 build/trans_presets.java:1304
+#: build/trans_presets.java:75 build/trans_presets.java:92
+#: build/trans_presets.java:112 build/trans_presets.java:131
+#: build/trans_presets.java:152 build/trans_presets.java:168
+#: build/trans_presets.java:188 build/trans_presets.java:207
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:357
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:469
+#: build/trans_presets.java:489 build/trans_presets.java:508
+#: build/trans_presets.java:527 build/trans_presets.java:548
+#: build/trans_presets.java:569 build/trans_presets.java:590
+#: build/trans_presets.java:611 build/trans_presets.java:632
+#: build/trans_presets.java:664 build/trans_presets.java:1307
 msgid "Embankment"
 msgstr "Насип"
@@ -14271,5 +14629,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Motorway Link"
 msgstr "Автомагистрална връзка"
@@ -14278,5 +14636,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:80
+#: build/trans_presets.java:81
 msgid "Edit Motorway Link"
 msgstr "Редактиране автомагистрална връзка"
@@ -14284,5 +14642,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:94
+#: build/trans_presets.java:95
 msgid "Trunk"
 msgstr "Автострада"
@@ -14291,5 +14649,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:97
+#: build/trans_presets.java:98
 msgid "Edit Trunk"
 msgstr "Редактиране автострада"
@@ -14299,6 +14657,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
 msgid "Motorroad"
 msgstr "Магистрала"
@@ -14306,5 +14664,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:114
+#: build/trans_presets.java:115
 msgid "Trunk Link"
 msgstr "Автострадна връзка"
@@ -14313,5 +14671,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:117
+#: build/trans_presets.java:118
 msgid "Edit Trunk Link"
 msgstr "Редактиране автострадна връзка"
@@ -14324,5 +14682,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:134 build/trans_surveyor.java:76
+#: build/trans_presets.java:135 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Първокласен път / главна"
@@ -14331,5 +14689,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:137
+#: build/trans_presets.java:138
 msgid "Edit Primary Road"
 msgstr "Редактиране първокласен път"
@@ -14337,10 +14695,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:154
+#: build/trans_presets.java:155
 msgid "Primary Link"
 msgstr "Връзка с първокласен път"
 
 #. item
-#: build/trans_presets.java:155
+#: build/trans_presets.java:156
 msgid "Edit Primary Link"
 msgstr "Редактиране връзка с първокласен път"
@@ -14352,5 +14710,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:170 build/trans_surveyor.java:80
+#: build/trans_presets.java:171 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Второкласен път"
@@ -14360,5 +14718,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:174
+#: build/trans_presets.java:175
 msgid "Edit Secondary Road"
 msgstr "Редактиране второкалсен път"
@@ -14366,5 +14724,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:190
+#: build/trans_presets.java:191
 msgid "Tertiary"
 msgstr "Третокласен"
@@ -14374,5 +14732,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:194
+#: build/trans_presets.java:195
 msgid "Edit Tertiary Road"
 msgstr "Редактиране третокласен път"
@@ -14384,5 +14742,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:209 build/trans_surveyor.java:84
+#: build/trans_presets.java:210 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Некласифициран"
@@ -14392,5 +14750,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:213
+#: build/trans_presets.java:214
 msgid "Edit Unclassified Road"
 msgstr "Редактиране некласифициран път"
@@ -14417,19 +14775,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:225 build/trans_presets.java:243
-#: build/trans_presets.java:261 build/trans_presets.java:281
-#: build/trans_presets.java:314 build/trans_presets.java:359
-#: build/trans_presets.java:375 build/trans_presets.java:389
-#: build/trans_presets.java:413 build/trans_presets.java:432
-#: build/trans_presets.java:453 build/trans_presets.java:473
-#: build/trans_presets.java:491 build/trans_presets.java:511
-#: build/trans_presets.java:532 build/trans_presets.java:553
-#: build/trans_presets.java:574 build/trans_presets.java:595
-#: build/trans_presets.java:616 build/trans_presets.java:637
-#: build/trans_presets.java:667 build/trans_presets.java:680
-#: build/trans_presets.java:693 build/trans_presets.java:706
-#: build/trans_presets.java:719 build/trans_presets.java:732
-#: build/trans_presets.java:745 build/trans_presets.java:1308
-#: build/trans_presets.java:1498 build/trans_presets.java:1540
+#: build/trans_presets.java:226 build/trans_presets.java:244
+#: build/trans_presets.java:262 build/trans_presets.java:282
+#: build/trans_presets.java:315 build/trans_presets.java:360
+#: build/trans_presets.java:376 build/trans_presets.java:390
+#: build/trans_presets.java:414 build/trans_presets.java:433
+#: build/trans_presets.java:454 build/trans_presets.java:474
+#: build/trans_presets.java:492 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:554
+#: build/trans_presets.java:575 build/trans_presets.java:596
+#: build/trans_presets.java:617 build/trans_presets.java:638
+#: build/trans_presets.java:668 build/trans_presets.java:681
+#: build/trans_presets.java:694 build/trans_presets.java:707
+#: build/trans_presets.java:720 build/trans_presets.java:733
+#: build/trans_presets.java:746 build/trans_presets.java:1311
+#: build/trans_presets.java:1501 build/trans_presets.java:1543
 msgid "Width (meters)"
 msgstr "Ширина (метри)"
@@ -14441,5 +14799,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:228 build/trans_surveyor.java:88
+#: build/trans_presets.java:229 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Улица"
@@ -14448,5 +14806,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:231
+#: build/trans_presets.java:232
 msgid "Edit Residential Street"
 msgstr "Редактиране улица от населено място"
@@ -14471,14 +14829,14 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:611
-#: build/trans_presets.java:632 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "Surface"
 msgstr "Пътна настилка"
@@ -14499,53 +14857,53 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paved"
 msgstr "асфалтиран път"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "unpaved"
 msgstr "неасфалтиран път"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "asphalt"
 msgstr "асфалт"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "concrete"
 msgstr "бетон"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
 msgid "metal"
 msgstr "метал"
@@ -14559,22 +14917,22 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
-#: build/trans_style.java:3367
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
+#: build/trans_style.java:3375
 msgid "wood"
 msgstr "гора"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paving_stones"
 msgstr "павета"
@@ -14582,77 +14940,77 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "cobblestone"
 msgstr "павиран път"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "gravel"
 msgstr "чакъл"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "pebblestone"
 msgstr "чакъл"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "compacted"
 msgstr "сбито"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "grass_paver"
 msgstr "трева"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "grass"
 msgstr "трева"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "sand"
 msgstr "пясък"
@@ -14660,19 +15018,19 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "ground"
-msgstr "грунт"
+msgstr "земя"
 
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:246
+#: build/trans_presets.java:247
 msgid "Living Street"
 msgstr "Жилищна улица"
@@ -14681,5 +15039,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:249
+#: build/trans_presets.java:250
 msgid "Edit Living Street"
 msgstr "Редактиране жилищна улица"
@@ -14687,5 +15045,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:264
+#: build/trans_presets.java:265
 msgid "Service"
 msgstr "Помощна улица"
@@ -14694,5 +15052,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:267
+#: build/trans_presets.java:268
 msgid "Edit Serviceway"
 msgstr "Редактиране помощна улица"
@@ -14702,18 +15060,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "Serviceway type"
 msgstr "Тип помощна улица"
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "alley"
 msgstr "алея"
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "driveway"
 msgstr "автомобилен"
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "parking_aisle"
 msgstr "паркинг"
@@ -14721,5 +15079,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:284
+#: build/trans_presets.java:285
 msgid "Parking Aisle"
 msgstr "Улица паркинг"
@@ -14729,5 +15087,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:288
+#: build/trans_presets.java:289
 msgid "Edit Parking Aisle"
 msgstr "Редактиране улица паркинг"
@@ -14735,5 +15093,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:298
+#: build/trans_presets.java:299
 msgid "Road (Unknown Type)"
 msgstr "Път (неизвестен тип)"
@@ -14742,5 +15100,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Edit Road of unknown type"
 msgstr "Редактиране път от неизвестен тип"
@@ -14749,20 +15107,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:318
+#: build/trans_presets.java:319
 msgid "Road Restrictions"
 msgstr "Пътни ограничения"
 
 #. item
-#: build/trans_presets.java:319
+#: build/trans_presets.java:320
 msgid "Edit Road Restrictions"
 msgstr "Редактиране пътни ограничения"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:321
+#: build/trans_presets.java:322
 msgid "Toll"
 msgstr "Пътна такса"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:322
+#: build/trans_presets.java:323
 msgid "No exit (cul-de-sac)"
 msgstr "Без изход"
@@ -14775,8 +15133,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:323 build/trans_presets.java:529
-#: build/trans_presets.java:550 build/trans_presets.java:571
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:634
+#: build/trans_presets.java:324 build/trans_presets.java:530
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:593 build/trans_presets.java:614
+#: build/trans_presets.java:635
 msgid "Access"
 msgstr "Достъп"
@@ -14830,29 +15188,29 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1397
-#: build/trans_presets.java:1398 build/trans_presets.java:1399
-#: build/trans_presets.java:1763 build/trans_presets.java:1773
-#: build/trans_presets.java:2397 build/trans_presets.java:2433
-#: build/trans_presets.java:2442 build/trans_presets.java:2443
-#: build/trans_presets.java:2444 build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:1396
+#: build/trans_presets.java:1397 build/trans_presets.java:1400
+#: build/trans_presets.java:1401 build/trans_presets.java:1402
+#: build/trans_presets.java:1767 build/trans_presets.java:1777
+#: build/trans_presets.java:2408 build/trans_presets.java:2444
+#: build/trans_presets.java:2453 build/trans_presets.java:2454
+#: build/trans_presets.java:2455 build/trans_presets.java:2725
 msgid "yes"
 msgstr "да"
@@ -14865,40 +15223,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:212
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:212
 msgid "private"
 msgstr "частен"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655
 msgid "designated"
 msgstr "предназначен"
@@ -14911,19 +15269,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:219
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:219
 msgid "destination"
 msgstr "с назначение"
@@ -14946,71 +15304,71 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:205
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:205
 msgid "permissive"
 msgstr "разрешителен"
 
-#: build/trans_presets.java:323 build/trans_presets.java:327
-#: build/trans_presets.java:330 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636
+#: build/trans_presets.java:324 build/trans_presets.java:328
+#: build/trans_presets.java:331 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637
 msgid "agricultural"
 msgstr "селскостопански"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
-#: build/trans_presets.java:2433 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1396 build/trans_presets.java:1397
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
+#: build/trans_presets.java:2444 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
+#: build/trans_presets.java:2725
 msgid "no"
 msgstr "не"
 
-#: build/trans_presets.java:326
+#: build/trans_presets.java:327
 msgid "Goods"
 msgstr "лек камион (до 3.5т)"
 
-#: build/trans_presets.java:327
+#: build/trans_presets.java:328
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Камион (над 3.5т)"
@@ -15025,10 +15383,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:328 build/trans_presets.java:651
-#: build/trans_presets.java:858 build/trans_presets.java:891
-#: build/trans_presets.java:913 build/trans_presets.java:950
-#: build/trans_presets.java:963 build/trans_presets.java:975
-#: build/trans_presets.java:987 build/trans_presets.java:999
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:329 build/trans_presets.java:652
+#: build/trans_presets.java:859 build/trans_presets.java:892
+#: build/trans_presets.java:914 build/trans_presets.java:951
+#: build/trans_presets.java:964 build/trans_presets.java:976
+#: build/trans_presets.java:988 build/trans_presets.java:1000
+#: build/trans_presets.java:1040
 msgid "Horse"
 msgstr "Кон"
@@ -15044,13 +15402,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:329 build/trans_presets.java:530
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:635 build/trans_presets.java:859
-#: build/trans_presets.java:877 build/trans_presets.java:892
-#: build/trans_presets.java:914 build/trans_presets.java:951
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:330 build/trans_presets.java:531
+#: build/trans_presets.java:552 build/trans_presets.java:573
+#: build/trans_presets.java:594 build/trans_presets.java:615
+#: build/trans_presets.java:636 build/trans_presets.java:860
+#: build/trans_presets.java:878 build/trans_presets.java:893
+#: build/trans_presets.java:915 build/trans_presets.java:952
+#: build/trans_presets.java:965 build/trans_presets.java:977
+#: build/trans_presets.java:989 build/trans_presets.java:1001
+#: build/trans_presets.java:1041
 msgid "Motorcycle"
 msgstr "Мотоциклет"
@@ -15065,30 +15423,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:330 build/trans_presets.java:531
-#: build/trans_presets.java:552 build/trans_presets.java:573
-#: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:636 build/trans_presets.java:654
-#: build/trans_presets.java:878 build/trans_presets.java:893
-#: build/trans_presets.java:915 build/trans_presets.java:952
-#: build/trans_presets.java:965 build/trans_presets.java:977
-#: build/trans_presets.java:989 build/trans_presets.java:1001
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:331 build/trans_presets.java:532
+#: build/trans_presets.java:553 build/trans_presets.java:574
+#: build/trans_presets.java:595 build/trans_presets.java:616
+#: build/trans_presets.java:637 build/trans_presets.java:655
+#: build/trans_presets.java:879 build/trans_presets.java:894
+#: build/trans_presets.java:916 build/trans_presets.java:953
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1042
 msgid "Motorcar"
 msgstr "Автомобил"
 
-#: build/trans_presets.java:331
+#: build/trans_presets.java:332
 msgid "Public Service Vehicles (psv)"
 msgstr "Обществен транспорт"
 
-#: build/trans_presets.java:332
+#: build/trans_presets.java:333
 msgid "Motorboat"
 msgstr "Моторна лодка"
 
-#: build/trans_presets.java:333
+#: build/trans_presets.java:334
 msgid "Boat"
 msgstr "Лодка"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:336
 msgid "Min. speed (km/h)"
 msgstr "Мин. скорост (км/ч)"
@@ -15096,25 +15454,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:336 build/trans_presets.java:374
+#: build/trans_presets.java:337 build/trans_presets.java:375
 msgid "Max. weight (tonnes)"
 msgstr "Макс. маса (т)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:337
+#: build/trans_presets.java:338
 msgid "Max. Height (meters)"
 msgstr "Макс.височина (метри)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Max. Width (meters)"
 msgstr "макс.ширина (метри)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:339
+#: build/trans_presets.java:340
 msgid "Max. Length (meters)"
 msgstr "макс.дължина (метри)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:341
+#: build/trans_presets.java:342
 msgid "Roundabout"
 msgstr "Кръгово движение"
@@ -15125,5 +15483,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:346
+#: build/trans_presets.java:347
 msgid "Edit Junction"
 msgstr "Редактиране пътен възел"
@@ -15145,9 +15503,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:349 build/trans_presets.java:648
-#: build/trans_presets.java:788 build/trans_presets.java:1135
-#: build/trans_presets.java:1392 build/trans_presets.java:2353
-#: build/trans_presets.java:2901 build/trans_presets.java:2911
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:350 build/trans_presets.java:649
+#: build/trans_presets.java:789 build/trans_presets.java:1137
+#: build/trans_presets.java:1395 build/trans_presets.java:2364
+#: build/trans_presets.java:2913 build/trans_presets.java:2923
+#: build/trans_presets.java:2932
 msgid "Type"
 msgstr "Тип"
@@ -15167,10 +15525,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:547
+#: build/trans_presets.java:350 build/trans_style.java:547
 #: build/trans_style.java:555
 msgid "motorway"
 msgstr "автомагистрала"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "motorway_link"
 msgstr "Автомагистрална връзка"
@@ -15192,10 +15550,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:563
+#: build/trans_presets.java:350 build/trans_style.java:563
 #: build/trans_style.java:571
 msgid "trunk"
 msgstr "автострада"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "trunk_link"
 msgstr "Автострадна връзка"
@@ -15217,10 +15575,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:579
+#: build/trans_presets.java:350 build/trans_style.java:579
 #: build/trans_style.java:587
 msgid "primary"
 msgstr "главен / първокласен"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "primary_link"
 msgstr "Връзка с главен път"
@@ -15242,5 +15600,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:595
+#: build/trans_presets.java:350 build/trans_style.java:595
 #: build/trans_style.java:603
 msgid "secondary"
@@ -15255,9 +15613,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:349 build/trans_style.java:611
+#: build/trans_presets.java:350 build/trans_style.java:611
 msgid "tertiary"
 msgstr "третокласен"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "unclassified"
 msgstr "Некласифициран"
@@ -15271,9 +15629,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:349 build/trans_style.java:3143
+#: build/trans_presets.java:350 build/trans_style.java:3151
 msgid "residential"
 msgstr "улица"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "living_street"
 msgstr "Жилищна улица"
@@ -15303,10 +15661,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:349 build/trans_style.java:667
-#: build/trans_style.java:4244
+#: build/trans_presets.java:350 build/trans_style.java:667
+#: build/trans_style.java:4252
 msgid "service"
 msgstr "служебна"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "bus_guideway"
 msgstr "Направлява автобуси"
@@ -15336,6 +15694,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:349 build/trans_style.java:877
-#: build/trans_style.java:3208 build/trans_style.java:3209
+#: build/trans_presets.java:350 build/trans_style.java:877
+#: build/trans_style.java:3216 build/trans_style.java:3217
 msgid "construction"
 msgstr "ремонт"
@@ -15346,10 +15704,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Edit Bridge"
 msgstr "Редактирай мост"
 
 #. item
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "Edit Tunnel"
 msgstr "Редактиране тунел"
@@ -15357,19 +15715,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:393
+#: build/trans_presets.java:394
 msgid "Ways"
 msgstr "Пътища"
 
 #. group "Ways"
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Construction"
 msgstr "Пътен ремонт"
 
 #. item
-#: build/trans_presets.java:395
+#: build/trans_presets.java:396
 msgid "Edit Highway Under Construction"
 msgstr "Редактиране пътен ремонт"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "Junction"
 msgstr "Пътен възел"
@@ -15385,5 +15743,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:411 build/trans_style.java:895
+#: build/trans_presets.java:412 build/trans_style.java:895
 msgid "roundabout"
 msgstr "кръгово"
@@ -15392,5 +15750,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:417
+#: build/trans_presets.java:418
 msgid "Bridleway"
 msgstr "Алея за езда"
@@ -15398,5 +15756,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:419
+#: build/trans_presets.java:420
 msgid "Edit Bridleway"
 msgstr "Редактиране алея за езда"
@@ -15404,5 +15762,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:435
+#: build/trans_presets.java:436
 msgid "Cycleway"
 msgstr "Велоалея"
@@ -15412,10 +15770,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:439
+#: build/trans_presets.java:440
 msgid "Edit Cycleway"
 msgstr "Редактиране велоалея"
 
 #. item "Ways/Cycleway" check "Embankment"
-#: build/trans_presets.java:449
+#: build/trans_presets.java:450
 msgid "Pedestrians"
 msgstr "Пешеходци"
@@ -15423,5 +15781,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Footway"
 msgstr "Алея / Тротоар"
@@ -15430,10 +15788,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Footway"
 msgstr "Редактиране на алея или тротоар"
 
 #. item "Ways/Footway" check "Embankment"
-#: build/trans_presets.java:469
+#: build/trans_presets.java:470
 msgid "Bikes"
 msgstr "Колелета"
@@ -15441,5 +15799,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:476
+#: build/trans_presets.java:477
 msgid "Pedestrian"
 msgstr "Пешеходна улица"
@@ -15448,5 +15806,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Edit Pedestrian Street"
 msgstr "Редактирай пешеходна улица"
@@ -15454,5 +15812,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:494
+#: build/trans_presets.java:495
 msgid "Steps"
 msgstr "Стълбище"
@@ -15462,5 +15820,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:498
+#: build/trans_presets.java:499
 msgid "Edit Flight of Steps"
 msgstr "Редактирай стълбище"
@@ -15469,5 +15827,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:515
+#: build/trans_presets.java:516
 msgid "Track"
 msgstr "Черен път"
@@ -15476,5 +15834,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:518
+#: build/trans_presets.java:519
 msgid "Edit Track"
 msgstr "Редактирай черен път"
@@ -15482,5 +15840,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:535
+#: build/trans_presets.java:536
 msgid "Track Grade 1"
 msgstr "Черен път 1-ви клас"
@@ -15489,5 +15847,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:538
+#: build/trans_presets.java:539
 msgid "Edit Track of grade 1"
 msgstr "Редактирай черен път 1-ви клас"
@@ -15495,5 +15853,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:556
+#: build/trans_presets.java:557
 msgid "Track Grade 2"
 msgstr "Черен път 2-ри клас"
@@ -15502,5 +15860,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:559
+#: build/trans_presets.java:560
 msgid "Edit Track of grade 2"
 msgstr "Редактирай черен път 2-ри клас"
@@ -15508,5 +15866,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:577
+#: build/trans_presets.java:578
 msgid "Track Grade 3"
 msgstr "Черен път 3-ти клас"
@@ -15515,5 +15873,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:580
+#: build/trans_presets.java:581
 msgid "Edit Track of grade 3"
 msgstr "Редактирай черен път 3-ти клас"
@@ -15521,5 +15879,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:598
+#: build/trans_presets.java:599
 msgid "Track Grade 4"
 msgstr "Черен път 4-ти клас"
@@ -15528,5 +15886,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:601
+#: build/trans_presets.java:602
 msgid "Edit Track of grade 4"
 msgstr "Редактирай черен път 4-ти клас"
@@ -15534,5 +15892,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:619
+#: build/trans_presets.java:620
 msgid "Track Grade 5"
 msgstr "Черен път 5-ти клас"
@@ -15541,5 +15899,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:622
+#: build/trans_presets.java:623
 msgid "Edit Track of grade 5"
 msgstr "Редактирай черен път 5-ти клас"
@@ -15548,5 +15906,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:641
+#: build/trans_presets.java:642
 msgid "Path"
 msgstr "Пътека"
@@ -15555,13 +15913,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:644
+#: build/trans_presets.java:645
 msgid "Edit Path"
 msgstr "Редактирай пътека"
 
-#: build/trans_presets.java:652
+#: build/trans_presets.java:653
 msgid "Ski"
 msgstr "Ски"
 
-#: build/trans_presets.java:653
+#: build/trans_presets.java:654
 msgid "Snowmobile"
 msgstr "Снегоход"
@@ -15571,6 +15929,6 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:670 build/trans_presets.java:1725
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:671 build/trans_presets.java:1729
+#: build/trans_presets.java:1752
 msgid "Hiking"
 msgstr "Туристическа пътека"
@@ -15580,5 +15938,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:674
+#: build/trans_presets.java:675
 msgid "Edit Hiking"
 msgstr "Редактиране туристическа пътека"
@@ -15586,5 +15944,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:683
+#: build/trans_presets.java:684
 msgid "Mountain Hiking"
 msgstr "Планинска туристическа пътека"
@@ -15594,5 +15952,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:687
+#: build/trans_presets.java:688
 msgid "Edit Mountain Hiking"
 msgstr "Редактиране планинска туристическа пътека"
@@ -15600,5 +15958,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:696
+#: build/trans_presets.java:697
 msgid "Demanding Mountain Hiking"
 msgstr "Трудна планинска туристическа пътека"
@@ -15608,5 +15966,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:700
+#: build/trans_presets.java:701
 msgid "Edit Demanding Mountain Hiking"
 msgstr "Редактиране трудна планинска туристическа пътека"
@@ -15614,5 +15972,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:709
+#: build/trans_presets.java:710
 msgid "Alpine Hiking"
 msgstr "Алпийска туристическа пътека"
@@ -15622,5 +15980,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:713
+#: build/trans_presets.java:714
 msgid "Edit Alpine Hiking"
 msgstr "Редактиране алпийска туристическа пътека"
@@ -15628,5 +15986,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:723
 msgid "Demanding Alpine Hiking"
 msgstr "Трудна алпийска туристическа пътека"
@@ -15636,5 +15994,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:726
+#: build/trans_presets.java:727
 msgid "Edit Demanding Alpine Hiking"
 msgstr "Редактиране трудна алпийска туристическа пътека"
@@ -15642,5 +16000,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:735
+#: build/trans_presets.java:736
 msgid "Difficult Alpine Hiking"
 msgstr "Екстремна алпийска туристическа пътека"
@@ -15650,5 +16008,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:739
+#: build/trans_presets.java:740
 msgid "Edit Difficult Alpine Hiking"
 msgstr "Редактиране екстремна алпийска туристическа пътека"
@@ -15656,10 +16014,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:749
+#: build/trans_presets.java:750
 msgid "Waypoints"
 msgstr "Пътни точки"
 
 #. group "Waypoints"
-#: build/trans_presets.java:750
+#: build/trans_presets.java:751
 msgid "Motorway Junction"
 msgstr "Магистрален възел"
@@ -15667,15 +16025,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:752
+#: build/trans_presets.java:753
 msgid "Edit Motorway Junction"
 msgstr "Редактирай магистрален възел"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:757
 msgid "Number"
 msgstr "Номер"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:759
 msgid "Services"
 msgstr "Услуги"
@@ -15683,5 +16041,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:761
 msgid "Edit Service Station"
 msgstr "Редактирай служба услуги"
@@ -15719,15 +16077,15 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:765 build/trans_presets.java:902
-#: build/trans_presets.java:1382 build/trans_presets.java:1406
-#: build/trans_presets.java:1413 build/trans_presets.java:1419
-#: build/trans_presets.java:1427 build/trans_presets.java:1434
-#: build/trans_presets.java:1761 build/trans_presets.java:1771
-#: build/trans_presets.java:2361 build/trans_presets.java:2368
-#: build/trans_presets.java:2384 build/trans_presets.java:2395
-#: build/trans_presets.java:2403 build/trans_presets.java:2410
-#: build/trans_presets.java:2464 build/trans_presets.java:2512
-#: build/trans_presets.java:2678 build/trans_presets.java:2693
-#: build/trans_presets.java:2732 build/trans_presets.java:3151
+#: build/trans_presets.java:766 build/trans_presets.java:903
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
+#: build/trans_presets.java:1416 build/trans_presets.java:1422
+#: build/trans_presets.java:1430 build/trans_presets.java:1437
+#: build/trans_presets.java:1765 build/trans_presets.java:1775
+#: build/trans_presets.java:2372 build/trans_presets.java:2379
+#: build/trans_presets.java:2395 build/trans_presets.java:2406
+#: build/trans_presets.java:2414 build/trans_presets.java:2421
+#: build/trans_presets.java:2475 build/trans_presets.java:2523
+#: build/trans_presets.java:2689 build/trans_presets.java:2704
+#: build/trans_presets.java:2743 build/trans_presets.java:3163
 msgid "Operator"
 msgstr "Оператор"
@@ -15736,5 +16094,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:769
+#: build/trans_presets.java:770
 msgid "Traffic Signal"
 msgstr "Светофар"
@@ -15744,5 +16102,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:774
 msgid "Pedestrian crossing type"
 msgstr "Тип пешеходна пътека"
@@ -15751,27 +16109,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "uncontrolled"
 msgstr "неконтролирано"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "traffic_signals"
 msgstr "светофар"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "island"
 msgstr "остров"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "unmarked"
 msgstr "немаркиран"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:774 build/trans_presets.java:790
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:775 build/trans_presets.java:791
+#: build/trans_presets.java:1334
 msgid "Cross on horseback"
 msgstr "Пресичане върху кон"
@@ -15779,6 +16137,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:775 build/trans_presets.java:789
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:776 build/trans_presets.java:790
+#: build/trans_presets.java:1335
 msgid "Cross by bicycle"
 msgstr "Пресичане с велосипед"
@@ -15787,11 +16145,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:776 build/trans_presets.java:791
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:1336
 msgid "Crossing attendant"
 msgstr "Помощник при пресъчане"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:778
 msgid "Crossing type name (UK)"
 msgstr "Име на типа пътека (UK)"
@@ -15799,30 +16157,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "zebra"
 msgstr "зебра"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pelican"
 msgstr "светофар контролиран от пешеходци"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "toucan"
 msgstr "toucan"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "puffin"
 msgstr "puffin"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pegasus"
 msgstr "pegasus"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "tiger"
 msgstr "tiger"
 
 #. </optional>
-#: build/trans_presets.java:780
+#: build/trans_presets.java:781
 msgid "Stop"
 msgstr "Стоп"
@@ -15830,5 +16188,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:783
+#: build/trans_presets.java:784
 msgid "Pedestrian Crossing"
 msgstr "Пешеходна пътека"
@@ -15837,14 +16195,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:786
+#: build/trans_presets.java:787
 msgid "Edit Crossing"
 msgstr "Редактиране на пресечно място или кръстовище"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:793
 msgid "Type name (UK)"
 msgstr "Тип име (UK)"
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:795
 msgid "Mini-roundabout"
 msgstr "Мини кръгово движение"
@@ -15855,14 +16213,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "Direction"
 msgstr "Посока"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "clockwise"
 msgstr "по часовниковата стрелка"
 
-#: build/trans_presets.java:801
+#: build/trans_presets.java:802
 msgid "Turning Circle"
 msgstr "Обръщало"
@@ -15872,20 +16230,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:806
+#: build/trans_presets.java:807
 msgid "City Limit"
-msgstr "Табела оказваща начало/край населено място"
-
-#. item
-#: build/trans_presets.java:807
+msgstr "Знак указващ начало/край на населено място"
+
+#. item
+#: build/trans_presets.java:808
 msgid "Edit City Limit Sign"
 msgstr "Редактирай знак за ограничение в град"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:812
+#: build/trans_presets.java:813
 msgid "Second Name"
 msgstr "Второ име"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:814
+#: build/trans_presets.java:815
 msgid "Speed Camera"
 msgstr "Пътна камера"
@@ -15893,5 +16251,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:817
+#: build/trans_presets.java:818
 msgid "Emergency Phone"
 msgstr "Телефон за спешен случай"
@@ -15899,5 +16257,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:820
+#: build/trans_presets.java:821
 msgid "Incline"
 msgstr "Наклон"
@@ -15905,5 +16263,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:823
+#: build/trans_presets.java:824
 msgid "Incline Steep"
 msgstr "Стръмен наклон"
@@ -15912,10 +16270,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:827
+#: build/trans_presets.java:828
 msgid "Ford"
 msgstr "Брод"
 
 #. item
-#: build/trans_presets.java:828
+#: build/trans_presets.java:829
 msgid "Edit Ford"
 msgstr "Редактирай брод"
@@ -15923,5 +16281,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:835
+#: build/trans_presets.java:836
 msgid "Mountain Pass"
 msgstr "Планински проход"
@@ -15929,5 +16287,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:837
+#: build/trans_presets.java:838
 msgid "Edit Mountain Pass"
 msgstr "Редактирай планински проход"
@@ -15939,7 +16297,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:842 build/trans_presets.java:1600
-#: build/trans_presets.java:1745 build/trans_presets.java:2845
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:843 build/trans_presets.java:1604
+#: build/trans_presets.java:1749 build/trans_presets.java:2857
+#: build/trans_presets.java:2864 build/trans_presets.java:2871
 msgid "Elevation"
 msgstr "Надморска височина"
@@ -15947,5 +16305,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:846
+#: build/trans_presets.java:847
 msgid "Barriers"
 msgstr "Прегради"
@@ -15953,5 +16311,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:849
+#: build/trans_presets.java:850
 msgid "Bollard"
 msgstr "Дирек"
@@ -15959,5 +16317,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:852
 msgid "Edit Bollard"
 msgstr "Редактиране на стълб"
@@ -16002,16 +16360,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:854 build/trans_presets.java:873
-#: build/trans_presets.java:887 build/trans_presets.java:909
-#: build/trans_presets.java:946 build/trans_presets.java:959
-#: build/trans_presets.java:971 build/trans_presets.java:983
-#: build/trans_presets.java:995 build/trans_presets.java:1007
-#: build/trans_presets.java:1017 build/trans_presets.java:1026
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:855 build/trans_presets.java:874
+#: build/trans_presets.java:888 build/trans_presets.java:910
+#: build/trans_presets.java:947 build/trans_presets.java:960
+#: build/trans_presets.java:972 build/trans_presets.java:984
+#: build/trans_presets.java:996 build/trans_presets.java:1008
+#: build/trans_presets.java:1018 build/trans_presets.java:1027
+#: build/trans_presets.java:1036
 msgid "Allowed traffic:"
 msgstr "Разрешено преминаване:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:861
+#: build/trans_presets.java:862
 msgid "Cycle Barrier"
 msgstr "Вело бариера"
@@ -16020,5 +16378,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:865
+#: build/trans_presets.java:866
 msgid "Block"
 msgstr "Бетонен блок"
@@ -16026,5 +16384,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:868
+#: build/trans_presets.java:869
 msgid "Cattle Grid"
 msgstr "Тексаска мрежа (препятствие за животни)"
@@ -16032,10 +16390,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:870
+#: build/trans_presets.java:871
 msgid "Edit Cattle Grid"
 msgstr "Редактирай тексаска мрежа"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:880
+#: build/trans_presets.java:881
 msgid "Bus Trap"
 msgstr "Бус трап"
@@ -16043,15 +16401,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:883
+#: build/trans_presets.java:884
 msgid "Spikes"
 msgstr "Шипове"
 
 #. item
-#: build/trans_presets.java:884
+#: build/trans_presets.java:885
 msgid "Edit Spikes"
 msgstr "Редактиране шипове"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:896
 msgid "Toll Booth"
 msgstr "Място за плащане пътна такса"
@@ -16059,5 +16417,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:897
+#: build/trans_presets.java:898
 msgid "Edit Toll Booth"
 msgstr "Редактирай място за плащане пътна такса"
@@ -16065,10 +16423,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:905
+#: build/trans_presets.java:906
 msgid "Border Control"
 msgstr "Граничен контрол"
 
 #. item
-#: build/trans_presets.java:906
+#: build/trans_presets.java:907
 msgid "Edit Border Control"
 msgstr "Редактирай граничен контрол"
@@ -16078,5 +16436,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:920
+#: build/trans_presets.java:921
 msgid "Hedge"
 msgstr "Плет"
@@ -16085,5 +16443,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:925
 msgid "Fence"
 msgstr "Ограда / стобор"
@@ -16092,5 +16450,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:929
 msgid "Wall"
 msgstr "Стена"
@@ -16098,5 +16456,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:931
+#: build/trans_presets.java:932
 msgid "City Wall"
 msgstr "Градска стена"
@@ -16105,5 +16463,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:935
+#: build/trans_presets.java:936
 msgid "Retaining Wall"
 msgstr "Подпорна стена"
@@ -16115,15 +16473,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:942
+#: build/trans_presets.java:943
 msgid "Entrance"
 msgstr "Вход"
 
 #. item
-#: build/trans_presets.java:943
+#: build/trans_presets.java:944
 msgid "Edit Entrance"
 msgstr "Редактирай вход"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:954
+#: build/trans_presets.java:955
 msgid "Gate"
 msgstr "Порта"
@@ -16131,76 +16489,76 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:956
+#: build/trans_presets.java:957
 msgid "Edit Gate"
 msgstr "Редактирай порта"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:967
+#: build/trans_presets.java:968
 msgid "Lift Gate"
 msgstr "Вдигаще се врата"
 
 #. item
-#: build/trans_presets.java:968
+#: build/trans_presets.java:969
 msgid "Edit Lift Gate"
-msgstr "Вдигаще се врата"
+msgstr "Редактиране на вдигаща се преграда"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:979
+#: build/trans_presets.java:980
 msgid "Hampshire Gate"
 msgstr "Врата с бодлива тел"
 
 #. item
-#: build/trans_presets.java:980
+#: build/trans_presets.java:981
 msgid "Edit Hampshire Gate"
 msgstr "Редактирай врата с бодлива тел"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:991
+#: build/trans_presets.java:992
 msgid "Bump Gate"
 msgstr "Накланяща преграда (bump gate)"
 
 #. item
-#: build/trans_presets.java:992
+#: build/trans_presets.java:993
 msgid "Edit Bump Gate"
 msgstr "Редактирай накланяща преграда"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:1003
+#: build/trans_presets.java:1004
 msgid "Kissing Gate"
 msgstr "Кисинг гейт (преграда срещу животни)"
 
 #. item
-#: build/trans_presets.java:1004
+#: build/trans_presets.java:1005
 msgid "Edit Kissing Gate"
 msgstr "Редактирай кисинг гейт"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1013
 msgid "Stile"
-msgstr "Стъпалова преграда"
+msgstr "Стълби за преминаване през ограда"
 
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1014
+#: build/trans_presets.java:1015
 msgid "Edit Stile"
-msgstr "Редактирай стъпалова преграда"
+msgstr "Редактиране на: стълби за преминаване през ограда"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1023
 msgid "Turnstile"
 msgstr "турникет (контрол на достъпа)"
 
 #. item
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1024
 msgid "Edit Turnstile"
 msgstr "редактиране на: турникет"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1032
 msgid "Sally Port"
 msgstr "Двойна врата"
 
 #. item
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1033
 msgid "Edit Sally Port"
 msgstr "Редактирай двойна врата"
@@ -16208,13 +16566,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #.
-#. <separator/>
+#. group "Water"
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1046 build/trans_presets.java:1089
+#: build/trans_presets.java:1047 build/trans_presets.java:1048
+#: build/trans_presets.java:1091
 msgid "Water"
 msgstr "Вода"
 
 #. group "Water"
-#: build/trans_presets.java:1047
+#: build/trans_presets.java:1049
 msgid "Spring"
 msgstr "Извор"
@@ -16222,5 +16581,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1049
+#: build/trans_presets.java:1051
 msgid "Edit Spring"
 msgstr "Редактирай извора"
@@ -16228,5 +16587,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1056
 msgid "Drain"
 msgstr "Отточен канал"
@@ -16234,10 +16593,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1058
 msgid "Edit Drain"
 msgstr "Редактирай отточен канал"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1064
 msgid "Stream"
 msgstr "Поток"
@@ -16245,10 +16604,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1066
 msgid "Edit Stream"
 msgstr "Редактирай поток"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1072
 msgid "Canal"
 msgstr "Канал"
@@ -16256,10 +16615,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1074
 msgid "Edit Canal"
 msgstr "Редактирай канал"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1080
 msgid "River"
 msgstr "Река"
@@ -16269,5 +16628,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1084
 msgid "Edit River"
 msgstr "Редактирай река"
@@ -16275,15 +16634,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1093
 msgid "Edit Water"
 msgstr "Редактирай водата"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1097
 msgid "Land"
 msgstr "Суша"
 
 #. item
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1098
 msgid "Edit Land"
 msgstr "Редактирай сушата"
@@ -16291,15 +16650,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1103
 msgid "Basin"
 msgstr "Басейн"
 
 #. item
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1104
 msgid "Edit Basin Landuse"
 msgstr "Редактиране на басейн"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1109
 msgid "Reservoir"
 msgstr "Резервоар"
@@ -16307,15 +16666,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1109
+#: build/trans_presets.java:1111
 msgid "Edit Reservoir Landuse"
 msgstr "Редактирай резервоар"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1116
 msgid "Covered Reservoir"
 msgstr "Закрит резервоар"
 
 #. item
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1117
 msgid "Edit Covered Reservoir"
 msgstr "Редактирай закрит резервоар"
@@ -16323,5 +16682,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1120
+#: build/trans_presets.java:1122
 msgid "Riverbank"
 msgstr "Речен бряг"
@@ -16330,10 +16689,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1125
 msgid "Edit Riverbank"
 msgstr "Редактирай речен бряг"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1127
+#: build/trans_presets.java:1129
 msgid "Wetland"
 msgstr "Мочурище"
@@ -16344,14 +16703,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1134
 msgid "Edit Wetland"
 msgstr "Редактирай мочурището"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "swamp"
 msgstr "блато"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "bog"
 msgstr "тресавище"
@@ -16365,35 +16724,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1135 build/trans_style.java:3384
+#: build/trans_presets.java:1137 build/trans_style.java:3392
 msgid "marsh"
 msgstr "блато"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "reedbed"
 msgstr "тръстенак"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "saltmarsh"
 msgstr "солени блата / солници"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "tidalflat"
 msgstr "приливно-отливно крайбрежие"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "mangrove"
 msgstr "мангрова гора"
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1139
 msgid "Mud"
 msgstr "Кал"
 
 #. item
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1140
 msgid "Edit Mud"
 msgstr "Редактирай калта"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1144
 msgid "Beach"
 msgstr "Плаж"
@@ -16401,20 +16760,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1144
+#: build/trans_presets.java:1146
 msgid "Edit Beach"
 msgstr "Редактирай плажа"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1150
 msgid "Bay"
 msgstr "Залив"
 
 #. item
-#: build/trans_presets.java:1149
+#: build/trans_presets.java:1151
 msgid "Edit Bay"
 msgstr "Редактирай залива"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1155
 msgid "Cliff"
 msgstr "Скала"
@@ -16422,10 +16781,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1157
 msgid "Edit Cliff"
 msgstr "Редактирай скалата"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1159
+#: build/trans_presets.java:1161
 msgid "Coastline"
 msgstr "Крайбрежие"
@@ -16433,5 +16792,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1163
 msgid "Edit Coastline"
 msgstr "Редактирай крайбрежието"
@@ -16439,5 +16798,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1168
 msgid "Ferry Route"
 msgstr "Ферибот маршрут"
@@ -16445,5 +16804,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1170
 msgid "Edit Ferry"
 msgstr "Ферибот"
@@ -16452,5 +16811,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1176
+#: build/trans_presets.java:1178
 msgid "Boatyard"
 msgstr "Корабостроителница"
@@ -16458,10 +16817,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:1180
 msgid "Edit Boatyard"
 msgstr "Редактирай корабостроителница"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1185
 msgid "Dock"
 msgstr "Док"
@@ -16469,5 +16828,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1187
 msgid "Edit Dock"
 msgstr "Редактирай док"
@@ -16475,5 +16834,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1193
 msgid "Dam"
 msgstr "Язовирна стена"
@@ -16481,15 +16840,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1195
 msgid "Edit Dam"
 msgstr "Редактирай язовирна стена"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1199
+#: build/trans_presets.java:1201
 msgid "Waterway Point"
 msgstr "Хидротехническо съоръжение"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1202
 msgid "Lock Gate"
 msgstr "Шлюзова врата"
@@ -16498,5 +16857,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1206
 msgid "Weir"
 msgstr "Бент / преливник"
@@ -16504,20 +16863,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1208
 msgid "Edit Weir"
 msgstr "Редактирай бент / преливник"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1213
 msgid "Waterfall"
 msgstr "Водопад"
 
 #. item
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1214
 msgid "Edit Waterfall"
 msgstr "Редактирай водопад"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1219
 msgid "Turning Point"
 msgstr "Разширение за обръщане"
@@ -16526,15 +16885,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1221
+#: build/trans_presets.java:1223
 msgid "Marina"
 msgstr "Пристанище за яхти"
 
 #. item
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1224
 msgid "Edit Marina"
 msgstr "Редактирай пристанище за яхти"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1228
 msgid "Pier"
 msgstr "Кей"
@@ -16542,10 +16901,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1230
 msgid "Edit Pier"
 msgstr "Редактирай кей"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1234
 msgid "Ferry Terminal"
 msgstr "Ферибот терминал"
@@ -16553,10 +16912,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1236
 msgid "Edit Ferry Terminal"
 msgstr "Редактирай ферибот терминал"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1240
 msgid "Slipway"
 msgstr "Хелинг"
@@ -16566,16 +16925,21 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1244
 msgid "Edit Slipway"
 msgstr "Редактирай хелинг"
 
 #. item "Waterway Point/Slipway" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1250
+#, fuzzy
+msgid "Transport"
+msgstr "Обществен транспорт"
+
+#. group "Transport"
+#: build/trans_presets.java:1251
 msgid "Railway"
 msgstr "Железница"
 
 #. group "Railway"
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1252
 msgid "Rail"
 msgstr "ЖП Линия"
@@ -16583,5 +16947,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:1254
 msgid "Edit Rail"
 msgstr "Редактирай ЖП Линия"
@@ -16611,8 +16975,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "Optional Types"
 msgstr "Незадължителни типове"
@@ -16626,35 +16990,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "yard"
 msgstr "двор"
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "siding"
 msgstr "ЖП стрелка"
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "spur"
 msgstr "скоростна"
 
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1259
 msgid "Narrow Gauge Rail"
 msgstr "Теснолинейка"
 
 #. item
-#: build/trans_presets.java:1257
+#: build/trans_presets.java:1260
 msgid "Edit Narrow Gauge Rail"
 msgstr "Редактирай теснолинейка"
 
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1265
 msgid "Monorail"
 msgstr "Монорелса"
@@ -16662,45 +17026,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1267
 msgid "Edit Monorail"
 msgstr "Редактирай монорелса"
 
-#: build/trans_presets.java:1269
+#: build/trans_presets.java:1272
 msgid "Preserved"
 msgstr "Историческа ЖП линия"
 
 #. item
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1273
 msgid "Edit Preserved Railway"
 msgstr "Редактирай историческа ЖП линия"
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1278
 msgid "Light Rail"
 msgstr "Лека ЖП линия"
 
 #. item
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1279
 msgid "Edit Light Rail"
 msgstr "Редактирай лека ЖП линия"
 
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1284
 msgid "Subway"
 msgstr "Метро"
 
 #. item
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1285
 msgid "Edit Subway"
 msgstr "Редактирай метро"
 
-#: build/trans_presets.java:1287
+#: build/trans_presets.java:1290
 msgid "Tram"
 msgstr "Трамвай"
 
 #. item
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1291
 msgid "Edit Tram"
 msgstr "Редактирай трамвай"
 
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1296
 msgid "Bus Guideway"
 msgstr "Направляван автобус"
@@ -16708,5 +17072,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1295
+#: build/trans_presets.java:1298
 msgid "Edit Bus Guideway"
 msgstr "Редактирай направляван автобус"
@@ -16715,14 +17079,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1315
 msgid "Disused Rail"
 msgstr "Неизползвана ЖП линия"
 
 #. item
-#: build/trans_presets.java:1313
+#: build/trans_presets.java:1316
 msgid "Edit Disused Railway"
 msgstr "Редактирай неизползвана ЖП линия"
 
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1321
 msgid "Abandoned Rail"
 msgstr "Изоставена ЖП линия"
@@ -16731,5 +17095,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1325
 msgid "Level Crossing"
 msgstr "Регулиран ЖП прелез"
@@ -16738,5 +17102,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1329
 msgid "Crossing"
 msgstr "ЖП прелез"
@@ -16746,5 +17110,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1333
 msgid "Crossing type"
 msgstr "Тип пресичане"
@@ -16752,5 +17116,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1339
 msgid "Turntable"
 msgstr "ЖП Обръщаща платформа"
@@ -16759,10 +17123,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1344
 msgid "Aerialway"
 msgstr "Надземни линии"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1345
 msgid "Chair Lift"
 msgstr "Седалков лифт"
@@ -16770,10 +17134,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1347
 msgid "Edit Chair Lift"
 msgstr "Редактирай седалков лифт"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1351
 msgid "Drag Lift"
 msgstr "Влек"
@@ -16781,10 +17145,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1353
 msgid "Edit Drag Lift"
 msgstr "Редактирай влек"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1357
 msgid "Cable Car"
 msgstr "Кабинков лифт"
@@ -16792,10 +17156,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1359
 msgid "Edit Cable Car"
 msgstr "Редактирай кабинков лифт"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1360
+#: build/trans_presets.java:1363
 msgid "Gondola"
 msgstr "Гондола"
@@ -16803,5 +17167,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1365
 msgid "Edit Gondola"
 msgstr "Редактиране на гондола"
@@ -16809,5 +17173,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1366 build/trans_presets.java:1461
+#: build/trans_presets.java:1369 build/trans_presets.java:1464
 msgid "Station"
 msgstr "Гара / Станция / Спирка"
@@ -16818,10 +17182,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1368 build/trans_presets.java:1464
+#: build/trans_presets.java:1371 build/trans_presets.java:1467
 msgid "Edit Station"
 msgstr "Редактирай станция"
 
 #. group "Car"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1378
 msgid "Fuel"
 msgstr "Бензиностанция"
@@ -16831,5 +17195,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1382
 msgid "Edit Fuel"
 msgstr "Редактирай бензиностанция"
@@ -16887,32 +17251,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1671 build/trans_presets.java:1678
-#: build/trans_presets.java:1686 build/trans_presets.java:1699
-#: build/trans_presets.java:1713 build/trans_presets.java:1810
-#: build/trans_presets.java:1818 build/trans_presets.java:1909
-#: build/trans_presets.java:1915 build/trans_presets.java:2226
-#: build/trans_presets.java:2250 build/trans_presets.java:2465
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1703
+#: build/trans_presets.java:1717 build/trans_presets.java:1814
+#: build/trans_presets.java:1822 build/trans_presets.java:1919
+#: build/trans_presets.java:1925 build/trans_presets.java:2237
+#: build/trans_presets.java:2261 build/trans_presets.java:2476
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Opening Hours"
 msgstr "Работно време"
@@ -16971,91 +17335,91 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "24/7"
 msgstr "денонощно"
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Mo-Fr 08:30-20:00"
 msgstr "понеделник-петък 08:30-20:00"
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "вторник-неделя 08:00-15:00; събота 08:00-12:00"
@@ -17070,5 +17434,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1385 build/trans_presets.java:1438
+#: build/trans_presets.java:1388 build/trans_presets.java:1441
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -17078,5 +17442,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1391
 msgid "Edit Parking"
 msgstr "Редактирай паркинг"
@@ -17087,24 +17451,24 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1391 build/trans_presets.java:1762
-#: build/trans_presets.java:1772 build/trans_presets.java:2396
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:1394 build/trans_presets.java:1766
+#: build/trans_presets.java:1776 build/trans_presets.java:2407
+#: build/trans_presets.java:2524
 msgid "Reference number"
 msgstr "Ref номер"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "multi-storey"
 msgstr "на няколко нива"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "surface"
 msgstr "наземен"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "underground"
 msgstr "подземен"
 
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1396
 msgid "Park and Ride"
 msgstr ""
@@ -17113,38 +17477,38 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1394 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
+#: build/trans_presets.java:1397 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
 msgid "Fee"
 msgstr "Такса"
 
 #. <space />
-#: build/trans_presets.java:1396
+#: build/trans_presets.java:1399
 msgid "Capacity (overall)"
 msgstr "Капацитет (общ)"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1400
 msgid "Spaces for Disabled"
 msgstr "Места за инвалиди"
 
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1401
 msgid "Spaces for Women"
 msgstr "Запазени места за жени"
 
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1402
 msgid "Spaces for Parents"
 msgstr "Запазени места за родители"
 
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1403
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1405
 msgid "Wash"
 msgstr "Автомивка"
 
 #. item
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1406
 msgid "Edit Car Wash"
 msgstr "Редактирай автомивка"
@@ -17152,5 +17516,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1408 build/trans_presets.java:1452
+#: build/trans_presets.java:1411 build/trans_presets.java:1455
 msgid "Shop"
 msgstr "Магазин"
@@ -17158,15 +17522,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1413
 msgid "Edit Car Shop"
 msgstr "Редактирай автосалон"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1418
 msgid "Repair"
 msgstr "Сервиз"
 
 #. item
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1419
 msgid "Edit Car Repair"
 msgstr "Редактирай автосервиз"
@@ -17174,5 +17538,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1421 build/trans_presets.java:1445
+#: build/trans_presets.java:1424 build/trans_presets.java:1448
 msgid "Rental"
 msgstr "Под наем"
@@ -17181,10 +17545,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1427
 msgid "Edit Car Rental"
 msgstr "Редактиране коли под наем"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1432
 msgid "Sharing"
 msgstr "Споделяне на автомобили"
@@ -17192,5 +17556,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1434
 msgid "Edit Car Sharing"
 msgstr "Редактирай споделяне автомобили"
@@ -17198,10 +17562,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Parking"
 msgstr "Велосипедна стоянка (паркинг)"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1446
 msgid "Capacity"
 msgstr "Капацитет"
@@ -17210,5 +17574,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1448
+#: build/trans_presets.java:1451
 msgid "Edit Bicycle Rental"
 msgstr "Редактиране велосипеди под наем"
@@ -17217,15 +17581,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1458
 msgid "Edit Bicycle Shop"
 msgstr "Редактирай вело-магазин"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1463
 msgid "Public Transport"
 msgstr "Обществен транспорт"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:1472
 msgid "UIC-Reference"
 msgstr "UIC-Референция"
@@ -17233,5 +17597,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1475
 msgid "Railway Halt"
 msgstr "Малка ЖП гара"
@@ -17239,5 +17603,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1477
 msgid "Edit Halt"
 msgstr "Редактирай малка ЖП гара"
@@ -17245,5 +17609,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1484
 msgid "Tram Stop"
 msgstr "Трамвайна спирка"
@@ -17252,5 +17616,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1484
+#: build/trans_presets.java:1487
 msgid "Edit Tram Stop"
 msgstr "Редактирай трамвайна спирка"
@@ -17258,5 +17622,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1494
 msgid "Railway Platform"
 msgstr "ЖП платформа"
@@ -17265,5 +17629,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1497
 msgid "Edit Railway Platform"
 msgstr "Редактирай ЖП платформа"
@@ -17275,5 +17639,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1497 build/trans_presets.java:1539
+#: build/trans_presets.java:1500 build/trans_presets.java:1542
 msgid "Reference (track number)"
 msgstr "Референция (коловоз #)"
@@ -17281,10 +17645,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1499 build/trans_presets.java:1541
+#: build/trans_presets.java:1502 build/trans_presets.java:1544
 msgid "Area"
 msgstr "Област"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1504
 msgid "Subway Entrance"
 msgstr "Вход в метро"
@@ -17293,10 +17657,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1507
 msgid "Edit Subway Entrance"
 msgstr "Редактирай вход в метро"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1512
 msgid "Wheelchair"
 msgstr "Инвалидна количка"
@@ -17305,5 +17669,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1517
 msgid "Bus Station"
 msgstr "Автогара"
@@ -17312,5 +17676,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1520
 msgid "Edit Bus Station"
 msgstr "Редактирай автогара"
@@ -17318,5 +17682,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1526
 msgid "Bus Stop"
 msgstr "Автобусна спирка"
@@ -17326,5 +17690,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1530
 msgid "Edit Bus Stop"
 msgstr "Редактирай автобусна спирка"
@@ -17333,6 +17697,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1532 build/trans_presets.java:1785
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:1535 build/trans_presets.java:1789
+#: build/trans_presets.java:2453
 msgid "Shelter"
 msgstr "Навес"
@@ -17340,10 +17704,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1538
 msgid "Bus Platform"
 msgstr "Автобусна платформа"
 
 #. item
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1539
 msgid "Edit Bus Platform"
 msgstr "Редактирай автобусна платформа"
@@ -17351,5 +17715,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1547
 msgid "Taxi"
 msgstr "Такси"
@@ -17357,5 +17721,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1549
 msgid "Edit Taxi station"
 msgstr "Редактирай стоянка таксита"
@@ -17363,5 +17727,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1554
 msgid "Airport"
 msgstr "Летище"
@@ -17369,15 +17733,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1556
 msgid "Edit Airport"
 msgstr "Редактиране летище"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1561
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1559
+#: build/trans_presets.java:1562
 msgid "ICAO"
 msgstr "ICAO"
@@ -17385,6 +17749,11 @@
 #. item "Public Transport/Airport" text "ICAO"
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1567
+#, fuzzy
+msgid "Travel"
+msgstr "чакъл"
+
+#. group "Travel"
+#: build/trans_presets.java:1568
 msgid "Accomodation"
 msgstr "Настаняване"
@@ -17396,5 +17765,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1565 build/trans_surveyor.java:43
+#: build/trans_presets.java:1569 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Хотел"
@@ -17403,15 +17772,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:1568
+#: build/trans_presets.java:1572
 msgid "Edit Hotel"
 msgstr "Редактирай хотел"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1575
 msgid "Stars"
 msgstr "Звезди"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1577
 msgid "Motel"
 msgstr "Мотел"
@@ -17419,20 +17788,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1579
 msgid "Edit Motel"
 msgstr "Редактирай мотел"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1583
 msgid "Guest House"
 msgstr "Къща за гости"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1584
 msgid "Edit Guest House"
 msgstr "Редактирай къща за гости"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1588
 msgid "Chalet"
 msgstr "Бунгало"
@@ -17440,10 +17809,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1590
 msgid "Edit Chalet"
 msgstr "Редактирай бунгало"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1594
 msgid "Hostel"
 msgstr "Хостел / студентско общежитие"
@@ -17451,30 +17820,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1592
+#: build/trans_presets.java:1596
 msgid "Edit Hostel"
 msgstr "Редактирай хостел / студентско общежитие"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1600
 msgid "Alpine Hut"
 msgstr "Планинска хижа"
 
 #. item
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1601
 msgid "Edit Alpine Hut"
 msgstr "Редактирай планинска хижа"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1606
 msgid "Caravan Site"
 msgstr "Площадка за каравани"
 
 #. item
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1607
 msgid "Edit Caravan Site"
 msgstr "Редактирай площадка за каравани"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1611
 msgid "Camping Site"
 msgstr "Къмпинг"
@@ -17482,10 +17851,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1613
 msgid "Edit Camping Site"
 msgstr "Редактирай къмпинг"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1618
 msgid "Food+Drinks"
 msgstr "Храна и напитки"
@@ -17496,5 +17865,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1615 build/trans_surveyor.java:47
+#: build/trans_presets.java:1619 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Ресторант"
@@ -17502,5 +17871,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1621
 msgid "Edit Restaurant"
 msgstr "Редактирай ресторант"
@@ -17508,5 +17877,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "Cuisine"
 msgstr "Кухня"
@@ -17514,61 +17883,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "italian"
 msgstr "италианска"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "chinese"
 msgstr "китайска"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "pizza"
 msgstr "пица"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "burger"
 msgstr "бургери"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "greek"
 msgstr "гръцка"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "german"
 msgstr "немска"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "indian"
 msgstr "индийска"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "regional"
 msgstr "местна"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "kebab"
 msgstr "кебаб"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "turkish"
 msgstr "турска"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "asian"
 msgstr "азиатска"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "thai"
 msgstr "тайландска"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "mexican"
 msgstr "мексиканска"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "japanese"
 msgstr "японска"
 
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1627
 msgid "Fast Food"
 msgstr "Заведение за бързо хранене"
@@ -17576,9 +17945,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1629
 msgid "Edit Fast Food Restaurant"
 msgstr "Редактирай заведение бързо хранене"
 
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1635
 msgid "Cafe"
 msgstr "Кафене"
@@ -17586,9 +17955,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1633
+#: build/trans_presets.java:1637
 msgid "Edit Cafe"
 msgstr "Редактирай кафене"
 
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1642
 msgid "Pub"
 msgstr "Бар"
@@ -17596,18 +17965,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1644
 msgid "Edit Pub"
 msgstr "Редактирай бар"
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1649
 msgid "Biergarten"
 msgstr "Бирария"
 
 #. item
-#: build/trans_presets.java:1646
+#: build/trans_presets.java:1650
 msgid "Edit Biergarten"
 msgstr "Редактирай бирария"
 
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1655
 msgid "Bar"
 msgstr "Бар"
@@ -17615,9 +17984,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1657
 msgid "Edit Bar"
 msgstr "Редактиране на бар"
 
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1662
 msgid "Nightclub"
 msgstr "Нощен клуб"
@@ -17625,24 +17994,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1664
 msgid "Edit Nightclub"
 msgstr "Редактирай нощен клуб"
 
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1670
 msgid "Tourism"
 msgstr "Туризъм"
 
 #. group "Tourism"
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1671
 msgid "Attraction"
 msgstr "Атракция"
 
 #. item
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1672
 msgid "Edit Attraction"
 msgstr "Редактирай забележилтеност"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1677
 msgid "Museum"
 msgstr "Музей"
@@ -17650,9 +18019,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1679
 msgid "Edit Museum"
 msgstr "Редактирай музей"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1684
 msgid "Zoo"
 msgstr "Зоопарк"
@@ -17661,9 +18030,9 @@
 #. <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:1683
+#: build/trans_presets.java:1687
 msgid "Edit Zoo"
 msgstr "Редактирай зоопарк"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1692
 msgid "Viewpoint"
 msgstr "Място с добра гледка"
@@ -17671,24 +18040,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1694
 msgid "Edit Viewpoint"
 msgstr "Редактирай място с добра гледка"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1697
 msgid "Look-Out Tower"
 msgstr "Наблюдателница"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1699
 msgid "Theme Park"
 msgstr "Развлекателен парк"
 
 #. item
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1700
 msgid "Edit Theme Park"
 msgstr "Редактирай развлекателен парк"
 
-#: build/trans_presets.java:1701
+#: build/trans_presets.java:1705
 msgid "Artwork"
 msgstr "Творба на изкуството"
@@ -17696,5 +18065,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1707
 msgid "Edit Artwork"
 msgstr "Редактирай творба на изкуството"
@@ -17702,19 +18071,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1712
 msgid "Information Office"
 msgstr "Информационен пункт"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1719
 msgid "Map"
 msgstr "Карта"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "topo"
 msgstr ""
@@ -17752,5 +18121,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1720 build/trans_style.java:619
+#: build/trans_presets.java:1724 build/trans_style.java:619
 #: build/trans_style.java:635 build/trans_style.java:651
 #: build/trans_style.java:659
@@ -17758,28 +18127,28 @@
 msgstr "улица"
 
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "scheme"
 msgstr "схема"
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "site"
 msgstr "място"
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "city"
 msgstr "град"
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "region"
 msgstr "район"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1722 build/trans_presets.java:1738
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1726 build/trans_presets.java:1742
+#: build/trans_presets.java:1786
 msgid "Closer Description"
 msgstr "По-подробно описание"
@@ -17789,5 +18158,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1724 build/trans_presets.java:1747
+#: build/trans_presets.java:1728 build/trans_presets.java:1751
 msgid "Routes shown for:"
 msgstr "Показани са пътища за:"
@@ -17795,6 +18164,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1726 build/trans_presets.java:1749
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1965
 msgid "Cycling"
 msgstr "Велосипедизъм"
@@ -17802,5 +18171,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1727 build/trans_presets.java:1750
+#: build/trans_presets.java:1731 build/trans_presets.java:1754
 msgid "Mountainbiking"
 msgstr "Планинско колоездене"
@@ -17808,6 +18177,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1728 build/trans_presets.java:1751
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:1732 build/trans_presets.java:1755
+#: build/trans_presets.java:2019
 msgid "Skiing"
 msgstr "Ски"
@@ -17815,5 +18184,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1729 build/trans_presets.java:1752
+#: build/trans_presets.java:1733 build/trans_presets.java:1756
 msgid "Riding"
 msgstr "Колоездене"
@@ -17821,46 +18190,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1734 build/trans_presets.java:1757
 msgid "... other transportation modes possible"
 msgstr "... възможни са други способи за придвижване"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1736
 msgid "Information Board"
 msgstr "Информационно табло"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "Board Content"
 msgstr "Съдържание на таблото"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "notice"
 msgstr "табела"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "history"
 msgstr "история"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "nature"
 msgstr "природа"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "wildlife"
 msgstr "дива природа"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "plants"
 msgstr "растения"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1744
 msgid "Guidepost"
 msgstr "Упътване"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1759
 msgid "Information Terminal"
 msgstr "Информационен пункт"
@@ -17868,29 +18237,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1760 build/trans_presets.java:1770
+#: build/trans_presets.java:1764 build/trans_presets.java:1774
 msgid "Closer description"
 msgstr "По-точно описание"
 
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1769
 msgid "Audioguide"
 msgstr "Аудио напътствия"
 
 #. <space />
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1779
 msgid "Audioguide via mobile phone?"
 msgstr "Аудио-напътствия по мобилен телефон?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1780
 msgid "Phone number"
 msgstr "Тел. номер"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1778
+#: build/trans_presets.java:1782
 msgid "Other Information Points"
 msgstr "Други информационни точки"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1790
 msgid "Edit Shelter"
 msgstr "Редактирай навес"
@@ -17898,25 +18267,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1789 build/trans_presets.java:1795
+#: build/trans_presets.java:1793 build/trans_presets.java:1799
 msgid "Fireplace"
 msgstr "Огнище"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1791
+#: build/trans_presets.java:1795
 msgid "Picnic Site"
 msgstr "Място за пикник"
 
 #. item
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1796
 msgid "Edit Picnic Site"
 msgstr "Редактирай място за излет"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1802
 msgid "Historic Places"
 msgstr "Исторически места"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1799
+#: build/trans_presets.java:1803
 msgid "Castle"
 msgstr "Замък"
@@ -17925,19 +18294,19 @@
 #. <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:1802
+#: build/trans_presets.java:1806
 msgid "Edit Castle"
 msgstr "Редактирай замък"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1810
 msgid "Ruins"
 msgstr "Руини"
 
 #. item
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1811
 msgid "Edit Ruins"
 msgstr "Редактирай руини"
 
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1816
 msgid "Archaeological Site"
 msgstr "Архиологични разкопки"
@@ -17946,9 +18315,9 @@
 #. <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:1815
+#: build/trans_presets.java:1819
 msgid "Edit Archaeological Site"
 msgstr "Редактирай архиологични разкопки"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1824
 msgid "Battlefield"
 msgstr "Поле на битка"
@@ -17956,5 +18325,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1826
 msgid "Edit Battlefield"
 msgstr "Редактирай поле на битка"
@@ -17962,15 +18331,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1831
 msgid "Monument"
 msgstr "Забележителност"
 
 #. item
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1832
 msgid "Edit Monument"
 msgstr "Редактирай забележителност"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1836
 msgid "Memorial"
 msgstr "Паметник"
@@ -17978,45 +18347,57 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1838
 msgid "Edit Memorial"
 msgstr "Редактирай паметник"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1842
 msgid "Wayside Cross"
 msgstr "Крайпътен кръст"
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1843
 msgid "Edit Wayside Cross"
 msgstr "Редактирай крайпътен кръст"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1847
 msgid "Wayside Shrine"
 msgstr "Крайпътен параклис"
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1848
 msgid "Edit Wayside Shrine"
 msgstr "Редактирай крайпътен параклис"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1852
+#, fuzzy
+msgid "Boundary Stone"
+msgstr "Граници"
+
+#. item
+#: build/trans_presets.java:1853
+#, fuzzy
+msgid "Edit Boundary Stone"
+msgstr "Редактиране на книжарница"
+
+#. item "Historic Places/Boundary Stone" text "Name"
+#: build/trans_presets.java:1858
 msgid "Leisure"
 msgstr "Места за отдих и развлечения"
 
 #. group "Leisure"
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1859
 msgid "Water Park"
 msgstr "Аквапарк"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1860
 msgid "Edit Water Park"
 msgstr "Редактирай аквапарк"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1864
 msgid "Playground"
 msgstr "Площадка"
@@ -18024,31 +18405,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1866
 msgid "Edit Playground"
 msgstr "Редактирай площадка"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1870
 msgid "Fishing"
 msgstr "Риболов"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1871
 msgid "Edit Fishing"
 msgstr "Редактирай риболов"
 
 #. item "Leisure/Fishing" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1877 build/trans_presets.java:2669
+msgid "Sports"
+msgstr "Спортни стоки"
+
+#. group "Sports"
+#: build/trans_presets.java:1878
 msgid "Sport Facilities"
 msgstr "Спортни съоражения"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1879
 msgid "Stadium"
 msgstr "Стадион"
 
 #. item
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1880
 msgid "Edit Stadium"
 msgstr "Редактирай стадион"
@@ -18062,6 +18447,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1874 build/trans_presets.java:1883
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1902 build/trans_presets.java:1911
 msgid "select sport:"
 msgstr "вид спорт:"
@@ -18453,30 +18838,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884 build/trans_style.java:3892
-#: build/trans_style.java:3900 build/trans_style.java:3908
-#: build/trans_style.java:3916 build/trans_style.java:3924
-#: build/trans_style.java:3932
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_style.java:3572 build/trans_style.java:3580
+#: build/trans_style.java:3588 build/trans_style.java:3596
+#: build/trans_style.java:3604 build/trans_style.java:3612
+#: build/trans_style.java:3620 build/trans_style.java:3628
+#: build/trans_style.java:3636 build/trans_style.java:3644
+#: build/trans_style.java:3652 build/trans_style.java:3660
+#: build/trans_style.java:3668 build/trans_style.java:3676
+#: build/trans_style.java:3684 build/trans_style.java:3692
+#: build/trans_style.java:3700 build/trans_style.java:3708
+#: build/trans_style.java:3716 build/trans_style.java:3724
+#: build/trans_style.java:3732 build/trans_style.java:3740
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3764 build/trans_style.java:3772
+#: build/trans_style.java:3780 build/trans_style.java:3788
+#: build/trans_style.java:3796 build/trans_style.java:3804
+#: build/trans_style.java:3812 build/trans_style.java:3820
+#: build/trans_style.java:3828 build/trans_style.java:3836
+#: build/trans_style.java:3844 build/trans_style.java:3852
+#: build/trans_style.java:3860 build/trans_style.java:3868
+#: build/trans_style.java:3876 build/trans_style.java:3884
+#: build/trans_style.java:3892 build/trans_style.java:3900
+#: build/trans_style.java:3908 build/trans_style.java:3916
+#: build/trans_style.java:3924 build/trans_style.java:3932
+#: build/trans_style.java:3940
 msgid "sport"
 msgstr "спорт"
@@ -18486,225 +18871,225 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "multi"
 msgstr "многобой"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "archery"
 msgstr "стрелба с лък"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "athletics"
 msgstr "атлетика"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "australian_football"
 msgstr "австралийски футбол"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "baseball"
 msgstr "бейзбол"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "basketball"
 msgstr "баскетбол"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "boules"
 msgstr "игра с мет.топчета"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "bowls"
 msgstr "игра с асим.топки"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "canoe"
 msgstr "кану"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "climbing"
 msgstr "алпинизъм"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket"
 msgstr "крикет"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket_nets"
 msgstr "крикет мрежи"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "croquet"
 msgstr "крокет"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cycling"
 msgstr "велоспорт"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "dog_racing"
 msgstr "кучешки надбягвания"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "equestrian"
 msgstr "конна езда"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "football"
 msgstr "футбол"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "golf"
 msgstr "голф"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "gymnastics"
 msgstr "гимнастика"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "hockey"
 msgstr "хокей"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "horse_racing"
 msgstr "конни надбягвания"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "motor"
 msgstr "моторен спорт"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "pelota"
 msgstr "бейзбол"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "racquet"
 msgstr "ракет бол"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "rugby"
 msgstr "ръгби"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "shooting"
 msgstr "стрелба"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skateboard"
 msgstr "скейтборд"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skating"
 msgstr "фигурно пързаляне"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skiing"
 msgstr "ски"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "soccer"
 msgstr "футбол"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "swimming"
 msgstr "плуване"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "table_tennis"
 msgstr "тенис на маса"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "tennis"
 msgstr "тенис"
 
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1888
 msgid "Sports Centre"
 msgstr "Спортен център"
 
 #. item
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1889
 msgid "Edit Sports Centre"
 msgstr "Редактирай спортен център"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1897
 msgid "Pitch"
 msgstr "Игрище"
 
 #. item
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1898
 msgid "Edit Pitch"
 msgstr "Редактирай игрище"
 
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1906
 msgid "Racetrack"
 msgstr "Състезателна писта"
 
 #. item
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1907
 msgid "Edit Racetrack"
 msgstr "Редактирай състезателна писта"
 
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1915
 msgid "Golf Course"
 msgstr "Поле за голф"
 
 #. item
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1916
 msgid "Edit Golf Course"
 msgstr "Редактирай поле за голф"
 
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1921
 msgid "Miniature Golf"
 msgstr "Миниголф"
 
 #. item
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1922
 msgid "Edit Miniature Golf"
 msgstr "Редактирай миниголф"
 
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1928
 msgid "Sport"
 msgstr "Спорт"
 
 #. group "Sport"
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1929
 msgid "Multi"
 msgstr "Многобой"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1930
 msgid "Edit Multi"
 msgstr "Редактирай многобой"
@@ -18743,183 +19128,183 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "pitch"
 msgstr "игрище"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "sports_centre"
 msgstr "спортен център"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "stadium"
 msgstr "стадион"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1935
 msgid "10pin"
 msgstr "Боулинг зала"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1936
 msgid "Edit 10pin"
 msgstr "Редактирай боулинг зала"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1941
 msgid "Athletics"
 msgstr "Атлетика"
 
 #. item
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1942
 msgid "Edit Athletics"
 msgstr "Редактирай атлетика"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1947
 msgid "Archery"
 msgstr "Стрелба с лък"
 
 #. item
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1948
 msgid "Edit Archery"
 msgstr "Редактирай стрелба с лък"
 
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1953
 msgid "Climbing"
 msgstr "Скално катерене"
 
 #. item
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:1954
 msgid "Edit Climbing"
 msgstr "Редактирай скално катерене"
 
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1959
 msgid "Canoeing"
 msgstr "Кану"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1960
 msgid "Edit Canoeing"
 msgstr "Редактирай кану"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1966
 msgid "Edit Cycling"
 msgstr "Редактирай велосипедизъм"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1971
 msgid "Dog Racing"
 msgstr "Надпреварване с кучета"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1972
 msgid "Edit Dog Racing"
 msgstr "Редактирай надбягвания с кучета"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1977
 msgid "Equestrian"
 msgstr "Конна езда"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1978
 msgid "Edit Equestrian"
 msgstr "Редактирай конна езда"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1983
 msgid "Horse Racing"
 msgstr "Конни надбягвания"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1984
 msgid "Edit Horse Racing"
 msgstr "Редактирай конни надбягвания"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1989
 msgid "Gymnastics"
 msgstr "Гимнастика"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1990
 msgid "Edit Gymnastics"
 msgstr "Редактирай гимнастика"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1995
 msgid "Motor Sports"
 msgstr "Моторни спортове"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1996
 msgid "Edit Motor Sports"
 msgstr "Редактирай моторни спортове"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2001
 msgid "Skating"
 msgstr "Фигурно пързаляне"
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2002
 msgid "Edit Skating"
 msgstr "Редактирай фигурно пързаляне"
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2007
 msgid "Skateboard"
 msgstr "Скейтборд"
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2008
 msgid "Edit Skateboard"
 msgstr "Редактирай скейтборд"
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2013
 msgid "Swimming"
 msgstr "Плуване"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2014
 msgid "Edit Swimming"
 msgstr "Редактирай плуване"
@@ -18927,56 +19312,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2021
 msgid "Edit Skiing"
 msgstr "Редактирай ски"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "Piste type"
 msgstr "Тип писта"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "downhill"
 msgstr "спускане"
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "nordic"
 msgstr "нордическа"
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "snow_park"
 msgstr "Зимен парк"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "Difficulty"
 msgstr "Трудност"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "novice"
 msgstr "начинаещ"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "easy"
 msgstr "лесно"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "intermediate"
 msgstr "за средно ниво"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "advanced"
 msgstr "за напреднали"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "expert"
 msgstr "експерт"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "freeride"
 msgstr "свободна езда"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2028
 msgid "Shooting"
 msgstr "Стрелба"
@@ -18984,178 +19369,183 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2030
 msgid "Edit Shooting"
 msgstr "Редактирай стрелба"
 
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2036
 msgid "Sport (Ball)"
 msgstr "Спорт (с топка)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2037
 msgid "Soccer"
 msgstr "Футбол"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2038
 msgid "Edit Soccer"
 msgstr "Редактирай футбол"
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2043
 msgid "Football"
 msgstr "Американски футбол"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2044
 msgid "Edit Football"
 msgstr "Редактирай американски футбол"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2049
 msgid "Australian Football"
 msgstr "Австралийски футбол"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2050
 msgid "Edit Australian Football"
 msgstr "Редактирай австралийски футбол"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2055
 msgid "Baseball"
 msgstr "Бейсбол"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2056
 msgid "Edit Baseball"
 msgstr "Редактирай бейсбол"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2061
 msgid "Basketball"
 msgstr "Баскетбол"
 
 #. item
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2062
 msgid "Edit Basketball"
 msgstr "Редактирай баскетбол"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2067
 msgid "Golf"
 msgstr "Голф"
 
 #. item
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2068
 msgid "Edit Golf"
 msgstr "Редактирай голф"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2071
 msgid "golf_course"
 msgstr "поле за голф"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2073
 msgid "Boule"
 msgstr "Буле (игра с мет.топчета)"
 
 #. item
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2074
 msgid "Edit Boule"
 msgstr "Редактирай Игра с мет.топчета"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2079
 msgid "Bowls"
 msgstr "Игра с асим.мет.топки (bowls)"
 
 #. item
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2080
 msgid "Edit Bowls"
 msgstr "Редактирай игра с асим.мет.топки"
 
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2085
 msgid "Cricket"
 msgstr "Крикет"
 
 #. item
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2086
 msgid "Edit Cricket"
 msgstr "Редактирай крикет"
 
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2091
 msgid "Cricket Nets"
 msgstr "Крикет мрежи"
 
 #. item
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2092
 msgid "Edit Cricket Nets"
 msgstr "Рекдатирай крикет мрежи"
 
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2097
 msgid "Croquet"
 msgstr "Крокет"
 
 #. item
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2098
 msgid "Edit Croquet"
 msgstr "Редактирай крокет"
 
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2103
 msgid "Hockey"
 msgstr "Хокей"
 
 #. item
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2104
 msgid "Edit Hockey"
 msgstr "Редактирай хокей"
 
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2109
 msgid "Pelota"
 msgstr "Пелота"
 
 #. item
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2110
 msgid "Edit Pelota"
 msgstr "Редактирай пелота"
 
-#: build/trans_presets.java:2105
+#: build/trans_presets.java:2115
 msgid "Racquet"
 msgstr "ракет"
 
 #. item
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2116
 msgid "Edit Racquet"
 msgstr "Редактирай ракет"
 
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2121
 msgid "Rugby"
 msgstr "Ръгби"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2122
 msgid "Edit Rugby"
 msgstr "Редактирай ръгби"
 
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2127
 msgid "Table Tennis"
 msgstr "Тенис на маса"
 
 #. item
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2128
 msgid "Edit Table Tennis"
 msgstr "Редактирай тенис на маса"
 
-#: build/trans_presets.java:2123
+#: build/trans_presets.java:2133
 msgid "Tennis"
 msgstr "Тенис"
 
 #. item
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2134
 msgid "Edit Tennis"
 msgstr "Редактирай тенис"
 
-#. <separator/>
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2141
+#, fuzzy
+msgid "Man-Made"
+msgstr "Изкуствени"
+
+#. group "Man-Made"
+#: build/trans_presets.java:2142
 msgid "Buildings"
 msgstr "Сгради"
 
 #. group "Buildings"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2143
 msgid "Building"
 msgstr "Строеж"
@@ -19163,5 +19553,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Public Building"
 msgstr "Обществена сграда"
@@ -19169,10 +19559,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2148
 msgid "Edit Public Building"
 msgstr "Редактирай обществена сграда"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2152
 msgid "Town hall"
 msgstr "Кметство"
@@ -19180,10 +19570,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2154
 msgid "Edit Town hall"
 msgstr "Редактирай кметство"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:2158
 msgid "Embassy"
 msgstr "Посолство"
@@ -19191,10 +19581,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Edit Embassy"
 msgstr "Редактирай посолство"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2164
 msgid "Courthouse"
 msgstr "Съдебна сграда"
@@ -19203,10 +19593,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:2156
+#: build/trans_presets.java:2167
 msgid "Edit Courthouse"
 msgstr "Редактирай съдебна сграда"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2171
 msgid "Prison"
 msgstr "Затвор"
@@ -19215,10 +19605,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:2163
+#: build/trans_presets.java:2174
 msgid "Edit Prison"
 msgstr "Редактирай затвор"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2178
 msgid "Police"
 msgstr "Полиция/Милиция"
@@ -19228,10 +19618,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:2171
+#: build/trans_presets.java:2182
 msgid "Edit Police"
 msgstr "Редактирай полиция/милиция"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2186
 msgid "Fire Station"
 msgstr "Пожарна"
@@ -19240,10 +19630,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:2178
+#: build/trans_presets.java:2189
 msgid "Edit Fire Station"
 msgstr "Редактирай пожарна"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "Post Office"
 msgstr "Пощенска станция"
@@ -19251,5 +19641,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Edit Post Office"
 msgstr "Редактирай пощенска станция"
@@ -19257,15 +19647,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2200
 msgid "Kindergarten"
 msgstr "Детска градина"
 
 #. item
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Kindergarten"
 msgstr "Редактирай детска градина"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2205
 msgid "School"
 msgstr "Училище"
@@ -19273,10 +19663,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Edit School"
 msgstr "Редактирай училището"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2211
 msgid "University"
 msgstr "Университет"
@@ -19284,10 +19674,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit University"
 msgstr "Редактирай университет"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "College"
 msgstr "Колеж"
@@ -19295,5 +19685,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2219
 msgid "Edit College"
 msgstr "Редактирай колеж"
@@ -19301,5 +19691,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2224
 msgid "Cinema"
 msgstr "Кино"
@@ -19308,10 +19698,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:2216
+#: build/trans_presets.java:2227
 msgid "Edit Cinema"
 msgstr "Редактирай кино"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2231
 msgid "Library"
 msgstr "Библиотека"
@@ -19320,9 +19710,9 @@
 #. <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:2223
+#: build/trans_presets.java:2234
 msgid "Edit Library"
 msgstr "Редактирай библиотека"
 
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Arts Centre"
 msgstr "Център на изкуствата"
@@ -19330,10 +19720,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Arts Centre"
 msgstr "Редактирай център на изкуствата"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Theatre"
 msgstr "Театър"
@@ -19342,10 +19732,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:2237
+#: build/trans_presets.java:2248
 msgid "Edit Theatre"
 msgstr "Редактирай театър"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2252
 msgid "Place of Worship"
 msgstr "Място за богослужение"
@@ -19355,5 +19745,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:2245
+#: build/trans_presets.java:2256
 msgid "Edit Place of Worship"
 msgstr "Редактирай място за богослужение"
@@ -19362,6 +19752,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "Religion"
 msgstr "Религия"
@@ -19370,66 +19760,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "bahai"
 msgstr "Бахаи"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "buddhist"
 msgstr "Будизъм"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "christian"
 msgstr "Християнство"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "hindu"
 msgstr "Индуизъм"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jain"
 msgstr "Джайнизъм"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jewish"
 msgstr "Юдаизъм"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "muslim"
 msgstr "Мусулманство"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "sikh"
 msgstr "Сикхизъм"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "spiritualist"
 msgstr "Спиритуализъм"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "taoist"
 msgstr "Даосизъм"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "unitarian"
 msgstr "Унитаристи"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "zoroastrian"
 msgstr "Зороастризъм"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "Denomination"
 msgstr "Конфесия"
@@ -19438,81 +19828,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "anglican"
 msgstr "Англиканска"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "baptist"
 msgstr "Баптизъм"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "catholic"
 msgstr "Католическо"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "evangelical"
 msgstr "Евангелска"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "jehovahs_witness"
 msgstr "Свидетели на Йехова"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "lutheran"
 msgstr "Лютеранство"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "methodist"
 msgstr "Методизъм"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "mormon"
 msgstr "Мормони"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "orthodox"
 msgstr "Православие"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "pentecostal"
 msgstr "Петдесетници"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "presbyterian"
 msgstr "Пресвитериани"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "protestant"
 msgstr "Протестантизъм"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "quaker"
 msgstr "Кваркери"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "shia"
 msgstr "Шийти"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "sunni"
 msgstr "Сунити"
 
 #. <separator/>
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2264
 msgid "Addresses"
 msgstr "Адреси"
@@ -19521,5 +19911,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:2256
+#: build/trans_presets.java:2267
 msgid "Edit Address Information"
 msgstr "Редактиране на информацията за адреса"
@@ -19527,5 +19917,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2269
 msgid "House number"
 msgstr "Номер"
@@ -19533,20 +19923,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "House name"
 msgstr "Име на дом"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "City name"
 msgstr "Име на град"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2274
 msgid "Post code"
 msgstr "Пощенски код"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2275
 msgid "Country code"
 msgstr "Код на държава"
@@ -19554,5 +19944,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Address Interpolation"
 msgstr "Интерполация на адреси"
@@ -19561,5 +19951,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:2270
+#: build/trans_presets.java:2281
 msgid "Edit Address Interpolation"
 msgstr "Редактирай интерполация на адреси"
@@ -19567,67 +19957,67 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "Numbering scheme"
 msgstr "Схема на номериране"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "odd"
 msgstr "нечетни"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "even"
 msgstr "четни"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "alphabetic"
 msgstr "по азбучен ред"
 
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2286
 msgid "Man Made"
 msgstr "Изкуствени"
 
 #. group "Man Made"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Works"
 msgstr "Цех"
 
 #. item
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2288
 msgid "Edit Works"
 msgstr "Редактирай цех"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2292
 msgid "Tower"
 msgstr "Кула"
 
 #. item
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2293
 msgid "Edit Tower"
 msgstr "Редактирай кула"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Water Tower"
 msgstr "Водонапорна кула"
 
 #. item
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2298
 msgid "Edit Water Tower"
 msgstr "Редактирай водонапорна кула"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Gasometer"
 msgstr "Газохранилище"
 
 #. item
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2303
 msgid "Edit Gasometer"
 msgstr "Редактирай газохранилище"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Lighthouse"
 msgstr "Маяк / Светлинен фар"
@@ -19635,10 +20025,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2309
 msgid "Edit Lighthouse"
 msgstr "Редактирай маяк / светлинен фар"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Windmill"
 msgstr "Мелница"
@@ -19646,10 +20036,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2315
 msgid "Edit Windmill"
 msgstr "Редактирай мелница"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2319
 msgid "Pipeline"
 msgstr "Тръбопровод"
@@ -19657,10 +20047,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Edit Pipeline"
 msgstr "Редактирай газопровод"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2325
 msgid "Wastewater Plant"
 msgstr "Пречиствателна станция"
@@ -19670,10 +20060,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:2318
+#: build/trans_presets.java:2329
 msgid "Edit Wastewater Plant"
 msgstr "Редактирай пречиствателна станция"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2333
 msgid "Crane"
 msgstr "Кран"
@@ -19681,10 +20071,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2335
 msgid "Edit Crane"
 msgstr "Редактирай кран"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Beacon"
 msgstr "Маяк / Радиопредавател"
@@ -19692,10 +20082,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2341
 msgid "Edit Beacon"
 msgstr "Редактирай маяк / радиопредавател"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2345
 msgid "Survey Point"
 msgstr "Точка на наблюдение"
@@ -19703,10 +20093,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Edit Survey Point"
 msgstr "Редактирай точка на наблюдение"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2351
 msgid "Surveillance"
 msgstr "Видеонаблюдение"
@@ -19714,5 +20104,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2353
 msgid "Edit Surveillance Camera"
 msgstr "Редактирай видеонаблюдение"
@@ -19720,5 +20110,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Power Generator"
 msgstr "Електроцентрала"
@@ -19728,39 +20118,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:2351
+#: build/trans_presets.java:2362
 msgid "Edit Power Generator"
 msgstr "Редактирай електрогенератор"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "wind"
 msgstr "вятърна енергия"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "hydro"
 msgstr "водна енергия"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "fossil"
 msgstr "енергия от изкопаеми горива"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "nuclear"
 msgstr "атомна"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "coal"
 msgstr "въглища"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "photovoltaic"
 msgstr "слънчева енергия"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "gas"
 msgstr "газ"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2367
 msgid "Power Station"
 msgstr "Електростанция"
@@ -19769,10 +20159,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:2359
+#: build/trans_presets.java:2370
 msgid "Edit Power Station"
 msgstr "Редактирай електростанция"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2374
 msgid "Power Sub Station"
 msgstr "Електроподстанция"
@@ -19781,5 +20171,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:2366
+#: build/trans_presets.java:2377
 msgid "Edit Power Sub Station"
 msgstr "Редактирай електроподстанция"
@@ -19787,10 +20177,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2369 build/trans_presets.java:2385
+#: build/trans_presets.java:2380 build/trans_presets.java:2396
 msgid "Line reference"
 msgstr "Номер линия"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2382
 msgid "Power Tower"
 msgstr "Електрически стълб от ЕПМ"
@@ -19801,5 +20191,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:2376
+#: build/trans_presets.java:2387
 msgid "Edit Power Tower"
 msgstr "Редактирай стълб от ЕПМ"
@@ -19807,5 +20197,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2390
 msgid "Power Line"
 msgstr "Линия за електропренос"
@@ -19814,40 +20204,40 @@
 #. <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:2382
+#: build/trans_presets.java:2393
 msgid "Edit Power Line"
 msgstr "Редактирай линия за електропренос"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Voltage"
 msgstr "Волтаж"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2398
 msgid "Amount of Wires"
 msgstr "Брой жици"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Amenities"
 msgstr "Обществени удобства"
 
 #. group "Amenities"
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2402
 msgid "Toilets"
 msgstr "Тоалетни"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2398 build/trans_presets.java:2514
+#: build/trans_presets.java:2409 build/trans_presets.java:2525
 msgid "Note"
 msgstr "Забележка"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2411
 msgid "Post Box"
 msgstr "Пощенска кутия"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2416
 msgid "Telephone"
 msgstr "Телефон"
@@ -19856,5 +20246,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:2408
+#: build/trans_presets.java:2419
 msgid "Edit Telephone"
 msgstr "Редактирай телефон"
@@ -19862,5 +20252,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2411 build/trans_presets.java:2515
+#: build/trans_presets.java:2422 build/trans_presets.java:2526
 msgid "Coins"
 msgstr "Монети"
@@ -19868,5 +20258,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2412 build/trans_presets.java:2516
+#: build/trans_presets.java:2423 build/trans_presets.java:2527
 msgid "Notes"
 msgstr "Банкноти"
@@ -19874,5 +20264,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2413 build/trans_presets.java:2517
+#: build/trans_presets.java:2424 build/trans_presets.java:2528
 msgid "Electronic purses and Charge cards"
 msgstr "Електрони средства за разплата"
@@ -19880,5 +20270,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2414 build/trans_presets.java:2518
+#: build/trans_presets.java:2425 build/trans_presets.java:2529
 msgid "Debit cards"
 msgstr "Дебитни карти"
@@ -19886,15 +20276,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2415 build/trans_presets.java:2519
+#: build/trans_presets.java:2426 build/trans_presets.java:2530
 msgid "Credit cards"
 msgstr "Кредитни карти"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2427
 msgid "Telephone cards"
 msgstr "Телефонни карти"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2429
 msgid "Recycling"
 msgstr "Рециклиране"
@@ -19903,5 +20293,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:2421
+#: build/trans_presets.java:2432
 msgid "Edit Recycling station"
 msgstr "Редактиране на станция за рециклиране"
@@ -19909,35 +20299,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Batteries"
 msgstr "Батерии"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2435
 msgid "Cans"
 msgstr "Консервни кутии"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Clothes"
 msgstr "Дрехи"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2437
 msgid "Glass"
 msgstr "Стъкло"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2438
 msgid "Paper"
 msgstr "Хартия"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2439
 msgid "Scrap Metal"
 msgstr "Вторични суровини"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2441
 msgid "Bench"
 msgstr "Скамейка"
@@ -19946,40 +20336,33 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2433
-#, fuzzy
+#: build/trans_presets.java:2444
 msgid "Backrest"
-msgstr "Назад"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "Material"
-msgstr "Паметник"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2434
-#, fuzzy
+#: build/trans_presets.java:2445
 msgid "stone"
-msgstr "няма/никой"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "plastic"
-msgstr "място"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "Colour"
-msgstr "Цвят"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "black"
-msgstr "Назад"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "brown"
-msgstr "надолу"
+msgstr ""
 
 #. color historic
@@ -20048,39 +20431,35 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2435 build/trans_style.java:3055
-#: build/trans_style.java:3063 build/trans_style.java:3071
-#: build/trans_style.java:3079 build/trans_style.java:3127
-#: build/trans_style.java:3135 build/trans_style.java:3233
-#: build/trans_style.java:3241
+#: build/trans_presets.java:2446 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3135
+#: build/trans_style.java:3143 build/trans_style.java:3241
+#: build/trans_style.java:3249
 msgid "green"
 msgstr "зеленина"
 
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "red"
-msgstr "край"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "blue"
-msgstr "Стойност"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "white"
-msgstr "място"
-
-#: build/trans_presets.java:2436
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2447
 msgid "Amount of Seats"
-msgstr "Брой жици"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2449
 msgid "Hunting Stand"
 msgstr "Ловно скривалище"
 
 #. item
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2450
 msgid "Edit Hunting Stand"
 msgstr "Редактирай ловно скривалище"
@@ -20089,30 +20468,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2441 build/trans_presets.java:2902
+#: build/trans_presets.java:2452 build/trans_presets.java:2914
 msgid "Height"
 msgstr "Височина"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "low"
 msgstr "нисък"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "half"
 msgstr "среден"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "full"
 msgstr "пълен"
 
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2454
 msgid "Hide"
 msgstr "Скривалище"
 
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2455
 msgid "Lock"
 msgstr "Заключване"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Fountain"
 msgstr "Фонтан"
@@ -20121,10 +20500,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:2449
+#: build/trans_presets.java:2460
 msgid "Edit Fountain"
 msgstr "Редактирай фонтан"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2464
 msgid "Drinking Water"
 msgstr "Питейна вода"
@@ -20133,10 +20512,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:2456
+#: build/trans_presets.java:2467
 msgid "Edit Drinking Water"
 msgstr "Редактирай питейна вода"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2471
 msgid "Baby Hatch"
 msgstr "Дестка ясла"
@@ -20144,33 +20523,33 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Baby Hatch"
 msgstr "Редактирай детска ясла"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2479
 msgid "Shops"
 msgstr "Магазини"
 
 #. group "Shops"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2480
 msgid "Supermarket"
 msgstr "Супермаркет"
 
 #. item
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2481
 msgid "Edit Supermarket"
 msgstr "Редактирай супермаркет"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2486
 msgid "Chemist"
 msgstr "Аптека"
 
 #. item
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2487
 msgid "Edit Chemist"
 msgstr "Редактиране на: аптека"
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2492
 msgid "Convenience Store"
 msgstr "Бакалия"
@@ -20178,9 +20557,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Edit Convenience Store"
 msgstr "Редактирай бакалия"
 
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2499
 msgid "Kiosk"
 msgstr "Будка"
@@ -20188,27 +20567,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Kiosk"
 msgstr "Редактирай будка"
 
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Book Store"
 msgstr "Книжарница"
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2507
 msgid "Edit Book Store"
 msgstr "Редактиране на книжарница"
 
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2512
 msgid "Travel Agency"
 msgstr "Туристическа агенция"
 
 #. item
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2513
 msgid "Edit Travel Agency"
 msgstr "Редактиране на туристическа агенция"
 
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2518
 msgid "Vending machine"
 msgstr "Автомат за стоки"
@@ -20216,5 +20595,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Edit Vending machine"
 msgstr "Редактирай автомат за стоки"
@@ -20222,88 +20601,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "Vending products"
 msgstr "Продукти за автоматична продажба"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_tickets"
 msgstr "билети за обществен транспорт"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_plans"
 msgstr "карта на обществен транспорт"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "parking_tickets"
 msgstr "билети за паркиране"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "food"
 msgstr "храна"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "drinks"
 msgstr "напитки"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "sweets"
 msgstr "сладки"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "cigarettes"
 msgstr "цигари"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "photos"
 msgstr "фотографии"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "animal_food"
 msgstr "храна за животни"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "news_papers"
 msgstr "вестници"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "toys"
 msgstr "играчки"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "stamps"
 msgstr "пощенски марки"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "SIM-cards"
 msgstr "SIM-карти"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "telephone_vouchers"
 msgstr "телефонни ваучери"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "vouchers"
 msgstr "ваучери"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "condoms"
 msgstr "презервативи"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "tampons"
 msgstr "тампони"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "excrement_bags"
 msgstr "торби за екскременти"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Account or loyalty cards"
 msgstr "клиентски карти"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Butcher"
 msgstr "Месарница"
@@ -20311,9 +20690,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2535
 msgid "Edit Butcher"
 msgstr "Редактирай месарница"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2540
 msgid "Baker"
 msgstr "Фурна"
@@ -20321,9 +20700,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2542
 msgid "Edit Baker"
 msgstr "Редактирай фурна"
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2547
 msgid "Florist"
 msgstr "Цветарски магазин"
@@ -20331,18 +20710,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Florist"
 msgstr "Редактирай цветарски магазин"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2554
 msgid "Organic"
 msgstr "Био магазин"
 
 #. item
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Edit Organic Shop"
 msgstr "Редактирай био магазин"
 
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2560
 msgid "Alcohol"
 msgstr "Алкохол"
@@ -20350,54 +20729,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2562
 msgid "Edit Alcohol Shop"
 msgstr "Редактиране магазин за алкохол"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2567
 msgid "Beverages"
 msgstr "Напитки"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2568
 msgid "Edit Beverages Shop"
 msgstr "Редактиране магазин за безалкохолни"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2573
 msgid "Computer"
 msgstr "Компютри"
 
 #. item
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2574
 msgid "Edit Computer Shop"
 msgstr "Редактирай компютърен магазин"
 
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Electronics"
 msgstr "Електроника"
 
 #. item
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2580
 msgid "Edit Electronics Shop"
 msgstr "Редактирай магазин за електроника"
 
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2585
 msgid "Hifi"
 msgstr "Аудио HiFi"
 
 #. item
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2586
 msgid "Edit Hifi Shop"
 msgstr "Редактирай магазин за Аудио HiFi"
 
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2591
 msgid "Furniture"
 msgstr "Мебелен магазин"
 
 #. item
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Edit Furniture Shop"
 msgstr "Редактирай мебелен магазин"
 
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Garden Centre"
 msgstr "Градински център"
@@ -20405,9 +20784,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2599
 msgid "Edit Garden Centre"
 msgstr "Редактирай градински център"
 
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Hardware"
 msgstr "Железария"
@@ -20415,9 +20794,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2606
 msgid "Edit Hardware Store"
 msgstr "Редактирай железария"
 
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "Do-it-yourself-store"
 msgstr "Магазин \"Направи си сам\""
@@ -20425,54 +20804,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2613
 msgid "Edit Do-it-yourself-store"
 msgstr "Редактирай магазин \"Направи си сам\""
 
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2618
 msgid "Stationery"
 msgstr "Книжарница"
 
 #. item
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2619
 msgid "Edit Stationery Shop"
 msgstr "Редактирай книжарница"
 
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Hairdresser"
 msgstr "Фризьорски салон / козметика"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Hairdresser"
 msgstr "Редактирай фризьорски салон / козметика"
 
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Shoes"
 msgstr "Обувки"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Shoe Shop"
 msgstr "Редактирай магазин за обувки"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2636
 msgid "Toys"
 msgstr "Играчки"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit Toy Shop"
 msgstr "Редактирай магазин за играчки"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Video"
 msgstr "Видео"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Video Shop"
 msgstr "Редактирай Видео-магазин"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "Dry Cleaning"
 msgstr "Химическо чистене"
@@ -20480,9 +20859,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2650
 msgid "Edit Dry Cleaning"
 msgstr "Редактирай химическо чистене"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "Laundry"
 msgstr "Пералня"
@@ -20490,9 +20869,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2657
 msgid "Edit Laundry"
 msgstr "Редактирай пералня"
 
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2662
 msgid "Outdoor"
 msgstr "Туристически стоки (за активен отдих)"
@@ -20500,32 +20879,28 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2664
 msgid "Edit Outdoor Shop"
 msgstr "Редактирай мазизин за туристически стоки"
 
-#: build/trans_presets.java:2658
-msgid "Sports"
-msgstr "Спортни стоки"
-
-#. item
-#: build/trans_presets.java:2659
+#. item
+#: build/trans_presets.java:2670
 msgid "Edit Sports Shop"
 msgstr "Редактирай магазин за спортни стоки"
 
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Optician"
 msgstr "Оптика"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Optician"
 msgstr "Редактирай оптика"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2683
 msgid "Cash"
 msgstr "Пари"
 
 #. group "Cash"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2684
 msgid "Bank"
 msgstr "Банка"
@@ -20533,14 +20908,14 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2686
 msgid "Edit Bank"
 msgstr "Редактирай банка"
 
-#: build/trans_presets.java:2680 build/trans_presets.java:2689
+#: build/trans_presets.java:2691 build/trans_presets.java:2700
 msgid "Automated Teller Machine"
 msgstr "Банкомат"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2693
 msgid "Money Exchange"
 msgstr "Обмяна на валута"
@@ -20548,5 +20923,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Edit Money Exchange"
 msgstr "Редактирай обмяна на валута"
@@ -20554,15 +20929,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2691
+#: build/trans_presets.java:2702
 msgid "Edit Automated Teller Machine"
 msgstr "Редактирай банкомат"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2707
 msgid "Health"
 msgstr "Здраве"
 
 #. group "Health"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2708
 msgid "Doctors"
 msgstr "Доктори"
@@ -20570,18 +20945,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2710
 msgid "Edit Doctors"
 msgstr "Редактирай доктори"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2715
 msgid "Dentist"
 msgstr "Стоматолог"
 
 #. item
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Edit Dentist"
 msgstr "Редактирай стоматолигия"
 
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2721
 msgid "Pharmacy"
 msgstr "Аптека"
@@ -20589,5 +20964,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Edit Pharmacy"
 msgstr "Редактирай аптека"
@@ -20595,9 +20970,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Dispensing"
 msgstr "Приготвят лекарства по рецепти"
 
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2729
 msgid "Hospital"
 msgstr "Болница"
@@ -20605,10 +20980,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Edit Hospital"
 msgstr "Редактирай болница"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2735
 msgid "Emergency Access Point"
 msgstr "Пункт за връзка със спешна помощ"
@@ -20617,5 +20992,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:2727
+#: build/trans_presets.java:2738
 msgid "Edit Emergency Access Point"
 msgstr "Редактирай пункт за връзка със спешна помощ"
@@ -20624,20 +20999,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2741
 msgid "Point Number"
 msgstr "Номер на пункта"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2742
 msgid "Point Name"
 msgstr "Име на пункта"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Phone Number"
 msgstr "Телефонен номер"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Използвайте международен код, като например +12-345-67890)"
@@ -20645,5 +21020,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2748
 msgid "Veterinary"
 msgstr "Ветеринар"
@@ -20652,55 +21027,60 @@
 #. <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:2740
+#: build/trans_presets.java:2751
 msgid "Edit Veterinary"
 msgstr "Редактирай ветеринар"
 
+#: build/trans_presets.java:2758
+#, fuzzy
+msgid "Geography"
+msgstr "WGS84 Geographic"
+
 #. group "Places"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2760
 msgid "Continent"
 msgstr "Континент"
 
 #. item
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2761
 msgid "Edit Continent"
 msgstr "Редактирай континент"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2766
 msgid "Country"
 msgstr "Държава"
 
 #. item
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2767
 msgid "Edit Country"
 msgstr "Редактирай държава"
 
 #. item "Places/Country" text "Name"
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2772
 msgid "State"
 msgstr "Област/Щат"
 
 #. item
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2773
 msgid "Edit State"
 msgstr "Редактирай област/щат"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2778
 msgid "Region"
 msgstr "Област"
 
 #. item
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2779
 msgid "Edit Region"
 msgstr "Редактирай област"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2784
 msgid "County"
 msgstr "Графство"
 
 #. item
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2785
 msgid "Edit County"
 msgstr "Редактирай графство"
@@ -20708,15 +21088,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2791
 msgid "City"
 msgstr "Град (над 100 000)"
 
 #. item
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2792
 msgid "Edit City"
 msgstr "Редактирай голям град"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2797
 msgid "Town"
 msgstr "Град (под 100 000)"
@@ -20724,10 +21104,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2799
 msgid "Edit Town"
 msgstr "Редактирай град"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2804
 msgid "Suburb"
 msgstr "Квартал/предградие"
@@ -20735,25 +21115,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2806
 msgid "Edit Suburb"
 msgstr "Редактирай квартал"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2811
 msgid "Village"
 msgstr "Село"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2812
 msgid "Edit Village"
 msgstr "Редактирай село"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2817
 msgid "Hamlet"
 msgstr "Махала"
 
 #. item
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2818
 msgid "Edit Hamlet"
 msgstr "Редактирай махала"
@@ -20761,5 +21141,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2824
 msgid "Locality"
 msgstr "Местност"
@@ -20767,10 +21147,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2826
 msgid "Edit Locality"
 msgstr "Редактирай местност"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2831
 msgid "Island"
 msgstr "Остров"
@@ -20778,10 +21158,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2833
 msgid "Edit Island"
 msgstr "Редактирай остров"
 
 #. item "Places/Island" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2838
 msgid "Islet"
 msgstr "Скала"
@@ -20789,5 +21169,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2840
 msgid "Edit Islet"
 msgstr "Редактиране на: скала"
@@ -20795,5 +21175,5 @@
 #. item "Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2846
 msgid "Cave Entrance"
 msgstr "Пещерен вход"
@@ -20801,10 +21181,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2848
 msgid "Edit Cave Entrance"
 msgstr "Редактиране пещерен вход"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2852
 msgid "Peak"
 msgstr "Връх"
@@ -20812,10 +21192,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2854
 msgid "Edit Peak"
 msgstr "Редактиране връх"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2859
 msgid "Glacier"
 msgstr "Ледник"
@@ -20823,10 +21203,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2861
 msgid "Edit Glacier"
 msgstr "Редактиране ледник"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2854
+#: build/trans_presets.java:2866
 msgid "Volcano"
 msgstr "Вулкан"
@@ -20834,70 +21214,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2868
 msgid "Edit Volcano"
 msgstr "Редактиране вулкан"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2874
 msgid "Boundaries"
 msgstr "Граници"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2875
 msgid "National"
 msgstr "Национална"
 
 #. item
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2876
 msgid "Edit National Boundary"
 msgstr "Редактирай национална граница"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2881
 msgid "Administrative"
 msgstr "Административна"
 
 #. item
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2882
 msgid "Edit Administrative Boundary"
 msgstr "Редактирай административна граница"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:2887
 msgid "Civil"
 msgstr "Гражданска"
 
 #. item
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2888
 msgid "Edit Civil Boundary"
 msgstr "Редактирай гражданска граница"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2893
 msgid "Political"
 msgstr "Политическа"
 
 #. item
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2894
 msgid "Edit Political Boundary"
 msgstr "Редактирай политическа граница"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2899
 msgid "National park"
 msgstr "Национален парк"
 
 #. item
-#: build/trans_presets.java:2888
+#: build/trans_presets.java:2900
 msgid "Edit National Park Boundary"
 msgstr "Редактирай граница национален парк"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2906
 msgid "Land use"
 msgstr "Земеползване"
 
 #. group "Land use"
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2907
 msgid "Tree"
 msgstr "Дърво"
@@ -20906,15 +21286,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:2898
+#: build/trans_presets.java:2910
 msgid "Edit Tree"
 msgstr "Редактирай дърво"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2915
 msgid "Botanical Name"
 msgstr "Ботаническо название"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2917
 msgid "Wood"
 msgstr "Гора"
@@ -20923,5 +21303,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:2908
+#: build/trans_presets.java:2920
 msgid "Edit Wood"
 msgstr "Редактирай гората"
@@ -20929,17 +21309,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "coniferous"
 msgstr "иглолистен"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "deciduous"
 msgstr "широколистен"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "mixed"
 msgstr "смесен"
 
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2925
 msgid "Forest"
 msgstr "Гора"
@@ -20948,14 +21328,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:2916
+#: build/trans_presets.java:2928
 msgid "Edit Forest Landuse"
 msgstr "Редактирай гора"
 
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2934
 msgid "Nature Reserve"
 msgstr "Природен резерват"
 
 #. item
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2935
 msgid "Edit Nature Reserve"
 msgstr "Редактирай природен резерват"
@@ -20963,25 +21343,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2940
 msgid "Scree"
 msgstr "Сипей"
 
 #. item
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2941
 msgid "Edit Scree"
 msgstr "Редактирай сипей"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2945
 msgid "Scrub"
 msgstr "Шубрак"
 
 #. item
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2946
 msgid "Edit Scrub"
 msgstr "Редактирай шубрака"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2950
 msgid "Fell"
 msgstr "Скалист склон"
@@ -20989,10 +21369,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2952
 msgid "Edit Fell"
 msgstr "Редактирай скалист склон"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2956
 msgid "Heath"
 msgstr "Пустош"
@@ -21000,5 +21380,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2958
 msgid "Edit Heath"
 msgstr "Редактиране пустош"
@@ -21006,5 +21386,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2963
 msgid "Farmyard"
 msgstr "Двор ферма"
@@ -21013,45 +21393,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:2954
+#: build/trans_presets.java:2966
 msgid "Edit Farmyard Landuse"
 msgstr "Редактирай двор ферма"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2971
 msgid "Farmland"
 msgstr "Обработваема земя"
 
 #. item
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2972
 msgid "Edit Farmland Landuse"
 msgstr "Редактирай обработваема земя"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2977
 msgid "Meadow"
 msgstr "Поляна"
 
 #. item
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2978
 msgid "Edit Meadow Landuse"
 msgstr "Редактиране поляна"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2983
 msgid "Vineyard"
 msgstr "Лозе"
 
 #. item
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2984
 msgid "Edit Vineyard Landuse"
 msgstr "Редактирай лозе"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:2989
 msgid "Allotments"
 msgstr "Общинска земя"
 
 #. item
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2990
 msgid "Edit Allotments Landuse"
 msgstr "Редактирай общинска земя"
@@ -21059,25 +21439,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2996
 msgid "Garden"
 msgstr "Градина"
 
 #. item
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2997
 msgid "Edit Garden"
 msgstr "Редактирай градина"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3001
 msgid "Grass"
 msgstr "Трева"
 
 #. item
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3002
 msgid "Edit Grass Landuse"
 msgstr "Редактирай трева"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3007
 msgid "Village Green"
 msgstr "Зелено село"
@@ -21085,10 +21465,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3009
 msgid "Edit Village Green Landuse"
 msgstr "Редактирай зелено селище"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3014
 msgid "Common"
 msgstr "Общи"
@@ -21096,20 +21476,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3004
+#: build/trans_presets.java:3016
 msgid "Edit Common"
 msgstr "Редактирай общи"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3020
 msgid "Park"
 msgstr "Парк"
 
 #. item
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3021
 msgid "Edit Park"
 msgstr "Редактирай парк"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3025
 msgid "Recreation Ground"
 msgstr "Спортна площадка"
@@ -21117,5 +21497,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3027
 msgid "Edit Recreation Ground Landuse"
 msgstr "Редактирай спортна площадка"
@@ -21123,15 +21503,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3033
 msgid "Residential area"
 msgstr "Жилищна зона"
 
 #. item
-#: build/trans_presets.java:3022
+#: build/trans_presets.java:3034
 msgid "Edit Residential Landuse"
 msgstr "Редактирай жилищна зона"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3039
 msgid "Graveyard"
 msgstr "Църковно гробище"
@@ -21139,9 +21519,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3029
+#: build/trans_presets.java:3041
 msgid "Edit Graveyard"
 msgstr "Редактирай църковно гробище"
 
-#: build/trans_presets.java:3035
+#: build/trans_presets.java:3047
 msgid "Cemetery"
 msgstr "Гробище"
@@ -21149,39 +21529,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3049
 msgid "Edit Cemetery Landuse"
 msgstr "Редактирай гробище"
 
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3056
 msgid "Retail"
 msgstr "Търговия на дребно"
 
 #. item
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3057
 msgid "Edit Retail Landuse"
 msgstr "Редактирай търговия на дребно"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3062
 msgid "Commercial"
 msgstr "Търговия"
 
 #. item
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3063
 msgid "Edit Commercial Landuse"
 msgstr "Редактирай търговия"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3056
+#: build/trans_presets.java:3068
 msgid "Industrial"
 msgstr "Промишленост"
 
 #. item
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3069
 msgid "Edit Industrial Landuse"
 msgstr "Редактирай промишленост"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3074
 msgid "Railway land"
 msgstr "Железопътен път"
@@ -21189,15 +21569,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3076
 msgid "Edit Railway Landuse"
 msgstr "Редактирай ЖП"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3081
 msgid "Military"
 msgstr "Военен"
 
 #. item
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3082
 msgid "Edit Military Landuse"
 msgstr "Редакирай военна земя"
@@ -21205,55 +21585,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3088
 msgid "Construction area"
 msgstr "Строителна площадка"
 
 #. item
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3089
 msgid "Edit Construction Landuse"
 msgstr "Редактирай строителна площадка"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3094
 msgid "Brownfield"
 msgstr "Индустриални развалини"
 
 #. item
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3095
 msgid "Edit Brownfield Landuse"
 msgstr "Редактирай ундустриални развалини"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3100
 msgid "Greenfield"
 msgstr "Зелени площи"
 
 #. item
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3101
 msgid "Edit Greenfield Landuse"
 msgstr "Редактирай зелени площи"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3106
 msgid "Landfill"
 msgstr "Сметище"
 
 #. item
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3107
 msgid "Edit Landfill Landuse"
 msgstr "Редактирай сметище"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3112
 msgid "Quarry"
 msgstr "Кариера"
 
 #. item
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3113
 msgid "Edit Quarry Landuse"
 msgstr "Редактирай кариера"
 
 #. group "Relations"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3122
 msgid "Multipolygon"
 msgstr "Мултиполигон"
@@ -21263,5 +21643,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:3114
+#: build/trans_presets.java:3126
 msgid "Edit Multipolygon"
 msgstr "Редактиране мултиполигон"
@@ -21270,10 +21650,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3132
 msgid "outer segment"
 msgstr "външен сегмент"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3133
 msgid "inner segment"
 msgstr "вътрешен сегмент"
@@ -21281,5 +21661,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3136
 msgid "Turn restriction"
 msgstr "Ограничения при завиване"
@@ -21288,5 +21668,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3139
 msgid "Edit Turn Restriction"
 msgstr "Редактиране на ограничения при завиване"
@@ -21294,34 +21674,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "Restriction"
 msgstr "Ограничения"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_left_turn"
 msgstr "забранен ляв завой"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_right_turn"
 msgstr "забранен десен завой"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_straight_on"
 msgstr "забранено напред"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_u_turn"
 msgstr "забранен обратен завой"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_right_turn"
 msgstr "само десен завой"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_left_turn"
 msgstr "само ляв завой"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_straight_on"
 msgstr "само направо"
@@ -21330,15 +21710,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3146
 msgid "from way"
 msgstr "от път"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3147
 msgid "via node or way"
 msgstr "през точка или път"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3148
 msgid "to way"
 msgstr "до път"
@@ -21346,5 +21726,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3151
 msgid "Route"
 msgstr "Маршрут"
@@ -21353,5 +21733,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3154
 msgid "Edit Route"
 msgstr "Редактиране маршрут"
@@ -21359,5 +21739,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "Route type"
 msgstr "Тип маршрут"
@@ -21429,5 +21809,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3144 build/trans_style.java:233
+#: build/trans_presets.java:3156 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -21436,17 +21816,17 @@
 msgstr "велосипед"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "bus"
 msgstr "автобус"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "road"
 msgstr "път"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ferry"
 msgstr "ферибот"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ski"
 msgstr "ски"
@@ -21499,5 +21879,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3144 build/trans_style.java:247
+#: build/trans_presets.java:3156 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -21506,13 +21886,13 @@
 msgstr "пеш"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "hiking"
 msgstr "туристически маршрут"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "tram"
 msgstr "трамваен маршрут"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "detour"
 msgstr "обиколка"
@@ -21526,10 +21906,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3144 build/trans_style.java:1206
+#: build/trans_presets.java:3156 build/trans_style.java:1206
 msgid "subway"
 msgstr "метро"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3159
 msgid "Symbol description"
 msgstr "Описание на символ"
@@ -21537,31 +21917,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3162
 msgid "Network"
 msgstr "Мрежа"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "proposed"
 msgstr "предложен"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "alternate"
 msgstr "алтернативен"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "temporary"
 msgstr "временен"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "connection"
 msgstr "връзка"
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "Color (hex)"
 msgstr "Цвят (hex)"
@@ -21570,30 +21950,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3168
 msgid "route segment"
 msgstr "сегмент от маршрут"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3169
 msgid "forward segment"
 msgstr "сегмент напред"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3170
 msgid "backward segment"
 msgstr "сегмент назад"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3171
 msgid "halt point"
 msgstr "точка за спиране"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3172
 msgid "forward halt point"
 msgstr "точка за спиране напред"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3173
 msgid "backward halt point"
 msgstr "точка за спиране назад"
@@ -22031,11 +22411,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3375 build/trans_style.java:3376
-#: build/trans_style.java:3946 build/trans_style.java:4254
-#: build/trans_style.java:4263 build/trans_style.java:4272
-#: build/trans_style.java:4281 build/trans_style.java:4290
-#: build/trans_style.java:4299 build/trans_style.java:4308
-#: build/trans_style.java:4309 build/trans_style.java:4318
-#: build/trans_style.java:4327
+#: build/trans_style.java:3383 build/trans_style.java:3384
+#: build/trans_style.java:3954 build/trans_style.java:4262
+#: build/trans_style.java:4271 build/trans_style.java:4280
+#: build/trans_style.java:4289 build/trans_style.java:4298
+#: build/trans_style.java:4307 build/trans_style.java:4316
+#: build/trans_style.java:4317 build/trans_style.java:4326
+#: build/trans_style.java:4335
 msgid "deprecated"
 msgstr "остарял, вече невалиден"
@@ -24059,5 +24439,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3294
+#: build/trans_style.java:3302
 msgid "light_water"
 msgstr "светла_вода"
@@ -24739,8 +25119,17 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="boundary_stone"/>
+#. <icon annotate="true" src="historic/boundary_stone.png"/>
 #: build/trans_style.java:2990 build/trans_style.java:2998
 #: build/trans_style.java:3006 build/trans_style.java:3014
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
+#: build/trans_style.java:3054
 msgid "historic"
 msgstr "исторически"
@@ -24754,5 +25143,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3095
 msgid "quarry"
 msgstr "кариер"
@@ -24766,5 +25155,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "landfill"
 msgstr "сметище"
@@ -24786,5 +25175,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3103 build/trans_style.java:3111
+#: build/trans_style.java:3111 build/trans_style.java:3119
 msgid "basin"
 msgstr "басейн"
@@ -24798,5 +25187,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3127
 msgid "forest"
 msgstr "гора"
@@ -24810,5 +25199,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3159
 msgid "farmyard"
 msgstr "двор ферма"
@@ -24831,5 +25220,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3160 build/trans_style.java:3168
+#: build/trans_style.java:3168 build/trans_style.java:3176
 msgid "retail"
 msgstr "търговия на дребно"
@@ -24843,5 +25232,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3176
+#: build/trans_style.java:3184
 msgid "industrial"
 msgstr "индустрия"
@@ -24855,5 +25244,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "brownfield"
 msgstr "индустриални развалини"
@@ -24867,5 +25256,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "greenfield"
 msgstr "зелена площ"
@@ -24879,5 +25268,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "railland"
 msgstr "ЖП"
@@ -24934,7 +25323,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3217 build/trans_style.java:3252
-#: build/trans_style.java:3260 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3225 build/trans_style.java:3260
+#: build/trans_style.java:3268 build/trans_style.java:3276
+#: build/trans_style.java:3284 build/trans_style.java:3292
 msgid "military"
 msgstr "военни"
@@ -24948,5 +25337,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3225
+#: build/trans_style.java:3233
 msgid "cemetery"
 msgstr "гробище"
@@ -24959,5 +25348,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3301
+#: build/trans_style.java:3309
 msgid "peak"
 msgstr "връх"
@@ -24972,5 +25361,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3310
+#: build/trans_style.java:3318
 msgid "glacier"
 msgstr "ледник"
@@ -24984,5 +25373,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "volcano"
 msgstr "вулкан"
@@ -25037,8 +25426,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3326 build/trans_style.java:3327
-#: build/trans_style.java:3335 build/trans_style.java:3351
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440
+#: build/trans_style.java:3334 build/trans_style.java:3335
+#: build/trans_style.java:3343 build/trans_style.java:3359
+#: build/trans_style.java:3432 build/trans_style.java:3440
+#: build/trans_style.java:3448
 msgid "natural"
 msgstr "природа"
@@ -25052,5 +25441,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3343
+#: build/trans_style.java:3351
 msgid "scrub"
 msgstr "храсталак"
@@ -25064,5 +25453,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3359
+#: build/trans_style.java:3367
 msgid "heath"
 msgstr "пустош"
@@ -25076,5 +25465,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3408
+#: build/trans_style.java:3416
 msgid "mud"
 msgstr "кал"
@@ -25088,5 +25477,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "beach"
 msgstr "плаж"
@@ -25164,8 +25553,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
-#: build/trans_style.java:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496 build/trans_style.java:3504
+#: build/trans_style.java:3512 build/trans_style.java:3520
 msgid "route"
 msgstr "маршрут"
@@ -25213,7 +25602,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3522 build/trans_style.java:3530
-#: build/trans_style.java:3538 build/trans_style.java:3546
-#: build/trans_style.java:3554
+#: build/trans_style.java:3530 build/trans_style.java:3538
+#: build/trans_style.java:3546 build/trans_style.java:3554
+#: build/trans_style.java:3562
 msgid "boundary"
 msgstr "граница"
@@ -25363,11 +25752,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090
+#: build/trans_style.java:4002 build/trans_style.java:4010
+#: build/trans_style.java:4018 build/trans_style.java:4026
+#: build/trans_style.java:4034 build/trans_style.java:4042
+#: build/trans_style.java:4050 build/trans_style.java:4058
+#: build/trans_style.java:4066 build/trans_style.java:4074
+#: build/trans_style.java:4082 build/trans_style.java:4090
+#: build/trans_style.java:4098
 msgid "place"
 msgstr "място"
@@ -25415,6 +25804,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4207 build/trans_style.java:4214
-#: build/trans_style.java:4221 build/trans_style.java:4228
+#: build/trans_style.java:4215 build/trans_style.java:4222
+#: build/trans_style.java:4229 build/trans_style.java:4236
 msgid "address"
 msgstr "адрес"
@@ -25722,40 +26111,24 @@
 msgstr ""
 
-#~ msgid "All the ways were empty"
-#~ msgstr "Всички линии бяха празни"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Обединяване точки от различни релации?"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Сливане въпреки всичко"
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
+#~ msgid "Close current changeset"
+#~ msgstr "Затваряне на текущия списък с промени"
+
+#~ msgid "There is currently no changeset open."
+#~ msgstr "Няма отворен сисък с промени."
+
+#~ msgid "- running version is {0}"
+#~ msgstr "- изпълняващата се версия е {0}"
+
+#~ msgid "Use a new changeset and close it"
+#~ msgstr "Използване на нов списък с промени и затваряне"
+
+#~ msgid "Use the existing changeset {0} and close it after upload"
 #~ msgstr ""
-#~ "Избраните точки участват в различни връзки. Искате ли да ги обедините, "
-#~ "въпреки това?"
-
-#~ msgid "No currently open changeset. Opening a new changeset..."
-#~ msgstr "Няма отворен списък с промени. Отваряме нов списък ..."
-
-#~ msgid "Unknown version"
-#~ msgstr "Неизвестна версия"
-
-#~ msgid "Version number missing from OSM data"
-#~ msgstr "Версията липсва от OSM данните."
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "Намерен е елемент <nd> извън път."
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "към <nd> няма обръщения ref."
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Открит е маркер <member> извън релация."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Неправилен код на точка"
+#~ "Използване на съществуващия списък с промени {0}. След качване се затваря."
+
+#~ msgid "Use the existing changeset {0} and leave it open"
+#~ msgstr ""
+#~ "Използване на съществуващия списък с промени {0}. След качване остава "
+#~ "отворен."
 
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
@@ -25789,7 +26162,22 @@
 #~ msgstr "Прехвърлянето прекъснато поради грешка (повторен опит след 5 сек):"
 
+#~ msgid "Unknown version"
+#~ msgstr "Неизвестна версия"
+
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "Намерен е елемент <nd> извън път."
+
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr "Игнориране на път, понеже съдържа несъществуващ елемент: {0}\n"
 
+#~ msgid "<nd> has zero ref"
+#~ msgstr "към <nd> няма обръщения ref."
+
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "Открит е маркер <member> извън релация."
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "Неправилен код на точка"
+
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "За работа на модула е нужна по-нова версия на JOSM: {0}."
@@ -25830,7 +26218,4 @@
 #~ msgid "Contacting the OSM server..."
 #~ msgstr "Свързване с OSM сървър..."
-
-#~ msgid "Add Selected"
-#~ msgstr "Добавяне на избраните"
 
 #~ msgid "Cannot connect to server."
@@ -26096,4 +26481,10 @@
 #~ msgstr "Разрешаване {0} конфликти в {1} обекти"
 
+#~ msgid "All the ways were empty"
+#~ msgstr "Всички линии бяха празни"
+
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "Обединяване точки от различни релации?"
+
 #~ msgid "Unknown file extension."
 #~ msgstr "Неизвестно файлово разширение."
@@ -26162,4 +26553,7 @@
 #~ msgid "Delete and Download"
 #~ msgstr "Изтриване и Зареждане"
+
+#~ msgid "Merge Anyway"
+#~ msgstr "Сливане въпреки всичко"
 
 #~ msgid "Continue anyway"
@@ -26257,4 +26651,7 @@
 #~ msgid "Remove route nodes"
 #~ msgstr "Премахване на възли от маршрут"
+
+#~ msgid "Version number missing from OSM data"
+#~ msgstr "Версията липсва от OSM данните."
 
 #~ msgid "Data upload failed for unknown reason"
@@ -26294,7 +26691,4 @@
 #~ msgstr "Проверка дали примитив {0} е заминал..."
 
-#~ msgid "Delete mine"
-#~ msgstr "Изтриване на моите"
-
 #~ msgid "API initialization failed"
 #~ msgstr "Неуспешна иницилизация на API"
@@ -26312,7 +26706,4 @@
 #~ msgstr "Липсва примитив."
 
-#~ msgid "Change {0} {1}"
-#~ msgstr "Промени {0} {1}"
-
 #~ msgid "ways"
 #~ msgstr "линии"
@@ -26320,7 +26711,4 @@
 #~ msgid "nodes"
 #~ msgstr "точки"
-
-#~ msgid "changesets"
-#~ msgstr "набори от промени"
 
 #~ msgid ""
@@ -26353,4 +26741,11 @@
 #~ msgstr "Изтриване слой {0} от {1}"
 
+#~ msgid ""
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
+#~ msgstr ""
+#~ "Избраните точки участват в различни връзки. Искате ли да ги обедините, "
+#~ "въпреки това?"
+
 #~ msgid "Remove relation member {0} {1}"
 #~ msgstr "Премахване на члена {0} {1} от връзката"
@@ -26358,2 +26753,5 @@
 #~ msgid "relations"
 #~ msgstr "връзки"
+
+#~ msgid "No currently open changeset. Opening a new changeset..."
+#~ msgstr "Няма отворен списък с промени. Отваряме нов списък ..."
Index: applications/editors/josm/i18n/po/cs.po
===================================================================
--- applications/editors/josm/i18n/po/cs.po	(revision 17655)
+++ applications/editors/josm/i18n/po/cs.po	(revision 17697)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-12 18:11+0200\n"
-"PO-Revision-Date: 2009-09-12 08:13+0000\n"
-"Last-Translator: Jezevec <Unknown>\n"
+"POT-Creation-Date: 2009-09-19 13:00+0200\n"
+"PO-Revision-Date: 2009-09-15 15:02+0000\n"
+"Last-Translator: Martin Petricek <singularita@gmail.com>\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-09-12 16:07+0000\n"
+"X-Launchpad-Export-Date: 2009-09-19 10:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -42,10 +42,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:543
 #: ../core/src/org/openstreetmap/josm/Main.java:551
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -70,5 +70,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -86,6 +86,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:358
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
@@ -101,6 +101,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
@@ -125,10 +125,10 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
 msgid "Save and Exit"
 msgstr "Uložit a ukončit"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
 msgid "Discard and Exit"
 msgstr "Neuložit změny a ukončit"
@@ -139,4 +139,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
@@ -144,27 +145,28 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:296
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:258
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:613
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
@@ -172,5 +174,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -190,6 +192,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
@@ -206,17 +208,17 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:654
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1528
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -227,6 +229,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
@@ -279,9 +281,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:607
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:609
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -341,5 +343,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
 msgid "Plugins"
@@ -391,5 +393,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Sloučit"
@@ -479,5 +481,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -490,4 +492,5 @@
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -523,6 +526,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
@@ -531,6 +534,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:346
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
@@ -644,4 +647,46 @@
 msgstr "Není žádný konflikt, na který by se mohlo přiblížit"
 
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#, fuzzy
+msgid "Close open changesets"
+msgstr "Žádná otevřená sada změn"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#, fuzzy
+msgid "Closes open changesets"
+msgstr "Žádná otevřená sada změn"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
+#: ../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:114
+#, java-format
+msgid "File: {0}"
+msgstr "Soubor: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
+#, fuzzy
+msgid "There are no open changesets"
+msgstr "Žádná otevřená sada změn"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
+#, fuzzy
+msgid "No open changesets"
+msgstr "Žádná otevřená sada změn"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
+#, fuzzy
+msgid "Downloading open changesets ..."
+msgstr "Zavírám sadu změn..."
+
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
@@ -736,10 +781,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:123
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
@@ -782,31 +828,30 @@
 msgstr "Rozdělit zvolené uzly ve stejné vzdálenosti podél přímky."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
 msgid "Download from OSM..."
 msgstr "Stáhnout z OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
 msgid "Download map data from the OSM server."
 msgstr "Stáhnout data z OSM serveru"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
-#, java-format
-msgid "File: {0}"
-msgstr "Soubor: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
 msgid "Download"
 msgstr "Stáhnout"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
 msgid "Please select at least one task to download"
 msgstr "Prosím zvol aspoň jeden úkol ke stažení"
@@ -827,5 +872,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1527
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307
@@ -845,6 +890,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:376
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1415
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
 msgid "Duplicate"
 msgstr "Duplikovat"
@@ -918,10 +963,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
@@ -1007,25 +1053,26 @@
 msgstr "Sloučit aktuální vrstvu do jiné vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 msgid "Merge Nodes"
 msgstr "Spojit uzly"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
 msgid "Merge nodes into the oldest one."
 msgstr "Spoj uzly do nejstaršího"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
 msgid "Please select at least two nodes to merge."
 msgstr "Zvolte minimálně dva uzly ke spojení"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:394
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
@@ -1041,8 +1088,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -1068,6 +1115,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
@@ -1076,9 +1127,9 @@
 msgstr "parameter ''{0}'' nesmí být null"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr "Nemohu spojit uzly: Smazala by se tak cesta, která je stále používána."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283
 #, java-format
 msgid "Merge {0} nodes"
@@ -1150,5 +1201,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "New"
 msgstr "Nový"
@@ -1260,6 +1311,7 @@
 msgid "Pasting {0} tag"
 msgid_plural "Pasting {0} tags"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Vkládám {0} tag"
+msgstr[1] "Vkládám {0} tagy"
+msgstr[2] "Vkládám {0} tagů"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:125
@@ -1267,6 +1319,7 @@
 msgid "to {0} primitive"
 msgid_plural "to {0} primtives"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "na {0} objekt"
+msgstr[1] "na {0} objekty"
+msgstr[2] "na {0} objektů"
 
 #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
@@ -1424,14 +1477,15 @@
 msgstr "Nápověda: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
 msgid "Status Report"
 msgstr "Zpráva o stavu"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 msgid "Copy to clipboard and close"
 msgstr "Zkopírovat do schránky a zavřít"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
@@ -1511,25 +1565,4 @@
 msgstr "Rozdělit cestu {0} do {1} částí"
 
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24
-msgid "Close current changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-msgid "Close the current changeset ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41
-msgid "There is currently no changeset open."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42
-msgid "No open changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60
-msgid "Closing changeset"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
@@ -1697,41 +1730,39 @@
 msgstr "Prázdný výběr"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Nahrát do OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 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:133
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#, java-format
 msgid ""
 "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
 "resolve them first.</html>"
 msgstr ""
-"<html>Není zde žádné vrstvy pro zdrojovou vrstvu<br>''{0}''<br>které by měly "
-"být sloučeny.</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
 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:166
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 msgid "No changes to upload."
 msgstr "Žádné změny k nahrání."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Synchronizovat pouze {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
 msgid "Synchronize entire dataset"
 msgstr "Synchronizovat celý dataset"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
 #, java-format
 msgid ""
@@ -1752,17 +1783,17 @@
 "pro přerušení a pokračování editace.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
 msgid "Conflict detected"
 msgstr "Detekován konflikt"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr "Neočekávaná návratová hodnota. Navráceno {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:267
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
 #, java-format
 msgid ""
@@ -1778,31 +1809,43 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
+msgid ""
+"<html>Uploading <strong>failed</strong> because you've been "
+"using<br>changeset {0} which was already closed at {1}.<br>Please upload "
+"again with a new or an existing open changeset."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+#, fuzzy
+msgid "Changeset closed"
+msgstr "Informace o sadě změn"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr "Varování: chybná hlavička \"{0}\" neodpovídá očekávanému vzoru \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr "Chybná hlavička \"{0}\" neodpovídá očekávanému vzoru \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr "<html>Aktualizace <strong>selhala</strong>.<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
 msgid "Upload to OSM API failed"
 msgstr "Nahrándí do OSM API selhalo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
 msgid "Updating primitive"
 msgstr "Aktualizuji prvky"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
 #, java-format
 msgid "Uploading data for layer ''{0}''"
-msgstr ""
+msgstr "Nahrávám na server data pro vrstvu ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
@@ -2024,14 +2067,14 @@
 msgstr "Přidat uzel do cesty a spojit"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:930
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:932
 msgid "Create new node."
 msgstr "Vytvořit nový uzel."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
 msgid "Select node under cursor."
 msgstr "Vybrat uzel pod kurzorem."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939
 #, java-format
 msgid "Insert new node into way."
@@ -2041,14 +2084,14 @@
 msgstr[2] "Vložit nový uzel do {0} cest."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
 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:949
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951
 msgid "Continue way from last node."
 msgstr "Pokračovat v cestě od posledního uzlu."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:972
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:974
 msgid "Finish drawing."
 msgstr "Dokončit kreslení"
@@ -2070,14 +2113,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:547
 msgid "Release the mouse button to select the objects in the rectangle."
-msgstr "Pusť myší tlačítko k vybrání obejktů v obdélníku"
+msgstr "Pusťte myší tlačítko k vybrání obejktů v obdélníku"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:266
 msgid "Draw a rectangle of the desired size, then release the mouse button."
-msgstr "Nakresli obdélník požadované velikosti a pak pusť myší tlačítko."
+msgstr "Nakreslete obdélník požadované velikosti a pak pusťte myší tlačítko."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:268
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:551
 msgid "Release the mouse button to stop rotating."
-msgstr "Pusť myší tlačítko k zastavení otaáčení"
+msgstr "Pusťte myší tlačítko k zastavení otaáčení"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:270
@@ -2131,8 +2174,11 @@
 "Really move them?"
 msgstr ""
+"Přesunuli jste více než {0} objektů. Nechtěný přesun velkého množství "
+"objektů najednou je častá chyba.\n"
+"Opravdu přesunout?"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478
 msgid "Always move and don't show dialog again"
-msgstr ""
+msgstr "Vždy přesunout a tento dialog již více nezobrazovat"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
@@ -2167,62 +2213,72 @@
 "nahoru dolu doleva doprava; pohyb se zoomem možno též pravým tlačítkem myši"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Hledat..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Hledat objekty."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
 msgid "Can't search because there is no loaded data."
 msgstr "Nelze hledat jelikož nejsou nahrána žádná data."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
+#, fuzzy
+msgid "Please enter a filter string."
+msgstr "Zadjte hledaný řetězec."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
 msgid "Please enter a search string."
 msgstr "Zadjte hledaný řetězec."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
 msgid "replace selection"
 msgstr "nahradit označené"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72
 msgid "add to selection"
 msgstr "přidat k výběru"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73
 msgid "remove from selection"
 msgstr "odebrat z výběru"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
+#, fuzzy
+msgid "find in selection"
+msgstr "přidat k výběru"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81
 msgid "case sensitive"
 msgstr "velikost písmen rozhoduje"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82
 msgid "regular expression"
 msgstr "regulární výraz"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
 msgstr ""
 "<b>Baker Street</b> - 'Baker' a 'Street' v jakémkoliv klíči nebo jménu."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
 msgstr ""
 "<b>\"Baker Street\"</b> - 'Baker Street' v jakémkoliv klíči nebo jménu."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
 msgstr "<b>name:Bak</b> - 'Bak' kdekoliv ve jménu."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
+msgstr "<b>type=route</b> - klíč 'type' s hodnotou přesně 'route'."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid ""
 "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
@@ -2230,50 +2286,50 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
 msgstr "<b>-name:Bak</b> - neobsahuje 'Bak' ve jménu."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - klíč 'foot' nastavený na jakoukoliv hodnotu."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
 msgid "<u>Special targets:</u>"
 msgstr "<u>Speciální cíle:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr "<b>type:</b> - typ objektu (<b>node</b>, <b>way</b>, <b>relation</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - všechny objekty změněné uživatelem"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
+msgstr "<b>id:</b>... - objekt s daným ID (0 pro nové objekty)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 msgid "<b>nodes:</b>... - object with given number of nodes"
 msgstr "<b>nodes:</b>... - objekt s daným počtem uzlů"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - všechny změněné objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - všechny vybrané objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - všechny nekompletní objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - všechny objekty bez tagů"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2281,5 +2337,5 @@
 "<b>child <i>výraz</i></b> - všechny podobjekty objektů odpovídajících výrazu"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2287,55 +2343,72 @@
 "<b>parent <i>výraz</i></b> - všechny rodiče objektů odpovídajících výrazu"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Použijte <b>|</b> nebo <b>OR</b> ke kombinaci s logickým \"nebo\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
 "Použijte <b>\"</b> jako uvozovky (například pokud klíč obsahuje dvojtečku)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Použijte <b>(</b> a <b>)</b> k seskupení výrazů"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
+msgid "Filter"
+msgstr "Filtrovat"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Hledat"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
+msgid "Submit filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "Start Search"
 msgstr "Začít hledání"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Nebyly nalezeny záznamy pro \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Nic nebylo přidáno výběrem hledáním \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Nic nebylo odstraněno výběrem hledáním \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#, fuzzy, java-format
+msgid "Nothing find in selection by searching for ''{0}''"
+msgstr "Nic nebylo přidáno výběrem hledáním \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262
 #, java-format
 msgid "Found {0} matches"
 msgstr "Nalezeno {0} odpovídajích výrazů"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283
 msgid "RX"
 msgstr "RX"
@@ -2433,60 +2506,60 @@
 #, java-format
 msgid "Add node {0}"
-msgstr ""
+msgstr "Přidat bod {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
 #, java-format
 msgid "Add way {0}"
-msgstr ""
+msgstr "Přidat cestu {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68
 #, java-format
 msgid "Add relation {0}"
-msgstr ""
+msgstr "Přidat relaci {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
 #, java-format
 msgid "Change node {0}"
-msgstr ""
+msgstr "Změnit bod {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50
 #, java-format
 msgid "Change way {0}"
-msgstr ""
+msgstr "Změnit cestu {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51
 #, java-format
 msgid "Change relation {0}"
-msgstr ""
+msgstr "Změnit relaci {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
 #, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
-msgstr ""
+msgstr "Odstranit \"{0}\" pro uzel ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
 #, java-format
 msgid "Remove \"{0}\" for way ''{1}''"
-msgstr ""
+msgstr "Odstranit \"{0}\" pro cestu ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
 #, java-format
 msgid "Remove \"{0}\" for relation ''{1}''"
-msgstr ""
+msgstr "Odstranit \"{0}\" pro relaci ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
 #, java-format
 msgid "Set {0}={1} for node ''{2}''"
-msgstr ""
+msgstr "Nastavit {0}={1} pro uzel ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
 #, java-format
 msgid "Set {0}={1} for way ''{2}''"
-msgstr ""
+msgstr "Nastavit {0}={1} pro cestu ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
 #, java-format
 msgid "Set {0}={1} for relation ''{2}''"
-msgstr ""
+msgstr "Nastavit {0}={1} pro relaci ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
@@ -2523,5 +2596,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
 msgid "Double conflict"
 msgstr "Dvojí konflikt"
@@ -2539,5 +2612,5 @@
 #, java-format
 msgid "Add conflict for ''{0}''"
-msgstr ""
+msgstr "Přidání konfliktu pro ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
@@ -2550,5 +2623,5 @@
 #, java-format
 msgid "Resolve conflicts in coordinates in {0}"
-msgstr ""
+msgstr "Vyřešení konfliktu v souřadnicích pro {0}"
 
 #. should not happen
@@ -2562,6 +2635,7 @@
 msgid "Delete {0} object"
 msgid_plural "Delete {0} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Smazat {0} objekt"
+msgstr[1] "Smazat {0} objekty"
+msgstr[2] "Smazat {0} objektů"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:132
@@ -2569,6 +2643,7 @@
 msgid "Delete {0} node"
 msgid_plural "Delete {0} nodes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Smazat {0} uzel"
+msgstr[1] "Smazat {0} uzly"
+msgstr[2] "Smazat {0} uzlů"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:133
@@ -2576,6 +2651,7 @@
 msgid "Delete {0} way"
 msgid_plural "Delete {0} ways"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Smazat {0} cestu"
+msgstr[1] "Smazat {0} cesty"
+msgstr[2] "Smazat {0} cest"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:134
@@ -2583,6 +2659,7 @@
 msgid "Delete {0} relation"
 msgid_plural "Delete {0} relations"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Smazat {0} relaci"
+msgstr[1] "Smazat {0} relace"
+msgstr[2] "Smazat {0} relací"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:195
@@ -2601,4 +2678,6 @@
 "from relation?</html>"
 msgstr ""
+"<html>Výběr \"{0}\" je použit v relaci \"{1}\" s rolí {2}.<br>Smazat z "
+"relace?</html>"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213
@@ -2608,4 +2687,5 @@
 "</html>"
 msgstr ""
+"<html>Výběr \"{0}\" je použit v relaci \"{1}\".<br>Smazat z relace?</html>"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446
@@ -2633,5 +2713,5 @@
 #, java-format
 msgid "Resolve conflicts in deleted state in {0}"
-msgstr ""
+msgstr "Vyřešení konfliktu ve stavu smazání pro {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:116
@@ -2674,15 +2754,15 @@
 #, java-format
 msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
+msgstr "Odstranit uzel ''{0}'' na pozici {1} z relace ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:70
 #, java-format
 msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
+msgstr "Odstranit cestu ''{0}'' na pozici {1} z relace ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:71
 #, java-format
 msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
+msgstr "Odstranit relaci ''{0}'' na pozici {1} z relace ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:141
@@ -2701,15 +2781,15 @@
 #, java-format
 msgid "Resolve {0} tag conflicts in node {1}"
-msgstr ""
+msgstr "Vyřešení {0} konfliktů tagů v uzlu {1}"
 
 #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70
 #, java-format
 msgid "Resolve {0} tag conflicts in way {1}"
-msgstr ""
+msgstr "Vyřešení {0} konfliktů tagů v cestě {1}"
 
 #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71
 #, java-format
 msgid "Resolve {0} tag conflicts in relation {1}"
-msgstr ""
+msgstr "Vyřešení {0} konfliktů tagů v relaci {1}"
 
 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66
@@ -2721,20 +2801,20 @@
 #, java-format
 msgid "Resolve version conflicts for node {0}"
-msgstr ""
+msgstr "Vyřešení konfliktu verzí uzlu {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42
 #, java-format
 msgid "Resolve version conflicts for way {0}"
-msgstr ""
+msgstr "Vyřešení konfliktu verzí cesty {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
 #, java-format
 msgid "Resolve version conflicts for relation {0}"
-msgstr ""
+msgstr "Vyřešení konfliktu verzí relace {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:54
 #, java-format
 msgid "Resolve conflicts in node list of of way {0}"
-msgstr ""
+msgstr "Vyřešení konfliktů v seznamu uzlů cesty {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:72
@@ -2772,4 +2852,5 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:134
 msgid "Old value"
 msgstr "Stará hodnota"
@@ -2933,27 +3014,59 @@
 
 #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
 msgid "E"
 msgstr "V"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:59
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:203
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
 msgid "Changeset {0}"
 msgstr "Sada změn {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:323
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
 msgstr "požadován parametr {0} > 0. Zadáno {1}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:325
-#, fuzzy, java-format
-msgid "paramete''{0}'' must not be null"
-msgstr "parameter ''{0}'' nesmí být null"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331
-#, fuzzy, java-format
-msgid "unsupported value ''{0}'' or parameter ''{1}''"
-msgstr "Žádná použitelná role ''{0}'' pro cestu ''{1}''."
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "H"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "Text"
+msgstr "text"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "C"
+msgstr "CS"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "I"
+msgstr "CI"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "M"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#, fuzzy
+msgid "R"
+msgstr "RX"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+msgid "A"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+msgid "D"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+msgid "F"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
@@ -2967,29 +3080,29 @@
 msgstr "Varování: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
+#, java-format
 msgid "expected id >= 0. Got {0}"
-msgstr "neočekávaný index sloupce. Zadáno {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:257
+msgstr "očekáváno id >= 0. Nalezeno {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
 msgid "a primitive with id=0 can't be invisible"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:293
-#, fuzzy, java-format
+msgstr "objekt s id=0 nemůže být neviditelný"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
+#, java-format
 msgid "id > 0 expected. Got {0}"
-msgstr "Neočekávaný token: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295
-#, fuzzy, java-format
+msgstr "očekáváno id > 0. Nalezeno {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
+#, java-format
 msgid "version > 0 expected. Got {0}"
-msgstr "Neočekávaný token: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26
+msgstr "očekávána verze > 0. Nalezena {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
 msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
 msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
@@ -3008,5 +3121,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
 msgid "can't add node {0} to incomplete way {1}"
-msgstr ""
+msgstr "nelze přidat uzel {0} do nekompletní cesty {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154
@@ -3056,9 +3169,9 @@
 msgstr "parameter {0} není v rozsahu 0..{1}, zadáno {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:247
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:249
 msgid "Area style way is not closed."
 msgstr "Cesta se stylem plochy není uzavřená."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:478
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:482
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
@@ -3067,118 +3180,118 @@
 #. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
 #. TODO Remove useless nullcheck when RelationMember.member is encalupsed
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:851
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855
 msgid "Empty member in relation."
 msgstr "Prázdný prvek v relaci."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:853
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Odstraněn prvek ''{0}'' z relace."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:864
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Cesta ''{0}'' s méně, než dvěmi body."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "More than one \"from\" way found."
 msgstr "Nalezena více než jedna \"from\" cesta."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "More than one \"to\" way found."
 msgstr "Nalezeno více cílových \"to\" cest."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "More than one \"via\" found."
 msgstr "Nalezen více než jeden \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Neznámá role ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Neznámý typ prvku pro ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"from\" way found."
 msgstr "Nenazezena příchozí cesta \"from\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"to\" way found."
 msgstr "Nenalezena odchozí cesta \"to\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652
 msgid "No \"via\" node or way found."
 msgstr "Nenalezen \"via\" uzel nebo cesta."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "Cesta \"from\" nezačíná, ani nekončí v uzlu \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "Cesta \"to\" nezačíná nebo nekončí v uzlu \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "Cesta \"from\" nezačíná nebo nekončí v uzlu \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "Cesta \"to\" nezačíná nebo nekončí na cestě \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Styl pro omezení {0} nenalezen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Žádná použitelná role ''{0}'' pro cestu ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:885
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Ne-cesta ''{0}'' v multipolygonu."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:943
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Multipolygon ''{0}'' nemá žádnou vnější cestu."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1032
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Cesty ''{0}'' a ''{1}'' se protínají."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1044
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Vnitřní cesta ''{0}'' je venku."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1097
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Styl pro vnitřní cestu ''{0}'' odpovídá multipolygonu."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1123
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Styl pro vnější cestu ''{0}'' nesedí."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1327
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331
 msgid "untagged"
 msgstr "nepopsaný"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1328
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332
 msgid "text"
 msgstr "text"
@@ -3202,5 +3315,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
@@ -3223,5 +3336,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
@@ -3277,5 +3390,5 @@
 msgstr "Lambertova zóna (Francie)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambertova zóna (Estonsko)"
@@ -3317,9 +3430,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:38
 msgid "Do not show again"
 msgstr "Znovu nezobrazovat"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
 #, java-format
@@ -3327,31 +3440,31 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:91
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:116
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154
 msgid "incomplete"
 msgstr "nekompletní"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
 msgid "highway"
 msgstr "silnice"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
-#: build/trans_presets.java:3144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: build/trans_presets.java:3156
 msgid "railway"
 msgstr "železnice"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
 msgid "waterway"
 msgstr "vodní tok"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "landuse"
 msgstr "využití oblasti (landuse)"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:474
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
@@ -3362,5 +3475,5 @@
 msgstr[2] "{0} uzlů"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
 #, java-format
 msgid "{0} member"
@@ -3372,5 +3485,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:59
 msgid "Precondition violation"
-msgstr ""
+msgstr "Porušení předpokladů"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:81
@@ -3388,10 +3501,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
 msgid "Internal Server Error"
-msgstr ""
+msgstr "Interní chyba serveru"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
-#, fuzzy
 msgid "Bad Request"
-msgstr "Upravit pálkové (raketové) sporty"
+msgstr "Špatný požadavek"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144
@@ -3407,10 +3519,5 @@
 msgstr "Zprávu dne není možné zobrazit"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67
-#, java-format
-msgid "- running version is {0}"
-msgstr "- běžící verze je {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:95
 msgid "Downloading \"Message of the day\""
 msgstr "Stahuji zprávu dne"
@@ -3482,10 +3589,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:162
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
 msgid "Username"
 msgstr "Jméno uživatele"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
 msgid "Password"
 msgstr "Heslo"
@@ -3608,5 +3715,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226
 msgid "Presets"
 msgstr "Předvolby"
@@ -3680,38 +3787,49 @@
 msgstr "měřítko"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Zeměpisná délka na místě kurzoru myši."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The name of the object at the mouse pointer."
 msgstr "Jméno objektu na místě kurzoru myši."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Zeměpisná šířka na místě kurzoru myši."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The angle between the previous and the current way segment."
 msgstr "Úhel mezi předchozím a současným úsekem cesty."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The (compass) heading of the line segment being drawn."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The length of the new way segment being drawn."
 msgstr "Délka nového nakresleného segmentu trasy."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199
+msgid ""
+"Middle click again to cycle through.<br>Hold CTRL to select directly from "
+"this list with the mouse.<hr>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290
 msgid "(no object)"
 msgstr "(žádný objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:301
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418
+#, fuzzy
+msgid "User:"
+msgstr "Uživatel"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
 msgid "layer not in list."
 msgstr "vrstva není v seznamu"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:488
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3781,7 +3899,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:224
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Tags"
 msgstr "Značky"
@@ -3796,5 +3914,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
@@ -3982,4 +4100,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
 msgid "Up"
 msgstr "Nahoru"
@@ -3990,4 +4109,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Down"
 msgstr "Dolu"
@@ -4000,5 +4120,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
@@ -4424,35 +4544,34 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97
 msgid "Conflicts when combining primitives"
-msgstr ""
+msgstr "Konflikty při slučování objektů"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
-msgstr ""
+msgstr "Konflikty při slučování cest - zkombinovaná cesta je ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110
 #, java-format
 msgid "Conflicts when merging nodes - merged node is ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:236
-#, fuzzy
+msgstr "Konflikty při slučování uzlů - zkombinovaný uzel je ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239
 msgid "No conflicts to resolve"
-msgstr "Nezbývají žádné další konflikty značek k vyřešení"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:295
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257
+msgstr "Žádné konflikty k vyřešení"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254
 msgid "Cancel conflict resolution"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:310
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272
+msgstr "Zrušit řešení konfliktů"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269
 msgid "Apply resolved conflicts"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
+msgstr "Aplikovat vyřešené konflikty"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Apply"
 msgstr "Aplikovat"
@@ -4464,5 +4583,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "all"
 msgstr "všechny"
@@ -4470,29 +4589,29 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52
 msgid "Choose a value"
-msgstr ""
+msgstr "Vyberte hodnotu"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:54
 msgid "Please decided which values to keep"
-msgstr ""
+msgstr "Rozhodněte, které hodnoty ponechat"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:59
 #, java-format
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
-msgstr ""
+msgstr "Hodnota ''{0}'' bude použita pro klíč ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:65
 #, java-format
 msgid "The key ''{0}'' and all it's values are going to be removed"
-msgstr ""
+msgstr "Klíč ''{0}'' a všechny jeho hodnoty budou odstraněny"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:70
 #, java-format
 msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''"
-msgstr ""
+msgstr "Hodnoty spojené jako ''{0}'' budou použity pro klíč ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
 #, java-format
 msgid "parameter ''{0}'' must not be empty"
-msgstr ""
+msgstr "parametr ''{0}'' nesmí být prázdný"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
@@ -4503,10 +4622,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
 msgid "tag collection doesn't include the selected value ''{0}''"
-msgstr ""
+msgstr "soubor tagů neobsahuje zvolenou hodnotu ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
-msgid "not yet decided"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:213
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
@@ -4515,25 +4631,25 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
 msgid "Not decided yet"
-msgstr ""
+msgstr "Zatím nerozhodnuto"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49
 msgid "Tags from nodes"
-msgstr ""
+msgstr "Tagy z uzlů"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50
 msgid "Tags from ways"
-msgstr ""
+msgstr "Tagy z cest"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51
 msgid "Tags from relations"
-msgstr ""
+msgstr "Tagy z relací"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78
 msgid "Conflicts in pasted tags"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:475
+msgstr "Konflikt ve vložených tazích"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
@@ -4544,7 +4660,7 @@
 msgstr[2] "{0} cest"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:152
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
@@ -4555,25 +4671,26 @@
 msgstr[2] "{0} relací"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "Paste ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+msgstr "Vložit ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "From ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:372
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+msgstr "Z ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "To ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:428
+msgstr "Do ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
 #, java-format
 msgid "{0} tag"
 msgid_plural "{0} tags"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} tag"
+msgstr[1] "{0} tagy"
+msgstr[2] "{0} tagů"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
@@ -4584,13 +4701,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
-#, fuzzy
 msgid "Remove this relation member from the relation"
-msgstr "Odstranit vybrané členy z relace"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-#, fuzzy
 msgid "Replace"
-msgstr "místo"
+msgstr "Nahradit"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
@@ -4601,11 +4716,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
-#, fuzzy
 msgid "Undecided"
-msgstr "Nerozhodnuto"
+msgstr ""
 
 #. --- role editing
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:56
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510
 msgid "Role:"
 msgstr "Role:"
@@ -4621,11 +4735,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70
-#, fuzzy
 msgid "Value:"
-msgstr "Hodnota"
+msgstr "Hodnota:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86
 msgid "Apply this role to all members"
-msgstr ""
+msgstr "Aplikovat tuto roli na všechny členy"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33
@@ -4634,12 +4747,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51
-#, fuzzy
 msgid "Orig. Way"
-msgstr "Jednosměrka"
+msgstr "Orig. cesta"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
-#, fuzzy
 msgid "Decision"
-msgstr "Revize"
+msgstr "Rozhodnutí"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -4655,6 +4766,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
@@ -4716,5 +4828,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
 msgid "Close anyway"
-msgstr ""
+msgstr "Přesto zavřít"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:194
@@ -4745,171 +4857,13 @@
 msgstr "Vyřešit konflikty pro ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-msgid "History"
-msgstr "Historie"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-msgid "Display the history of all selected items."
-msgstr "Zobrazit historii všech zobrazených objektů"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
-#, java-format
-msgid "index out of bounds Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr "Bod {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
-msgid "History item"
-msgstr "Položka historie"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Znovu nahrát vybrané objekty a obnovit seznam."
-
-#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
-msgid "Show"
-msgstr "Zobrazit"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
-msgstr "Zobrazit historii vybraného prvku"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
-msgid "Dialog not created yet. Invoke createInstance() first"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
-msgid "Layers"
-msgstr "Vrstvy"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-msgid "Open a list of all loaded layers."
-msgstr "Otevřít seznam všech nahraných vrstev."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:297
-msgid "Delete the selected layer."
-msgstr "Smazat označenou vrstvu."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:367
-msgid "Show/Hide"
-msgstr "Zobrazit/Skrýt"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:378
-msgid "Toggle visible state of the selected layer."
-msgstr "Přepnout viditelnost zvolené vrstvy."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414
-msgid "Activate"
-msgstr "Aktivovat"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:420
-msgid "Activate the selected layer"
-msgstr "Aktivovat vybranou vrstvu"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:475
-msgid "Merge this layer into another layer"
-msgstr "Sloučit tuto vrstvu do jiné vrstvy"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:581
-msgid "Move the selected layer one row up."
-msgstr "Přesunout zvolenou vrstvu o řádek nahoru."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:600
-msgid "Move the selected layer one row down."
-msgstr "Přesunout zvolenou vrstvu o řádek dolů."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
-msgid "Information about layer"
-msgstr "Informace o vrstvě"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
-#, java-format
-msgid "This will change up to {0} object."
-msgid_plural "This will change up to {0} objects."
-msgstr[0] "Toto změní až  {0} objekt."
-msgstr[1] "Toto změní až  {0} objekty."
-msgstr[2] "Toto změní až  {0} objektů."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
-msgid "An empty value deletes the key."
-msgstr "Prázdná hodnota smaže klíč"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
-msgid "<different>"
-msgstr "<různé>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
-msgid "Change values?"
-msgstr "Změnit hodnoty ?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
-#, java-format
-msgid "Change properties of up to {0} object"
-msgid_plural "Change properties of up to {0} objects"
-msgstr[0] "Změnit vlastnosti až  {0} objektu."
-msgstr[1] "Změnit vlastnosti až  {0} objektů."
-msgstr[2] "Změnit vlastnosti až  {0} objektů."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
-msgid "Please select a key"
-msgstr "Prosím zvolte klíč"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
-msgid "Please select a value"
-msgstr "Vyberte prosím hodnotu"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
-msgid "Please select the objects you want to change properties for."
-msgstr "Vyberte objekty, u kterých chcete změnit vlastnosti."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
-msgid "Properties/Memberships"
-msgstr "Vlastnosti/Členství"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-msgid "Properties for selected objects."
-msgstr "Vlastnosti pro zvolené objekty"
-
-#. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-msgid "Member Of"
-msgstr "Člen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
-msgid "Add Properties"
-msgstr "Přidat vlastnosti"
-
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+msgid "Filter objects and hide/disable them."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
@@ -4923,4 +4877,214 @@
 msgstr "Přidat"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#, fuzzy
+msgid "Add filter."
+msgstr "Přidat vybrané"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
+#, fuzzy
+msgid "Edit filter."
+msgstr "Upravit molo"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#, fuzzy
+msgid "Delete filter."
+msgstr "Smazat vrstvu"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
+#, fuzzy
+msgid "Move filter up."
+msgstr "Posunout nahoru"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
+#, fuzzy
+msgid "Move filter down."
+msgstr "Posunout dolů"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128
+msgid "Enable filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
+#, fuzzy
+msgid "Hide elements"
+msgstr "Jednotlivé prvky"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
+msgid "Apply also for children"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
+msgid "Inverse filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
+#, fuzzy
+msgid "Filter mode"
+msgstr "Filtrovat"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
+msgid "History"
+msgstr "Historie"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+msgid "Display the history of all selected items."
+msgstr "Zobrazit historii všech zobrazených objektů"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr "Bod {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr "Cesta {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr "Relace {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
+msgid "History item"
+msgstr "Položka historie"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
+msgid "Reload all currently selected objects and refresh the list."
+msgstr "Znovu nahrát vybrané objekty a obnovit seznam."
+
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
+msgid "Show"
+msgstr "Zobrazit"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
+msgid "Display the history of the selected primitive"
+msgstr "Zobrazit historii vybraného prvku"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84
+msgid "Dialog not created yet. Invoke createInstance() first"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
+msgid "Layers"
+msgstr "Vrstvy"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+msgid "Open a list of all loaded layers."
+msgstr "Otevřít seznam všech nahraných vrstev."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294
+msgid "Delete the selected layer."
+msgstr "Smazat označenou vrstvu."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364
+msgid "Show/Hide"
+msgstr "Zobrazit/Skrýt"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375
+msgid "Toggle visible state of the selected layer."
+msgstr "Přepnout viditelnost zvolené vrstvy."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgid "Activate"
+msgstr "Aktivovat"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417
+msgid "Activate the selected layer"
+msgstr "Aktivovat vybranou vrstvu"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472
+msgid "Merge this layer into another layer"
+msgstr "Sloučit tuto vrstvu do jiné vrstvy"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578
+msgid "Move the selected layer one row up."
+msgstr "Přesunout zvolenou vrstvu o řádek nahoru."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597
+msgid "Move the selected layer one row down."
+msgstr "Přesunout zvolenou vrstvu o řádek dolů."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+msgid "Information about layer"
+msgstr "Informace o vrstvě"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+#, java-format
+msgid "This will change up to {0} object."
+msgid_plural "This will change up to {0} objects."
+msgstr[0] "Toto změní až  {0} objekt."
+msgstr[1] "Toto změní až  {0} objekty."
+msgstr[2] "Toto změní až  {0} objektů."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+msgid "An empty value deletes the key."
+msgstr "Prázdná hodnota smaže klíč"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+msgid "<different>"
+msgstr "<různé>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+msgid "Change values?"
+msgstr "Změnit hodnoty ?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#, java-format
+msgid "Change properties of up to {0} object"
+msgid_plural "Change properties of up to {0} objects"
+msgstr[0] "Změnit vlastnosti až  {0} objektu."
+msgstr[1] "Změnit vlastnosti až  {0} objektů."
+msgstr[2] "Změnit vlastnosti až  {0} objektů."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+msgid "Please select a key"
+msgstr "Prosím zvolte klíč"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+msgid "Please select a value"
+msgstr "Vyberte prosím hodnotu"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
+msgid "Please select the objects you want to change properties for."
+msgstr "Vyberte objekty, u kterých chcete změnit vlastnosti."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
+msgid "Properties/Memberships"
+msgstr "Vlastnosti/Členství"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+msgid "Properties for selected objects."
+msgstr "Vlastnosti pro zvolené objekty"
+
+#. setting up the membership table
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+msgid "Member Of"
+msgstr "Člen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
+msgid "Add Properties"
+msgstr "Přidat vlastnosti"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574
 msgid "Add a new key/value pair to all objects"
@@ -4962,10 +5126,9 @@
 
 #. item "Land use/Quarry" text "Name"
-#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
-#: build/trans_presets.java:3109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168
+#: build/trans_presets.java:3121
 msgid "Relations"
 msgstr "Relace"
@@ -4975,23 +5138,23 @@
 msgstr "Otevřít seznam všech relací"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relace: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276
 msgid "Open an editor for the selected relation"
 msgstr "Otevřít editor pro zvolenou relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
 msgid "Delete the selected relation"
 msgstr "Smazat vybrané relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349
 msgid "Create a new relation"
 msgstr "Vytvořit novou relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:373
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1412
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "Vytvořit kopii relace a otevřít ji v novém okně"
@@ -5024,5 +5187,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5034,9 +5197,9 @@
 msgstr "Výběr: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441
 msgid "Undock the panel"
 msgstr "Vytrhnout panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5045,5 +5208,5 @@
 "nástrojů."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:457
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Minimalizovat nebo maximalizovat obsah panelu"
@@ -5063,18 +5226,19 @@
 msgid "{0} Author"
 msgid_plural "{0} Authors"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} Autor"
+msgstr[1] "{0} Autoři"
+msgstr[2] "{0} Autorů"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142
 msgid "Select primitives submitted by this user"
-msgstr ""
+msgstr "Vybrat objekty nahrané tímto uživatelem"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172
 msgid "Show info"
-msgstr ""
+msgstr "Zobrazit informace"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173
 msgid "Launches a browser with information about the user"
-msgstr ""
+msgstr "Spustit prohlížeč s informacemi o uživateli"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185
@@ -5083,4 +5247,6 @@
 "Warning: only launching info browsers for the first {0} of {1} selected users"
 msgstr ""
+"Upozornění: spouštím prohlížeč pouze pro prvních {0} z {1} zvolených "
+"uživatelů"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208
@@ -5104,5 +5270,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr "Upravit relaci na kterou odkazuje vybraný člen"
@@ -5126,5 +5292,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1502
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1370
 msgid "Download relation members"
 msgstr "Stáhnout členy relace"
@@ -5155,5 +5321,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -5161,18 +5327,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
 msgid "Tags and Members"
 msgstr "Značky a Členové"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:167
 msgid "Parent Relations"
 msgstr "Rodičovské relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
 msgid "Child Relations"
 msgstr "Potomci relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5184,14 +5350,14 @@
 "provést s touto cyklickou závislostí?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
 msgid "Remove them, clean up relation"
 msgstr "Odstranit, vyčistit relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
 msgid "Ignore them, leave relation as is"
 msgstr "Ignorovat, ponechat relaci jak je"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613
 #, java-format
 msgid ""
@@ -5203,9 +5369,9 @@
 "''{0}''<br><br>Opravdu chcete přidat dalšího člena relace?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
 msgid "Multiple members referring to same primitive"
 msgstr "Více členů odkazuje na stejný prvek"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid ""
@@ -5218,10 +5384,10 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr "Přidat všechny vybrané prvky z aktuální datové sady před prvního člena"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
@@ -5229,5 +5395,5 @@
 "Přidat všechny vybrané prvky z aktuální datové sady za posledního člena"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5237,5 +5403,5 @@
 "člena"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5245,20 +5411,20 @@
 "člena"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
 msgid "Remove all members referring to one of the selected primitives"
 msgstr "Odstranit všechny členy odkazující na některý z vybraných prvků"
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
 msgid "Relation Editor: Remove Selected"
 msgstr "Editor relací: Odstranit vybrané"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr "Vybrat členy relace odkazující na prvky v aktuálním výběru"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849
 #, java-format
 msgid ""
@@ -5267,57 +5433,57 @@
 msgstr "Vybrat členy relace odkazující na {0} prvků v aktuálním výběru"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873
 msgid "Select primitives for selected relation members"
 msgstr "Vybrat prvky pro vybrané členy relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:961
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
 msgid "Sort the relation members"
 msgstr "Seřadit členy relace"
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909
 msgid "Move the currently selected members up"
 msgstr "Přesunout zvolené členy nahoru"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:979
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:912
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928
 msgid "Move the currently selected members down"
 msgstr "Přesunout zvolené členy dolů"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:998
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:931
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947
 msgid "Remove the currently selected members from this relation"
 msgstr "Odstranit vybrané členy z relace"
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
 msgid "Relation Editor: Remove"
 msgstr "Editor relací: Odstranit"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
 msgid "Delete the currently edited relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116
+msgstr "Smazat editovanou relaci"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Yes, create a conflict and close"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1117
+msgstr "Ano, vytvořit konflikt a zavřít"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050
 msgid "No, continue editing"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
+msgstr "Ne, pokračovat v editaci"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5326,9 +5492,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1058
 msgid "Conflict in data"
 msgstr "Konflikt v datech"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
 #, java-format
 msgid ""
@@ -5337,56 +5503,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090
 msgid "Apply the current updates"
 msgstr "Aplikovat aktuální změny"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123
 msgid "Apply the updates and close the dialog"
 msgstr "Aplikovat změny a zavřít dialog"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Cancel the updates and close the dialog"
 msgstr "Zrušit změny a zavřít dialog"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 msgid "Add an empty tag"
 msgstr "Přidat prázdnou značku"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
-msgid "Delete the currently selected tags"
-msgstr "Smazat vybrané značky"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Stáhnout všechny nekompletní cesty a uzly v relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 msgid "Download Members"
 msgstr "Stáhnout prvky"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Relation Editor: Download Members"
 msgstr "Editor relací: Stáhnout členy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1208
 msgid "Sets a role for the selected members"
 msgstr "Nastaví roli pro vybrané členy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1211
 msgid "Apply Role"
 msgstr "Aplikovat roli"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1356
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 #, java-format
 msgid ""
@@ -5398,13 +5549,13 @@
 "role těchto prvků.<br>Opravdu chcete novou roli aplikovat?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228
 msgid "Yes, apply it"
 msgstr "Ano, aplikovat"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1229
 msgid "No, don't apply"
 msgstr "Ne, neaplikovat"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1367
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
 msgid "Confirm empty role"
 msgstr "Potvrdit prázdnou roli"
@@ -5442,5 +5593,5 @@
 #, java-format
 msgid "child.getId() >0 expected. Got {1}"
-msgstr ""
+msgstr "očekáváno child.getId() >0. Nalezeno {1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
@@ -5491,37 +5642,37 @@
 msgstr "Záložky"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:82
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
 msgid "Please enter the desired coordinates first."
 msgstr "Prosím zadejte nejdříve pozadovanou pozici"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
 msgid "Please enter a name for the location."
 msgstr "Prosím zadejte jméno umístění"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
 msgid "Name of location"
 msgstr "Jméno lokace"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:107
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
 msgid "Select a bookmark first."
 msgstr "Nejdříve zvolte záložku"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
 msgid "min lat"
 msgstr "min šíř."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
 msgid "min lon"
 msgstr "min dél."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid "max lat"
 msgstr "max šíř."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
 msgid "max lon"
 msgstr "max dél."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5529,26 +5680,26 @@
 msgstr "URL z www.openstreetmap.org (adresu můžete vložit do pole níže)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
 msgid "Bounding Box"
 msgstr "Ohraničující box"
 
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
 msgid "Data Sources and Types"
 msgstr "Zdroje a typy dat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
 msgid "Download as new layer"
 msgstr "Uložit jako novou vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
 msgid "Download Area"
 msgstr "Stáhnout plochu"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
 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:219
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
 msgid "Download area ok, size probably acceptable to server"
 msgstr "Stahovaná plocha je v pořádku, velikost akceptována serverem"
@@ -5573,7 +5724,7 @@
 msgstr "Zadej jméno místa které chceš najít:"
 
-#. <separator/>
+#. group "Geography"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2759
 msgid "Places"
 msgstr "Místa"
@@ -5620,21 +5771,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "type"
 msgstr "typ"
@@ -5651,5 +5802,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-#, fuzzy
 msgid ""
 "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
@@ -5657,7 +5807,4 @@
 "Hold left mousebutton and draw a frame."
 msgstr ""
-"<b>Zvětšení:</b> Kolečko myši, dvojklik nebo Ctrl + Up/Down <b>Posun mapy:</"
-"b> Držet pravé tlačítko myši a pohyb myší nebo kurzorové klávesy. <b>Výběr:</"
-"b> Klik."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
@@ -5689,15 +5836,15 @@
 #, java-format
 msgid "History for node {0}"
-msgstr ""
+msgstr "Historie pro uzel {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45
 #, java-format
 msgid "History for way {0}"
-msgstr ""
+msgstr "Historie pro cestu {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
 #, java-format
 msgid "History for relation {0}"
-msgstr ""
+msgstr "Historie pro relaci {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111
@@ -5707,5 +5854,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
 msgid "Reload the history from the server"
-msgstr ""
+msgstr "Znovu nahrát historii ze serveru"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180
@@ -5740,20 +5887,20 @@
 #, java-format
 msgid "id > 0 expected, got {0}"
-msgstr ""
+msgstr "očekáváno id > 0, nalezeno {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:115
 #, java-format
 msgid "Loading history for node {0}"
-msgstr ""
+msgstr "Nahrávám historii pro uzel {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:116
 #, java-format
 msgid "Loading history for way {0}"
-msgstr ""
+msgstr "Nahrávám historii pro cestu {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:117
 #, java-format
 msgid "Loading history for relation {0}"
-msgstr ""
+msgstr "Nahrávám historii pro relaci {0}"
 
 #. item "Streets/Motorway" text "Reference"
@@ -6118,4 +6265,6 @@
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
 #. <key key="historic" value="wayside_shrine" />
+#. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
+#. <key key="historic" value="boundary_stone" />
 #. item "Leisure/Water Park" label "Edit Water Park"
 #. <key key="leisure" value="water_park" />
@@ -6487,153 +6636,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/trans_presets.java:66 build/trans_presets.java:102
-#: build/trans_presets.java:142 build/trans_presets.java:179
-#: build/trans_presets.java:199 build/trans_presets.java:217
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:272 build/trans_presets.java:305
-#: build/trans_presets.java:351 build/trans_presets.java:371
-#: build/trans_presets.java:386 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:463 build/trans_presets.java:482
-#: build/trans_presets.java:502 build/trans_presets.java:522
-#: build/trans_presets.java:543 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627 build/trans_presets.java:658
-#: build/trans_presets.java:679 build/trans_presets.java:692
-#: build/trans_presets.java:705 build/trans_presets.java:718
-#: build/trans_presets.java:731 build/trans_presets.java:744
-#: build/trans_presets.java:755 build/trans_presets.java:764
-#: build/trans_presets.java:811 build/trans_presets.java:832
-#: build/trans_presets.java:841 build/trans_presets.java:901
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1067 build/trans_presets.java:1075
-#: build/trans_presets.java:1085 build/trans_presets.java:1093
-#: build/trans_presets.java:1098 build/trans_presets.java:1105
-#: build/trans_presets.java:1112 build/trans_presets.java:1117
-#: build/trans_presets.java:1125 build/trans_presets.java:1134
-#: build/trans_presets.java:1140 build/trans_presets.java:1146
-#: build/trans_presets.java:1151 build/trans_presets.java:1157
-#: build/trans_presets.java:1163 build/trans_presets.java:1172
-#: build/trans_presets.java:1181 build/trans_presets.java:1188
-#: build/trans_presets.java:1196 build/trans_presets.java:1209
-#: build/trans_presets.java:1215 build/trans_presets.java:1224
-#: build/trans_presets.java:1230 build/trans_presets.java:1236
-#: build/trans_presets.java:1244 build/trans_presets.java:1299
-#: build/trans_presets.java:1346 build/trans_presets.java:1352
-#: build/trans_presets.java:1358 build/trans_presets.java:1364
-#: build/trans_presets.java:1370 build/trans_presets.java:1381
-#: build/trans_presets.java:1390 build/trans_presets.java:1405
-#: build/trans_presets.java:1412 build/trans_presets.java:1418
-#: build/trans_presets.java:1426 build/trans_presets.java:1433
-#: build/trans_presets.java:1442 build/trans_presets.java:1450
-#: build/trans_presets.java:1457 build/trans_presets.java:1468
-#: build/trans_presets.java:1478 build/trans_presets.java:1488
-#: build/trans_presets.java:1508 build/trans_presets.java:1520
-#: build/trans_presets.java:1531 build/trans_presets.java:1548
-#: build/trans_presets.java:1555 build/trans_presets.java:1570
-#: build/trans_presets.java:1577 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1594
-#: build/trans_presets.java:1599 build/trans_presets.java:1605
-#: build/trans_presets.java:1611 build/trans_presets.java:1619
-#: build/trans_presets.java:1627 build/trans_presets.java:1635
-#: build/trans_presets.java:1642 build/trans_presets.java:1648
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1670 build/trans_presets.java:1677
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1712 build/trans_presets.java:1719
-#: build/trans_presets.java:1736 build/trans_presets.java:1744
-#: build/trans_presets.java:1759 build/trans_presets.java:1769
-#: build/trans_presets.java:1781 build/trans_presets.java:1788
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:1809 build/trans_presets.java:1817
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1841
-#: build/trans_presets.java:1846 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1864
-#: build/trans_presets.java:1872 build/trans_presets.java:1881
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1908 build/trans_presets.java:1914
-#: build/trans_presets.java:1922 build/trans_presets.java:1928
-#: build/trans_presets.java:1934 build/trans_presets.java:1940
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2013
-#: build/trans_presets.java:2022 build/trans_presets.java:2030
-#: build/trans_presets.java:2036 build/trans_presets.java:2042
-#: build/trans_presets.java:2048 build/trans_presets.java:2054
-#: build/trans_presets.java:2060 build/trans_presets.java:2066
-#: build/trans_presets.java:2072 build/trans_presets.java:2078
-#: build/trans_presets.java:2084 build/trans_presets.java:2090
-#: build/trans_presets.java:2096 build/trans_presets.java:2102
-#: build/trans_presets.java:2108 build/trans_presets.java:2114
-#: build/trans_presets.java:2120 build/trans_presets.java:2126
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2158
-#: build/trans_presets.java:2165 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2186
-#: build/trans_presets.java:2192 build/trans_presets.java:2198
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2218 build/trans_presets.java:2225
-#: build/trans_presets.java:2232 build/trans_presets.java:2239
-#: build/trans_presets.java:2247 build/trans_presets.java:2279
-#: build/trans_presets.java:2284 build/trans_presets.java:2289
-#: build/trans_presets.java:2294 build/trans_presets.java:2300
-#: build/trans_presets.java:2306 build/trans_presets.java:2312
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2354
-#: build/trans_presets.java:2451 build/trans_presets.java:2458
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2485 build/trans_presets.java:2492
-#: build/trans_presets.java:2498 build/trans_presets.java:2504
-#: build/trans_presets.java:2526 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2553 build/trans_presets.java:2559
-#: build/trans_presets.java:2565 build/trans_presets.java:2571
-#: build/trans_presets.java:2577 build/trans_presets.java:2583
-#: build/trans_presets.java:2590 build/trans_presets.java:2597
-#: build/trans_presets.java:2604 build/trans_presets.java:2610
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2661
-#: build/trans_presets.java:2667 build/trans_presets.java:2677
-#: build/trans_presets.java:2686 build/trans_presets.java:2701
-#: build/trans_presets.java:2707 build/trans_presets.java:2715
-#: build/trans_presets.java:2722 build/trans_presets.java:2742
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2783
-#: build/trans_presets.java:2790 build/trans_presets.java:2797
-#: build/trans_presets.java:2803 build/trans_presets.java:2809
-#: build/trans_presets.java:2817 build/trans_presets.java:2824
-#: build/trans_presets.java:2831 build/trans_presets.java:2838
-#: build/trans_presets.java:2844 build/trans_presets.java:2851
-#: build/trans_presets.java:2858 build/trans_presets.java:2867
-#: build/trans_presets.java:2873 build/trans_presets.java:2879
-#: build/trans_presets.java:2885 build/trans_presets.java:2891
-#: build/trans_presets.java:2900 build/trans_presets.java:2910
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2948
-#: build/trans_presets.java:2957 build/trans_presets.java:2963
-#: build/trans_presets.java:2969 build/trans_presets.java:2975
-#: build/trans_presets.java:2981 build/trans_presets.java:2987
-#: build/trans_presets.java:2993 build/trans_presets.java:3000
-#: build/trans_presets.java:3006 build/trans_presets.java:3011
-#: build/trans_presets.java:3018 build/trans_presets.java:3025
-#: build/trans_presets.java:3031 build/trans_presets.java:3040
-#: build/trans_presets.java:3048 build/trans_presets.java:3054
-#: build/trans_presets.java:3060 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3080
-#: build/trans_presets.java:3086 build/trans_presets.java:3092
-#: build/trans_presets.java:3098 build/trans_presets.java:3104
-#: build/trans_presets.java:3117 build/trans_presets.java:3131
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:67 build/trans_presets.java:103
+#: build/trans_presets.java:143 build/trans_presets.java:180
+#: build/trans_presets.java:200 build/trans_presets.java:218
+#: build/trans_presets.java:235 build/trans_presets.java:253
+#: build/trans_presets.java:273 build/trans_presets.java:306
+#: build/trans_presets.java:352 build/trans_presets.java:372
+#: build/trans_presets.java:387 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:503 build/trans_presets.java:523
+#: build/trans_presets.java:544 build/trans_presets.java:565
+#: build/trans_presets.java:586 build/trans_presets.java:607
+#: build/trans_presets.java:628 build/trans_presets.java:659
+#: build/trans_presets.java:680 build/trans_presets.java:693
+#: build/trans_presets.java:706 build/trans_presets.java:719
+#: build/trans_presets.java:732 build/trans_presets.java:745
+#: build/trans_presets.java:756 build/trans_presets.java:765
+#: build/trans_presets.java:812 build/trans_presets.java:833
+#: build/trans_presets.java:842 build/trans_presets.java:902
+#: build/trans_presets.java:1053 build/trans_presets.java:1061
+#: build/trans_presets.java:1069 build/trans_presets.java:1077
+#: build/trans_presets.java:1087 build/trans_presets.java:1095
+#: build/trans_presets.java:1100 build/trans_presets.java:1107
+#: build/trans_presets.java:1114 build/trans_presets.java:1119
+#: build/trans_presets.java:1127 build/trans_presets.java:1136
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1153 build/trans_presets.java:1159
+#: build/trans_presets.java:1165 build/trans_presets.java:1174
+#: build/trans_presets.java:1183 build/trans_presets.java:1190
+#: build/trans_presets.java:1198 build/trans_presets.java:1211
+#: build/trans_presets.java:1217 build/trans_presets.java:1226
+#: build/trans_presets.java:1232 build/trans_presets.java:1238
+#: build/trans_presets.java:1246 build/trans_presets.java:1302
+#: build/trans_presets.java:1349 build/trans_presets.java:1355
+#: build/trans_presets.java:1361 build/trans_presets.java:1367
+#: build/trans_presets.java:1373 build/trans_presets.java:1384
+#: build/trans_presets.java:1393 build/trans_presets.java:1408
+#: build/trans_presets.java:1415 build/trans_presets.java:1421
+#: build/trans_presets.java:1429 build/trans_presets.java:1436
+#: build/trans_presets.java:1445 build/trans_presets.java:1453
+#: build/trans_presets.java:1460 build/trans_presets.java:1471
+#: build/trans_presets.java:1481 build/trans_presets.java:1491
+#: build/trans_presets.java:1511 build/trans_presets.java:1523
+#: build/trans_presets.java:1534 build/trans_presets.java:1551
+#: build/trans_presets.java:1558 build/trans_presets.java:1574
+#: build/trans_presets.java:1581 build/trans_presets.java:1586
+#: build/trans_presets.java:1592 build/trans_presets.java:1598
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1646 build/trans_presets.java:1652
+#: build/trans_presets.java:1659 build/trans_presets.java:1666
+#: build/trans_presets.java:1674 build/trans_presets.java:1681
+#: build/trans_presets.java:1689 build/trans_presets.java:1696
+#: build/trans_presets.java:1702 build/trans_presets.java:1709
+#: build/trans_presets.java:1716 build/trans_presets.java:1723
+#: build/trans_presets.java:1740 build/trans_presets.java:1748
+#: build/trans_presets.java:1763 build/trans_presets.java:1773
+#: build/trans_presets.java:1785 build/trans_presets.java:1792
+#: build/trans_presets.java:1798 build/trans_presets.java:1808
+#: build/trans_presets.java:1813 build/trans_presets.java:1821
+#: build/trans_presets.java:1828 build/trans_presets.java:1834
+#: build/trans_presets.java:1840 build/trans_presets.java:1845
+#: build/trans_presets.java:1850 build/trans_presets.java:1855
+#: build/trans_presets.java:1862 build/trans_presets.java:1868
+#: build/trans_presets.java:1873 build/trans_presets.java:1882
+#: build/trans_presets.java:1891 build/trans_presets.java:1900
+#: build/trans_presets.java:1909 build/trans_presets.java:1918
+#: build/trans_presets.java:1924 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 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:2023 build/trans_presets.java:2032
+#: build/trans_presets.java:2040 build/trans_presets.java:2046
+#: build/trans_presets.java:2052 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 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:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2150
+#: build/trans_presets.java:2156 build/trans_presets.java:2162
+#: build/trans_presets.java:2169 build/trans_presets.java:2176
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2197 build/trans_presets.java:2203
+#: build/trans_presets.java:2209 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2229
+#: build/trans_presets.java:2236 build/trans_presets.java:2243
+#: build/trans_presets.java:2250 build/trans_presets.java:2258
+#: build/trans_presets.java:2290 build/trans_presets.java:2295
+#: build/trans_presets.java:2300 build/trans_presets.java:2305
+#: build/trans_presets.java:2311 build/trans_presets.java:2317
+#: build/trans_presets.java:2323 build/trans_presets.java:2331
+#: build/trans_presets.java:2337 build/trans_presets.java:2343
+#: build/trans_presets.java:2349 build/trans_presets.java:2355
+#: build/trans_presets.java:2365 build/trans_presets.java:2462
+#: build/trans_presets.java:2469 build/trans_presets.java:2483
+#: build/trans_presets.java:2489 build/trans_presets.java:2496
+#: build/trans_presets.java:2503 build/trans_presets.java:2509
+#: build/trans_presets.java:2515 build/trans_presets.java:2537
+#: build/trans_presets.java:2544 build/trans_presets.java:2551
+#: build/trans_presets.java:2557 build/trans_presets.java:2564
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2594 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2615
+#: build/trans_presets.java:2621 build/trans_presets.java:2627
+#: build/trans_presets.java:2633 build/trans_presets.java:2639
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2672 build/trans_presets.java:2678
+#: build/trans_presets.java:2688 build/trans_presets.java:2697
+#: build/trans_presets.java:2712 build/trans_presets.java:2718
+#: build/trans_presets.java:2726 build/trans_presets.java:2733
+#: build/trans_presets.java:2753 build/trans_presets.java:2764
+#: build/trans_presets.java:2770 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2788
+#: build/trans_presets.java:2795 build/trans_presets.java:2802
+#: build/trans_presets.java:2809 build/trans_presets.java:2815
+#: build/trans_presets.java:2821 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2912
+#: build/trans_presets.java:2922 build/trans_presets.java:2931
+#: build/trans_presets.java:2937 build/trans_presets.java:2943
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 build/trans_presets.java:2981
+#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:2999 build/trans_presets.java:3005
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3023 build/trans_presets.java:3030
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3066 build/trans_presets.java:3072
+#: build/trans_presets.java:3079 build/trans_presets.java:3085
+#: build/trans_presets.java:3092 build/trans_presets.java:3098
+#: build/trans_presets.java:3104 build/trans_presets.java:3110
+#: build/trans_presets.java:3116 build/trans_presets.java:3129
+#: build/trans_presets.java:3143 build/trans_presets.java:3157
 msgid "Name"
 msgstr "Název"
@@ -6648,14 +6798,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
 msgid "Changeset info"
-msgstr ""
+msgstr "Informace o sadě změn"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119
 msgid "Launch browser with information about the changeset"
-msgstr ""
+msgstr "Spustit prohlížeč s informacemi o sadě změn"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138
 #, java-format
 msgid "Show changeset {0}"
-msgstr ""
+msgstr "Zobrazit sadu změn {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
@@ -6668,4 +6818,58 @@
 msgstr "Verze"
 
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
+#, fuzzy
+msgid "Changeset id:"
+msgstr "Informace o sadě změn"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
+#, fuzzy
+msgid "Created at:"
+msgstr "Vytvořit plochy"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
+#, fuzzy
+msgid "Changeset comment:"
+msgstr "Informace o sadě změn"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
+msgid "No open changeset"
+msgstr "Žádná otevřená sada změn"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48
+#, fuzzy
+msgid "<html>Please select the changesets you want to close</html>"
+msgstr "Prosím vyberte které změny vlastností chcete použít."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
+#, fuzzy
+msgid "Open changesets"
+msgstr "Žádná otevřená sada změn"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101
+#, fuzzy
+msgid "Close changesets"
+msgstr "Uzavírám sadu změn"
+
+#. putValue(SMALL_ICON, ImageProvider.get("cancel"));
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
+#, fuzzy
+msgid "Close the selected open changesets"
+msgstr "Uzavřít aktuální sadu změn ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126
+#, fuzzy
+msgid "Cancel closeing of changesets"
+msgstr "Uzavírám sadu změn"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37
+msgid "Closing changeset"
+msgstr "Uzavírám sadu změn"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77
+#, fuzzy, java-format
+msgid "Closing changeset {0}"
+msgstr "Uzavírám sadu změn {0}..."
+
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
 msgid "Launch a file chooser to select a file"
@@ -6674,5 +6878,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148
 msgid "Select filename"
-msgstr ""
+msgstr "Vyberte soubor"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:45
@@ -6689,30 +6893,30 @@
 #, java-format
 msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
-msgstr ""
+msgstr "Vrstva ''{0}'' má změny, které by měly být nahrány na server."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50
-#, java-format
-msgid "Layer ''{0}'' has no modifications to be uploaded"
-msgstr ""
+#, fuzzy, java-format
+msgid "Layer ''{0}'' has no modifications to be uploaded."
+msgstr "Vrstva ''{0}'' nemá změny k nahrání na server"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:61
-#, java-format
-msgid ""
-"Layer ''{0}'' has modifications which should be saved to its assoicated file "
+#, fuzzy, java-format
+msgid ""
+"Layer ''{0}'' has modifications which should be saved to its associated file "
 "''{1}''."
-msgstr ""
+msgstr "Vrstva ''{0}'' má změny, které by měly být uloženy do souboru ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63
-#, java-format
-msgid "Layer ''{0}'' has no modifications to be saved"
-msgstr ""
+#, fuzzy, java-format
+msgid "Layer ''{0}'' has no modifications to be saved."
+msgstr "Vrstva ''{0}'' nemá změny k uložení"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:81
 msgid "No file associated with this layer"
-msgstr ""
+msgstr "Žádný soubor patřící k této vrstvě"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84
 msgid "Please select a file"
-msgstr ""
+msgstr "Prosím vyberte soubor"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87
@@ -6724,5 +6928,5 @@
 #, java-format
 msgid "File ''{0}'' is not writable. Please enter another file name."
-msgstr ""
+msgstr "Do souboru ''{0}'' nelze zapisovat. Prosíme, vyberte jiný soubor."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:110
@@ -6735,19 +6939,19 @@
 #, java-format
 msgid "Saving layer to ''{0}'' ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114
+msgstr "Ukládám vrstvu do ''{0}'' ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113
 msgid "Unsaved changes - Save/Upload before exiting?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120
+msgstr "Neuložené změny - Uložit/nahrát na server před ukončením?"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119
 msgid "Unsaved changes - Save/Upload before deleting?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140
+msgstr "Neuložené změny - Uložit/nahrát na server před smazáním?"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139
 msgid "Uploading and saving modified layers ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195
+msgstr "Ukládám a nahrávám na server změněné vrstvy ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194
 #, java-format
 msgid ""
@@ -6760,10 +6964,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205
 msgid "Unsaved data and conflicts"
-msgstr "Vyřešit konflikty"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
+msgstr "Neuložená data a konflikty"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212
 #, java-format
 msgid ""
@@ -6777,9 +6980,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223
 msgid "Unsaved data and missing associated file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230
 #, java-format
 msgid ""
@@ -6794,42 +6997,46 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243
 msgid "Unsaved data non-writable files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
 msgid "Close this dialog and resume editing in JOSM"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318
+msgstr "Zavřít tento dialog a pokračovat v editování v JOSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
-msgstr ""
+msgstr "Ukončit JOSM bez ukládání. Neuložené změny budou ztraceny."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322
+msgid "Discard and Delete"
+msgstr "Zahodit a smazat"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
-msgid "Discard and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
 msgid "Delete layers without saving. Unsaved changes are lost."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350
+msgstr "Smazat vrstvy bez ukládání. Neuložené změny budou ztraceny."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
+"Ukončit JOSM s uložením. Neuložené změny budou nahrány na server a/nebo "
+"uloženy."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354
+msgid "Save and Delete"
+msgstr "Uložit a smazat"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
-msgid "Save and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
 msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403
+"Uložit/nahrát na server vrstvy před smazáním. Neuložené změny nebudou "
+"ztraceny."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402
 #, java-format
 msgid "Preparing layer ''{0}'' for upload ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482
+msgstr "Připravuji vrstvu ''{0}'' pro nahrání na server ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
@@ -6837,5 +7044,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491
 msgid "Incomplete upload and/or save"
 msgstr ""
@@ -6875,21 +7082,21 @@
 #. item "Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:200
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:278
-#: build/trans_presets.java:311 build/trans_presets.java:357
-#: build/trans_presets.java:372 build/trans_presets.java:387
-#: build/trans_presets.java:409 build/trans_presets.java:429
-#: build/trans_presets.java:450 build/trans_presets.java:470
-#: build/trans_presets.java:489 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:549
-#: build/trans_presets.java:570 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:633
-#: build/trans_presets.java:664 build/trans_presets.java:1060
-#: build/trans_presets.java:1068 build/trans_presets.java:1076
-#: build/trans_presets.java:1086 build/trans_presets.java:1305
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:242
+#: build/trans_presets.java:260 build/trans_presets.java:279
+#: build/trans_presets.java:312 build/trans_presets.java:358
+#: build/trans_presets.java:373 build/trans_presets.java:388
+#: build/trans_presets.java:410 build/trans_presets.java:430
+#: build/trans_presets.java:451 build/trans_presets.java:471
+#: build/trans_presets.java:490 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:665 build/trans_presets.java:1062
+#: build/trans_presets.java:1070 build/trans_presets.java:1078
+#: build/trans_presets.java:1088 build/trans_presets.java:1308
 msgid "Layer"
 msgstr "Vrstva"
@@ -6897,87 +7104,51 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29
 msgid "Should upload?"
-msgstr ""
+msgstr "Má se nahrát?"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37
 msgid "Should save?"
-msgstr ""
+msgstr "Má se uložit?"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45
 msgid "Filename"
-msgstr ""
+msgstr "Jméno souboru"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:200
 msgid "Upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-msgid "Use a new changeset and close it"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
-msgid ""
-"Select to upload the data using a new changeset and to close the changeset "
-"after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
-msgid "Use a new changeset and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
-msgid ""
-"Select to upload the data using a new changeset and to leave the changeset "
-"open after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
-msgid "Upload to a new or to an existing changeset?"
-msgstr ""
+msgstr "Nahrát na server"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
-msgid "upload all changes in one request"
-msgstr "Nahrát všechny změny v jednom požadavku"
+msgid "Settings"
+msgstr "Nastavení"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
-msgid ""
-"Enable to upload all changes in one request, disable to use one request per "
-"changed primitive"
-msgstr ""
-"Povoleno nahrává všechny změny najednou, zakázáno nahrává změnu každého "
-"prvku samostatně"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171
-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/gui/io/UploadDialog.java:216
-msgid "Settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908
 msgid "Tags of new changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
+msgstr "Tagy nové sady změn"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:221
 msgid "Objects to add:"
 msgstr "Objekty k přidání:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:227
 msgid "Objects to modify:"
 msgstr "Objekty ke změnění:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:233
 msgid "Objects to delete:"
 msgstr "Objekty ke smazání:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
 #, java-format
 msgid "{0} object to add:"
 msgid_plural "{0} objects to add:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:324
+msgstr[0] "{0} objekt k přidání:"
+msgstr[1] "{0} objekty k přidání:"
+msgstr[2] "{0} objektů k přidání:"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:277
 #, java-format
 msgid "{0} object to modifiy:"
@@ -6987,5 +7158,5 @@
 msgstr[2] "{0} upravených objektů:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:286
 #, java-format
 msgid "{0} object to delete:"
@@ -6995,61 +7166,97 @@
 msgstr[2] "{0} smazaných objektů:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422
-#, java-format
-msgid "Use the existing changeset {0} and close it after upload"
-msgstr "Použít existující sadu změn {0} a zavřít ji po nahrání"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:423
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to close the changeset "
-"after this upload"
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:470
+msgid "Upload Changes"
+msgstr "Nahrát změny na server"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472
+msgid "Upload the changed primitives"
+msgstr "Nahrát změněné objekty"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
+msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:479
+msgid "Illegal upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
+msgid "Cancel the upload and resume editing"
+msgstr "Zrušit nahrávání na server a pokračovat v editaci"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606
+#, fuzzy
+msgid "Upload all changes in one request"
+msgstr "Nahrát všechny změny v jednom požadavku"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607
+msgid ""
+"Enable to upload all changes in one request, disable to use one request per "
+"changed primitive"
+msgstr ""
+"Povoleno nahrává všechny změny najednou, zakázáno nahrává změnu každého "
+"prvku samostatně"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:617
+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/gui/io/UploadDialog.java:672
+#, fuzzy
+msgid "Open a new changeset"
+msgstr "Tagy nové sady změn"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
+#, fuzzy
+msgid "Open a new changeset and use it in the next upload"
+msgstr "Použít novou sadu změn a ponechat ji otevřenou"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
+#, fuzzy
+msgid "Use an open changeset"
+msgstr "Žádná otevřená sada změn"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
+#, fuzzy
+msgid "Upload data to an already opened changeset"
+msgstr "Nahrát do nové nebo do existující sady změn?"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
+#, fuzzy
+msgid "Close changeset after upload"
+msgstr "Žádné změny k nahrání."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
+#, fuzzy
+msgid "Select to close the changeset after the next upload"
 msgstr "Vloží data do již existující sady změn {0} a následně ji uzavře"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426
-#, java-format
-msgid "Use the existing changeset {0} and leave it open"
-msgstr "Použít existující sadu změn {0}  a ponechat ji  otevřenou"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:427
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to leave the changeset "
-"open for further uploads"
-msgstr ""
-"Vloží data do již existující sady změn {0} a ponechá ji otevřenou pro "
-"vkládání dalších dat"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922
 #, java-format
 msgid "Tags of changeset {0}"
 msgstr "Značky sady změn {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584
-msgid "Upload Changes"
-msgstr "Nahrát změny na server"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
 #, fuzzy
-msgid "Upload the changed primitives"
-msgstr "Nahrát tyto úpravy?"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592
+msgid "Load the list of your open changesets from the server"
+msgstr "Znovu nahrát historii ze serveru"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
 #, fuzzy
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "Prosím zadejte jméno umístění"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:593
-msgid "Illegal upload comment"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
-#, fuzzy
-msgid "Cancel the upload and resume editing"
-msgstr "Zrušit změny a zavřít dialog"
+msgid "Close the currently selected open changeset"
+msgstr "Smazat vybrané značky"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
+#, fuzzy, java-format
+msgid "changeset id > 0 expected. Got {1}"
+msgstr "očekáváno child.getId() >0. Nalezeno {1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63
 msgid "Preparing primitives to upload ..."
-msgstr ""
+msgstr "Připravuji objekty k nahrání na server ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
@@ -7124,5 +7331,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
@@ -7160,5 +7367,5 @@
 msgstr "Zadaný čas nemůže být rozparsován"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
@@ -7166,30 +7373,30 @@
 msgstr "gps bod"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
 msgid "Customize line drawing"
 msgstr "Přizpůsobit kreslení linií"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
 msgid "Use global settings."
 msgstr "Použít globální nastavení."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Draw lines between points for this layer."
 msgstr "Kreslit spojnice mezi body v této vrstvě"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Do not draw lines between points for this layer."
 msgstr "Nereslit spojnice mezi body v této vrstvě"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 msgid "Select line drawing options"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7197,5 +7404,5 @@
 msgstr "Přizpůsobit barvu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7204,5 +7411,5 @@
 msgstr "Výchozí"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7211,39 +7418,76 @@
 msgstr "Zvolit barvu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
 msgid "Markers From Named Points"
 msgstr "Značky z pojmenovaných bodů"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Pojmenované body z {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
 msgid "Import Audio"
 msgstr "Importovat zvuk"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave Audiosoubory (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Audio značky z {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
 msgid "Import images"
 msgstr "Importovat obrázky"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#, java-format
+msgid "Name: {0}"
+msgstr "Jméno: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#, java-format
+msgid "Description: {0}"
+msgstr "Popis: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#, fuzzy, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
 msgstr[0] "{0} cest, "
 msgstr[1] "{0} cesta, "
 msgstr[2] "{0} cesty, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
+#: build/trans_presets.java:3160
+msgid "Description"
+msgstr "Popis"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#, fuzzy
+msgid "Timespan"
+msgstr "Časové rozpětí: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#, fuzzy
+msgid "Length"
+msgstr "Délka: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
+msgid "URL"
+msgstr "URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+msgid "Length: "
+msgstr "Délka: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
 #, java-format
 msgid "{0} route, "
@@ -7253,5 +7497,5 @@
 msgstr[2] "{0} trasy, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 #, java-format
 msgid "{0} waypoint"
@@ -7261,29 +7505,10 @@
 msgstr[2] "{0} značek"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
-#, java-format
-msgid "Name: {0}"
-msgstr "Jméno: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
-#, java-format
-msgid "Description: {0}"
-msgstr "Popis: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
-msgid "Timespan: "
-msgstr "Časové rozpětí: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
-msgid "Length: "
-msgstr "Délka: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Převést do datové vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7293,10 +7518,10 @@
 "<br>Pokud chcete nahrát trasy, podívejte se tady:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -7307,29 +7532,29 @@
 msgstr "Převedeno z: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
 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:769
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
 msgid "Download everything within:"
 msgstr "Stáhnout vše v rozmezí:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metrů"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 msgid "Maximum area per request:"
 msgstr "Maximální plocha na požadavek:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} čtverečních km"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
 #, java-format
 msgid ""
@@ -7340,13 +7565,13 @@
 "pokračovat?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
 msgid "Download data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
 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:1143
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7354,5 +7579,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7405,30 +7630,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
-#, fuzzy
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
 "<br>If you want to upload traces, look here:</html>"
 msgstr ""
-"<html>Nahrání nezpracovaných GPS dat je považováno za poškozování projektu."
-"<br>Pokud chcete nahrát trasy, podívejte se tady:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "track"
 msgid_plural "tracks"
@@ -7567,4 +7789,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
@@ -7791,14 +8014,19 @@
 msgstr "Kreslit větší GPS body"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+msgid "Draw a circle form HDOP value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Rychlost (červená = pomalá, zelená = rychlá)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 "Nepřesnost pozice (červená = vysoká, zelená = nízká, je-li k dispozici)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Jedna barva (může být nastavena pro pojmenované vrstvy)"
@@ -7806,6 +8034,6 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1374
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:1377
 msgid "Car"
 msgstr "Auto"
@@ -7826,14 +8054,14 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:324 build/trans_presets.java:650
-#: build/trans_presets.java:857 build/trans_presets.java:876
-#: build/trans_presets.java:890 build/trans_presets.java:912
-#: build/trans_presets.java:949 build/trans_presets.java:962
-#: build/trans_presets.java:974 build/trans_presets.java:986
-#: build/trans_presets.java:998 build/trans_presets.java:1010
-#: build/trans_presets.java:1020 build/trans_presets.java:1029
-#: build/trans_presets.java:1038 build/trans_presets.java:1437
-#: build/trans_presets.java:1510
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:325 build/trans_presets.java:651
+#: build/trans_presets.java:858 build/trans_presets.java:877
+#: build/trans_presets.java:891 build/trans_presets.java:913
+#: build/trans_presets.java:950 build/trans_presets.java:963
+#: build/trans_presets.java:975 build/trans_presets.java:987
+#: build/trans_presets.java:999 build/trans_presets.java:1011
+#: build/trans_presets.java:1021 build/trans_presets.java:1030
+#: build/trans_presets.java:1039 build/trans_presets.java:1440
+#: build/trans_presets.java:1513
 msgid "Bicycle"
 msgstr "Cyklisté"
@@ -7866,62 +8094,62 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:325 build/trans_presets.java:649
-#: build/trans_presets.java:856 build/trans_presets.java:875
-#: build/trans_presets.java:889 build/trans_presets.java:911
-#: build/trans_presets.java:948 build/trans_presets.java:961
-#: build/trans_presets.java:973 build/trans_presets.java:985
-#: build/trans_presets.java:997 build/trans_presets.java:1009
-#: build/trans_presets.java:1019 build/trans_presets.java:1028
-#: build/trans_presets.java:1037
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:326 build/trans_presets.java:650
+#: build/trans_presets.java:857 build/trans_presets.java:876
+#: build/trans_presets.java:890 build/trans_presets.java:912
+#: build/trans_presets.java:949 build/trans_presets.java:962
+#: build/trans_presets.java:974 build/trans_presets.java:986
+#: build/trans_presets.java:998 build/trans_presets.java:1010
+#: build/trans_presets.java:1020 build/trans_presets.java:1029
+#: build/trans_presets.java:1038
 msgid "Foot"
 msgstr "Pěší"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Kreslit šipky ve směru jízdy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Rychlé vykreslování (vypadá ošklivě)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Jen zajímavé směry (např. jednosměrka)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Only on the head of a way."
 msgstr "Pouze na prvním úseku cesty."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Vykreslit segmenty s pořadovými čísly"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Vykreslit ohraničující box stažených dat"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Vykreslovat virtuální uzly v modu výběru"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Vykreslovat neaktivní vrstvy v jiných barvách"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Vyhlazené mapy (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:82
 msgid "Draw lines between raw GPS points"
 msgstr "Kreslit čáru mezi body GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -7929,9 +8157,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
 msgid "Maximum length for local files (meters)"
 msgstr "Maximální délka lokálních souborů (v metrech)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
@@ -7940,10 +8168,10 @@
 "kreslení všech linií."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length (meters)"
 msgstr "Maximální délka (metrů)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -7951,15 +8179,15 @@
 "Vynutit kreslení čar, pokud importovaná data neobsahují informace o čarách."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:129
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Zobrazovat šipky pro čary spojující GPS body."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:135
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr "Zobrazovat směrové šipky pomocí tabulek místo komplexní matematiky."
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:141
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -7967,13 +8195,13 @@
 msgstr "Nekreslit šipky, pokud nejsou alespoň tuto vzdálenost od předchozí."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:144
 msgid "Minimum distance (pixels)"
 msgstr "Minimální vzdálenost (pixelů)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Draw larger dots for the GPS points."
 msgstr "Zobrazovat větší tečky pro GPS body."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -7983,9 +8211,9 @@
 "v kartě vrstev."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Colors points and track segments by velocity."
 msgstr "Obarvovat body a části trasy podle rychlosti."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -7995,46 +8223,46 @@
 "musí tuto informaci ukládat."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Umožní ladit barvy cesty pro rozdílné průměrné rychlosti."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid "Track and Point Coloring"
 msgstr "Barvy tras a bodů"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202
 msgid "GPS Points"
 msgstr "GPS body"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "Draw direction hints for way segments."
 msgstr "Zobrazovat směr u segmentů cesty."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:237
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Zobrazovat pořadí u všech segmentů v cestách."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Aplikovat vyhlazování (antialiasing) v mapě pro jemnější zobrazení."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Zobrazovat hranice dat stažených ze serveru."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Vykreslovat křížky uprostřed cest ve výběrovém módu."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257
 msgid "Draw the inactive data layers in a different color."
 msgstr "Zobrazovat neaktivní vrstvy dat jinou barvou."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "OSM Data"
 msgstr "OSM data"
@@ -8113,45 +8341,46 @@
 msgstr "Použitý styl"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Configure available plugins."
 msgstr "Nastavení dostupných pluginů."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50
+#. buttons at the bottom
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
 msgid "Download List"
 msgstr "Stáhnout seznam"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:100
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 msgid "Update"
 msgstr "Aktualizovat"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Configure Sites..."
 msgstr "Konfigurovat zařízení..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:125
 msgid "Add JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:126
 msgid "Enter URL"
 msgstr "Zadat URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:162
 msgid "Please select an entry."
 msgstr "Prosím, vyberte položku."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:147
 msgid "Edit JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:148
 msgid "JOSM Plugin description URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:175
 msgid "Configure Plugin Sites"
 msgstr "Nastavení webů s pluginy"
@@ -8294,5 +8523,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:243
 msgid "Copy defaults"
-msgstr ""
+msgstr "Zkopírovat výchozí hodnoty"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:248
@@ -8481,6 +8710,6 @@
 msgstr "<mnohonásobný>"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:369
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341
 #, java-format
 msgid "Remove old keys from up to {0} object"
@@ -8490,9 +8719,9 @@
 msgstr[2] "Odstranit staré klíče z {0} objektů"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135
 msgid "Add a new tag"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161
+msgstr "Přidat nový tag"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160
 msgid "Delete the selection in the tag table"
 msgstr ""
@@ -8527,7 +8756,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:68
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:75
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -8572,4 +8801,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24
+#, fuzzy, java-format
+msgid "Preset group ''{0}'' of group ''{1}''"
+msgstr "Použít přednastavení \"{0}\" ze skupiny \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
 #, java-format
 msgid "Preset group ''{0}''"
@@ -8590,4 +8824,10 @@
 msgstr "Stahuji body {0} až {1}..."
 
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, fuzzy, java-format
+msgid "parameter ''{0}'' > 0 expected. Got {1}"
+msgstr "očekáván parameter ''{0}'' > 0, zadáno ''{1}''"
+
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8696,5 +8936,5 @@
 msgstr "Parsování souboru \"{0}\" selhalo"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "Chyba parsování: Chybná struktura GPX dokumentu"
@@ -8723,15 +8963,15 @@
 #, java-format
 msgid "Fetching node with id {0} from ''{1}''"
-msgstr ""
+msgstr "Stahuji uzel s id {0} z ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366
 #, java-format
 msgid "Fetching way with id {0} from ''{1}''"
-msgstr ""
+msgstr "Stahuji cestu s id {0} z ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367
 #, java-format
 msgid "Fetching relation with id {0} from ''{1}''"
-msgstr ""
+msgstr "Stahuji relaci s id {0} z ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373
@@ -8743,15 +8983,15 @@
 #, java-format
 msgid "Fetching a package of nodes from ''{0}''"
-msgstr ""
+msgstr "Stahuji balík uzlů z ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404
 #, java-format
 msgid "Fetching a package of ways from ''{0}''"
-msgstr ""
+msgstr "Stahuji balík cest z ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405
 #, java-format
 msgid "Fetching a package of relations from ''{0}''"
-msgstr ""
+msgstr "Stahuji balík relací z ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416
@@ -8819,10 +9059,11 @@
 msgstr "Komunikace s {0} zahájena za použití protokolu verze {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
 msgstr "neočekávaný formát id získaný ze serveru, získáno ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -8831,76 +9072,80 @@
 "neočekávaný formát nové verze modifikovaného prvku ''{0}'', zadáno ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315
 msgid "Creating changeset..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:293
+msgstr "Vytvářím sadu změn..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
 #, java-format
 msgid "Successfully opened changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#, fuzzy, java-format
+msgid "id of changeset > 0 required. Got {0}"
+msgstr "požadován parametr {0} > 0. Zadáno {1}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
-#, java-format
-msgid "Changeset {0} is unchanged. Skipping update."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317
+msgstr "Aktualizuji sadu změn..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
 #, java-format
 msgid "Updating changeset {0}..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
-msgid ""
-"Failed to update changeset. Either there is no current changeset or the id "
-"of the current changeset is 0"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
+msgstr "Aktualizuji sadu změn {0}..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
 msgid "Closing changeset..."
 msgstr "Zavírám sadu změn..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
-#, java-format
-msgid "Closing changeset {0}..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
-#, java-format
-msgid "Leaving changeset {0} open..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
 msgid "No changeset present for diff upload"
 msgstr "Není k dizpozici sada změn pro rozdílový upload"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414
 msgid "Preparing..."
 msgstr "Připravuji..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419
 msgid "Uploading..."
 msgstr "Nahrávám..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438
 msgid "Waiting 10 seconds ... "
 msgstr "Čekám 10 sekund ... "
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
+msgstr "Zkusím nový pokus, {0} z {1}, během {2} sekund ..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449
 msgid "OK - trying again."
 msgstr "OK - další pokus."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:485
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr "Zahajuji pokus {0} z {1}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
+msgid "current changeset is null. Can't upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
+#, java-format
+msgid "id of current changeset > required. Current id is {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, fuzzy, java-format
+msgid "Changeset id > 0 expected. Got {0}"
+msgstr "očekáváno id > 0. Nalezeno {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
+#, java-format
+msgid "Open changeset expected. Got closed changeset with id {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
@@ -8925,33 +9170,92 @@
 msgstr "poškozený bz2 soubor."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
+#, fuzzy, java-format
+msgid "missing mandatory attribute ''{0}''"
+msgstr "Chybějící povinný atribut ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:128
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:134
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
+#, fuzzy, java-format
+msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgstr "Neplatná hodnota pro atribut ''uid''. Nalezeno ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
+#, fuzzy, java-format
+msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgstr "Neplatná hodnota pro atribut ''uid''. Nalezeno ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
+#, fuzzy, java-format
+msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgstr "Neplatná hodnota pro atribut ''uid''. Nalezeno ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#, java-format
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
+msgstr "Chybějící povinný atribut ''{0}'' XML elementu {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''"
+msgstr "Chybějící povinný atribut ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#, java-format
+msgid "Unsupported version: {0}"
+msgstr "Nepodporovaná verze: {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:176
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Aborting."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#, java-format
+msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgstr "Neplatná hodnota pro atribut ''uid''. Nalezeno ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
+#, fuzzy
+msgid "Parsing list of changesets..."
+msgstr "Zavírám sadu změn..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
 msgid "Incorrect password or username."
 msgstr "Nesprávné heslo nebo uživatelské jméno"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:168
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 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:172
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 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:178
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
 msgid "Enter Password"
 msgstr "Zadejte heslo"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 msgid "Login"
 msgstr "Přihlásit se"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:242
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Základní URL OSM serveru (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
 msgid "Login name (e-mail) to the OSM account."
 msgstr "Přihlašovací jméno (e-mail) k účtu OSM."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -8959,17 +9263,17 @@
 "Přihlašovací heslo k OSM účtu. Nechte prázdné, pokud nechcete heslo ukládat."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
 msgid "Base Server URL"
 msgstr "URL serveru"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
 msgid "OSM username (e-mail)"
 msgstr "Uživatelské jméno (e-mail)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
 msgid "OSM password"
 msgstr "OSM heslo"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -8981,8 +9285,8 @@
 "<br><b>Nepoužívejte hesla která chcete utajit.</b></html>"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:51
+#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #, java-format
 msgid "(at line {0}, column {1})"
-msgstr ""
+msgstr "(na řádce {0}, sloupci {1})"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26
@@ -9076,20 +9380,5 @@
 msgstr "Chyba během parsování"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124
-#, fuzzy, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr "povinný atribut ''{0}'' chybí"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
-#, fuzzy, java-format
-msgid "Missing mandatory attribute ''{0}''"
-msgstr "povinný atribut ''{0}'' chybí"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
-#, fuzzy, java-format
-msgid "Unsupported version: {0}"
-msgstr "Neznámá verze: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:155
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -9098,70 +9387,67 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
 msgid "found XML element <nd> element not as direct child of element <way>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183
-#, fuzzy, java-format
+msgstr "Nalezen XML element <nd> jinde, než jako přímý potomek elementu <rway>"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
-msgstr "povinný atribut ''{0}'' chybí"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
-#, fuzzy, java-format
+msgstr "Chybějící povinný atribut ''{0}'' na <nd> v cestě {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
-msgstr "Neplatná hodnota atributu \"ref\" člena reláce {0}, zadáno {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+msgstr "Neplatná hodnota atributu ''ref'' elementu <nd>. Nalezeno {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
 msgid "Found XML element <member> not as direct child of element <relation>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212
-#, fuzzy, java-format
+"Nalezen XML element <member> jinde, než jako přímý potomek elementu "
+"<relation>"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}"
-msgstr "Chybí atribut \"ref\" člena relace {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217
-#, fuzzy, java-format
+msgstr "Chybějící atribut ''ref'' na členu v relaci {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
-msgstr "Neplatná hodnota atributu \"ref\" člena reláce {0}, zadáno {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
-#, fuzzy, java-format
+msgstr "Neplatná hodnota atributu ''ref'' na členu v relaci {0}. Nalezeno {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}"
-msgstr "Chybí atribut \"type\" člena {0} relace {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
-#, fuzzy, java-format
+msgstr "Chybějící atribut ''type'' na členu {0} v relaci {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#, java-format
 msgid ""
 "Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}."
-msgstr "Neplatná hodnota atributu \"ref\" člena reláce {0}, zadáno {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
+msgstr ""
+"Neplatná hodnota atributu ''type'' na členu {0} v relaci {1}. Nalezeno {2}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Nekompletní <member> specifikace s ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
-#, java-format
-msgid "Warning: Undefined element ''{0}'' found in input stream. Skipping."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
-#, fuzzy, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
-msgstr "nedovolená hodnota povinného atributu ''{0}'' typu int, zadáno ''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Skipping."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
 msgid "Illegal object with id=0"
 msgstr "Neplatný objekt s id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#, java-format
 msgid ""
 "Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
 msgstr ""
-"Neplatná hodnota atributu \"version\" v OSM prvku s  id {0}, zadáno {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:303
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
 #, java-format
 msgid ""
@@ -9170,5 +9456,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
 #, java-format
 msgid ""
@@ -9177,5 +9463,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
@@ -9185,25 +9471,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:316
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#, java-format
 msgid "Unknown or unsupported API version. Got {0}"
-msgstr "Neznámá verze: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
-#, fuzzy, java-format
+msgstr "Neznámá, nebo nepodporovaná verze API. Nalezeno {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#, java-format
 msgid "Missing attribute ''version'' on OSM primitive with id {0}"
-msgstr "Chybí atribut \"version\" v OSM prvku s id {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
-#, fuzzy, java-format
+msgstr "Chybějící atribut ''version'' na OSM objektu s id {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#, java-format
 msgid "Missing required attribute ''{0}''."
-msgstr "Chybí povinný atribut \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#, fuzzy, java-format
+msgstr "Chybějící povinný atribut ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
-msgstr "nedovolená hodnota povinného atributu ''{0}'' typu int, zadáno ''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
 #, java-format
 msgid ""
@@ -9211,5 +9497,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
 #, java-format
 msgid ""
@@ -9218,5 +9504,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
 #, java-format
 msgid ""
@@ -9224,22 +9510,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#, java-format
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
 "id ''{1}''"
-msgstr "nelze porovnat prvky s id ''{0}'' a id ''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
 msgid "Prepare OSM data..."
 msgstr "Připravuji OSM data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 msgid "Parsing OSM data..."
-msgstr "Parsuji data historie OSM ..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487
-#, fuzzy
+msgstr "Zpracovávám OSM data..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
 msgid "Preparing data set..."
 msgstr "Připravuji data..."
@@ -9263,4 +9547,24 @@
 msgstr "Stahování odkazovaných relací ..."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51
+#, fuzzy
+msgid "Reading changesets..."
+msgstr "Vytvářím sadu změn..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
+#, fuzzy
+msgid "Downloading changesets ..."
+msgstr "Zavírám sadu změn..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85
+#, fuzzy, java-format
+msgid "Reading changeset {0} ..."
+msgstr "Nechávám sadu změn {0} otevřenou..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91
+#, fuzzy, java-format
+msgid "Downloading changeset {0} ..."
+msgstr "Uzavírám sadu změn {0}..."
+
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
@@ -9276,10 +9580,14 @@
 msgstr "Kontaktuji server..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
 msgid "Failed to open connection to API {0}"
 msgstr "Nepodařilo se navázat spojení s API {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
+msgid "Error: failed to add authentication credentials to the connection."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -9288,33 +9596,52 @@
 "internetu."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+msgid "XML tag <user> is missing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
+#, fuzzy, java-format
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgstr "Chybějící povinný atribut ''{0}'' XML elementu {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
+#, fuzzy, java-format
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgstr "Neplatná hodnota pro atribut ''uid''. Nalezeno ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
 msgid "Starting to upload with one request per primitive ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
+msgstr "Začínám nahrávat s jedním požadavkem na objekt ..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
+msgstr "{0}% ({1}/{2}), {3} zbývát. Nahrávám uzel ''{4}'' (id: {5})"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
+msgstr "{0}% ({1}/{2}), {3} zbývát. Nahrávám cestu ''{4}'' (id: {5})"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+msgstr "{0}% ({1}/{2}), {3} zbývát. Nahrávám relaci ''{4}'' (id: {5})"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
 msgid "Starting to upload in one request ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:171
-#, fuzzy
+msgstr "Začínám nahrávat vše v jednom požadavku ..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135
 msgid "Uploading data ..."
-msgstr "Nahrávám..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:178
+msgstr "Nahrávám data na serevr ..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
 msgid ""
 "WARNING: no API version defined for data to upload. Falling back to version "
@@ -9322,5 +9649,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147
 #, java-format
 msgid ""
@@ -9330,10 +9657,10 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
 msgid "Update Plugins"
 msgstr "Aktualizuj pluginy"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 msgid "Download Plugins"
 msgstr "Stáhnout pluginy"
@@ -9444,5 +9771,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:290
 msgid "<html>"
-msgstr ""
+msgstr "<html>"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291
@@ -9493,5 +9820,5 @@
 msgstr "Více detailů"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -9501,18 +9828,18 @@
 msgstr[2] "Informace o pluginech staženy z {0} sití"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
 msgid "No plugin information found."
 msgstr "Nenalezeny informace o pluginu"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr "Plug-in {0} je nedostupný. Aktualizace přeskočena."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:93
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
 msgid "All installed plugins are up to date."
 msgstr "Všechny nainstalované pluginy jsou aktuální."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
 #, java-format
 msgid ""
@@ -9525,9 +9852,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
 msgid "Download missing plugins"
 msgstr "Stáhnout chybějící pluginy"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
 #, java-format
 msgid ""
@@ -9542,43 +9869,43 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
 msgid "unknown"
 msgstr "neznámý"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Verze {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 msgid "Plugin bundled with JOSM"
 msgstr "Plugin zahrnut v JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:357
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -9705,5 +10032,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:165
-#, fuzzy
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -9711,6 +10037,4 @@
 "community."
 msgstr ""
-"Maximální velikost hranice oblasti je 0.25 a váš požadavek byl příliš velký. "
-"Vyžádejte si menší plochu, nebo použijte planet.osm"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:168
@@ -9894,5 +10218,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
 msgid "Visibility"
-msgstr ""
+msgstr "Viditelnost"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
@@ -9906,11 +10230,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:140
 msgid "(What does that mean?)"
-msgstr ""
-
-#. item "Relations/Route" text "Symbol description"
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3148
-msgid "Description"
-msgstr "Popis"
+msgstr "(Co to znamená?)"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
@@ -10339,5 +10657,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:386
 msgid "Select Feuille"
-msgstr ""
+msgstr "Vybrat Feuille"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:128
@@ -10374,4 +10692,6 @@
 "or action canceled"
 msgstr ""
+"Město {0} nenalezeno, nebo není dostupné\n"
+"nebo byla akce přerušena"
 
 #. this below is a temporary workaround to fix the "always on top" issue
@@ -10381,5 +10701,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:365
 msgid "Select commune"
-msgstr ""
+msgstr "Vybrat commune"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:354
@@ -10486,5 +10806,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:92
 msgid "Allows multiple layers stacking"
-msgstr ""
+msgstr "Povolit skládání více vrstev"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:97
@@ -10505,13 +10825,13 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:134
 msgid "Grab smaller images (higher quality but use more memory)"
-msgstr ""
+msgstr "Stahovat menší obrázky (lepší kvalita, ale používá více paměti)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:138
 msgid "Fixed size square (default is 100m)"
-msgstr ""
+msgstr "Fixní velikost čtverce (výchozí je 100m)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:158
 msgid "Fixed size (from 25 to 1000 meters)"
-msgstr ""
+msgstr "Fixní velikost (od 25 do 1000 metrů)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:167
@@ -10555,4 +10875,6 @@
 "building import size is limited to 1 km2 max."
 msgstr ""
+"Aby se předešlo přetížení WMS katastru,\n"
+"import budov je omezen na max. 1 km2."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadSVGBuilding.java:269
@@ -10575,9 +10897,9 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:32
 msgid "Contacting cadastre WMS ..."
-msgstr ""
+msgstr "Kontaktuji WMS katastru ..."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:38
 msgid "Image already loaded"
-msgstr ""
+msgstr "Obrázek je již načtený"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/DownloadWMSPlanImage.java:74
@@ -10631,13 +10953,15 @@
 "(two points required)"
 msgstr ""
+"Klikněte na první roh pro oříznutí obrázku\n"
+"(jsou potřeba dva body)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:158
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:177
 msgid "Image cropping"
-msgstr ""
+msgstr "Ořezávání obrázků"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:176
 msgid "Click second corner for image cropping"
-msgstr ""
+msgstr "Klikněte na druhý roh pro oříznutí obrázku"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:196
@@ -10661,4 +10985,6 @@
 "or just retry "
 msgstr ""
+"Chcete zrušit úplně\n"
+"nebo jen opakovat "
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:249
@@ -10672,13 +10998,14 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:252
 msgid "East"
-msgstr ""
+msgstr "Východ"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:253
 msgid "North"
-msgstr ""
+msgstr "Sever"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
-msgid "Set "
-msgstr ""
+#, fuzzy, java-format
+msgid "Set {0} Lambert coordinates"
+msgstr "Ponechat cizí souřadnice"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -10704,5 +11031,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:26
 msgid "Set a new location for the next request"
-msgstr ""
+msgstr "Nastavení nového místa pro další požadavek"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:38
@@ -10732,13 +11059,13 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
 msgid "Reset cookie"
-msgstr ""
+msgstr "Vymazat cookie"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionResetCookie.java:17
 msgid "Get a new cookie (session timeout)"
-msgstr ""
+msgstr "Získat nový cookie (vypršení sezení)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:25
 msgid "Export as PNG format (only raster images)"
-msgstr ""
+msgstr "Exportovat v PNG formátu (pouze rastrové obrázky)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/SimplifyWay.java:62
@@ -10783,5 +11110,5 @@
 #, java-format
 msgid "Raster size: {0}"
-msgstr ""
+msgstr "Velikost rastru: {0}"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:186
@@ -10811,4 +11138,5 @@
 msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
 msgstr ""
+"Lambertova zóne {0} v cache nekompatibilní se současnou Lambertovou zónou {1}"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:393
@@ -11308,6 +11636,6 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 #: build/trans_style.java:990 build/trans_style.java:1007
-#: build/trans_style.java:1023 build/trans_style.java:3392
-#: build/trans_style.java:3400
+#: build/trans_style.java:1023 build/trans_style.java:3400
+#: build/trans_style.java:3408
 msgid "water"
 msgstr "voda"
@@ -11604,4 +11932,55 @@
 msgstr "Měření"
 
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Michigan Left"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Adds no left turn for sets of 4 or 5 ways."
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45
+#, fuzzy
+msgid "Please select 4 or 5 ways to assign no left turns."
+msgstr "Vyberte jednu nebo více uzavřených cest s alespoň čtyřmi uzly."
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61
+#, fuzzy, java-format
+msgid "{0} extrem nodes."
+msgstr "{0} uzel"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69
+#, fuzzy, java-format
+msgid "Via node {0}, {1}"
+msgstr "Změnit {0} {1}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75
+#, fuzzy, java-format
+msgid "{0} via nodes."
+msgstr "{0} uzel"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78
+msgid "Unable to find via nodes. Please check your selection"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98
+#, fuzzy, java-format
+msgid "MIddle way: {0}"
+msgstr "Přidat cestu {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121
+msgid "Create Michigan left turn restriction"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129
+#, fuzzy, java-format
+msgid "Processing {0}"
+msgstr "Verze {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142
+#, fuzzy, java-format
+msgid "Relation: from {0} to {1} via {2}"
+msgstr "Verze {0} vytvořená na {1} uživatelem {2}"
+
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
 msgid "OpenLayers"
@@ -11759,7 +12138,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
-#, fuzzy
 msgid "create new objects"
-msgstr "Vytvořit nový uzel."
+msgstr "vytváření nových objektů"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
@@ -11823,7 +12201,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
-#, fuzzy
 msgid "Remote Control has been asked to create a new node."
-msgstr "Dálkové ovládání bylo požádáno o nahrání dat z API."
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
@@ -11862,5 +12239,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java:88
 msgid "Click and drag to move destination"
-msgstr "Táhni a pusť pro přesun cíle"
+msgstr "Táhněte a pusťte pro přesun cíle"
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java:77
@@ -12086,5 +12463,5 @@
 msgstr "Otevřít dialog editoru tagů"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:158
 msgid "JOSM Tag Editor Plugin"
 msgstr "Plugin pro editaci tagů v JOSM"
@@ -12094,5 +12471,5 @@
 msgstr "Výška"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:370
 #, java-format
 msgid "Updating properties of up to {0} object"
@@ -12102,18 +12479,4 @@
 msgstr[2] "Upravit vlastnosti {0} objektů"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44
-msgid "INFO: entering compatibilty mode for JOSM with Main.ds"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47
-msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49
-msgid ""
-"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-"found."
-msgstr ""
-
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
 msgid "Group"
@@ -12123,9 +12486,4 @@
 msgid "Item"
 msgstr "Položka"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-msgid "Filter"
-msgstr "Filtrovat"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63
@@ -12211,5 +12569,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2272
 msgid "Street name"
 msgstr "Jméno ulice"
@@ -12376,8 +12734,4 @@
 msgid "Zoom (in metres)"
 msgstr "Přiblížení (v metrech)"
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
-msgid "URL"
-msgstr "URL"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -12574,17 +12928,15 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:460
-#, fuzzy
 msgid "Fixing errors ..."
-msgstr "Čekám 10 sekund ... "
+msgstr "Opravuji chyby ..."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:484
 #, java-format
 msgid "Fixing ({0}/{1}): ''{2}''"
-msgstr ""
+msgstr "Opravuji ({0}/{1}): ''{2}''"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501
-#, fuzzy
 msgid "Updating map ..."
-msgstr "Aktualizuji data"
+msgstr "Aktualizuji mapu ..."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69
@@ -12617,5 +12969,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
 msgid "Crossing buildings"
-msgstr ""
+msgstr "Křížící se budovy"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
@@ -12634,5 +12986,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:84
 msgid "Nodes at same position"
-msgstr ""
+msgstr "Uzly na stejné pozici"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143
@@ -12643,5 +12995,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76
 msgid "Duplicated ways"
-msgstr ""
+msgstr "Duplicitní cesty"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
@@ -12650,8 +13002,10 @@
 "coordinates."
 msgstr ""
+"Tento test kontroluje na přítomnost cest se stejnými tagy a stejnými "
+"souřadnicemi uzlů."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141
 msgid "Delete duplicate ways"
-msgstr ""
+msgstr "Smazat duplicitní cesty"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22
@@ -12888,5 +13242,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
 msgid "Check if map painting found data errors."
-msgstr ""
+msgstr "Kontroila, zda při kreslení mapy nebyly nalezeny chyby."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735
@@ -13076,7 +13430,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
-#: build/trans_style.java:4179
+#: build/trans_style.java:4159 build/trans_style.java:4166
+#: build/trans_style.java:4173 build/trans_style.java:4180
+#: build/trans_style.java:4187
 msgid "building"
 msgstr "budova"
@@ -13090,5 +13444,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4186
+#: build/trans_style.java:4194
 msgid "area"
 msgstr "oblast"
@@ -13145,5 +13499,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:92
 msgid "Unnamed junction"
-msgstr ""
+msgstr "Nepojmenovaná křižovatka"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:99
@@ -13213,14 +13567,14 @@
 #: ../plugins/waydownloader/src/WayDownloaderPlugin.java:92
 msgid "Select a starting node on the end of a way"
-msgstr ""
-
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147
+msgstr "Vyberte počáteční bod na konci cesty"
+
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:148
 msgid "Reached the end of the line"
-msgstr ""
+msgstr "Dosažen konec cesty"
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:155
 msgid "Reached a junction"
-msgstr ""
+msgstr "Dosažena křižovatka"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
@@ -13352,5 +13706,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:177
 msgid "Select WMS layer"
-msgstr ""
+msgstr "Vybrat WMS vrstvu"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
@@ -13404,5 +13758,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96
 msgid "(deactivated)"
-msgstr ""
+msgstr "(deaktivované)"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:143
@@ -13431,5 +13785,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202
 msgid "Invalid URL?"
-msgstr ""
+msgstr "Neplatné URL?"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
@@ -13520,18 +13874,17 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
 msgid "Copy Selected Default(s)"
-msgstr ""
+msgstr "Kopírovat zvolené výchozí hodnoty"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
 msgid "Please select at least one row to copy."
-msgstr ""
+msgstr "Vyberte alespoň jeden řádek pro kopírování"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
 msgid "Downloader:"
-msgstr ""
+msgstr "Stahovač:"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
-#, fuzzy
 msgid "Overlap tiles"
-msgstr "Překrývající se plochy"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
@@ -13540,12 +13893,11 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
-#, fuzzy
 msgid "% of north:"
-msgstr "sever"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10
 msgid "WMS Files (*.wms)"
-msgstr ""
+msgstr "WMS soubory (*.wms)"
 
 #. *
@@ -13588,5 +13940,5 @@
 #: build/specialmessages.java:11
 msgid "You must make your edits public to upload new data"
-msgstr ""
+msgstr "Musíte vaše editace označit jako veřejné pro nahrávání nových dat"
 
 #. Plugin AgPifoJ
@@ -13703,6 +14055,11 @@
 "importovat z gps vrstvy)."
 
+#. Plugin michigan_left
+#: build/trans_plugins.java:35
+msgid "Adds no left turn for sets of 4 or 5 ways"
+msgstr ""
+
 #. Plugin nearclick
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid ""
 "Simulates a click when you do a small and short drag. This is usefull for "
@@ -13715,15 +14072,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid "Displays an OpenLayers background image"
 msgstr "Zobrazuje na pozadí obrázek z OpenLayers"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importuje problémy z OpenStreetBugs."
 
 #. Plugin openvisible
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13732,5 +14089,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13739,5 +14096,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13748,15 +14105,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Let other applications send commands to JOSM."
 msgstr "Umožní jiné aplikace posílat příkazy do JOSM."
 
 #. Plugin routes
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13767,10 +14124,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Provides routing capabilities."
 msgstr "Poskytuje směrování"
 
 #. Plugin slippymap
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13781,15 +14138,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Umožní přidat ukazatele/body na současnou GPS polohu."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Poskytuje dialog umožňující editovat tagy v tabulce."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -13799,10 +14156,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Make terraced houses out of single blocks."
 msgstr "Vytváření řadových domků z jednotlivých bloků."
 
 #. Plugin usertools
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -13813,5 +14170,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -13822,5 +14179,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -13831,5 +14188,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -13838,10 +14195,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Snadné stahovaní velmi dlouhých propojených cest"
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -13898,4 +14255,10 @@
 #. <annotations>
 #: build/trans_presets.java:57
+#, fuzzy
+msgid "Highways"
+msgstr "silnice"
+
+#. group "Highways"
+#: build/trans_presets.java:58
 msgid "Streets"
 msgstr "Ulice"
@@ -13906,5 +14269,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:58 build/trans_surveyor.java:72
+#: build/trans_presets.java:59 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Dálnice"
@@ -13913,5 +14276,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:61
+#: build/trans_presets.java:62
 msgid "Edit Motorway"
 msgstr "Upravit dálnici"
@@ -13938,8 +14301,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:120 build/trans_presets.java:140
-#: build/trans_presets.java:177 build/trans_presets.java:197
-#: build/trans_presets.java:1557 build/trans_presets.java:3146
+#: build/trans_presets.java:65 build/trans_presets.java:101
+#: build/trans_presets.java:121 build/trans_presets.java:141
+#: build/trans_presets.java:178 build/trans_presets.java:198
+#: build/trans_presets.java:1560 build/trans_presets.java:3158
 msgid "Reference"
 msgstr "Číslo"
@@ -13953,8 +14316,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:358
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:359
 msgid "Lanes"
 msgstr "Jízdních pruhů"
@@ -13971,15 +14334,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:224 build/trans_presets.java:280
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:373 build/trans_presets.java:388
-#: build/trans_presets.java:412 build/trans_presets.java:431
-#: build/trans_presets.java:452 build/trans_presets.java:472
-#: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1307
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:225 build/trans_presets.java:281
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:374 build/trans_presets.java:389
+#: build/trans_presets.java:413 build/trans_presets.java:432
+#: build/trans_presets.java:453 build/trans_presets.java:473
+#: build/trans_presets.java:511 build/trans_presets.java:667
+#: build/trans_presets.java:1310
 msgid "Max. speed (km/h)"
 msgstr "Max. rychlost (km/h)"
@@ -14016,16 +14379,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:293 build/trans_presets.java:306
-#: build/trans_presets.java:320 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:464
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:659 build/trans_presets.java:1300
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:294 build/trans_presets.java:307
+#: build/trans_presets.java:321 build/trans_presets.java:353
+#: build/trans_presets.java:405 build/trans_presets.java:425
+#: build/trans_presets.java:445 build/trans_presets.java:465
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:660 build/trans_presets.java:1303
 msgid "Oneway"
 msgstr "Jednosměrka"
@@ -14067,19 +14430,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:353
-#: build/trans_presets.java:362 build/trans_presets.java:405
-#: build/trans_presets.java:425 build/trans_presets.java:445
-#: build/trans_presets.java:465 build/trans_presets.java:485
-#: build/trans_presets.java:504 build/trans_presets.java:523
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:586 build/trans_presets.java:607
-#: build/trans_presets.java:628 build/trans_presets.java:660
-#: build/trans_presets.java:1301 build/trans_surveyor.java:12
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:354
+#: build/trans_presets.java:363 build/trans_presets.java:406
+#: build/trans_presets.java:426 build/trans_presets.java:446
+#: build/trans_presets.java:466 build/trans_presets.java:486
+#: build/trans_presets.java:505 build/trans_presets.java:524
+#: build/trans_presets.java:545 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629 build/trans_presets.java:661
+#: build/trans_presets.java:1304 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Most"
@@ -14115,19 +14478,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:354
-#: build/trans_presets.java:378 build/trans_presets.java:406
-#: build/trans_presets.java:426 build/trans_presets.java:446
-#: build/trans_presets.java:466 build/trans_presets.java:486
-#: build/trans_presets.java:505 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629 build/trans_presets.java:661
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:355
+#: build/trans_presets.java:379 build/trans_presets.java:407
+#: build/trans_presets.java:427 build/trans_presets.java:447
+#: build/trans_presets.java:467 build/trans_presets.java:487
+#: build/trans_presets.java:506 build/trans_presets.java:525
+#: build/trans_presets.java:546 build/trans_presets.java:567
+#: build/trans_presets.java:588 build/trans_presets.java:609
+#: build/trans_presets.java:630 build/trans_presets.java:662
+#: build/trans_presets.java:1305
 msgid "Tunnel"
 msgstr "Tunel"
@@ -14161,18 +14524,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:73 build/trans_presets.java:90
-#: build/trans_presets.java:110 build/trans_presets.java:129
-#: build/trans_presets.java:150 build/trans_presets.java:166
-#: build/trans_presets.java:186 build/trans_presets.java:205
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:355
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:467
-#: build/trans_presets.java:487 build/trans_presets.java:506
-#: build/trans_presets.java:525 build/trans_presets.java:546
-#: build/trans_presets.java:567 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:630
-#: build/trans_presets.java:662 build/trans_presets.java:1303
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:356
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:468
+#: build/trans_presets.java:488 build/trans_presets.java:507
+#: build/trans_presets.java:526 build/trans_presets.java:547
+#: build/trans_presets.java:568 build/trans_presets.java:589
+#: build/trans_presets.java:610 build/trans_presets.java:631
+#: build/trans_presets.java:663 build/trans_presets.java:1306
 msgid "Cutting"
 msgstr "Zářez"
@@ -14206,18 +14569,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:74 build/trans_presets.java:91
-#: build/trans_presets.java:111 build/trans_presets.java:130
-#: build/trans_presets.java:151 build/trans_presets.java:167
-#: build/trans_presets.java:187 build/trans_presets.java:206
-#: build/trans_presets.java:222 build/trans_presets.java:240
-#: build/trans_presets.java:258 build/trans_presets.java:277
-#: build/trans_presets.java:310 build/trans_presets.java:356
-#: build/trans_presets.java:408 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:468
-#: build/trans_presets.java:488 build/trans_presets.java:507
-#: build/trans_presets.java:526 build/trans_presets.java:547
-#: build/trans_presets.java:568 build/trans_presets.java:589
-#: build/trans_presets.java:610 build/trans_presets.java:631
-#: build/trans_presets.java:663 build/trans_presets.java:1304
+#: build/trans_presets.java:75 build/trans_presets.java:92
+#: build/trans_presets.java:112 build/trans_presets.java:131
+#: build/trans_presets.java:152 build/trans_presets.java:168
+#: build/trans_presets.java:188 build/trans_presets.java:207
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:357
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:469
+#: build/trans_presets.java:489 build/trans_presets.java:508
+#: build/trans_presets.java:527 build/trans_presets.java:548
+#: build/trans_presets.java:569 build/trans_presets.java:590
+#: build/trans_presets.java:611 build/trans_presets.java:632
+#: build/trans_presets.java:664 build/trans_presets.java:1307
 msgid "Embankment"
 msgstr "Násep"
@@ -14225,5 +14588,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Motorway Link"
 msgstr "Dálnice - nájezd, rampa, kolektor"
@@ -14232,5 +14595,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:80
+#: build/trans_presets.java:81
 msgid "Edit Motorway Link"
 msgstr "Upravit dálniční spojku"
@@ -14238,14 +14601,14 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:94
+#: build/trans_presets.java:95
 msgid "Trunk"
-msgstr "4. pruhová silnice"
+msgstr "Čtyřproudá silnice"
 
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:97
+#: build/trans_presets.java:98
 msgid "Edit Trunk"
-msgstr "Upravit 4. pruhovou silnice"
+msgstr "Upravit čtyřproudou silnici"
 
 #. item "Streets/Trunk" check "Oneway"
@@ -14253,6 +14616,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
 msgid "Motorroad"
 msgstr "Silnice pro motorová vozidla"
@@ -14260,14 +14623,14 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:114
+#: build/trans_presets.java:115
 msgid "Trunk Link"
-msgstr "4. pruhová silnice - nájezd"
+msgstr "Čtyřproudá silnice - nájezd"
 
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:117
+#: build/trans_presets.java:118
 msgid "Edit Trunk Link"
-msgstr "Upravit 4. pruhovou silnici - nájezd"
+msgstr "Upravit čtyřproudou silnici - nájezd"
 
 #. item "Streets/Trunk Link" check "Embankment"
@@ -14278,5 +14641,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:134 build/trans_surveyor.java:76
+#: build/trans_presets.java:135 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Silnice 1. třídy"
@@ -14285,5 +14648,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:137
+#: build/trans_presets.java:138
 msgid "Edit Primary Road"
 msgstr "Upravit silnici 1. třídy"
@@ -14291,10 +14654,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:154
+#: build/trans_presets.java:155
 msgid "Primary Link"
 msgstr "Silnice 1. třídy - nájezd"
 
 #. item
-#: build/trans_presets.java:155
+#: build/trans_presets.java:156
 msgid "Edit Primary Link"
 msgstr "Upravit spojku silnice 1. třídy"
@@ -14306,5 +14669,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:170 build/trans_surveyor.java:80
+#: build/trans_presets.java:171 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Silnice 2. třídy"
@@ -14314,5 +14677,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:174
+#: build/trans_presets.java:175
 msgid "Edit Secondary Road"
 msgstr "Upravit silnici 2. třídy"
@@ -14320,5 +14683,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:190
+#: build/trans_presets.java:191
 msgid "Tertiary"
 msgstr "Silnice 3. třídy"
@@ -14328,5 +14691,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:194
+#: build/trans_presets.java:195
 msgid "Edit Tertiary Road"
 msgstr "Upravit silnici 3. třídy"
@@ -14338,5 +14701,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:209 build/trans_surveyor.java:84
+#: build/trans_presets.java:210 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Místní silnice"
@@ -14346,5 +14709,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:213
+#: build/trans_presets.java:214
 msgid "Edit Unclassified Road"
 msgstr "Upravit místní silnici"
@@ -14371,19 +14734,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:225 build/trans_presets.java:243
-#: build/trans_presets.java:261 build/trans_presets.java:281
-#: build/trans_presets.java:314 build/trans_presets.java:359
-#: build/trans_presets.java:375 build/trans_presets.java:389
-#: build/trans_presets.java:413 build/trans_presets.java:432
-#: build/trans_presets.java:453 build/trans_presets.java:473
-#: build/trans_presets.java:491 build/trans_presets.java:511
-#: build/trans_presets.java:532 build/trans_presets.java:553
-#: build/trans_presets.java:574 build/trans_presets.java:595
-#: build/trans_presets.java:616 build/trans_presets.java:637
-#: build/trans_presets.java:667 build/trans_presets.java:680
-#: build/trans_presets.java:693 build/trans_presets.java:706
-#: build/trans_presets.java:719 build/trans_presets.java:732
-#: build/trans_presets.java:745 build/trans_presets.java:1308
-#: build/trans_presets.java:1498 build/trans_presets.java:1540
+#: build/trans_presets.java:226 build/trans_presets.java:244
+#: build/trans_presets.java:262 build/trans_presets.java:282
+#: build/trans_presets.java:315 build/trans_presets.java:360
+#: build/trans_presets.java:376 build/trans_presets.java:390
+#: build/trans_presets.java:414 build/trans_presets.java:433
+#: build/trans_presets.java:454 build/trans_presets.java:474
+#: build/trans_presets.java:492 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:554
+#: build/trans_presets.java:575 build/trans_presets.java:596
+#: build/trans_presets.java:617 build/trans_presets.java:638
+#: build/trans_presets.java:668 build/trans_presets.java:681
+#: build/trans_presets.java:694 build/trans_presets.java:707
+#: build/trans_presets.java:720 build/trans_presets.java:733
+#: build/trans_presets.java:746 build/trans_presets.java:1311
+#: build/trans_presets.java:1501 build/trans_presets.java:1543
 msgid "Width (meters)"
 msgstr "Šířka (metrů)"
@@ -14395,5 +14758,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:228 build/trans_surveyor.java:88
+#: build/trans_presets.java:229 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Ulice"
@@ -14402,5 +14765,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:231
+#: build/trans_presets.java:232
 msgid "Edit Residential Street"
 msgstr "Upravit ulici"
@@ -14425,14 +14788,14 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:611
-#: build/trans_presets.java:632 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "Surface"
 msgstr "Povrch"
@@ -14453,55 +14816,55 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paved"
 msgstr "zpevněný"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "unpaved"
 msgstr "nezpevněný"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "asphalt"
-msgstr ""
-
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+msgstr "asfalt"
+
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "concrete"
 msgstr "beton"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
 msgid "metal"
-msgstr ""
+msgstr "kov"
 
 #. color heath
@@ -14513,100 +14876,100 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
-#: build/trans_style.java:3367
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
+#: build/trans_style.java:3375
 msgid "wood"
 msgstr "Prales"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paving_stones"
-msgstr ""
+msgstr "dlažební kostky"
 
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "cobblestone"
 msgstr "dlažební kostky"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "gravel"
 msgstr "štěrk"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "pebblestone"
-msgstr ""
-
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+msgstr "oblázky"
+
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "grass"
 msgstr "tráva"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "sand"
 msgstr "písek"
@@ -14614,13 +14977,13 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "ground"
 msgstr "země"
@@ -14628,5 +14991,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:246
+#: build/trans_presets.java:247
 msgid "Living Street"
 msgstr "Obytná zóna"
@@ -14635,5 +14998,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:249
+#: build/trans_presets.java:250
 msgid "Edit Living Street"
 msgstr "Upravit obytnou zónu"
@@ -14641,5 +15004,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:264
+#: build/trans_presets.java:265
 msgid "Service"
 msgstr "Účelová komunikace"
@@ -14648,5 +15011,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:267
+#: build/trans_presets.java:268
 msgid "Edit Serviceway"
 msgstr "Upravit účelovou komunikaci"
@@ -14656,18 +15019,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "Serviceway type"
 msgstr "Typ účelové komunikace"
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "alley"
 msgstr "ulička"
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "driveway"
 msgstr "příjezdová cesta"
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "parking_aisle"
 msgstr "Obslužná silnice na parkovišti"
@@ -14675,5 +15038,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:284
+#: build/trans_presets.java:285
 msgid "Parking Aisle"
 msgstr "Obslužná silnice na parkovišti"
@@ -14683,5 +15046,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:288
+#: build/trans_presets.java:289
 msgid "Edit Parking Aisle"
 msgstr "Editovat obslužnou silnici na parkovišti"
@@ -14689,5 +15052,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:298
+#: build/trans_presets.java:299
 msgid "Road (Unknown Type)"
 msgstr "Cesta (neznámý typ)"
@@ -14696,5 +15059,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Edit Road of unknown type"
 msgstr "Upravit cestu neznámého typu"
@@ -14703,20 +15066,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:318
+#: build/trans_presets.java:319
 msgid "Road Restrictions"
 msgstr "Silniční omezení"
 
 #. item
-#: build/trans_presets.java:319
+#: build/trans_presets.java:320
 msgid "Edit Road Restrictions"
 msgstr "Upravit silniční omezení"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:321
+#: build/trans_presets.java:322
 msgid "Toll"
 msgstr "Poplatek"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:322
+#: build/trans_presets.java:323
 msgid "No exit (cul-de-sac)"
 msgstr "Slepá ulice"
@@ -14729,8 +15092,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:323 build/trans_presets.java:529
-#: build/trans_presets.java:550 build/trans_presets.java:571
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:634
+#: build/trans_presets.java:324 build/trans_presets.java:530
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:593 build/trans_presets.java:614
+#: build/trans_presets.java:635
 msgid "Access"
 msgstr "Přístup"
@@ -14784,29 +15147,29 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1397
-#: build/trans_presets.java:1398 build/trans_presets.java:1399
-#: build/trans_presets.java:1763 build/trans_presets.java:1773
-#: build/trans_presets.java:2397 build/trans_presets.java:2433
-#: build/trans_presets.java:2442 build/trans_presets.java:2443
-#: build/trans_presets.java:2444 build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:1396
+#: build/trans_presets.java:1397 build/trans_presets.java:1400
+#: build/trans_presets.java:1401 build/trans_presets.java:1402
+#: build/trans_presets.java:1767 build/trans_presets.java:1777
+#: build/trans_presets.java:2408 build/trans_presets.java:2444
+#: build/trans_presets.java:2453 build/trans_presets.java:2454
+#: build/trans_presets.java:2455 build/trans_presets.java:2725
 msgid "yes"
 msgstr "ano"
@@ -14819,40 +15182,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:212
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:212
 msgid "private"
 msgstr "soukromý"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655
 msgid "designated"
 msgstr "vyhrazený(preferovaný)"
@@ -14865,19 +15228,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:219
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:219
 msgid "destination"
 msgstr "dopravní obsluha"
@@ -14900,71 +15263,71 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:205
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:205
 msgid "permissive"
 msgstr "na povolení"
 
-#: build/trans_presets.java:323 build/trans_presets.java:327
-#: build/trans_presets.java:330 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636
+#: build/trans_presets.java:324 build/trans_presets.java:328
+#: build/trans_presets.java:331 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637
 msgid "agricultural"
 msgstr "zemědelská vozidla"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
-#: build/trans_presets.java:2433 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1396 build/trans_presets.java:1397
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
+#: build/trans_presets.java:2444 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
+#: build/trans_presets.java:2725
 msgid "no"
 msgstr "ne"
 
-#: build/trans_presets.java:326
+#: build/trans_presets.java:327
 msgid "Goods"
 msgstr "Zásobování"
 
-#: build/trans_presets.java:327
+#: build/trans_presets.java:328
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Nákladní vozidlo"
@@ -14979,10 +15342,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:328 build/trans_presets.java:651
-#: build/trans_presets.java:858 build/trans_presets.java:891
-#: build/trans_presets.java:913 build/trans_presets.java:950
-#: build/trans_presets.java:963 build/trans_presets.java:975
-#: build/trans_presets.java:987 build/trans_presets.java:999
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:329 build/trans_presets.java:652
+#: build/trans_presets.java:859 build/trans_presets.java:892
+#: build/trans_presets.java:914 build/trans_presets.java:951
+#: build/trans_presets.java:964 build/trans_presets.java:976
+#: build/trans_presets.java:988 build/trans_presets.java:1000
+#: build/trans_presets.java:1040
 msgid "Horse"
 msgstr "Kůň"
@@ -14998,13 +15361,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:329 build/trans_presets.java:530
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:635 build/trans_presets.java:859
-#: build/trans_presets.java:877 build/trans_presets.java:892
-#: build/trans_presets.java:914 build/trans_presets.java:951
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:330 build/trans_presets.java:531
+#: build/trans_presets.java:552 build/trans_presets.java:573
+#: build/trans_presets.java:594 build/trans_presets.java:615
+#: build/trans_presets.java:636 build/trans_presets.java:860
+#: build/trans_presets.java:878 build/trans_presets.java:893
+#: build/trans_presets.java:915 build/trans_presets.java:952
+#: build/trans_presets.java:965 build/trans_presets.java:977
+#: build/trans_presets.java:989 build/trans_presets.java:1001
+#: build/trans_presets.java:1041
 msgid "Motorcycle"
 msgstr "Motocykl"
@@ -15019,30 +15382,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:330 build/trans_presets.java:531
-#: build/trans_presets.java:552 build/trans_presets.java:573
-#: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:636 build/trans_presets.java:654
-#: build/trans_presets.java:878 build/trans_presets.java:893
-#: build/trans_presets.java:915 build/trans_presets.java:952
-#: build/trans_presets.java:965 build/trans_presets.java:977
-#: build/trans_presets.java:989 build/trans_presets.java:1001
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:331 build/trans_presets.java:532
+#: build/trans_presets.java:553 build/trans_presets.java:574
+#: build/trans_presets.java:595 build/trans_presets.java:616
+#: build/trans_presets.java:637 build/trans_presets.java:655
+#: build/trans_presets.java:879 build/trans_presets.java:894
+#: build/trans_presets.java:916 build/trans_presets.java:953
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1042
 msgid "Motorcar"
 msgstr "Motorové vozidlo"
 
-#: build/trans_presets.java:331
+#: build/trans_presets.java:332
 msgid "Public Service Vehicles (psv)"
 msgstr "Vozidla MHD"
 
-#: build/trans_presets.java:332
+#: build/trans_presets.java:333
 msgid "Motorboat"
 msgstr "Motorová loď"
 
-#: build/trans_presets.java:333
+#: build/trans_presets.java:334
 msgid "Boat"
 msgstr "Loď"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:336
 msgid "Min. speed (km/h)"
 msgstr "Min. rychlost (km/h)"
@@ -15050,25 +15413,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:336 build/trans_presets.java:374
+#: build/trans_presets.java:337 build/trans_presets.java:375
 msgid "Max. weight (tonnes)"
 msgstr "Max. hmotnost (tun)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:337
+#: build/trans_presets.java:338
 msgid "Max. Height (meters)"
 msgstr "Max. výška (metrů)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Max. Width (meters)"
 msgstr "Max. šířka (metrů)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:339
+#: build/trans_presets.java:340
 msgid "Max. Length (meters)"
 msgstr "Max. délka (metrů)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:341
+#: build/trans_presets.java:342
 msgid "Roundabout"
 msgstr "Kruhový objezd"
@@ -15079,5 +15442,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:346
+#: build/trans_presets.java:347
 msgid "Edit Junction"
 msgstr "Upravit křižovatku"
@@ -15099,9 +15462,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:349 build/trans_presets.java:648
-#: build/trans_presets.java:788 build/trans_presets.java:1135
-#: build/trans_presets.java:1392 build/trans_presets.java:2353
-#: build/trans_presets.java:2901 build/trans_presets.java:2911
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:350 build/trans_presets.java:649
+#: build/trans_presets.java:789 build/trans_presets.java:1137
+#: build/trans_presets.java:1395 build/trans_presets.java:2364
+#: build/trans_presets.java:2913 build/trans_presets.java:2923
+#: build/trans_presets.java:2932
 msgid "Type"
 msgstr "Typ"
@@ -15121,10 +15484,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:547
+#: build/trans_presets.java:350 build/trans_style.java:547
 #: build/trans_style.java:555
 msgid "motorway"
 msgstr "dálnice"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "motorway_link"
 msgstr "Dálnice - nájezd"
@@ -15146,12 +15509,12 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:563
+#: build/trans_presets.java:350 build/trans_style.java:563
 #: build/trans_style.java:571
 msgid "trunk"
-msgstr "4. pruhová silnice"
-
-#: build/trans_presets.java:349
+msgstr "čtyřproudá silnice"
+
+#: build/trans_presets.java:350
 msgid "trunk_link"
-msgstr "4. pruhová silnice - nájezd"
+msgstr "čtyřproudá silnice - nájezd"
 
 #. color trunk
@@ -15171,10 +15534,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:579
+#: build/trans_presets.java:350 build/trans_style.java:579
 #: build/trans_style.java:587
 msgid "primary"
 msgstr "silnice první třídy"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "primary_link"
 msgstr "Silnice 1. třídy - nájezd"
@@ -15196,5 +15559,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:595
+#: build/trans_presets.java:350 build/trans_style.java:595
 #: build/trans_style.java:603
 msgid "secondary"
@@ -15209,9 +15572,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:349 build/trans_style.java:611
+#: build/trans_presets.java:350 build/trans_style.java:611
 msgid "tertiary"
 msgstr "silnice třetí třídy"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "unclassified"
 msgstr "silnice bez klasifikace"
@@ -15225,9 +15588,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:349 build/trans_style.java:3143
+#: build/trans_presets.java:350 build/trans_style.java:3151
 msgid "residential"
 msgstr "obytná oblast"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "living_street"
 msgstr "obytná zóna"
@@ -15257,10 +15620,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:349 build/trans_style.java:667
-#: build/trans_style.java:4244
+#: build/trans_presets.java:350 build/trans_style.java:667
+#: build/trans_style.java:4252
 msgid "service"
 msgstr "obslužná cesta"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "bus_guideway"
 msgstr "Autobusová dráha"
@@ -15290,6 +15653,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:349 build/trans_style.java:877
-#: build/trans_style.java:3208 build/trans_style.java:3209
+#: build/trans_presets.java:350 build/trans_style.java:877
+#: build/trans_style.java:3216 build/trans_style.java:3217
 msgid "construction"
 msgstr "konstrukce"
@@ -15300,10 +15663,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Edit Bridge"
 msgstr "Edituj most"
 
 #. item
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "Edit Tunnel"
 msgstr "Upravit tunel"
@@ -15311,19 +15674,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:393
+#: build/trans_presets.java:394
 msgid "Ways"
 msgstr "Cesty"
 
 #. group "Ways"
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Construction"
 msgstr "Výstavba, plánovaná výstavba (Construction)"
 
 #. item
-#: build/trans_presets.java:395
+#: build/trans_presets.java:396
 msgid "Edit Highway Under Construction"
 msgstr "Upravit silnici ve stavbě"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "Junction"
 msgstr "Križovatka"
@@ -15339,5 +15702,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:411 build/trans_style.java:895
+#: build/trans_presets.java:412 build/trans_style.java:895
 msgid "roundabout"
 msgstr "kruhový objezd"
@@ -15346,5 +15709,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:417
+#: build/trans_presets.java:418
 msgid "Bridleway"
 msgstr "Cesta pro koně"
@@ -15352,5 +15715,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:419
+#: build/trans_presets.java:420
 msgid "Edit Bridleway"
 msgstr "Upravit cestu pro koně"
@@ -15358,5 +15721,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:435
+#: build/trans_presets.java:436
 msgid "Cycleway"
 msgstr "Cyklostezka"
@@ -15366,10 +15729,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:439
+#: build/trans_presets.java:440
 msgid "Edit Cycleway"
 msgstr "Upravit cyklostezku"
 
 #. item "Ways/Cycleway" check "Embankment"
-#: build/trans_presets.java:449
+#: build/trans_presets.java:450
 msgid "Pedestrians"
 msgstr ""
@@ -15377,5 +15740,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Footway"
 msgstr "Chodník, stezka"
@@ -15384,10 +15747,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Footway"
 msgstr "Upravit chodník nebo stezku"
 
 #. item "Ways/Footway" check "Embankment"
-#: build/trans_presets.java:469
+#: build/trans_presets.java:470
 msgid "Bikes"
 msgstr ""
@@ -15395,5 +15758,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:476
+#: build/trans_presets.java:477
 msgid "Pedestrian"
 msgstr "Pěší zóna"
@@ -15402,5 +15765,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Edit Pedestrian Street"
 msgstr "Upravit pěší zónu"
@@ -15408,5 +15771,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:494
+#: build/trans_presets.java:495
 msgid "Steps"
 msgstr "Schody"
@@ -15416,5 +15779,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:498
+#: build/trans_presets.java:499
 msgid "Edit Flight of Steps"
 msgstr "Upravit schody"
@@ -15423,5 +15786,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:515
+#: build/trans_presets.java:516
 msgid "Track"
 msgstr "Vozová cesta (track)"
@@ -15430,5 +15793,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:518
+#: build/trans_presets.java:519
 msgid "Edit Track"
 msgstr "Upravit vozovou cestu"
@@ -15436,5 +15799,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:535
+#: build/trans_presets.java:536
 msgid "Track Grade 1"
 msgstr "Vozová cesta stupně 1 (zpevněná)"
@@ -15443,5 +15806,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:538
+#: build/trans_presets.java:539
 msgid "Edit Track of grade 1"
 msgstr "Upravit vozovou cestu stupně 1 (zpevněnou)"
@@ -15449,5 +15812,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:556
+#: build/trans_presets.java:557
 msgid "Track Grade 2"
 msgstr "Vozová cesta stupně 2"
@@ -15456,5 +15819,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:559
+#: build/trans_presets.java:560
 msgid "Edit Track of grade 2"
 msgstr "Upravit vozovou cestu stupně 2"
@@ -15462,5 +15825,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:577
+#: build/trans_presets.java:578
 msgid "Track Grade 3"
 msgstr "Vozová cesta stupně 3"
@@ -15469,5 +15832,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:580
+#: build/trans_presets.java:581
 msgid "Edit Track of grade 3"
 msgstr "Upravit vozovou cestu stupně 3"
@@ -15475,5 +15838,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:598
+#: build/trans_presets.java:599
 msgid "Track Grade 4"
 msgstr "Vozová cesta stupně 4"
@@ -15482,5 +15845,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:601
+#: build/trans_presets.java:602
 msgid "Edit Track of grade 4"
 msgstr "Upravit vozovou cestu stupně 4"
@@ -15488,5 +15851,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:619
+#: build/trans_presets.java:620
 msgid "Track Grade 5"
 msgstr "Vozová cesta stupně 5 (nejhorší)"
@@ -15495,5 +15858,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:622
+#: build/trans_presets.java:623
 msgid "Edit Track of grade 5"
 msgstr "Upravit vozovou cestu stupně 5 (nejhorší)"
@@ -15502,5 +15865,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:641
+#: build/trans_presets.java:642
 msgid "Path"
 msgstr "Cesta vychozená v terénu pro cyklo/pěší (path)"
@@ -15509,13 +15872,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:644
+#: build/trans_presets.java:645
 msgid "Edit Path"
 msgstr "Upravit cestu"
 
-#: build/trans_presets.java:652
+#: build/trans_presets.java:653
 msgid "Ski"
 msgstr "Lyže"
 
-#: build/trans_presets.java:653
+#: build/trans_presets.java:654
 msgid "Snowmobile"
 msgstr "Sněžný skůtr"
@@ -15525,6 +15888,6 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:670 build/trans_presets.java:1725
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:671 build/trans_presets.java:1729
+#: build/trans_presets.java:1752
 msgid "Hiking"
 msgstr "turistická stezka"
@@ -15534,5 +15897,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:674
+#: build/trans_presets.java:675
 msgid "Edit Hiking"
 msgstr "Editovat turistickou stezka"
@@ -15540,5 +15903,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:683
+#: build/trans_presets.java:684
 msgid "Mountain Hiking"
 msgstr "horská turistická stezka"
@@ -15548,5 +15911,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:687
+#: build/trans_presets.java:688
 msgid "Edit Mountain Hiking"
 msgstr "Editovat horskou stezka"
@@ -15554,5 +15917,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:696
+#: build/trans_presets.java:697
 msgid "Demanding Mountain Hiking"
 msgstr "Náročná horská stezka"
@@ -15562,5 +15925,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:700
+#: build/trans_presets.java:701
 msgid "Edit Demanding Mountain Hiking"
 msgstr "Editovat náročnou horskou stezku"
@@ -15568,5 +15931,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:709
+#: build/trans_presets.java:710
 msgid "Alpine Hiking"
 msgstr "Vysokohorská stezka"
@@ -15576,5 +15939,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:713
+#: build/trans_presets.java:714
 msgid "Edit Alpine Hiking"
 msgstr "Editovat vysokohorskou stezku"
@@ -15582,5 +15945,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:723
 msgid "Demanding Alpine Hiking"
 msgstr "Náročná vysokohorská stezka"
@@ -15590,5 +15953,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:726
+#: build/trans_presets.java:727
 msgid "Edit Demanding Alpine Hiking"
 msgstr "Editovat náročnou vysokohorskou stezku"
@@ -15596,5 +15959,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:735
+#: build/trans_presets.java:736
 msgid "Difficult Alpine Hiking"
 msgstr "Obtížná vysokohorská stezka"
@@ -15604,5 +15967,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:739
+#: build/trans_presets.java:740
 msgid "Edit Difficult Alpine Hiking"
 msgstr "Upravit obtížnou vysokohorskou stezku"
@@ -15610,10 +15973,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:749
+#: build/trans_presets.java:750
 msgid "Waypoints"
 msgstr "Silniční body"
 
 #. group "Waypoints"
-#: build/trans_presets.java:750
+#: build/trans_presets.java:751
 msgid "Motorway Junction"
 msgstr "Dálniční sjezd (exit)"
@@ -15621,15 +15984,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:752
+#: build/trans_presets.java:753
 msgid "Edit Motorway Junction"
 msgstr "Upravit křižovatku dálnic"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:757
 msgid "Number"
 msgstr "Číslo"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:759
 msgid "Services"
 msgstr "Služby motoristům (odpočívadla)"
@@ -15637,5 +16000,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:761
 msgid "Edit Service Station"
 msgstr "Upravit služby motoristům (odpočívadla)"
@@ -15673,15 +16036,15 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:765 build/trans_presets.java:902
-#: build/trans_presets.java:1382 build/trans_presets.java:1406
-#: build/trans_presets.java:1413 build/trans_presets.java:1419
-#: build/trans_presets.java:1427 build/trans_presets.java:1434
-#: build/trans_presets.java:1761 build/trans_presets.java:1771
-#: build/trans_presets.java:2361 build/trans_presets.java:2368
-#: build/trans_presets.java:2384 build/trans_presets.java:2395
-#: build/trans_presets.java:2403 build/trans_presets.java:2410
-#: build/trans_presets.java:2464 build/trans_presets.java:2512
-#: build/trans_presets.java:2678 build/trans_presets.java:2693
-#: build/trans_presets.java:2732 build/trans_presets.java:3151
+#: build/trans_presets.java:766 build/trans_presets.java:903
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
+#: build/trans_presets.java:1416 build/trans_presets.java:1422
+#: build/trans_presets.java:1430 build/trans_presets.java:1437
+#: build/trans_presets.java:1765 build/trans_presets.java:1775
+#: build/trans_presets.java:2372 build/trans_presets.java:2379
+#: build/trans_presets.java:2395 build/trans_presets.java:2406
+#: build/trans_presets.java:2414 build/trans_presets.java:2421
+#: build/trans_presets.java:2475 build/trans_presets.java:2523
+#: build/trans_presets.java:2689 build/trans_presets.java:2704
+#: build/trans_presets.java:2743 build/trans_presets.java:3163
 msgid "Operator"
 msgstr "Operátor"
@@ -15690,5 +16053,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:769
+#: build/trans_presets.java:770
 msgid "Traffic Signal"
 msgstr "Semafory"
@@ -15698,5 +16061,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:774
 msgid "Pedestrian crossing type"
 msgstr "Typ přechodu pro chodce"
@@ -15705,27 +16068,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "uncontrolled"
 msgstr "volný"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "traffic_signals"
 msgstr "světelná signalizace"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "island"
 msgstr "ostrov"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "unmarked"
 msgstr "neoznačený"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:774 build/trans_presets.java:790
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:775 build/trans_presets.java:791
+#: build/trans_presets.java:1334
 msgid "Cross on horseback"
 msgstr "Přechod na koni"
@@ -15733,6 +16096,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:775 build/trans_presets.java:789
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:776 build/trans_presets.java:790
+#: build/trans_presets.java:1335
 msgid "Cross by bicycle"
 msgstr "Přechod na kole"
@@ -15741,11 +16104,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:776 build/trans_presets.java:791
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:1336
 msgid "Crossing attendant"
 msgstr "Dohled nad přechodem"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:778
 msgid "Crossing type name (UK)"
 msgstr "Typ přechodu (UK)"
@@ -15753,30 +16116,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "zebra"
 msgstr "zebra (bez semaforů)"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pelican"
 msgstr "pelikán (se semafory)"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "toucan"
 msgstr "tukan (se semafory a tlačítkem pro chodce a cyklisty)"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "puffin"
 msgstr "papuchalk"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pegasus"
 msgstr "pegas (se semafory a tlačítkem pro chodce, cyklisty a jezdce na koni)"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "tiger"
 msgstr "tygr"
 
 #. </optional>
-#: build/trans_presets.java:780
+#: build/trans_presets.java:781
 msgid "Stop"
 msgstr "Stop"
@@ -15784,5 +16147,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:783
+#: build/trans_presets.java:784
 msgid "Pedestrian Crossing"
 msgstr "Přechod pro chodce"
@@ -15791,14 +16154,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:786
+#: build/trans_presets.java:787
 msgid "Edit Crossing"
 msgstr "Upravit přechod"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:793
 msgid "Type name (UK)"
 msgstr "Jméno typu (UK)"
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:795
 msgid "Mini-roundabout"
 msgstr "Malý kruhový objezd"
@@ -15809,14 +16172,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "Direction"
 msgstr "Směr"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "clockwise"
 msgstr "po směru hodinových ručiček"
 
-#: build/trans_presets.java:801
+#: build/trans_presets.java:802
 msgid "Turning Circle"
 msgstr "Obratiště"
@@ -15826,20 +16189,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:806
+#: build/trans_presets.java:807
 msgid "City Limit"
 msgstr "Hranice města/obce"
 
 #. item
-#: build/trans_presets.java:807
+#: build/trans_presets.java:808
 msgid "Edit City Limit Sign"
 msgstr "Upravit značku hranice města/obce"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:812
+#: build/trans_presets.java:813
 msgid "Second Name"
 msgstr "Druhé jméno"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:814
+#: build/trans_presets.java:815
 msgid "Speed Camera"
 msgstr "Rychlostní radar"
@@ -15847,5 +16210,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:817
+#: build/trans_presets.java:818
 msgid "Emergency Phone"
 msgstr "Nouzový telefon"
@@ -15853,5 +16216,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:820
+#: build/trans_presets.java:821
 msgid "Incline"
 msgstr "Stoupání"
@@ -15859,5 +16222,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:823
+#: build/trans_presets.java:824
 msgid "Incline Steep"
 msgstr "Prudké stoupání"
@@ -15866,10 +16229,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:827
+#: build/trans_presets.java:828
 msgid "Ford"
 msgstr "Brod"
 
 #. item
-#: build/trans_presets.java:828
+#: build/trans_presets.java:829
 msgid "Edit Ford"
 msgstr "Upravit brod"
@@ -15877,5 +16240,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:835
+#: build/trans_presets.java:836
 msgid "Mountain Pass"
 msgstr "Horský průsmyk"
@@ -15883,5 +16246,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:837
+#: build/trans_presets.java:838
 msgid "Edit Mountain Pass"
 msgstr "Upravit horský průsmyk"
@@ -15893,7 +16256,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:842 build/trans_presets.java:1600
-#: build/trans_presets.java:1745 build/trans_presets.java:2845
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:843 build/trans_presets.java:1604
+#: build/trans_presets.java:1749 build/trans_presets.java:2857
+#: build/trans_presets.java:2864 build/trans_presets.java:2871
 msgid "Elevation"
 msgstr "Nadmořská výška"
@@ -15901,5 +16264,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:846
+#: build/trans_presets.java:847
 msgid "Barriers"
 msgstr "Bariéry"
@@ -15907,5 +16270,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:849
+#: build/trans_presets.java:850
 msgid "Bollard"
 msgstr "Sloupek"
@@ -15913,5 +16276,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:852
 msgid "Edit Bollard"
 msgstr "Upravit sloupek"
@@ -15956,16 +16319,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:854 build/trans_presets.java:873
-#: build/trans_presets.java:887 build/trans_presets.java:909
-#: build/trans_presets.java:946 build/trans_presets.java:959
-#: build/trans_presets.java:971 build/trans_presets.java:983
-#: build/trans_presets.java:995 build/trans_presets.java:1007
-#: build/trans_presets.java:1017 build/trans_presets.java:1026
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:855 build/trans_presets.java:874
+#: build/trans_presets.java:888 build/trans_presets.java:910
+#: build/trans_presets.java:947 build/trans_presets.java:960
+#: build/trans_presets.java:972 build/trans_presets.java:984
+#: build/trans_presets.java:996 build/trans_presets.java:1008
+#: build/trans_presets.java:1018 build/trans_presets.java:1027
+#: build/trans_presets.java:1036
 msgid "Allowed traffic:"
 msgstr "Povolený provoz:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:861
+#: build/trans_presets.java:862
 msgid "Cycle Barrier"
 msgstr "Zábrana proti kolům"
@@ -15974,5 +16337,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:865
+#: build/trans_presets.java:866
 msgid "Block"
 msgstr "Zátarasa"
@@ -15980,5 +16343,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:868
+#: build/trans_presets.java:869
 msgid "Cattle Grid"
 msgstr "Mříž proti dobytku"
@@ -15986,10 +16349,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:870
+#: build/trans_presets.java:871
 msgid "Edit Cattle Grid"
 msgstr "Editovat mříž proti dobytku"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:880
+#: build/trans_presets.java:881
 msgid "Bus Trap"
 msgstr "Zábrana průjezdná pouze autobusem"
@@ -15997,15 +16360,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:883
+#: build/trans_presets.java:884
 msgid "Spikes"
 msgstr "Jednosměrné hroty"
 
 #. item
-#: build/trans_presets.java:884
+#: build/trans_presets.java:885
 msgid "Edit Spikes"
 msgstr "Editovat jednosměrné hroty"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:896
 msgid "Toll Booth"
 msgstr "Mýtná budka"
@@ -16013,5 +16376,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:897
+#: build/trans_presets.java:898
 msgid "Edit Toll Booth"
 msgstr "Upravit mýtnou budku"
@@ -16019,10 +16382,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:905
+#: build/trans_presets.java:906
 msgid "Border Control"
 msgstr "Hraniční kontrola"
 
 #. item
-#: build/trans_presets.java:906
+#: build/trans_presets.java:907
 msgid "Edit Border Control"
 msgstr "Upravit hraniční kontrolu"
@@ -16032,5 +16395,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:920
+#: build/trans_presets.java:921
 msgid "Hedge"
 msgstr "Živý plot"
@@ -16039,5 +16402,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:925
 msgid "Fence"
 msgstr "Plot"
@@ -16046,5 +16409,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:929
 msgid "Wall"
 msgstr "Zeď"
@@ -16052,5 +16415,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:931
+#: build/trans_presets.java:932
 msgid "City Wall"
 msgstr "Městské hradby"
@@ -16059,5 +16422,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:935
+#: build/trans_presets.java:936
 msgid "Retaining Wall"
 msgstr "Opěrná zeď"
@@ -16069,15 +16432,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:942
+#: build/trans_presets.java:943
 msgid "Entrance"
 msgstr "Vstup"
 
 #. item
-#: build/trans_presets.java:943
+#: build/trans_presets.java:944
 msgid "Edit Entrance"
 msgstr "Upravit vstup"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:954
+#: build/trans_presets.java:955
 msgid "Gate"
 msgstr "Brána"
@@ -16085,50 +16448,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:956
+#: build/trans_presets.java:957
 msgid "Edit Gate"
 msgstr "Editovat bránu"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:967
+#: build/trans_presets.java:968
 msgid "Lift Gate"
 msgstr "Závora"
 
 #. item
-#: build/trans_presets.java:968
+#: build/trans_presets.java:969
 msgid "Edit Lift Gate"
 msgstr "Upravit závoru"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:979
+#: build/trans_presets.java:980
 msgid "Hampshire Gate"
 msgstr "Odstranitelný díl plotu"
 
 #. item
-#: build/trans_presets.java:980
+#: build/trans_presets.java:981
 msgid "Edit Hampshire Gate"
 msgstr "Editovat odstranitelný díl plotu"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:991
+#: build/trans_presets.java:992
 msgid "Bump Gate"
 msgstr "Brána otevíratelná nárazníkem vozidla"
 
 #. item
-#: build/trans_presets.java:992
+#: build/trans_presets.java:993
 msgid "Edit Bump Gate"
 msgstr "Editovat bránu otevíratelnou nárazníkem vozidla"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:1003
+#: build/trans_presets.java:1004
 msgid "Kissing Gate"
 msgstr "Průchod v ohrazení s ostrou zatáčkou"
 
 #. item
-#: build/trans_presets.java:1004
+#: build/trans_presets.java:1005
 msgid "Edit Kissing Gate"
 msgstr "Editovat průchod v ohrazení s ostrou zatáčkou"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1013
 msgid "Stile"
 msgstr "Schůdky přes ohrazení"
@@ -16136,25 +16499,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1014
+#: build/trans_presets.java:1015
 msgid "Edit Stile"
 msgstr "Editovat schůdky přes ohrazení"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1023
 msgid "Turnstile"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1024
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1032
 msgid "Sally Port"
 msgstr "Průchod se dvěma vraty"
 
 #. item
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1033
 msgid "Edit Sally Port"
 msgstr "Upravit průchod se dvěma vraty"
@@ -16162,13 +16525,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #.
-#. <separator/>
+#. group "Water"
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1046 build/trans_presets.java:1089
+#: build/trans_presets.java:1047 build/trans_presets.java:1048
+#: build/trans_presets.java:1091
 msgid "Water"
 msgstr "Vodní plocha"
 
 #. group "Water"
-#: build/trans_presets.java:1047
+#: build/trans_presets.java:1049
 msgid "Spring"
 msgstr "Pramen"
@@ -16176,5 +16540,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1049
+#: build/trans_presets.java:1051
 msgid "Edit Spring"
 msgstr "Upravit pramen"
@@ -16182,5 +16546,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1056
 msgid "Drain"
 msgstr "Odvodňovací kanál, meliorace"
@@ -16188,10 +16552,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1058
 msgid "Edit Drain"
 msgstr "Editovat odvodňovací kanál, meliorace"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1064
 msgid "Stream"
 msgstr "Potok"
@@ -16199,10 +16563,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1066
 msgid "Edit Stream"
 msgstr "Upravit potok"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1072
 msgid "Canal"
 msgstr "Plavební kanál"
@@ -16210,10 +16574,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1074
 msgid "Edit Canal"
 msgstr "Upravit plavební kanál"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1080
 msgid "River"
 msgstr "Řeka"
@@ -16223,5 +16587,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1084
 msgid "Edit River"
 msgstr "Upravit řeku"
@@ -16229,15 +16593,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1093
 msgid "Edit Water"
 msgstr "Upravit vodní plochu"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1097
 msgid "Land"
 msgstr "Země (souš)"
 
 #. item
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1098
 msgid "Edit Land"
 msgstr "Upravit plochu země"
@@ -16245,15 +16609,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1103
 msgid "Basin"
 msgstr "Vodní nádrž"
 
 #. item
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1104
 msgid "Edit Basin Landuse"
 msgstr "Upravit vodní nádrž"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1109
 msgid "Reservoir"
 msgstr "Umělá vodní plocha"
@@ -16261,15 +16625,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1109
+#: build/trans_presets.java:1111
 msgid "Edit Reservoir Landuse"
 msgstr "Upravit umělou vodní plochu"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1116
 msgid "Covered Reservoir"
 msgstr "Zakrytá umělá vodní plocha"
 
 #. item
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1117
 msgid "Edit Covered Reservoir"
 msgstr "Upravit zakrytou umělou vodní plochu"
@@ -16277,5 +16641,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1120
+#: build/trans_presets.java:1122
 msgid "Riverbank"
 msgstr "Břeh řeky"
@@ -16284,10 +16648,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1125
 msgid "Edit Riverbank"
 msgstr "Upravit břeh řeky"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1127
+#: build/trans_presets.java:1129
 msgid "Wetland"
 msgstr "Mokřina"
@@ -16298,14 +16662,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1134
 msgid "Edit Wetland"
 msgstr "Upravit mokřinu"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "swamp"
 msgstr "bažina"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "bog"
 msgstr "močál"
@@ -16319,35 +16683,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1135 build/trans_style.java:3384
+#: build/trans_presets.java:1137 build/trans_style.java:3392
 msgid "marsh"
 msgstr "mokřina"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "reedbed"
 msgstr "rákosiny"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "saltmarsh"
 msgstr "slanisko"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "tidalflat"
 msgstr "přílivová oblast"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "mangrove"
 msgstr "mangrove"
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1139
 msgid "Mud"
 msgstr "Bahno"
 
 #. item
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1140
 msgid "Edit Mud"
 msgstr "Upravit bahno"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1144
 msgid "Beach"
 msgstr "Pláž"
@@ -16355,20 +16719,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1144
+#: build/trans_presets.java:1146
 msgid "Edit Beach"
 msgstr "Upravit pláž"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1150
 msgid "Bay"
 msgstr "Zátoka"
 
 #. item
-#: build/trans_presets.java:1149
+#: build/trans_presets.java:1151
 msgid "Edit Bay"
 msgstr "Upravit zátoku"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1155
 msgid "Cliff"
 msgstr "Útes"
@@ -16376,10 +16740,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1157
 msgid "Edit Cliff"
 msgstr "Upravit útes"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1159
+#: build/trans_presets.java:1161
 msgid "Coastline"
 msgstr "Linie pobřeží"
@@ -16387,5 +16751,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1163
 msgid "Edit Coastline"
 msgstr "Upravit linii pobřeží"
@@ -16393,5 +16757,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1168
 msgid "Ferry Route"
 msgstr "Přívoz"
@@ -16399,5 +16763,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1170
 msgid "Edit Ferry"
 msgstr "Upravit přívoz"
@@ -16406,5 +16770,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1176
+#: build/trans_presets.java:1178
 msgid "Boatyard"
 msgstr "doky"
@@ -16412,10 +16776,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:1180
 msgid "Edit Boatyard"
 msgstr "Upravit doky"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1185
 msgid "Dock"
 msgstr "Dok"
@@ -16423,5 +16787,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1187
 msgid "Edit Dock"
 msgstr "Upravit dok"
@@ -16429,5 +16793,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1193
 msgid "Dam"
 msgstr "Hráz přehrady"
@@ -16435,15 +16799,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1195
 msgid "Edit Dam"
 msgstr "Upravit přehradu"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1199
+#: build/trans_presets.java:1201
 msgid "Waterway Point"
 msgstr "Vodní objekty"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1202
 msgid "Lock Gate"
 msgstr "Plavební komora"
@@ -16452,5 +16816,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1206
 msgid "Weir"
 msgstr "Jez"
@@ -16458,20 +16822,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1208
 msgid "Edit Weir"
 msgstr "Upravit jez"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1213
 msgid "Waterfall"
 msgstr "Vodopád"
 
 #. item
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1214
 msgid "Edit Waterfall"
 msgstr "Upravit vodopád"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1219
 msgid "Turning Point"
 msgstr "Rožšířené místo pro otáčení lodí"
@@ -16480,15 +16844,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1221
+#: build/trans_presets.java:1223
 msgid "Marina"
 msgstr "Přístav"
 
 #. item
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1224
 msgid "Edit Marina"
 msgstr "Upravit přístav"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1228
 msgid "Pier"
 msgstr "Molo"
@@ -16496,10 +16860,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1230
 msgid "Edit Pier"
 msgstr "Upravit molo"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1234
 msgid "Ferry Terminal"
 msgstr "Přístaviště přívozu"
@@ -16507,10 +16871,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1236
 msgid "Edit Ferry Terminal"
 msgstr "Upravit přístaviště přivozu"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1240
 msgid "Slipway"
 msgstr "Skluz v loděnici"
@@ -16520,16 +16884,21 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1244
 msgid "Edit Slipway"
 msgstr "Upravit skluz v loděnici"
 
 #. item "Waterway Point/Slipway" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1250
+#, fuzzy
+msgid "Transport"
+msgstr "Hromadná doprava"
+
+#. group "Transport"
+#: build/trans_presets.java:1251
 msgid "Railway"
 msgstr "Železnice"
 
 #. group "Railway"
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1252
 msgid "Rail"
 msgstr "Železnice"
@@ -16537,5 +16906,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:1254
 msgid "Edit Rail"
 msgstr "Upravit železnici"
@@ -16565,8 +16934,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "Optional Types"
 msgstr "Volitelné typy"
@@ -16580,35 +16949,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "yard"
 msgstr "seřazovací kolej"
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "siding"
 msgstr "paralelní pomocná dráha"
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "spur"
 msgstr "vlečka"
 
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1259
 msgid "Narrow Gauge Rail"
 msgstr "Úzkorozchodná železnice"
 
 #. item
-#: build/trans_presets.java:1257
+#: build/trans_presets.java:1260
 msgid "Edit Narrow Gauge Rail"
 msgstr "Upravit úzkorozchodnou železnici"
 
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1265
 msgid "Monorail"
 msgstr "Monorail"
@@ -16616,45 +16985,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1267
 msgid "Edit Monorail"
 msgstr "Upravit monorail"
 
-#: build/trans_presets.java:1269
+#: build/trans_presets.java:1272
 msgid "Preserved"
 msgstr "Historická trať"
 
 #. item
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1273
 msgid "Edit Preserved Railway"
 msgstr "Upravit historickou trať"
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1278
 msgid "Light Rail"
 msgstr "Krátká/lehká trať"
 
 #. item
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1279
 msgid "Edit Light Rail"
 msgstr "Upravit krátká/lehká trať"
 
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1284
 msgid "Subway"
 msgstr "Metro"
 
 #. item
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1285
 msgid "Edit Subway"
 msgstr "Upravit metro"
 
-#: build/trans_presets.java:1287
+#: build/trans_presets.java:1290
 msgid "Tram"
 msgstr "Tramvaj"
 
 #. item
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1291
 msgid "Edit Tram"
 msgstr "Upravit tramvaj"
 
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1296
 msgid "Bus Guideway"
 msgstr "Autobusová dráha"
@@ -16662,5 +17031,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1295
+#: build/trans_presets.java:1298
 msgid "Edit Bus Guideway"
 msgstr "Upravit autobusovou dráhu"
@@ -16669,14 +17038,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1315
 msgid "Disused Rail"
 msgstr "Nepoužívaná železnice"
 
 #. item
-#: build/trans_presets.java:1313
+#: build/trans_presets.java:1316
 msgid "Edit Disused Railway"
 msgstr "Upravit nepoužívanou železnici"
 
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1321
 msgid "Abandoned Rail"
 msgstr "Opuštěná železnice"
@@ -16685,5 +17054,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1325
 msgid "Level Crossing"
 msgstr "železniční přejezd"
@@ -16692,5 +17061,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1329
 msgid "Crossing"
 msgstr "Železniční přechod pro chodce"
@@ -16700,5 +17069,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1333
 msgid "Crossing type"
 msgstr "Druh křížení"
@@ -16706,5 +17075,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1339
 msgid "Turntable"
 msgstr "Točna"
@@ -16713,10 +17082,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1344
 msgid "Aerialway"
 msgstr "Lanovky"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1345
 msgid "Chair Lift"
 msgstr "Sedačková lanovka"
@@ -16724,10 +17093,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1347
 msgid "Edit Chair Lift"
 msgstr "Upravit sedačkovou lanovku"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1351
 msgid "Drag Lift"
 msgstr "Lyžařský vlek"
@@ -16735,10 +17104,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1353
 msgid "Edit Drag Lift"
 msgstr "Upravit lyžařský vlek"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1357
 msgid "Cable Car"
 msgstr "Kyvadlová kabinková lanovka"
@@ -16746,10 +17115,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1359
 msgid "Edit Cable Car"
 msgstr "Upravit kyvadlovou kabinkovou lanovku"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1360
+#: build/trans_presets.java:1363
 msgid "Gondola"
 msgstr "Oběžná kabinková lanovka"
@@ -16757,5 +17126,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1365
 msgid "Edit Gondola"
 msgstr "Upravit oběžnou kabinkovou lanovku"
@@ -16763,5 +17132,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1366 build/trans_presets.java:1461
+#: build/trans_presets.java:1369 build/trans_presets.java:1464
 msgid "Station"
 msgstr "Stanice"
@@ -16772,10 +17141,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1368 build/trans_presets.java:1464
+#: build/trans_presets.java:1371 build/trans_presets.java:1467
 msgid "Edit Station"
 msgstr "Upravit stanici"
 
 #. group "Car"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1378
 msgid "Fuel"
 msgstr "Čerpací stanice"
@@ -16785,5 +17154,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1382
 msgid "Edit Fuel"
 msgstr "Upravit čerpací stanici"
@@ -16841,32 +17210,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1671 build/trans_presets.java:1678
-#: build/trans_presets.java:1686 build/trans_presets.java:1699
-#: build/trans_presets.java:1713 build/trans_presets.java:1810
-#: build/trans_presets.java:1818 build/trans_presets.java:1909
-#: build/trans_presets.java:1915 build/trans_presets.java:2226
-#: build/trans_presets.java:2250 build/trans_presets.java:2465
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1703
+#: build/trans_presets.java:1717 build/trans_presets.java:1814
+#: build/trans_presets.java:1822 build/trans_presets.java:1919
+#: build/trans_presets.java:1925 build/trans_presets.java:2237
+#: build/trans_presets.java:2261 build/trans_presets.java:2476
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Opening Hours"
 msgstr "Otevírací doba"
@@ -16925,91 +17294,91 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "24/7"
-msgstr ""
-
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+msgstr "24/7"
+
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -17024,5 +17393,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1385 build/trans_presets.java:1438
+#: build/trans_presets.java:1388 build/trans_presets.java:1441
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -17032,5 +17401,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1391
 msgid "Edit Parking"
 msgstr "Upravit parkoviště"
@@ -17041,24 +17410,24 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1391 build/trans_presets.java:1762
-#: build/trans_presets.java:1772 build/trans_presets.java:2396
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:1394 build/trans_presets.java:1766
+#: build/trans_presets.java:1776 build/trans_presets.java:2407
+#: build/trans_presets.java:2524
 msgid "Reference number"
 msgstr "Číslo záchodu"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "multi-storey"
 msgstr "vícepodlažní"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "surface"
 msgstr "povrchové"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "underground"
 msgstr "podzemní"
 
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1396
 msgid "Park and Ride"
 msgstr ""
@@ -17067,38 +17436,38 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1394 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
+#: build/trans_presets.java:1397 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
 msgid "Fee"
 msgstr "Poplatek"
 
 #. <space />
-#: build/trans_presets.java:1396
+#: build/trans_presets.java:1399
 msgid "Capacity (overall)"
-msgstr ""
+msgstr "Kapacita (celkem)"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1400
 msgid "Spaces for Disabled"
 msgstr "Místa pro vozíčkáře"
 
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1401
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1402
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1403
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1405
 msgid "Wash"
 msgstr "Myčka"
 
 #. item
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1406
 msgid "Edit Car Wash"
 msgstr "Upravit myčku aut"
@@ -17106,5 +17475,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1408 build/trans_presets.java:1452
+#: build/trans_presets.java:1411 build/trans_presets.java:1455
 msgid "Shop"
 msgstr "Obchod"
@@ -17112,15 +17481,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1413
 msgid "Edit Car Shop"
 msgstr "Upravit obchod s auty"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1418
 msgid "Repair"
 msgstr "Opravna"
 
 #. item
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1419
 msgid "Edit Car Repair"
 msgstr "Upravit autoopravnu"
@@ -17128,5 +17497,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1421 build/trans_presets.java:1445
+#: build/trans_presets.java:1424 build/trans_presets.java:1448
 msgid "Rental"
 msgstr "Půjčovna"
@@ -17135,10 +17504,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1427
 msgid "Edit Car Rental"
 msgstr "Upravit půjčovnu aut"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1432
 msgid "Sharing"
 msgstr "Sdílení"
@@ -17146,5 +17515,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1434
 msgid "Edit Car Sharing"
 msgstr "̈́Upravit sdílení aut"
@@ -17152,10 +17521,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Parking"
 msgstr "Upravit parkoviště pro kola."
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1446
 msgid "Capacity"
 msgstr "Kapacita"
@@ -17164,5 +17533,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1448
+#: build/trans_presets.java:1451
 msgid "Edit Bicycle Rental"
 msgstr "Upravit půjčovnu kol"
@@ -17171,15 +17540,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1458
 msgid "Edit Bicycle Shop"
 msgstr "Upravit prodejnu kol"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1463
 msgid "Public Transport"
 msgstr "Hromadná doprava"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:1472
 msgid "UIC-Reference"
 msgstr "UIC-Reference"
@@ -17187,5 +17556,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1475
 msgid "Railway Halt"
 msgstr "Železniční zastávka"
@@ -17193,5 +17562,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1477
 msgid "Edit Halt"
 msgstr "Upravit železniční zastávku"
@@ -17199,5 +17568,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1484
 msgid "Tram Stop"
 msgstr "Tramvajová zastávka"
@@ -17206,5 +17575,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1484
+#: build/trans_presets.java:1487
 msgid "Edit Tram Stop"
 msgstr "Upravit tramvajovou zastávku"
@@ -17212,5 +17581,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1494
 msgid "Railway Platform"
 msgstr "Železniční nástupiště"
@@ -17219,5 +17588,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1497
 msgid "Edit Railway Platform"
 msgstr "Upravit železniční nástupiště"
@@ -17229,5 +17598,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1497 build/trans_presets.java:1539
+#: build/trans_presets.java:1500 build/trans_presets.java:1542
 msgid "Reference (track number)"
 msgstr "Číslo nástupiště"
@@ -17235,10 +17604,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1499 build/trans_presets.java:1541
+#: build/trans_presets.java:1502 build/trans_presets.java:1544
 msgid "Area"
 msgstr "Označit jako plochu"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1504
 msgid "Subway Entrance"
 msgstr "Vchod do metra"
@@ -17247,10 +17616,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1507
 msgid "Edit Subway Entrance"
 msgstr "Upravit vchod do metra"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1512
 msgid "Wheelchair"
 msgstr "Invalidní vozík"
@@ -17259,5 +17628,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1517
 msgid "Bus Station"
 msgstr "Autobusové nádraží"
@@ -17266,5 +17635,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1520
 msgid "Edit Bus Station"
 msgstr "Upravit autobusové nádraží"
@@ -17272,5 +17641,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1526
 msgid "Bus Stop"
 msgstr "Zastávka autobusu"
@@ -17280,5 +17649,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1530
 msgid "Edit Bus Stop"
 msgstr "Upravit zastávku autobusu"
@@ -17287,6 +17656,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1532 build/trans_presets.java:1785
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:1535 build/trans_presets.java:1789
+#: build/trans_presets.java:2453
 msgid "Shelter"
 msgstr "Přístřešek"
@@ -17294,10 +17663,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1538
 msgid "Bus Platform"
 msgstr "Nástupiště autobusu"
 
 #. item
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1539
 msgid "Edit Bus Platform"
 msgstr "Upravit nástupiště autobusu"
@@ -17305,5 +17674,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1547
 msgid "Taxi"
 msgstr "Stanoviště taxi"
@@ -17311,5 +17680,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1549
 msgid "Edit Taxi station"
 msgstr "Upravit stanoviště taxi"
@@ -17317,5 +17686,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1554
 msgid "Airport"
 msgstr "Letiště"
@@ -17323,15 +17692,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1556
 msgid "Edit Airport"
 msgstr "Upravit letiště"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1561
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1559
+#: build/trans_presets.java:1562
 msgid "ICAO"
 msgstr "ICAO"
@@ -17339,6 +17708,11 @@
 #. item "Public Transport/Airport" text "ICAO"
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1567
+#, fuzzy
+msgid "Travel"
+msgstr "štěrk"
+
+#. group "Travel"
+#: build/trans_presets.java:1568
 msgid "Accomodation"
 msgstr "Ubytování"
@@ -17350,5 +17724,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1565 build/trans_surveyor.java:43
+#: build/trans_presets.java:1569 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -17357,15 +17731,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:1568
+#: build/trans_presets.java:1572
 msgid "Edit Hotel"
 msgstr "Upravit hotel"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1575
 msgid "Stars"
 msgstr "Počet hvězdiček"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1577
 msgid "Motel"
 msgstr "Motel"
@@ -17373,20 +17747,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1579
 msgid "Edit Motel"
 msgstr "Upravit motel"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1583
 msgid "Guest House"
 msgstr "Penzion"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1584
 msgid "Edit Guest House"
 msgstr "Upravit penzion"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1588
 msgid "Chalet"
 msgstr "Horská chata"
@@ -17394,10 +17768,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1590
 msgid "Edit Chalet"
 msgstr "Upravit horskou chatu"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1594
 msgid "Hostel"
 msgstr "Hostel"
@@ -17405,30 +17779,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1592
+#: build/trans_presets.java:1596
 msgid "Edit Hostel"
 msgstr "Upravit hostel"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1600
 msgid "Alpine Hut"
 msgstr "Horská bouda"
 
 #. item
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1601
 msgid "Edit Alpine Hut"
 msgstr "Upravit vysokohorskou boudu"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1606
 msgid "Caravan Site"
 msgstr "Autokemping (karavany)"
 
 #. item
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1607
 msgid "Edit Caravan Site"
 msgstr "Upravit autokemping (karavany)"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1611
 msgid "Camping Site"
 msgstr "Tábořiště"
@@ -17436,10 +17810,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1613
 msgid "Edit Camping Site"
 msgstr "Upravit tábořiště"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1618
 msgid "Food+Drinks"
 msgstr "Jídlo a pití"
@@ -17450,5 +17824,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1615 build/trans_surveyor.java:47
+#: build/trans_presets.java:1619 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurace"
@@ -17456,5 +17830,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1621
 msgid "Edit Restaurant"
 msgstr "Upravit restauraci"
@@ -17462,5 +17836,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "Cuisine"
 msgstr "Kuchyně"
@@ -17468,61 +17842,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "italian"
 msgstr "italská"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "chinese"
 msgstr "čínská"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "greek"
 msgstr "řecká"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "german"
 msgstr "německá"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "indian"
 msgstr "indická"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "regional"
 msgstr "místní"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "turkish"
 msgstr "turecká"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "asian"
 msgstr "asijská"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "thai"
 msgstr "thajská"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "mexican"
 msgstr "mexická"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "japanese"
 msgstr "japonská"
 
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1627
 msgid "Fast Food"
 msgstr "Rychlé občersvení"
@@ -17530,9 +17904,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1629
 msgid "Edit Fast Food Restaurant"
 msgstr "Upravit rychlé občerstvení"
 
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1635
 msgid "Cafe"
 msgstr "Kavárna"
@@ -17540,9 +17914,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1633
+#: build/trans_presets.java:1637
 msgid "Edit Cafe"
 msgstr "Upravit kavárnu"
 
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1642
 msgid "Pub"
 msgstr "Hospoda"
@@ -17550,18 +17924,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1644
 msgid "Edit Pub"
 msgstr "Upravit hospodu"
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1649
 msgid "Biergarten"
 msgstr "Hospoda-zahrádka"
 
 #. item
-#: build/trans_presets.java:1646
+#: build/trans_presets.java:1650
 msgid "Edit Biergarten"
 msgstr "Upravit hospoda-zahrádka"
 
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1655
 msgid "Bar"
 msgstr "Bar"
@@ -17569,9 +17943,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1657
 msgid "Edit Bar"
 msgstr "Upravit bar"
 
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1662
 msgid "Nightclub"
 msgstr "Noční klub"
@@ -17579,24 +17953,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1664
 msgid "Edit Nightclub"
 msgstr "Upravit noční klub"
 
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1670
 msgid "Tourism"
 msgstr "Turistika"
 
 #. group "Tourism"
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1671
 msgid "Attraction"
 msgstr "Atrakce"
 
 #. item
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1672
 msgid "Edit Attraction"
 msgstr "Upravit atrakci"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1677
 msgid "Museum"
 msgstr "Muzeum"
@@ -17604,9 +17978,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1679
 msgid "Edit Museum"
 msgstr "Upravit muzeum"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1684
 msgid "Zoo"
 msgstr "Zoo"
@@ -17615,9 +17989,9 @@
 #. <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:1683
+#: build/trans_presets.java:1687
 msgid "Edit Zoo"
 msgstr "Upravit zoo"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1692
 msgid "Viewpoint"
 msgstr "Vyhlídka"
@@ -17625,24 +17999,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1694
 msgid "Edit Viewpoint"
 msgstr "Upravit vyhlídku"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1697
 msgid "Look-Out Tower"
 msgstr "Vyhlídková věž"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1699
 msgid "Theme Park"
 msgstr "Zábavní park"
 
 #. item
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1700
 msgid "Edit Theme Park"
 msgstr "Upravit zábavní park"
 
-#: build/trans_presets.java:1701
+#: build/trans_presets.java:1705
 msgid "Artwork"
 msgstr "Umělecké dílo"
@@ -17650,5 +18024,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1707
 msgid "Edit Artwork"
 msgstr "Upravit umělecké dílo"
@@ -17656,19 +18030,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1712
 msgid "Information Office"
 msgstr "Turistické informační centrum"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1719
 msgid "Map"
 msgstr "Přehledová mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "Detail Grade"
-msgstr ""
+msgstr "Úroveň detailů"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "topo"
 msgstr ""
@@ -17706,5 +18080,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1720 build/trans_style.java:619
+#: build/trans_presets.java:1724 build/trans_style.java:619
 #: build/trans_style.java:635 build/trans_style.java:651
 #: build/trans_style.java:659
@@ -17712,28 +18086,28 @@
 msgstr "ulice"
 
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "Shown Area"
-msgstr ""
+msgstr "Zobrazený areál"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "site"
-msgstr ""
-
-#: build/trans_presets.java:1721
+msgstr "místo"
+
+#: build/trans_presets.java:1725
 msgid "city"
-msgstr ""
-
-#: build/trans_presets.java:1721
+msgstr "město"
+
+#: build/trans_presets.java:1725
 msgid "region"
-msgstr ""
+msgstr "region"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1722 build/trans_presets.java:1738
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1726 build/trans_presets.java:1742
+#: build/trans_presets.java:1786
 msgid "Closer Description"
 msgstr "Bližší popis"
@@ -17743,12 +18117,12 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1724 build/trans_presets.java:1747
+#: build/trans_presets.java:1728 build/trans_presets.java:1751
 msgid "Routes shown for:"
-msgstr ""
+msgstr "Trasy zobrazeny pro:"
 
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1726 build/trans_presets.java:1749
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1965
 msgid "Cycling"
 msgstr "Cyklistika"
@@ -17756,12 +18130,12 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1727 build/trans_presets.java:1750
+#: build/trans_presets.java:1731 build/trans_presets.java:1754
 msgid "Mountainbiking"
-msgstr ""
+msgstr "Jízda na horském kole"
 
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1728 build/trans_presets.java:1751
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:1732 build/trans_presets.java:1755
+#: build/trans_presets.java:2019
 msgid "Skiing"
 msgstr "Lyžování"
@@ -17769,82 +18143,82 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1729 build/trans_presets.java:1752
+#: build/trans_presets.java:1733 build/trans_presets.java:1756
 msgid "Riding"
-msgstr ""
+msgstr "Jízda na koni"
 
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1734 build/trans_presets.java:1757
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1736
 msgid "Information Board"
 msgstr "Informační nástěnka"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "Board Content"
-msgstr ""
+msgstr "Obsah tabule"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "notice"
-msgstr ""
-
-#: build/trans_presets.java:1737
+msgstr "upozornění"
+
+#: build/trans_presets.java:1741
 msgid "history"
 msgstr "informace o historii"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "nature"
 msgstr "informace o přírodě"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "wildlife"
 msgstr "informace o divokých zvířatech"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1744
 msgid "Guidepost"
-msgstr ""
+msgstr "Rozcestník"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1759
 msgid "Information Terminal"
-msgstr ""
+msgstr "Informační terminál"
 
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1760 build/trans_presets.java:1770
+#: build/trans_presets.java:1764 build/trans_presets.java:1774
 msgid "Closer description"
-msgstr ""
-
-#: build/trans_presets.java:1765
+msgstr "Bližší popis"
+
+#: build/trans_presets.java:1769
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1779
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1780
 msgid "Phone number"
-msgstr ""
+msgstr "Telefonní číslo"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1778
+#: build/trans_presets.java:1782
 msgid "Other Information Points"
 msgstr "Jiný informační bod"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1790
 msgid "Edit Shelter"
 msgstr "Upravit přístřešek"
@@ -17852,25 +18226,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1789 build/trans_presets.java:1795
+#: build/trans_presets.java:1793 build/trans_presets.java:1799
 msgid "Fireplace"
 msgstr "Ohniště"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1791
+#: build/trans_presets.java:1795
 msgid "Picnic Site"
 msgstr "Místo na piknik"
 
 #. item
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1796
 msgid "Edit Picnic Site"
 msgstr "Upravit místo na piknik"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1802
 msgid "Historic Places"
 msgstr "Historická místa"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1799
+#: build/trans_presets.java:1803
 msgid "Castle"
 msgstr "Zámek/Hrad"
@@ -17879,19 +18253,19 @@
 #. <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:1802
+#: build/trans_presets.java:1806
 msgid "Edit Castle"
 msgstr "Upravit zámek/hrad"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1810
 msgid "Ruins"
 msgstr "Zřícenina"
 
 #. item
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1811
 msgid "Edit Ruins"
 msgstr "Upravit zříceninu"
 
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1816
 msgid "Archaeological Site"
 msgstr "Archeologické naleziště"
@@ -17900,9 +18274,9 @@
 #. <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:1815
+#: build/trans_presets.java:1819
 msgid "Edit Archaeological Site"
 msgstr "Upravit archeologické naleziště"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1824
 msgid "Battlefield"
 msgstr "Bojiště"
@@ -17910,5 +18284,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1826
 msgid "Edit Battlefield"
 msgstr "Upravit bojiště"
@@ -17916,15 +18290,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1831
 msgid "Monument"
 msgstr "Monument"
 
 #. item
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1832
 msgid "Edit Monument"
 msgstr "Upravit monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1836
 msgid "Memorial"
 msgstr "Památník"
@@ -17932,45 +18306,57 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1838
 msgid "Edit Memorial"
 msgstr "Upravit památník"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1842
 msgid "Wayside Cross"
 msgstr "Kříž"
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1843
 msgid "Edit Wayside Cross"
 msgstr "Upravit kříž"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1847
 msgid "Wayside Shrine"
 msgstr "Boží muka"
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1848
 msgid "Edit Wayside Shrine"
 msgstr "Upravit boží muka"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1852
+#, fuzzy
+msgid "Boundary Stone"
+msgstr "Hranice"
+
+#. item
+#: build/trans_presets.java:1853
+#, fuzzy
+msgid "Edit Boundary Stone"
+msgstr "Upravit knihkupectví"
+
+#. item "Historic Places/Boundary Stone" text "Name"
+#: build/trans_presets.java:1858
 msgid "Leisure"
 msgstr "Volný čas"
 
 #. group "Leisure"
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1859
 msgid "Water Park"
 msgstr "Akvapark"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1860
 msgid "Edit Water Park"
 msgstr "Upravit akvapark"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1864
 msgid "Playground"
 msgstr "Hřiště"
@@ -17978,31 +18364,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1866
 msgid "Edit Playground"
 msgstr "Upravit hřiště"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1870
 msgid "Fishing"
 msgstr "Rybaření"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1871
 msgid "Edit Fishing"
 msgstr "Upravit rybaření"
 
 #. item "Leisure/Fishing" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1877 build/trans_presets.java:2669
+msgid "Sports"
+msgstr "Sportovní potřeby"
+
+#. group "Sports"
+#: build/trans_presets.java:1878
 msgid "Sport Facilities"
 msgstr "Sportovní zařízení"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1879
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1880
 msgid "Edit Stadium"
 msgstr "Upravit stadion"
@@ -18016,6 +18406,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1874 build/trans_presets.java:1883
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1902 build/trans_presets.java:1911
 msgid "select sport:"
 msgstr "vyberte sport:"
@@ -18407,30 +18797,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884 build/trans_style.java:3892
-#: build/trans_style.java:3900 build/trans_style.java:3908
-#: build/trans_style.java:3916 build/trans_style.java:3924
-#: build/trans_style.java:3932
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_style.java:3572 build/trans_style.java:3580
+#: build/trans_style.java:3588 build/trans_style.java:3596
+#: build/trans_style.java:3604 build/trans_style.java:3612
+#: build/trans_style.java:3620 build/trans_style.java:3628
+#: build/trans_style.java:3636 build/trans_style.java:3644
+#: build/trans_style.java:3652 build/trans_style.java:3660
+#: build/trans_style.java:3668 build/trans_style.java:3676
+#: build/trans_style.java:3684 build/trans_style.java:3692
+#: build/trans_style.java:3700 build/trans_style.java:3708
+#: build/trans_style.java:3716 build/trans_style.java:3724
+#: build/trans_style.java:3732 build/trans_style.java:3740
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3764 build/trans_style.java:3772
+#: build/trans_style.java:3780 build/trans_style.java:3788
+#: build/trans_style.java:3796 build/trans_style.java:3804
+#: build/trans_style.java:3812 build/trans_style.java:3820
+#: build/trans_style.java:3828 build/trans_style.java:3836
+#: build/trans_style.java:3844 build/trans_style.java:3852
+#: build/trans_style.java:3860 build/trans_style.java:3868
+#: build/trans_style.java:3876 build/trans_style.java:3884
+#: build/trans_style.java:3892 build/trans_style.java:3900
+#: build/trans_style.java:3908 build/trans_style.java:3916
+#: build/trans_style.java:3924 build/trans_style.java:3932
+#: build/trans_style.java:3940
 msgid "sport"
 msgstr "sport"
@@ -18440,225 +18830,225 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "multi"
 msgstr "kombinovaný"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "archery"
 msgstr "lukostřelba"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "athletics"
 msgstr "atletika"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "australian_football"
 msgstr "australský fotbal"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "basketball"
 msgstr "basketbal"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "boules"
 msgstr "Hry s koulemi (např. pétanque)"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "bowls"
 msgstr "bowls"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "canoe"
 msgstr "kanoistika"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "climbing"
 msgstr "Horolezení"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket"
 msgstr "kriket"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket_nets"
 msgstr "ohražené místo pro tréning kriketu"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "croquet"
 msgstr "kroket"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cycling"
 msgstr "cyklistika"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "dog_racing"
 msgstr "závody psů"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "equestrian"
 msgstr "krasojízda"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "football"
 msgstr "fotbal"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "gymnastics"
 msgstr "gymnastika"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "horse_racing"
 msgstr "dostihy"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "motor"
 msgstr "motoristické sporty"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "pelota"
 msgstr "pelota (míčová hra)"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "racquet"
 msgstr "pálkové (raketové) sporty"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "rugby"
 msgstr "ragby"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "shooting"
 msgstr "střelba"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skating"
 msgstr "bruslení"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skiing"
 msgstr "lyžování"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "soccer"
 msgstr "fotbal"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "swimming"
 msgstr "plavání"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "table_tennis"
 msgstr "stolní tenis"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1888
 msgid "Sports Centre"
 msgstr "Sportovní centrum"
 
 #. item
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1889
 msgid "Edit Sports Centre"
 msgstr "Upravit sportovní centrum"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1897
 msgid "Pitch"
 msgstr "Hřiště"
 
 #. item
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1898
 msgid "Edit Pitch"
 msgstr "Upravit hřiště"
 
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1906
 msgid "Racetrack"
 msgstr "Závodní trať"
 
 #. item
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1907
 msgid "Edit Racetrack"
 msgstr "Upravit závodní trať"
 
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1915
 msgid "Golf Course"
 msgstr "Golfové hřiště"
 
 #. item
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1916
 msgid "Edit Golf Course"
 msgstr "Upravit golfové hřiště"
 
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1921
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1922
 msgid "Edit Miniature Golf"
 msgstr "Upravit minigolf"
 
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1928
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1929
 msgid "Multi"
 msgstr "Kombinováné"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1930
 msgid "Edit Multi"
 msgstr "Upravit kombinované"
@@ -18697,183 +19087,183 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "pitch"
 msgstr "hřiště"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "sports_centre"
 msgstr "sportovní centrum"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1935
 msgid "10pin"
 msgstr "Bowling"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1936
 msgid "Edit 10pin"
 msgstr "Upravit bowling"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1941
 msgid "Athletics"
 msgstr "Atletika"
 
 #. item
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1942
 msgid "Edit Athletics"
 msgstr "Upravit atletiku"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1947
 msgid "Archery"
 msgstr "Lukostřelba"
 
 #. item
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1948
 msgid "Edit Archery"
 msgstr "Upravit lukostřelbu"
 
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1953
 msgid "Climbing"
 msgstr "Horolezení"
 
 #. item
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:1954
 msgid "Edit Climbing"
 msgstr "Upravit horolezení"
 
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1959
 msgid "Canoeing"
 msgstr "Kanoistika"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1960
 msgid "Edit Canoeing"
 msgstr "Upravit kanoistiku"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1966
 msgid "Edit Cycling"
 msgstr "Upravit cyklistiku"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1971
 msgid "Dog Racing"
 msgstr "Závody psů"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1972
 msgid "Edit Dog Racing"
 msgstr "Upravit závody psů"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1977
 msgid "Equestrian"
 msgstr "Krasojízda"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1978
 msgid "Edit Equestrian"
 msgstr "Upravit krasojízdu"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1983
 msgid "Horse Racing"
 msgstr "Dostihy"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1984
 msgid "Edit Horse Racing"
 msgstr "Upravit dostihy"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1989
 msgid "Gymnastics"
 msgstr "Gymnastika"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1990
 msgid "Edit Gymnastics"
 msgstr "Upravit gymnastiku"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1995
 msgid "Motor Sports"
 msgstr "Motorové sporty"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1996
 msgid "Edit Motor Sports"
 msgstr "Upravit motorové sporty"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2001
 msgid "Skating"
 msgstr "Bruslení"
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2002
 msgid "Edit Skating"
 msgstr "Upravit bruslení"
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2007
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2008
 msgid "Edit Skateboard"
 msgstr "Upravit Skateboard"
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2013
 msgid "Swimming"
 msgstr "Plavání"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2014
 msgid "Edit Swimming"
 msgstr "Upravit plavání"
@@ -18881,56 +19271,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2021
 msgid "Edit Skiing"
 msgstr "Upravit lyžování"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "Piste type"
 msgstr "Typ sjezdovky"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "downhill"
 msgstr "Sjezdovka"
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "nordic"
 msgstr "Běžecká trať"
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "snow_park"
 msgstr "snow park"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "Difficulty"
 msgstr "Obtížnost"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "novice"
 msgstr "pro začátečníky (zelená)"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "easy"
 msgstr "jednoduchá (modrá)"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "intermediate"
 msgstr "pro středně pokročilé (červená)"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "advanced"
 msgstr "pro zkušené (černá)"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "expert"
 msgstr "pro experty (oranžová)"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "freeride"
 msgstr "volný terén - freeride (žlutá)"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2028
 msgid "Shooting"
 msgstr "Střelba"
@@ -18938,178 +19328,183 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2030
 msgid "Edit Shooting"
 msgstr "Upravit střelbu"
 
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2036
 msgid "Sport (Ball)"
 msgstr "Sport (míčové hry)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2037
 msgid "Soccer"
 msgstr "Fotbal"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2038
 msgid "Edit Soccer"
 msgstr "Upravit fotbal"
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2043
 msgid "Football"
 msgstr "Fotbal"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2044
 msgid "Edit Football"
 msgstr "Upravit fotbal"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2049
 msgid "Australian Football"
 msgstr "Australský fotbal"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2050
 msgid "Edit Australian Football"
 msgstr "Upravit australský fotbal"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2055
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2056
 msgid "Edit Baseball"
 msgstr "Upravit baseball"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2061
 msgid "Basketball"
 msgstr "Basketbal"
 
 #. item
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2062
 msgid "Edit Basketball"
 msgstr "Upravit basketbal"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2067
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2068
 msgid "Edit Golf"
 msgstr "Upravit Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2071
 msgid "golf_course"
 msgstr "golfové hřiště"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2073
 msgid "Boule"
 msgstr "Hry s koulemi (např. pétanque)"
 
 #. item
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2074
 msgid "Edit Boule"
 msgstr "Upravit hry s koulemi (např. pétanque)"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2079
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2080
 msgid "Edit Bowls"
 msgstr "Upravit Bowls"
 
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2085
 msgid "Cricket"
 msgstr "Kriket"
 
 #. item
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2086
 msgid "Edit Cricket"
 msgstr "Upravit kriket"
 
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2091
 msgid "Cricket Nets"
 msgstr "Ohražené místo pro tréning kriketu"
 
 #. item
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2092
 msgid "Edit Cricket Nets"
 msgstr "Upravit ohražené místo pro tréning kriketu"
 
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2097
 msgid "Croquet"
 msgstr "Kroket"
 
 #. item
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2098
 msgid "Edit Croquet"
 msgstr "Upravit kroket"
 
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2103
 msgid "Hockey"
 msgstr "Hokej"
 
 #. item
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2104
 msgid "Edit Hockey"
 msgstr "Upravit hokej"
 
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2109
 msgid "Pelota"
 msgstr "Pelota (míčová hra)"
 
 #. item
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2110
 msgid "Edit Pelota"
 msgstr "Upravit pelotu (míčová hra)"
 
-#: build/trans_presets.java:2105
+#: build/trans_presets.java:2115
 msgid "Racquet"
 msgstr "Pálkové (raketové) sporty"
 
 #. item
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2116
 msgid "Edit Racquet"
 msgstr "Upravit pálkové (raketové) sporty"
 
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2121
 msgid "Rugby"
 msgstr "Ragby"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2122
 msgid "Edit Rugby"
 msgstr "Upravit ragby"
 
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2127
 msgid "Table Tennis"
 msgstr "Stolní tenis (ping-pong)"
 
 #. item
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2128
 msgid "Edit Table Tennis"
 msgstr "Upravit stolní tenis (ping-pong)"
 
-#: build/trans_presets.java:2123
+#: build/trans_presets.java:2133
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2134
 msgid "Edit Tennis"
 msgstr "Upravit tenis"
 
-#. <separator/>
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2141
+#, fuzzy
+msgid "Man-Made"
+msgstr "Umělé konstrukce"
+
+#. group "Man-Made"
+#: build/trans_presets.java:2142
 msgid "Buildings"
 msgstr "Budovy"
 
 #. group "Buildings"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2143
 msgid "Building"
 msgstr "Budova"
@@ -19117,5 +19512,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Public Building"
 msgstr "Veřejná budova"
@@ -19123,10 +19518,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2148
 msgid "Edit Public Building"
 msgstr "Upravit veřejnou budovu"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2152
 msgid "Town hall"
 msgstr "Radnice"
@@ -19134,10 +19529,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2154
 msgid "Edit Town hall"
 msgstr "Upravit radnici"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:2158
 msgid "Embassy"
 msgstr "Ambasáda"
@@ -19145,10 +19540,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Edit Embassy"
 msgstr "Upravit ambasádu"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2164
 msgid "Courthouse"
 msgstr "Soud"
@@ -19157,10 +19552,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:2156
+#: build/trans_presets.java:2167
 msgid "Edit Courthouse"
 msgstr "Upravit soud"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2171
 msgid "Prison"
 msgstr "Vězení"
@@ -19169,10 +19564,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:2163
+#: build/trans_presets.java:2174
 msgid "Edit Prison"
 msgstr "Upravit vězení"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2178
 msgid "Police"
 msgstr "Policie"
@@ -19182,10 +19577,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:2171
+#: build/trans_presets.java:2182
 msgid "Edit Police"
 msgstr "Upravit policii"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2186
 msgid "Fire Station"
 msgstr "Hasičská stanice"
@@ -19194,10 +19589,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:2178
+#: build/trans_presets.java:2189
 msgid "Edit Fire Station"
 msgstr "Upravit hasičskou stanici"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "Post Office"
 msgstr "Pošta"
@@ -19205,5 +19600,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Edit Post Office"
 msgstr "Upravit poštu"
@@ -19211,15 +19606,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2200
 msgid "Kindergarten"
 msgstr "Mateřská škola"
 
 #. item
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Kindergarten"
 msgstr "Upravit mateřskou školu"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2205
 msgid "School"
 msgstr "Škola"
@@ -19227,10 +19622,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Edit School"
 msgstr "Upravit školu"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2211
 msgid "University"
 msgstr "Vysoká škola"
@@ -19238,10 +19633,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit University"
 msgstr "Upravit vysokou školu"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "College"
 msgstr "Střední škola"
@@ -19249,5 +19644,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2219
 msgid "Edit College"
 msgstr "Upravit střední školu"
@@ -19255,5 +19650,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2224
 msgid "Cinema"
 msgstr "Kino"
@@ -19262,10 +19657,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:2216
+#: build/trans_presets.java:2227
 msgid "Edit Cinema"
 msgstr "Upravit kino"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2231
 msgid "Library"
 msgstr "Knihovna"
@@ -19274,9 +19669,9 @@
 #. <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:2223
+#: build/trans_presets.java:2234
 msgid "Edit Library"
 msgstr "Upravit knihovnu"
 
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Arts Centre"
 msgstr "Komunitní umělecké centrum"
@@ -19284,10 +19679,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Arts Centre"
 msgstr "Upravit komunitní umělecké centrum"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Theatre"
 msgstr "Divadlo"
@@ -19296,10 +19691,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:2237
+#: build/trans_presets.java:2248
 msgid "Edit Theatre"
 msgstr "Upravit divadlo"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2252
 msgid "Place of Worship"
 msgstr "Chrám(kostel, synagoga, mešita)"
@@ -19309,5 +19704,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:2245
+#: build/trans_presets.java:2256
 msgid "Edit Place of Worship"
 msgstr "Upravit chrám"
@@ -19316,6 +19711,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "Religion"
 msgstr "Náboženství"
@@ -19324,66 +19719,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "bahai"
 msgstr "bahá'í"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "buddhist"
 msgstr "budhistické"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "christian"
 msgstr "křesťanské"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "hindu"
 msgstr "hindské"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jain"
 msgstr "džinistické"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jewish"
 msgstr "židovské"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "muslim"
 msgstr "muslimské"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "spiritualist"
 msgstr "spiritualistické"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "taoist"
 msgstr "taoistické"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "unitarian"
 msgstr "Unitářské"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "zoroastrian"
 msgstr "zoroastristické"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "Denomination"
 msgstr "Vyznání"
@@ -19392,81 +19787,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "anglican"
 msgstr "anglikánské"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "baptist"
 msgstr "baptistické"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "catholic"
 msgstr "katolické"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "evangelical"
 msgstr "evangelické"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "jehovahs_witness"
 msgstr "svědkové Jehovovi"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "lutheran"
 msgstr "luteránské"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "methodist"
 msgstr "metodistické"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "mormon"
 msgstr "mormonské"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "orthodox"
 msgstr "pravoslavné"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "pentecostal"
 msgstr "pentekostalistické"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "presbyterian"
 msgstr "presbyteriánské"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "protestant"
 msgstr "protestantské"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "quaker"
 msgstr "kvakerské"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "shia"
 msgstr "ší'itské"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "sunni"
 msgstr "sunnitské"
 
 #. <separator/>
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2264
 msgid "Addresses"
 msgstr "Adresy"
@@ -19475,5 +19870,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:2256
+#: build/trans_presets.java:2267
 msgid "Edit Address Information"
 msgstr "Upravit informace o adrese"
@@ -19481,5 +19876,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2269
 msgid "House number"
 msgstr "Číslo domu"
@@ -19487,20 +19882,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "House name"
 msgstr "Jméno domu"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "City name"
 msgstr "Jméno města"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2274
 msgid "Post code"
 msgstr "Poštovní směrovací číslo"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2275
 msgid "Country code"
 msgstr "Kód země"
@@ -19508,5 +19903,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Address Interpolation"
 msgstr "Interpolace adres"
@@ -19515,5 +19910,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:2270
+#: build/trans_presets.java:2281
 msgid "Edit Address Interpolation"
 msgstr "Upravit interpolaci adres"
@@ -19521,67 +19916,67 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "Numbering scheme"
 msgstr "Schéma číslování"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "odd"
 msgstr "liché"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "even"
 msgstr "sudé"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "alphabetic"
 msgstr "abecední"
 
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2286
 msgid "Man Made"
 msgstr "Umělé konstrukce"
 
 #. group "Man Made"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Works"
 msgstr "Továrna"
 
 #. item
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2288
 msgid "Edit Works"
 msgstr "Upravit továrnu"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2292
 msgid "Tower"
 msgstr "Věž"
 
 #. item
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2293
 msgid "Edit Tower"
 msgstr "Upravit věž"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Water Tower"
 msgstr "Vodojem"
 
 #. item
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2298
 msgid "Edit Water Tower"
 msgstr "Upravit vodojem"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Gasometer"
 msgstr "Plynojem"
 
 #. item
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2303
 msgid "Edit Gasometer"
 msgstr "Upravit plynojem"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Lighthouse"
 msgstr "Maják"
@@ -19589,10 +19984,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2309
 msgid "Edit Lighthouse"
 msgstr "Upravit maják"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Windmill"
 msgstr "Větrný mlýn"
@@ -19600,10 +19995,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2315
 msgid "Edit Windmill"
 msgstr "Upravit větrný mlýn"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2319
 msgid "Pipeline"
 msgstr "Potrubí"
@@ -19611,10 +20006,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Edit Pipeline"
 msgstr "Upravit potrubí"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2325
 msgid "Wastewater Plant"
 msgstr "Čistička odpadních vod"
@@ -19624,10 +20019,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:2318
+#: build/trans_presets.java:2329
 msgid "Edit Wastewater Plant"
 msgstr "Upravit čističku odpadních vod"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2333
 msgid "Crane"
 msgstr "Jeřáb"
@@ -19635,10 +20030,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2335
 msgid "Edit Crane"
 msgstr "Upravit jeřáb"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Beacon"
 msgstr "Vodní bój"
@@ -19646,10 +20041,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2341
 msgid "Edit Beacon"
 msgstr "Editovat vodní bój"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2345
 msgid "Survey Point"
 msgstr "Triangulační bod"
@@ -19657,10 +20052,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Edit Survey Point"
 msgstr "Upravit triangulační bod"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2351
 msgid "Surveillance"
 msgstr "Sledovací kamera"
@@ -19668,5 +20063,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2353
 msgid "Edit Surveillance Camera"
 msgstr "Upravit sledovací kameru"
@@ -19674,5 +20069,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Power Generator"
 msgstr "Elektrárna"
@@ -19682,39 +20077,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:2351
+#: build/trans_presets.java:2362
 msgid "Edit Power Generator"
 msgstr "Upravit elektrárnu"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "wind"
 msgstr "větrná"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "hydro"
 msgstr "vodní"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "fossil"
 msgstr "fosilní paliva"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "nuclear"
 msgstr "jaderná"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "coal"
 msgstr "uhelná"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "photovoltaic"
 msgstr "sluneční"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "gas"
 msgstr "plynová"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2367
 msgid "Power Station"
 msgstr "Rozvodna"
@@ -19723,10 +20118,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:2359
+#: build/trans_presets.java:2370
 msgid "Edit Power Station"
 msgstr "Upravit rozvodnu"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2374
 msgid "Power Sub Station"
 msgstr "Trafostanice"
@@ -19735,5 +20130,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:2366
+#: build/trans_presets.java:2377
 msgid "Edit Power Sub Station"
 msgstr "Upravit trafostanici"
@@ -19741,10 +20136,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2369 build/trans_presets.java:2385
+#: build/trans_presets.java:2380 build/trans_presets.java:2396
 msgid "Line reference"
 msgstr "Číslo vedení"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2382
 msgid "Power Tower"
 msgstr "Stožár elektrického vedení"
@@ -19755,5 +20150,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:2376
+#: build/trans_presets.java:2387
 msgid "Edit Power Tower"
 msgstr "Upravit stožár elektrického vedení"
@@ -19761,5 +20156,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2390
 msgid "Power Line"
 msgstr "Dráty elektrického vedení"
@@ -19768,40 +20163,40 @@
 #. <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:2382
+#: build/trans_presets.java:2393
 msgid "Edit Power Line"
 msgstr "Upravit dráty elektrického vedení"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Voltage"
 msgstr "Napětí"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2398
 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:2390
+#: build/trans_presets.java:2401
 msgid "Amenities"
 msgstr "Občanská vybavenost"
 
 #. group "Amenities"
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2402
 msgid "Toilets"
 msgstr "Záchody"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2398 build/trans_presets.java:2514
+#: build/trans_presets.java:2409 build/trans_presets.java:2525
 msgid "Note"
 msgstr "Poznámka"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2411
 msgid "Post Box"
 msgstr "Poštovní schránka"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2416
 msgid "Telephone"
 msgstr "Telefon"
@@ -19810,5 +20205,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:2408
+#: build/trans_presets.java:2419
 msgid "Edit Telephone"
 msgstr "Upravit telefon"
@@ -19816,5 +20211,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2411 build/trans_presets.java:2515
+#: build/trans_presets.java:2422 build/trans_presets.java:2526
 msgid "Coins"
 msgstr "Mince"
@@ -19822,5 +20217,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2412 build/trans_presets.java:2516
+#: build/trans_presets.java:2423 build/trans_presets.java:2527
 msgid "Notes"
 msgstr "Bankovky"
@@ -19828,5 +20223,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2413 build/trans_presets.java:2517
+#: build/trans_presets.java:2424 build/trans_presets.java:2528
 msgid "Electronic purses and Charge cards"
 msgstr "Elektronické peněženky nebo kreditní karty."
@@ -19834,5 +20229,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2414 build/trans_presets.java:2518
+#: build/trans_presets.java:2425 build/trans_presets.java:2529
 msgid "Debit cards"
 msgstr "Debetní karty"
@@ -19840,15 +20235,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2415 build/trans_presets.java:2519
+#: build/trans_presets.java:2426 build/trans_presets.java:2530
 msgid "Credit cards"
 msgstr "Kreditní karty"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2427
 msgid "Telephone cards"
 msgstr "Telefonní karty"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2429
 msgid "Recycling"
 msgstr "Recyklační stanoviště"
@@ -19857,5 +20252,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:2421
+#: build/trans_presets.java:2432
 msgid "Edit Recycling station"
 msgstr "Upravit recyklační stanoviště"
@@ -19863,35 +20258,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Batteries"
 msgstr "Baterie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2435
 msgid "Cans"
 msgstr "Plechovky"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Clothes"
 msgstr "Oblečení"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2437
 msgid "Glass"
 msgstr "Sklo"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2438
 msgid "Paper"
 msgstr "Papír"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2439
 msgid "Scrap Metal"
 msgstr "Kovový šrot"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2441
 msgid "Bench"
 msgstr "Lavička"
@@ -19900,40 +20295,33 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2433
-#, fuzzy
+#: build/trans_presets.java:2444
 msgid "Backrest"
-msgstr "Zpět"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "Material"
-msgstr "Památník"
+msgstr "Materiál"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2434
-#, fuzzy
+#: build/trans_presets.java:2445
 msgid "stone"
-msgstr "nic"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr "kámen"
+
+#: build/trans_presets.java:2445
 msgid "plastic"
-msgstr "místo"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr "plast"
+
+#: build/trans_presets.java:2446
 msgid "Colour"
 msgstr "Barva"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "black"
-msgstr "Zpět"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr "černá"
+
+#: build/trans_presets.java:2446
 msgid "brown"
-msgstr "dolů"
+msgstr "hnědá"
 
 #. color historic
@@ -20002,39 +20390,35 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2435 build/trans_style.java:3055
-#: build/trans_style.java:3063 build/trans_style.java:3071
-#: build/trans_style.java:3079 build/trans_style.java:3127
-#: build/trans_style.java:3135 build/trans_style.java:3233
-#: build/trans_style.java:3241
+#: build/trans_presets.java:2446 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3135
+#: build/trans_style.java:3143 build/trans_style.java:3241
+#: build/trans_style.java:3249
 msgid "green"
 msgstr "zeleň"
 
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "red"
-msgstr "konec"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr "červená"
+
+#: build/trans_presets.java:2446
 msgid "blue"
-msgstr "Hodnota"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr "modrá"
+
+#: build/trans_presets.java:2446
 msgid "white"
-msgstr "voda"
-
-#: build/trans_presets.java:2436
-#, fuzzy
+msgstr "bílá"
+
+#: build/trans_presets.java:2447
 msgid "Amount of Seats"
-msgstr "Počet drátů tvořících vodič"
+msgstr "Počet sedadel"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2449
 msgid "Hunting Stand"
 msgstr "Posed"
 
 #. item
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2450
 msgid "Edit Hunting Stand"
 msgstr "Upravit posed"
@@ -20043,30 +20427,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2441 build/trans_presets.java:2902
+#: build/trans_presets.java:2452 build/trans_presets.java:2914
 msgid "Height"
 msgstr "Výška"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "low"
 msgstr "nízká"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "half"
 msgstr "střední"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "full"
 msgstr "plná"
 
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2454
 msgid "Hide"
 msgstr "Úkryt"
 
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2455
 msgid "Lock"
 msgstr "Uzamknutelný"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Fountain"
 msgstr "Fontána"
@@ -20075,10 +20459,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:2449
+#: build/trans_presets.java:2460
 msgid "Edit Fountain"
 msgstr "Upravit fontánu"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2464
 msgid "Drinking Water"
 msgstr "Pitná voda"
@@ -20087,10 +20471,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:2456
+#: build/trans_presets.java:2467
 msgid "Edit Drinking Water"
 msgstr "Upravit pitnou vodu"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2471
 msgid "Baby Hatch"
 msgstr "Babybox"
@@ -20098,33 +20482,33 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Baby Hatch"
 msgstr "Upravit babybox"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2479
 msgid "Shops"
 msgstr "Obchody"
 
 #. group "Shops"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2480
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2481
 msgid "Edit Supermarket"
 msgstr "Upravit supermarket"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2486
 msgid "Chemist"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2476
+msgstr "Drogerie"
+
+#. item
+#: build/trans_presets.java:2487
 msgid "Edit Chemist"
-msgstr ""
-
-#: build/trans_presets.java:2481
+msgstr "Upravit drogerii"
+
+#: build/trans_presets.java:2492
 msgid "Convenience Store"
 msgstr "Samoobsluha, smíšenka, večerka"
@@ -20132,9 +20516,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Edit Convenience Store"
 msgstr "Upravit večerku"
 
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2499
 msgid "Kiosk"
 msgstr "Kiosek"
@@ -20142,27 +20526,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Kiosk"
 msgstr "Upravit kiosek"
 
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Book Store"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2496
+msgstr "Knihkupectví"
+
+#. item
+#: build/trans_presets.java:2507
 msgid "Edit Book Store"
-msgstr ""
-
-#: build/trans_presets.java:2501
+msgstr "Upravit knihkupectví"
+
+#: build/trans_presets.java:2512
 msgid "Travel Agency"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2502
+msgstr "Cestovní kancelář"
+
+#. item
+#: build/trans_presets.java:2513
 msgid "Edit Travel Agency"
-msgstr ""
-
-#: build/trans_presets.java:2507
+msgstr "Upravit cestovní kancelář"
+
+#: build/trans_presets.java:2518
 msgid "Vending machine"
 msgstr "Prodejní automat"
@@ -20170,5 +20554,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Edit Vending machine"
 msgstr "Upravit prodejní automat"
@@ -20176,88 +20560,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "Vending products"
 msgstr "Prodávané produkty"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_tickets"
 msgstr "lístky na městskou hromadnou dopravu"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_plans"
 msgstr "plány městské hromadné dopravy"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "parking_tickets"
 msgstr "parkovací lístky"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "food"
 msgstr "jídlo"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "drinks"
 msgstr "pití"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "sweets"
 msgstr "sladkosti"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "cigarettes"
 msgstr "cigarety"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "photos"
 msgstr "fotografie"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "animal_food"
 msgstr "krmivo pro zvířata"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "news_papers"
 msgstr "noviny"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "toys"
 msgstr "hračky"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "stamps"
 msgstr "známky"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "SIM-cards"
 msgstr "SIM-karty"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "telephone_vouchers"
 msgstr "telefonní karty"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "vouchers"
 msgstr "poukazy"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "condoms"
 msgstr "kondomy"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "tampons"
 msgstr "tampóny"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "excrement_bags"
 msgstr "sáčky na výkaly"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 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:2522
+#: build/trans_presets.java:2533
 msgid "Butcher"
 msgstr "Řeznictví"
@@ -20265,9 +20649,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2535
 msgid "Edit Butcher"
 msgstr "Upravit řeznictví"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2540
 msgid "Baker"
 msgstr "Pekařství"
@@ -20275,9 +20659,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2542
 msgid "Edit Baker"
 msgstr "Upravit pekařství"
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2547
 msgid "Florist"
 msgstr "Květinářství"
@@ -20285,18 +20669,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Florist"
 msgstr "Upravit květinářství"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2554
 msgid "Organic"
 msgstr "Obchod se zdravou výživou"
 
 #. item
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Edit Organic Shop"
 msgstr "Upravit obchod se zdravou výživou"
 
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2560
 msgid "Alcohol"
 msgstr "Alkohol"
@@ -20304,54 +20688,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2562
 msgid "Edit Alcohol Shop"
 msgstr "Upravit obchod s alkoholem"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2567
 msgid "Beverages"
 msgstr "Nápoje"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2568
 msgid "Edit Beverages Shop"
 msgstr "Upravit obchod s nápoji"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2573
 msgid "Computer"
 msgstr "Počítače"
 
 #. item
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2574
 msgid "Edit Computer Shop"
 msgstr "Upravit obchod s počítači"
 
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Electronics"
 msgstr "Elektronika"
 
 #. item
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2580
 msgid "Edit Electronics Shop"
 msgstr "Upravit obchod s elektronikou"
 
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2585
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2586
 msgid "Edit Hifi Shop"
 msgstr "Upravit obchod s hifi"
 
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2591
 msgid "Furniture"
 msgstr "Nábytek"
 
 #. item
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Edit Furniture Shop"
 msgstr "Upravit obchod s nábytkem"
 
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Garden Centre"
 msgstr "Zahradnické centrum"
@@ -20359,9 +20743,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2599
 msgid "Edit Garden Centre"
 msgstr "Upravit zahradnické centrum"
 
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Hardware"
 msgstr "Železářství"
@@ -20369,9 +20753,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2606
 msgid "Edit Hardware Store"
 msgstr "Upravit železářství"
 
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "Do-it-yourself-store"
 msgstr "Zboží pro kutily"
@@ -20379,54 +20763,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2613
 msgid "Edit Do-it-yourself-store"
 msgstr "Upravit obchod se zbožím pro kutily"
 
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2618
 msgid "Stationery"
 msgstr "Papírnictví"
 
 #. item
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2619
 msgid "Edit Stationery Shop"
 msgstr "Upravit papírnictví"
 
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Hairdresser"
 msgstr "Kadeřnictví"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Hairdresser"
 msgstr "Upravit Kadeřnictví"
 
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Shoes"
 msgstr "Obuv"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Shoe Shop"
 msgstr "Upravit obchod s obuví"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2636
 msgid "Toys"
 msgstr "Hračky"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit Toy Shop"
 msgstr "Upravit obchod s hračkami"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Video"
 msgstr "Videopůjčovna/prodejna"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Video Shop"
 msgstr "Upravit videopůjčovnu/prodejnu"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "Dry Cleaning"
 msgstr "Čistírna"
@@ -20434,9 +20818,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2650
 msgid "Edit Dry Cleaning"
 msgstr "Upravit čistírnu"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "Laundry"
 msgstr "Prádelna"
@@ -20444,9 +20828,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2657
 msgid "Edit Laundry"
 msgstr "Upravit prádelnu"
 
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2662
 msgid "Outdoor"
 msgstr "Vybavení do přírody"
@@ -20454,32 +20838,28 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2664
 msgid "Edit Outdoor Shop"
 msgstr "Obchod s vybavením do přírody"
 
-#: build/trans_presets.java:2658
-msgid "Sports"
-msgstr "Sportovní potřeby"
-
-#. item
-#: build/trans_presets.java:2659
+#. item
+#: build/trans_presets.java:2670
 msgid "Edit Sports Shop"
 msgstr "Upravit obchod se sportovními pořebami"
 
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Optician"
 msgstr "Oční optik"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Optician"
 msgstr "Upravit oční optiku"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2683
 msgid "Cash"
 msgstr "Finance"
 
 #. group "Cash"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2684
 msgid "Bank"
 msgstr "Banka"
@@ -20487,14 +20867,14 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2686
 msgid "Edit Bank"
 msgstr "Upravit banku"
 
-#: build/trans_presets.java:2680 build/trans_presets.java:2689
+#: build/trans_presets.java:2691 build/trans_presets.java:2700
 msgid "Automated Teller Machine"
 msgstr "Bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2693
 msgid "Money Exchange"
 msgstr "Směnárna"
@@ -20502,5 +20882,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Edit Money Exchange"
 msgstr "Upravit směnárnu"
@@ -20508,15 +20888,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2691
+#: build/trans_presets.java:2702
 msgid "Edit Automated Teller Machine"
 msgstr "Upravit bankomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2707
 msgid "Health"
 msgstr "Zdraví"
 
 #. group "Health"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2708
 msgid "Doctors"
 msgstr "Středisko"
@@ -20524,18 +20904,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2710
 msgid "Edit Doctors"
 msgstr "Upravit středisko"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2715
 msgid "Dentist"
 msgstr "Zubař"
 
 #. item
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Edit Dentist"
 msgstr "Upravit zubařskou ordinaci"
 
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2721
 msgid "Pharmacy"
 msgstr "Lékárna"
@@ -20543,5 +20923,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Edit Pharmacy"
 msgstr "Upravit lékárnu"
@@ -20549,9 +20929,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Dispensing"
 msgstr "Vydává léky na předpis"
 
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2729
 msgid "Hospital"
 msgstr "Nemocnice"
@@ -20559,10 +20939,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Edit Hospital"
 msgstr "Upravit nemocnici"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2735
 msgid "Emergency Access Point"
 msgstr "Místo pro kontaktování záchranářů"
@@ -20571,5 +20951,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:2727
+#: build/trans_presets.java:2738
 msgid "Edit Emergency Access Point"
 msgstr "Upravit místo pro kontaktování záchranářů"
@@ -20578,20 +20958,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2741
 msgid "Point Number"
 msgstr "Číslo místa"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2742
 msgid "Point Name"
 msgstr "Jméno místa"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Phone Number"
 msgstr "Telefonní číslo"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Použijte mezinárodní zápis, např. +420123456789)"
@@ -20599,5 +20979,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2748
 msgid "Veterinary"
 msgstr "Veterinář"
@@ -20606,55 +20986,60 @@
 #. <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:2740
+#: build/trans_presets.java:2751
 msgid "Edit Veterinary"
 msgstr "Upravit veterinární ordinaci"
 
+#: build/trans_presets.java:2758
+#, fuzzy
+msgid "Geography"
+msgstr "WGS84 Geographic"
+
 #. group "Places"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2760
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2761
 msgid "Edit Continent"
 msgstr "Upravit kontinent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2766
 msgid "Country"
 msgstr "Stát"
 
 #. item
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2767
 msgid "Edit Country"
 msgstr "Upravit stát"
 
 #. item "Places/Country" text "Name"
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2772
 msgid "State"
 msgstr "Země"
 
 #. item
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2773
 msgid "Edit State"
 msgstr "Upravit zemi"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2778
 msgid "Region"
 msgstr "Kraj"
 
 #. item
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2779
 msgid "Edit Region"
 msgstr "Upravit kraj"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2784
 msgid "County"
 msgstr "Okres"
 
 #. item
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2785
 msgid "Edit County"
 msgstr "Upravit okres"
@@ -20662,15 +21047,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2791
 msgid "City"
 msgstr "Velkoměsto"
 
 #. item
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2792
 msgid "Edit City"
 msgstr "Upravit velkoměsto"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2797
 msgid "Town"
 msgstr "Město"
@@ -20678,10 +21063,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2799
 msgid "Edit Town"
 msgstr "Upravit město"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2804
 msgid "Suburb"
 msgstr "Městský obvod, nebo městská část"
@@ -20689,25 +21074,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2806
 msgid "Edit Suburb"
 msgstr "Upravit městský obvod, nebo městská část"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2811
 msgid "Village"
 msgstr "Obec"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2812
 msgid "Edit Village"
 msgstr "Upravit obci"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2817
 msgid "Hamlet"
 msgstr "Samota"
 
 #. item
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2818
 msgid "Edit Hamlet"
 msgstr "Upravit samotu"
@@ -20715,5 +21100,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2824
 msgid "Locality"
 msgstr "Místní název"
@@ -20721,10 +21106,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2826
 msgid "Edit Locality"
 msgstr "Editovat místní název"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2831
 msgid "Island"
 msgstr "Ostrov"
@@ -20732,10 +21117,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2833
 msgid "Edit Island"
 msgstr "Upravit ostrov"
 
 #. item "Places/Island" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2838
 msgid "Islet"
 msgstr ""
@@ -20743,5 +21128,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2840
 msgid "Edit Islet"
 msgstr ""
@@ -20749,5 +21134,5 @@
 #. item "Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2846
 msgid "Cave Entrance"
 msgstr "Vstup do jeskyně"
@@ -20755,10 +21140,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2848
 msgid "Edit Cave Entrance"
 msgstr "Upravit vstup do jeskyně"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2852
 msgid "Peak"
 msgstr "Vrchol"
@@ -20766,10 +21151,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2854
 msgid "Edit Peak"
 msgstr "Upravit vrchol"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2859
 msgid "Glacier"
 msgstr "Ledovec"
@@ -20777,10 +21162,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2861
 msgid "Edit Glacier"
 msgstr "Upravit ledovec"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2854
+#: build/trans_presets.java:2866
 msgid "Volcano"
 msgstr "Sopka"
@@ -20788,70 +21173,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2868
 msgid "Edit Volcano"
 msgstr "Upravit sopku"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2874
 msgid "Boundaries"
 msgstr "Hranice"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2875
 msgid "National"
 msgstr "Národní"
 
 #. item
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2876
 msgid "Edit National Boundary"
 msgstr "Upravit národní hranici"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2881
 msgid "Administrative"
 msgstr "Administrativní"
 
 #. item
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2882
 msgid "Edit Administrative Boundary"
 msgstr "Upravit administrativní hranici"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:2887
 msgid "Civil"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2888
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2893
 msgid "Political"
 msgstr "Volební obvod"
 
 #. item
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2894
 msgid "Edit Political Boundary"
 msgstr "Upravit volební obvod"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2899
 msgid "National park"
 msgstr "Národní park"
 
 #. item
-#: build/trans_presets.java:2888
+#: build/trans_presets.java:2900
 msgid "Edit National Park Boundary"
 msgstr "Upravit hranice národního parku"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2906
 msgid "Land use"
 msgstr "Využití krajiny"
 
 #. group "Land use"
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2907
 msgid "Tree"
 msgstr "Strom"
@@ -20860,15 +21245,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:2898
+#: build/trans_presets.java:2910
 msgid "Edit Tree"
 msgstr "Upravit strom"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2915
 msgid "Botanical Name"
 msgstr "Botanické jméno"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2917
 msgid "Wood"
 msgstr "Prales"
@@ -20877,5 +21262,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:2908
+#: build/trans_presets.java:2920
 msgid "Edit Wood"
 msgstr "Editovat Prales"
@@ -20883,17 +21268,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "coniferous"
 msgstr "jehličnatý"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "deciduous"
 msgstr "listnatý"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "mixed"
 msgstr "smíšený"
 
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2925
 msgid "Forest"
 msgstr "Les"
@@ -20902,14 +21287,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:2916
+#: build/trans_presets.java:2928
 msgid "Edit Forest Landuse"
 msgstr "Upravit lesní plochu"
 
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2934
 msgid "Nature Reserve"
 msgstr "Přírodní rezervace"
 
 #. item
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2935
 msgid "Edit Nature Reserve"
 msgstr "Upravit přírodní rezervaci"
@@ -20917,25 +21302,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2940
 msgid "Scree"
 msgstr "Suťoviště"
 
 #. item
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2941
 msgid "Edit Scree"
 msgstr "Upravit suťoviště"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2945
 msgid "Scrub"
 msgstr "Podrost"
 
 #. item
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2946
 msgid "Edit Scrub"
 msgstr "Upravit podrost"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2950
 msgid "Fell"
 msgstr "Travnatá pahorkatina"
@@ -20943,10 +21328,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2952
 msgid "Edit Fell"
 msgstr "Upravit travnatou pahorkatinu"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2956
 msgid "Heath"
 msgstr "Vřesoviště"
@@ -20954,5 +21339,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2958
 msgid "Edit Heath"
 msgstr "Upravit vřesoviště"
@@ -20960,5 +21345,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2963
 msgid "Farmyard"
 msgstr "Farma"
@@ -20967,45 +21352,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:2954
+#: build/trans_presets.java:2966
 msgid "Edit Farmyard Landuse"
 msgstr "Upravit farmu"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2971
 msgid "Farmland"
 msgstr "Zemědělská půda"
 
 #. item
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2972
 msgid "Edit Farmland Landuse"
 msgstr "Upravit zemědělskou půdu"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2977
 msgid "Meadow"
 msgstr "Louka"
 
 #. item
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2978
 msgid "Edit Meadow Landuse"
 msgstr "Upravit louku"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2983
 msgid "Vineyard"
 msgstr "Vinice"
 
 #. item
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2984
 msgid "Edit Vineyard Landuse"
 msgstr "Upravit vinici"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:2989
 msgid "Allotments"
 msgstr "Zahrádkářská kolonie"
 
 #. item
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2990
 msgid "Edit Allotments Landuse"
 msgstr "Upravit zahrádkářskou kolonii"
@@ -21013,25 +21398,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2996
 msgid "Garden"
 msgstr "Zahrada"
 
 #. item
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2997
 msgid "Edit Garden"
 msgstr "Upravit zahradu"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3001
 msgid "Grass"
 msgstr "Tráva"
 
 #. item
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3002
 msgid "Edit Grass Landuse"
 msgstr "Upravit travnatou plochu"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3007
 msgid "Village Green"
 msgstr "Zelená plocha"
@@ -21039,10 +21424,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3009
 msgid "Edit Village Green Landuse"
 msgstr "Upravit zelenou plochu"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3014
 msgid "Common"
 msgstr "veřejná zeleň (mimo parky)"
@@ -21050,20 +21435,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3004
+#: build/trans_presets.java:3016
 msgid "Edit Common"
 msgstr "Upravit veřejnou zeleň"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3020
 msgid "Park"
 msgstr "Park"
 
 #. item
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3021
 msgid "Edit Park"
 msgstr "Upravit park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3025
 msgid "Recreation Ground"
 msgstr "Rekreační plocha"
@@ -21071,5 +21456,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3027
 msgid "Edit Recreation Ground Landuse"
 msgstr "Upravit rekreační plochu"
@@ -21077,15 +21462,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3033
 msgid "Residential area"
 msgstr "Obytná plocha"
 
 #. item
-#: build/trans_presets.java:3022
+#: build/trans_presets.java:3034
 msgid "Edit Residential Landuse"
 msgstr "Upravit obytnou plochu"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3039
 msgid "Graveyard"
 msgstr "Malý hřbitov"
@@ -21093,9 +21478,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3029
+#: build/trans_presets.java:3041
 msgid "Edit Graveyard"
 msgstr "Upravit malý hřbitov"
 
-#: build/trans_presets.java:3035
+#: build/trans_presets.java:3047
 msgid "Cemetery"
 msgstr "Hřbitov"
@@ -21103,39 +21488,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3049
 msgid "Edit Cemetery Landuse"
 msgstr "Upravit hřbitov"
 
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3056
 msgid "Retail"
 msgstr "Obchody"
 
 #. item
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3057
 msgid "Edit Retail Landuse"
 msgstr "Upravit plochu s obchody"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3062
 msgid "Commercial"
 msgstr "Kanceláře"
 
 #. item
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3063
 msgid "Edit Commercial Landuse"
 msgstr "Upravit kancelářskou plochu"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3056
+#: build/trans_presets.java:3068
 msgid "Industrial"
 msgstr "Průmysl"
 
 #. item
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3069
 msgid "Edit Industrial Landuse"
 msgstr "Upravit průmyslovou plochu"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3074
 msgid "Railway land"
 msgstr "Železniční plocha"
@@ -21143,15 +21528,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3076
 msgid "Edit Railway Landuse"
 msgstr "Upravit železniční plochu"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3081
 msgid "Military"
 msgstr "Vojenský prostor"
 
 #. item
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3082
 msgid "Edit Military Landuse"
 msgstr "Upravit vojenský prostor"
@@ -21159,55 +21544,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3088
 msgid "Construction area"
 msgstr "Probíhající výstavba"
 
 #. item
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3089
 msgid "Edit Construction Landuse"
 msgstr "Upravit výstavbu"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3094
 msgid "Brownfield"
 msgstr "Stará zátěž, městské ruiny (Brownfield)"
 
 #. item
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3095
 msgid "Edit Brownfield Landuse"
 msgstr "Upravit starou zátěž (Brownfield)"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3100
 msgid "Greenfield"
 msgstr "Zastavitelné území (Greenfield)"
 
 #. item
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3101
 msgid "Edit Greenfield Landuse"
 msgstr "Upravit zastavitelné území (Greenfield)"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3106
 msgid "Landfill"
 msgstr "skládka odpadu"
 
 #. item
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3107
 msgid "Edit Landfill Landuse"
 msgstr "Upravit skládku odpadu"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3112
 msgid "Quarry"
 msgstr "Lom"
 
 #. item
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3113
 msgid "Edit Quarry Landuse"
 msgstr "Upravit lom"
 
 #. group "Relations"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3122
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -21217,5 +21602,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:3114
+#: build/trans_presets.java:3126
 msgid "Edit Multipolygon"
 msgstr "Upravit multipolygon"
@@ -21224,10 +21609,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3132
 msgid "outer segment"
 msgstr "vnější část"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3133
 msgid "inner segment"
 msgstr "vnitřní část"
@@ -21235,5 +21620,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3136
 msgid "Turn restriction"
 msgstr "Zákaz odbočení"
@@ -21242,5 +21627,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3139
 msgid "Edit Turn Restriction"
 msgstr "Upravit zákaz odbočení"
@@ -21248,34 +21633,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "Restriction"
 msgstr "Omezení"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_left_turn"
 msgstr "zákaz odbočení vlevo"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_right_turn"
 msgstr "zákaz odbočení vpravo"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_straight_on"
 msgstr "zákaz jízdy rovně"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_u_turn"
 msgstr "zákaz otáčení"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_right_turn"
 msgstr "pouze odbočení vpravo"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_left_turn"
 msgstr "pouze odbočení vlevo"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_straight_on"
 msgstr "pouze jízda rovně"
@@ -21284,15 +21669,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3146
 msgid "from way"
 msgstr "z cesty"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3147
 msgid "via node or way"
 msgstr "přes uzel nebo cestu"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3148
 msgid "to way"
 msgstr "na cestu"
@@ -21300,5 +21685,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3151
 msgid "Route"
 msgstr "Trasa"
@@ -21307,5 +21692,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3154
 msgid "Edit Route"
 msgstr "Upravit trasu"
@@ -21313,5 +21698,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "Route type"
 msgstr "Typ trasy"
@@ -21383,5 +21768,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3144 build/trans_style.java:233
+#: build/trans_presets.java:3156 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -21390,17 +21775,17 @@
 msgstr "bicykl"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "bus"
 msgstr "autobus"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "road"
 msgstr "silnice"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ferry"
 msgstr "trajekt"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ski"
 msgstr "lyžařská"
@@ -21453,5 +21838,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3144 build/trans_style.java:247
+#: build/trans_presets.java:3156 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -21460,13 +21845,13 @@
 msgstr "pěší"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "hiking"
 msgstr "turistická"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "tram"
 msgstr "tramvajová"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "detour"
 msgstr "objízdná"
@@ -21480,10 +21865,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3144 build/trans_style.java:1206
+#: build/trans_presets.java:3156 build/trans_style.java:1206
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3159
 msgid "Symbol description"
 msgstr "Popis symbolu"
@@ -21491,31 +21876,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3162
 msgid "Network"
 msgstr "Síť"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "proposed"
 msgstr "navrhovaná"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "alternate"
 msgstr "alternativní"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "temporary"
 msgstr "dočasná"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "connection"
 msgstr "spojení"
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "Color (hex)"
 msgstr "Barva (hex)"
@@ -21524,30 +21909,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3168
 msgid "route segment"
 msgstr "segment trasy"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3169
 msgid "forward segment"
 msgstr "dopředný segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3170
 msgid "backward segment"
 msgstr "zpětný segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3171
 msgid "halt point"
 msgstr "zastávka"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3172
 msgid "forward halt point"
 msgstr "dopředná zastávka"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3173
 msgid "backward halt point"
 msgstr "zpětná zastávka"
@@ -21985,11 +22370,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3375 build/trans_style.java:3376
-#: build/trans_style.java:3946 build/trans_style.java:4254
-#: build/trans_style.java:4263 build/trans_style.java:4272
-#: build/trans_style.java:4281 build/trans_style.java:4290
-#: build/trans_style.java:4299 build/trans_style.java:4308
-#: build/trans_style.java:4309 build/trans_style.java:4318
-#: build/trans_style.java:4327
+#: build/trans_style.java:3383 build/trans_style.java:3384
+#: build/trans_style.java:3954 build/trans_style.java:4262
+#: build/trans_style.java:4271 build/trans_style.java:4280
+#: build/trans_style.java:4289 build/trans_style.java:4298
+#: build/trans_style.java:4307 build/trans_style.java:4316
+#: build/trans_style.java:4317 build/trans_style.java:4326
+#: build/trans_style.java:4335
 msgid "deprecated"
 msgstr "zastaralý"
@@ -23056,5 +23441,5 @@
 #: build/trans_style.java:1435 build/trans_style.java:1436
 msgid "piste_expert"
-msgstr ""
+msgstr "sjezdovka pro experty"
 
 #. color piste_expert
@@ -24013,5 +24398,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3294
+#: build/trans_style.java:3302
 msgid "light_water"
 msgstr "menší vodní plochy"
@@ -24693,8 +25078,17 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="boundary_stone"/>
+#. <icon annotate="true" src="historic/boundary_stone.png"/>
 #: build/trans_style.java:2990 build/trans_style.java:2998
 #: build/trans_style.java:3006 build/trans_style.java:3014
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
+#: build/trans_style.java:3054
 msgid "historic"
 msgstr "historické"
@@ -24708,5 +25102,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3095
 msgid "quarry"
 msgstr "lom"
@@ -24720,5 +25114,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "landfill"
 msgstr "skládka"
@@ -24740,5 +25134,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3103 build/trans_style.java:3111
+#: build/trans_style.java:3111 build/trans_style.java:3119
 msgid "basin"
 msgstr "nádrže"
@@ -24752,5 +25146,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3127
 msgid "forest"
 msgstr "les"
@@ -24764,5 +25158,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3159
 msgid "farmyard"
 msgstr "zemědělství"
@@ -24785,5 +25179,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3160 build/trans_style.java:3168
+#: build/trans_style.java:3168 build/trans_style.java:3176
 msgid "retail"
 msgstr "obchody"
@@ -24797,5 +25191,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3176
+#: build/trans_style.java:3184
 msgid "industrial"
 msgstr "průmysl"
@@ -24809,5 +25203,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "brownfield"
 msgstr "stará zátěž, městské ruiny (Brownfield)"
@@ -24821,5 +25215,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "greenfield"
 msgstr "Zastavitelné území (Greenfield)"
@@ -24833,5 +25227,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "railland"
 msgstr "železniční plochy"
@@ -24888,7 +25282,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3217 build/trans_style.java:3252
-#: build/trans_style.java:3260 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3225 build/trans_style.java:3260
+#: build/trans_style.java:3268 build/trans_style.java:3276
+#: build/trans_style.java:3284 build/trans_style.java:3292
 msgid "military"
 msgstr "vojenský"
@@ -24902,5 +25296,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3225
+#: build/trans_style.java:3233
 msgid "cemetery"
 msgstr "hřbitov"
@@ -24913,5 +25307,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3301
+#: build/trans_style.java:3309
 msgid "peak"
 msgstr "vrchol"
@@ -24926,5 +25320,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3310
+#: build/trans_style.java:3318
 msgid "glacier"
 msgstr "ledovec"
@@ -24938,5 +25332,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "volcano"
 msgstr "sopka"
@@ -24991,8 +25385,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3326 build/trans_style.java:3327
-#: build/trans_style.java:3335 build/trans_style.java:3351
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440
+#: build/trans_style.java:3334 build/trans_style.java:3335
+#: build/trans_style.java:3343 build/trans_style.java:3359
+#: build/trans_style.java:3432 build/trans_style.java:3440
+#: build/trans_style.java:3448
 msgid "natural"
 msgstr "přírodní"
@@ -25006,5 +25400,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3343
+#: build/trans_style.java:3351
 msgid "scrub"
 msgstr "křoví"
@@ -25018,5 +25412,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3359
+#: build/trans_style.java:3367
 msgid "heath"
 msgstr "vřesoviště"
@@ -25030,5 +25424,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3408
+#: build/trans_style.java:3416
 msgid "mud"
 msgstr "bahno"
@@ -25042,5 +25436,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "beach"
 msgstr "pláž"
@@ -25118,8 +25512,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
-#: build/trans_style.java:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496 build/trans_style.java:3504
+#: build/trans_style.java:3512 build/trans_style.java:3520
 msgid "route"
 msgstr "cesta"
@@ -25167,7 +25561,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3522 build/trans_style.java:3530
-#: build/trans_style.java:3538 build/trans_style.java:3546
-#: build/trans_style.java:3554
+#: build/trans_style.java:3530 build/trans_style.java:3538
+#: build/trans_style.java:3546 build/trans_style.java:3554
+#: build/trans_style.java:3562
 msgid "boundary"
 msgstr "hranice"
@@ -25317,11 +25711,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090
+#: build/trans_style.java:4002 build/trans_style.java:4010
+#: build/trans_style.java:4018 build/trans_style.java:4026
+#: build/trans_style.java:4034 build/trans_style.java:4042
+#: build/trans_style.java:4050 build/trans_style.java:4058
+#: build/trans_style.java:4066 build/trans_style.java:4074
+#: build/trans_style.java:4082 build/trans_style.java:4090
+#: build/trans_style.java:4098
 msgid "place"
 msgstr "místo"
@@ -25369,6 +25763,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4207 build/trans_style.java:4214
-#: build/trans_style.java:4221 build/trans_style.java:4228
+#: build/trans_style.java:4215 build/trans_style.java:4222
+#: build/trans_style.java:4229 build/trans_style.java:4236
 msgid "address"
 msgstr "adresa"
@@ -25518,5 +25912,5 @@
 #: build/trans_validator.java:47
 msgid "Unnamed unclassified highway"
-msgstr ""
+msgstr "Nepojmenovaná neklasifikovaná silnice"
 
 #. way  : W : highway == unclassified && name != *
@@ -25629,20 +26023,20 @@
 #: build/trans_wms.java:13
 msgid "Yahoo Sat"
-msgstr ""
+msgstr "Yahoo Sat"
 
 #. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
 #: build/trans_wms.java:14
 msgid "OpenStreetMap"
-msgstr ""
+msgstr "OpenStreetMap"
 
 #. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
 #: build/trans_wms.java:15
 msgid "OpenCycleMap"
-msgstr ""
+msgstr "OpenCycleMap"
 
 #. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
 #: build/trans_wms.java:16
 msgid "TilesAtHome"
-msgstr ""
+msgstr "TilesAtHome"
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
@@ -25658,10 +26052,10 @@
 #: build/trans_wms.java:22
 msgid "Terraserver Topo"
-msgstr ""
+msgstr "Terraserver Topo"
 
 #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
 #: build/trans_wms.java:23
 msgid "Terraserver Urban"
-msgstr ""
+msgstr "Terraserver Urban"
 
 #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
@@ -25669,31 +26063,140 @@
 #: build/trans_wms.java:25
 msgid "Czech CUZK:KM"
-msgstr ""
+msgstr "Český CUZK:KM"
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE&
 #: build/trans_wms.java:26
 msgid "Czech UHUL:ORTOFOTO"
-msgstr ""
+msgstr "Český UHUL:ORTOFOTO"
+
+#~ msgid "Close current changeset"
+#~ msgstr "Uzavřít aktuální sadu změn"
+
+#~ msgid "There is currently no changeset open."
+#~ msgstr "Aktuálně není otevřena žádná sada změn."
+
+#~ msgid "- running version is {0}"
+#~ msgstr "- běžící verze je {0}"
+
+#~ msgid "not yet decided"
+#~ msgstr "zatím nerozhodnoto"
+
+#~ msgid "Use a new changeset and close it"
+#~ msgstr "Použít novou sadu změn a uzavřít ji"
+
+#~ msgid "Use the existing changeset {0} and close it after upload"
+#~ msgstr "Použít existující sadu změn {0} a zavřít ji po nahrání"
+
+#~ msgid "Use the existing changeset {0} and leave it open"
+#~ msgstr "Použít existující sadu změn {0}  a ponechat ji  otevřenou"
+
+#~ msgid ""
+#~ "Select to upload to the existing changeset {0} and to leave the changeset "
+#~ "open for further uploads"
+#~ msgstr ""
+#~ "Vloží data do již existující sady změn {0} a ponechá ji otevřenou pro "
+#~ "vkládání dalších dat"
+
+#~ msgid "Email"
+#~ msgstr "E-mail"
+
+#~ msgid "Data Layer"
+#~ msgstr "Vrstva dat"
+
+#~ msgid "unnamed"
+#~ msgstr "nepojmenováno"
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Neznámá přípona souboru."
+
+#~ msgid "Change"
+#~ msgstr "Změnit"
+
+#~ msgid "Delete {1} {0}"
+#~ msgstr "Smazat {1} {0}"
+
+#~ msgid "Rotate"
+#~ msgstr "Otočit"
+
+#~ msgid "Move"
+#~ msgstr "Přesunout"
+
+#~ msgid "false"
+#~ msgstr "nepravda"
+
+#~ msgid "true"
+#~ msgstr "pravda"
+
+#~ msgid "different"
+#~ msgstr "různé"
+
+#~ msgid "position"
+#~ msgstr "pozice"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
+#~ msgid "their version:"
+#~ msgstr "verze na serveru:"
+
+#~ msgid "resolved version:"
+#~ msgstr "finální verze:"
+
+#~ msgid "my version:"
+#~ msgstr "moje verze:"
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
+#~ msgid "Object"
+#~ msgstr "Objekt"
+
+#~ msgid "Revert"
+#~ msgstr "Vrátit zpět"
+
+#~ 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 "Cannot connect to server."
+#~ msgstr "Nemohu se připojit na server."
+
+#~ msgid "There were conflicts during import."
+#~ msgstr "Vznikly konflikty během importu"
+
+#~ msgid "Error parsing server response."
+#~ msgstr "Chyba parsování odezvy serveru"
+
+#~ msgid "Contacting the OSM server..."
+#~ msgstr "Kontaktuji OSM server..."
 
 #~ msgid "All the ways were empty"
 #~ msgstr "Všechny cesty byli prázdné"
 
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Spojit uzly s různými členství v relaci?"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Přesto sloučit"
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr ""
-#~ "Zvolené uzly mají rozdílné členství v relaci. Chcete je přesto spojit ?"
+#~ msgid "Resolve Conflicts"
+#~ msgstr "Vyřešit konflikty"
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM uživatelské jméno (email)"
 
 #~ msgid "Unknown version"
 #~ msgstr "Neznámá verze"
 
-#~ msgid "Version number missing from OSM data"
-#~ msgstr "V OSM datech chybí číslo verze"
+#~ msgid "Aborting..."
+#~ msgstr "Přerušuji..."
+
+#~ msgid "Adjust the position of the WMS layer"
+#~ msgstr "Upravit pozici WMS vrstvy"
+
+#~ msgid "YAHOO (WebKit)"
+#~ msgstr "YAHOO (WebKit)"
+
+#~ msgid "YAHOO (GNOME)"
+#~ msgstr "YAHOO (GNOME)"
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr "Není otevřený žádný dokument, není co uložit."
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "Přihlašovací jméno (email) k OSM účtu."
 
 #~ msgid "Found <nd> element in non-way."
@@ -25702,109 +26205,4 @@
 #~ msgid "<nd> has zero ref"
 #~ msgstr "<nd> má nulový ref"
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Nalezen <member> tag mimo relaci."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Neplatné id uzlu"
-
-#~ msgid "Email"
-#~ msgstr "E-mail"
-
-#~ msgid "Data Layer"
-#~ msgstr "Vrstva dat"
-
-#~ msgid "unnamed"
-#~ msgstr "nepojmenováno"
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Neznámá přípona souboru."
-
-#~ msgid "Change"
-#~ msgstr "Změnit"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Smazat {1} {0}"
-
-#~ msgid "Rotate"
-#~ msgstr "Otočit"
-
-#~ msgid "Move"
-#~ msgstr "Přesunout"
-
-#~ msgid "false"
-#~ msgstr "nepravda"
-
-#~ msgid "true"
-#~ msgstr "pravda"
-
-#~ msgid "different"
-#~ msgstr "různé"
-
-#~ msgid "position"
-#~ msgstr "pozice"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "their version:"
-#~ msgstr "verze na serveru:"
-
-#~ msgid "resolved version:"
-#~ msgstr "finální verze:"
-
-#~ msgid "my version:"
-#~ msgstr "moje verze:"
-
-#~ msgid "Date"
-#~ msgstr "Datum"
-
-#~ msgid "Object"
-#~ msgstr "Objekt"
-
-#~ msgid "Revert"
-#~ msgstr "Vrátit zpět"
-
-#~ msgid "Add Selected"
-#~ msgstr "Přidat vybrané"
-
-#~ 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 "Cannot connect to server."
-#~ msgstr "Nemohu se připojit na server."
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Vznikly konflikty během importu"
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Chyba parsování odezvy serveru"
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Kontaktuji OSM server..."
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Vyřešit konflikty"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM uživatelské jméno (email)"
-
-#~ msgid "Aborting..."
-#~ msgstr "Přerušuji..."
-
-#~ msgid "Adjust the position of the WMS layer"
-#~ msgstr "Upravit pozici WMS vrstvy"
-
-#~ msgid "YAHOO (WebKit)"
-#~ msgstr "YAHOO (WebKit)"
-
-#~ msgid "YAHOO (GNOME)"
-#~ msgstr "YAHOO (GNOME)"
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Není otevřený žádný dokument, není co uložit."
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "Přihlašovací jméno (email) k OSM účtu."
 
 #~ msgid "Click Reload to refresh list"
@@ -25872,4 +26270,7 @@
 #~ msgid "Some of the nodes are (almost) in the line"
 #~ msgstr "Některé z uzlů jsou (skoro) v přímce"
+
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "Nalezen <member> tag mimo relaci."
 
 #~ msgid ""
@@ -25950,6 +26351,12 @@
 #~ msgstr "Základní"
 
-#~ msgid "Delete Layer"
-#~ msgstr "Smazat vrstvu"
+#~ msgid ""
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
+#~ msgstr ""
+#~ "Zvolené uzly mají rozdílné členství v relaci. Chcete je přesto spojit ?"
+
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "Spojit uzly s různými členství v relaci?"
 
 #~ msgid "Add all currently selected objects as members"
@@ -25988,4 +26395,7 @@
 #~ msgstr "Server nepodporuje sady změn"
 
+#~ msgid "Ill-formed node id"
+#~ msgstr "Neplatné id uzlu"
+
 #~ msgid "Remove the member in the current table row from this relation"
 #~ msgstr "Odstranit prvek v aktuálním řádku tabulky z relace"
@@ -26002,4 +26412,7 @@
 #~ msgid "Delete and Download"
 #~ msgstr "Smazat a stáhnout"
+
+#~ msgid "Merge Anyway"
+#~ msgstr "Přesto sloučit"
 
 #~ msgid "Download Image from french Cadastre WMS"
@@ -26179,7 +26592,4 @@
 #~ msgstr "Žádná data"
 
-#~ msgid "Change {0} {1}"
-#~ msgstr "Změnit {0} {1}"
-
 #~ msgid "nodes"
 #~ msgstr "body"
@@ -26199,4 +26609,7 @@
 #~ msgid "<html>Failed to load history from the server. Details:<br>{0}</html>"
 #~ msgstr "<html>Selhalo nahrávání historie ze serveru. Detaily:<br>{0}</html>"
+
+#~ msgid "Version number missing from OSM data"
+#~ msgstr "V OSM datech chybí číslo verze"
 
 #~ msgid ""
Index: applications/editors/josm/i18n/po/da.po
===================================================================
--- applications/editors/josm/i18n/po/da.po	(revision 17655)
+++ applications/editors/josm/i18n/po/da.po	(revision 17697)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-12 18:11+0200\n"
-"PO-Revision-Date: 2009-09-10 21:25+0000\n"
-"Last-Translator: Peter Brodersen <Unknown>\n"
+"POT-Creation-Date: 2009-09-19 13:00+0200\n"
+"PO-Revision-Date: 2009-09-15 03:13+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\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-09-12 16:04+0000\n"
+"X-Launchpad-Export-Date: 2009-09-19 10:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -42,10 +42,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:543
 #: ../core/src/org/openstreetmap/josm/Main.java:551
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -70,5 +70,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -86,6 +86,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:358
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
@@ -101,6 +101,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
@@ -124,10 +124,10 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
 msgid "Save and Exit"
 msgstr "Gem og afslut"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
 msgid "Discard and Exit"
 msgstr "Smid væk og afslut"
@@ -138,4 +138,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
@@ -143,27 +144,28 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:296
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:258
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:613
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
@@ -171,5 +173,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -189,6 +191,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
@@ -205,17 +207,17 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:654
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1528
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -226,6 +228,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
@@ -278,9 +280,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:607
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:609
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -340,5 +342,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
 msgid "Plugins"
@@ -388,5 +390,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Sammenflet"
@@ -476,5 +478,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -487,4 +489,5 @@
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -520,6 +523,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
@@ -528,6 +531,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:346
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
@@ -638,4 +641,46 @@
 msgstr "Ingen konflikter at zoome ind på."
 
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#, fuzzy
+msgid "Close open changesets"
+msgstr "Intet rettesæt åbent"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#, fuzzy
+msgid "Closes open changesets"
+msgstr "Intet rettesæt åbent"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
+#: ../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:114
+#, java-format
+msgid "File: {0}"
+msgstr "Fil: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
+#, fuzzy
+msgid "There are no open changesets"
+msgstr "Intet rettesæt åbent"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
+#, fuzzy
+msgid "No open changesets"
+msgstr "Intet rettesæt åbent"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
+#, fuzzy
+msgid "Downloading open changesets ..."
+msgstr "Lukker rettesæt..."
+
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
@@ -735,10 +780,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:123
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
@@ -781,31 +827,30 @@
 msgstr "Fordel de valgte punkter med samme afstand langs en linje."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
 msgid "Download from OSM..."
 msgstr "Hent fra OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
 msgid "Download map data from the OSM server."
 msgstr "Hent kort-data fra OSM serveren."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
-#, java-format
-msgid "File: {0}"
-msgstr "Fil: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
 msgid "Download"
 msgstr "Hent"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
 msgid "Please select at least one task to download"
 msgstr "Vælg mindst én opgave til download"
@@ -826,5 +871,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1527
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307
@@ -844,6 +889,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:376
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1415
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
 msgid "Duplicate"
 msgstr "Duplikér"
@@ -915,10 +960,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
@@ -1004,25 +1050,26 @@
 msgstr "Flet det nuværende lag sammen med et andet lag"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 msgid "Merge Nodes"
 msgstr "Foren punkter"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
 msgid "Merge nodes into the oldest one."
 msgstr "Foren punkter til den ældste."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
 msgid "Please select at least two nodes to merge."
 msgstr "Vælg mindst to punkter, der skal forenes."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:394
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
@@ -1038,8 +1085,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -1065,6 +1112,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
@@ -1073,5 +1124,5 @@
 msgstr "parameteren \"{0}\" må ikke være en null-værdi"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
@@ -1079,5 +1130,5 @@
 "er i brug."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283
 #, java-format
 msgid "Merge {0} nodes"
@@ -1149,5 +1200,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "New"
 msgstr "Ny"
@@ -1421,14 +1472,15 @@
 msgstr "Hjælp: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
 msgid "Status Report"
 msgstr "Statusrapport"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 msgid "Copy to clipboard and close"
 msgstr "Kopier til udklipsholder og luk"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
@@ -1507,25 +1559,4 @@
 msgstr "Opdel vejen {0} i {1} stykker"
 
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24
-msgid "Close current changeset"
-msgstr "Luk nuværende rettesæt"
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-msgid "Close the current changeset ..."
-msgstr "Luk det nuværende rettesæt ..."
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41
-msgid "There is currently no changeset open."
-msgstr "Der er ingen rettesæt åbne."
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42
-msgid "No open changeset"
-msgstr "Intet rettesæt åbent"
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60
-msgid "Closing changeset"
-msgstr "Lukker rettesæt"
-
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
@@ -1689,41 +1720,39 @@
 msgstr "Intet er valgt"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Send til OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 msgid "Upload all changes to the OSM server."
 msgstr "Send alle ændringer til OSM-serveren."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#, java-format
 msgid ""
 "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
 "resolve them first.</html>"
 msgstr ""
-"<html>Der er ingen lag, kildelaget<br>\"{0}\"<br>kunne flettes sammen med.</"
-"html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
 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:166
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 msgid "No changes to upload."
 msgstr "Ingen ændringer at sende."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Synkronisér kun {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
 msgid "Synchronize entire dataset"
 msgstr "Synkronisér hele datasættet"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
 #, java-format
 msgid ""
@@ -1737,17 +1766,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
 msgid "Conflict detected"
 msgstr "Der er opdaget en konflikt"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr "uventet svar. Modtog {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:267
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
 #, java-format
 msgid ""
@@ -1758,28 +1787,40 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
+msgid ""
+"<html>Uploading <strong>failed</strong> because you've been "
+"using<br>changeset {0} which was already closed at {1}.<br>Please upload "
+"again with a new or an existing open changeset."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+#, fuzzy
+msgid "Changeset closed"
+msgstr "rettesæt"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
 msgid "Upload to OSM API failed"
 msgstr "Upload til OSM-API'et fejlede"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
 msgid "Updating primitive"
 msgstr "Opdaterer primitiv"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1998,14 +2039,14 @@
 msgstr "Tilføj punkt ind i vej og forbind"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:930
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:932
 msgid "Create new node."
 msgstr "Opret nyt punkt."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
 msgid "Select node under cursor."
 msgstr "Vælg punkt under markøren."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939
 #, java-format
 msgid "Insert new node into way."
@@ -2014,14 +2055,14 @@
 msgstr[1] "Indsæt nyt punkt i {0} veje."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
 msgid "Start new way from last node."
 msgstr "Start ny vej fra seneste punkt."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951
 msgid "Continue way from last node."
 msgstr "Fortsæt vej fra seneste punkt."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:972
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:974
 msgid "Finish drawing."
 msgstr "Afslut tegning."
@@ -2139,60 +2180,70 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Søg..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Søg efter objekter."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
 msgid "Can't search because there is no loaded data."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
+#, fuzzy
+msgid "Please enter a filter string."
+msgstr "Indtast en søgetekst."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
 msgid "Please enter a search string."
 msgstr "Indtast en søgetekst."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
 msgid "replace selection"
 msgstr "erstat valgte"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72
 msgid "add to selection"
 msgstr "føj til valgte"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73
 msgid "remove from selection"
 msgstr "fjern fra valgte"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
+#, fuzzy
+msgid "find in selection"
+msgstr "føj til valgte"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81
 msgid "case sensitive"
 msgstr "versalfølsom"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82
 msgid "regular expression"
 msgstr "regulært udtryk"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
 msgstr "<b>Baker Street</b> - 'Baker' og 'Street' i enhver nøgle eller navn."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
 msgstr "<b>\"Baker Street\"</b> - 'Baker Street' i enhver nøgle eller navn."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
 msgstr "<b>name:Bak</b> - 'Bak' hvor som helst i navnet."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid ""
 "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
@@ -2200,110 +2251,127 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
 msgstr "<b>-name:Bak</b> - intet 'Bak' i navnet."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
 msgid "<u>Special targets:</u>"
 msgstr "<u>Specielle mål:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - alle objekter rettet af bruger"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 msgid "<b>nodes:</b>... - object with given number of nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - alle ændrede objekter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - alle valgte objekter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - alle ufuldstændige objekter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "<b>untagged</b> - all untagged objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
 "Brug <b>|</b> eller <b>OR</b> to for at forbinde med et logisk \"eller\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr "Brug <b>\"</b> for at angive operatorer (fx hvis key indeholder : )"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Brug <b>(</b> og <b>)</b> for at gruppere udtryk"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
+msgid "Filter"
+msgstr "Filter"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Søg"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
+msgid "Submit filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "Start Search"
 msgstr "Start søgning"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Intet resultat for \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Intet tilføjet til det valgte ved søgning efter \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Intet fjernet fra det valgte ved søgning efter \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#, fuzzy, java-format
+msgid "Nothing find in selection by searching for ''{0}''"
+msgstr "Intet tilføjet til det valgte ved søgning efter \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262
 #, java-format
 msgid "Found {0} matches"
 msgstr "Fandt {0} resultater"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CS"
 msgstr "Versalfølsom"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CI"
 msgstr "Ikke-versalfølsom"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283
 msgid "RX"
 msgstr "Regulært udtryk"
@@ -2489,5 +2557,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
 msgid "Double conflict"
 msgstr ""
@@ -2732,4 +2800,5 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:134
 msgid "Old value"
 msgstr "Gammel værdi"
@@ -2893,27 +2962,59 @@
 
 #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
 msgid "E"
 msgstr "Ø"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:59
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:203
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
 msgid "Changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:323
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:325
-#, fuzzy, java-format
-msgid "paramete''{0}'' must not be null"
-msgstr "parameteren \"{0}\" må ikke være en null-værdi"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331
-#, fuzzy, java-format
-msgid "unsupported value ''{0}'' or parameter ''{1}''"
-msgstr "Ingen brugbar rolle \"{0}\" for vej \"{1}\"."
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "H"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "Text"
+msgstr "tekst"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "C"
+msgstr "Versalfølsom"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "I"
+msgstr "Ikke-versalfølsom"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "M"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#, fuzzy
+msgid "R"
+msgstr "Regulært udtryk"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+msgid "A"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+msgid "D"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+msgid "F"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
@@ -2927,29 +3028,29 @@
 msgstr "Advarsel: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
+#, java-format
 msgid "expected id >= 0. Got {0}"
-msgstr "uventet kolonne-indeks. Modtog {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:257
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
 msgid "a primitive with id=0 can't be invisible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:293
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
+#, java-format
 msgid "id > 0 expected. Got {0}"
-msgstr "uventet svar. Modtog {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
 msgid "version > 0 expected. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
 msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
 msgstr "parameteren \"{0}\" er ikke et gyldigt typenavn, modtog \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
 msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
@@ -3016,9 +3117,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:247
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:249
 msgid "Area style way is not closed."
 msgstr "En vej af typen Område er ikke lukket."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:478
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:482
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
@@ -3027,118 +3128,118 @@
 #. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
 #. TODO Remove useless nullcheck when RelationMember.member is encalupsed
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:851
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855
 msgid "Empty member in relation."
 msgstr "Tomt medlem i relation."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:853
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Slettede medlem \"{0}\" i relation"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:864
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Vej \"{0}\" med mindre end to punkter."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "More than one \"from\" way found."
 msgstr "Mere end én \"fra\"-vej blev fundet."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "More than one \"to\" way found."
 msgstr "Mere end én \"til\"-vej blev fundet."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "More than one \"via\" found."
 msgstr "Mere end én \"via\" blev fundet."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Ukendt rolle \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Ukendt medlemstype for \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"from\" way found."
 msgstr "Ingen \"fra\"-vej blev fundet."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"to\" way found."
 msgstr "Ingen \"til\"-vej blev fundet."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652
 msgid "No \"via\" node or way found."
 msgstr "Intet \"via\"-punkt eller vej blev fundet."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "\"Fra\"-vejen begynder eller slutter ikke ved et \"via\"-punkt."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "\"Til\"-vejen begynder eller slutter ikke ved et \"via\"-punkt."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "\"Fra\"-vejen begynder eller slutter ikke ved \"via\"-vejen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "\"Til\"-vejen begynder eller slutter ikke ved \"via\"-vejen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Ingen brugbar rolle \"{0}\" for vej \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:885
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Ikke-vej \"{0}\" i multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:943
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Ingen ydre vej for multipolygon \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1032
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Overlap mellem vejene \"{0}\" og \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1044
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Indre vej \"{0}\" er på ydersiden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1097
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1123
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1327
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331
 msgid "untagged"
 msgstr "utagget"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1328
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332
 msgid "text"
 msgstr "tekst"
@@ -3159,5 +3260,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
@@ -3178,5 +3279,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
@@ -3225,5 +3326,5 @@
 msgstr "Lambert-zone (Frankrig)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambert-zone (Estland)"
@@ -3265,9 +3366,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:38
 msgid "Do not show again"
 msgstr "Vis ikke igen"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
 #, java-format
@@ -3275,31 +3376,31 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:91
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:116
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154
 msgid "incomplete"
 msgstr "ufuldstændig"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
 msgid "highway"
 msgstr "landevej"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
-#: build/trans_presets.java:3144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: build/trans_presets.java:3156
 msgid "railway"
 msgstr "jernbane"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
 msgid "waterway"
 msgstr "vandvej"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "landuse"
 msgstr "brug af jord"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:474
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
@@ -3309,5 +3410,5 @@
 msgstr[1] "{0} punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
 #, java-format
 msgid "{0} member"
@@ -3352,10 +3453,5 @@
 msgstr "Dagens besked er ikke tilgængelig"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67
-#, java-format
-msgid "- running version is {0}"
-msgstr "- nuværende version er {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:95
 msgid "Downloading \"Message of the day\""
 msgstr "Henter \"Dagens besked\""
@@ -3428,10 +3524,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:162
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
 msgid "Username"
 msgstr "Brugernavn"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
 msgid "Password"
 msgstr "Kodeord"
@@ -3552,5 +3648,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226
 msgid "Presets"
 msgstr "Forudindstillinger"
@@ -3624,38 +3720,49 @@
 msgstr "skalér"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Den geografiske længdegrad ved musemarkøren."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The name of the object at the mouse pointer."
 msgstr "Navnet på objektet ved musemarkøren."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Den geografiske breddegrad ved musemarkøren."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The angle between the previous and the current way segment."
 msgstr "Vinklen mellem det forrige og det nuværende vejstykke."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "(Kompas)retningen af det tegnede linjestykke."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The length of the new way segment being drawn."
 msgstr "Længden af det nytegnede vejstykke."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199
+msgid ""
+"Middle click again to cycle through.<br>Hold CTRL to select directly from "
+"this list with the mouse.<hr>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290
 msgid "(no object)"
 msgstr "(intet objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:301
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418
+#, fuzzy
+msgid "User:"
+msgstr "Bruger"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
 msgid "layer not in list."
 msgstr "lag er ikke i listen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:488
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3726,7 +3833,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:224
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Tags"
 msgstr "Tags"
@@ -3741,5 +3848,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
@@ -3920,4 +4027,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
 msgid "Up"
 msgstr "Op"
@@ -3928,4 +4036,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Down"
 msgstr "Ned"
@@ -3938,5 +4047,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
@@ -4361,23 +4470,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:236
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239
 msgid "No conflicts to resolve"
-msgstr "Ingen konflikter at zoome ind på."
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:295
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254
 msgid "Cancel conflict resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:310
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269
 msgid "Apply resolved conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Apply"
 msgstr ""
@@ -4389,5 +4497,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "all"
 msgstr "alle"
@@ -4431,7 +4539,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
-msgid "not yet decided"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:213
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
@@ -4458,7 +4563,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
@@ -4468,7 +4573,7 @@
 msgstr[1] "{0} veje"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:152
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
@@ -4478,20 +4583,20 @@
 msgstr[1] "{0} relationer"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "Paste ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "From ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:372
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "To ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:428
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
 #, java-format
 msgid "{0} tag"
@@ -4507,13 +4612,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
-#, fuzzy
 msgid "Remove this relation member from the relation"
-msgstr "Fjern medlemmet i den nuværende tabelrække fra denne relation"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-#, fuzzy
 msgid "Replace"
-msgstr "sted"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
@@ -4524,11 +4627,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
-#, fuzzy
 msgid "Undecided"
-msgstr "<udefineret>"
+msgstr ""
 
 #. --- role editing
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:56
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510
 msgid "Role:"
 msgstr ""
@@ -4544,7 +4646,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70
-#, fuzzy
 msgid "Value:"
-msgstr "Værdi"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86
@@ -4557,12 +4658,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51
-#, fuzzy
 msgid "Orig. Way"
-msgstr "Ensrettet"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
-#, fuzzy
 msgid "Decision"
-msgstr "Version"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -4578,6 +4677,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
@@ -4668,169 +4768,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-msgid "History"
-msgstr "Historik"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-msgid "Display the history of all selected items."
-msgstr "Vis historikken for alle valgte elementer."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
-#, java-format
-msgid "index out of bounds Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
-msgid "History item"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Genindlæs alle valgte objekter og genopfrisk listen."
-
-#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
-msgid "Show"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
-msgid "Dialog not created yet. Invoke createInstance() first"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
-msgid "Layers"
-msgstr "Lag"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-msgid "Open a list of all loaded layers."
-msgstr "Åbn en liste af alle hentede lag."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:297
-msgid "Delete the selected layer."
-msgstr "Slet det valgte lag."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:367
-msgid "Show/Hide"
-msgstr "Vis/skjul"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:378
-msgid "Toggle visible state of the selected layer."
-msgstr "Skift synligheden for det valgte lag."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:420
-msgid "Activate the selected layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:475
-msgid "Merge this layer into another layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:581
-msgid "Move the selected layer one row up."
-msgstr "Flyt det valgte lag en række op."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:600
-msgid "Move the selected layer one row down."
-msgstr "Flyt det valgte lag en række ned."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
-msgid "Information about layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
-#, java-format
-msgid "This will change up to {0} object."
-msgid_plural "This will change up to {0} objects."
-msgstr[0] "Dette vil ændre på op til {0} objekt."
-msgstr[1] "Dette vil ændre på op til {0} objekter."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
-msgid "An empty value deletes the key."
-msgstr "En tom værdi vil slette nøglen."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
-msgid "<different>"
-msgstr "<forskellige>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
-msgid "Change values?"
-msgstr "Ret værdier?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
-#, java-format
-msgid "Change properties of up to {0} object"
-msgid_plural "Change properties of up to {0} objects"
-msgstr[0] "Ret egenskaber for op til {0} objekt"
-msgstr[1] "Ret egenskaber for op til {0} objekter"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
-msgid "Please select a key"
-msgstr "Vælg venligst en nøgle"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
-msgid "Please select a value"
-msgstr "Vælg venligst en værdi"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
-msgid "Please select the objects you want to change properties for."
-msgstr "Vælg de objekter, du vil rette egenskaber for."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
-msgid "Properties/Memberships"
-msgstr "Egenskaber/medlemsskaber"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-msgid "Properties for selected objects."
-msgstr "Egenskaber for valgte objekter."
-
-#. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-msgid "Member Of"
-msgstr "Medlem af"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
-msgid "Add Properties"
-msgstr "Tilføj egenskaber"
-
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+msgid "Filter objects and hide/disable them."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
@@ -4844,4 +4788,212 @@
 msgstr "Tilføj"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#, fuzzy
+msgid "Add filter."
+msgstr "Tilføj valgte"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
+#, fuzzy
+msgid "Edit filter."
+msgstr "Ret mole"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#, fuzzy
+msgid "Delete filter."
+msgstr "Slet mine"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
+#, fuzzy
+msgid "Move filter up."
+msgstr "Flyt op"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
+#, fuzzy
+msgid "Move filter down."
+msgstr "Flyt ned"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128
+msgid "Enable filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
+#, fuzzy
+msgid "Hide elements"
+msgstr "Enkelte elementer"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
+msgid "Apply also for children"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
+msgid "Inverse filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
+#, fuzzy
+msgid "Filter mode"
+msgstr "Filter"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
+msgid "History"
+msgstr "Historik"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+msgid "Display the history of all selected items."
+msgstr "Vis historikken for alle valgte elementer."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
+msgid "History item"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
+msgid "Reload all currently selected objects and refresh the list."
+msgstr "Genindlæs alle valgte objekter og genopfrisk listen."
+
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
+msgid "Show"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
+msgid "Display the history of the selected primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84
+msgid "Dialog not created yet. Invoke createInstance() first"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
+msgid "Layers"
+msgstr "Lag"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+msgid "Open a list of all loaded layers."
+msgstr "Åbn en liste af alle hentede lag."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294
+msgid "Delete the selected layer."
+msgstr "Slet det valgte lag."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364
+msgid "Show/Hide"
+msgstr "Vis/skjul"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375
+msgid "Toggle visible state of the selected layer."
+msgstr "Skift synligheden for det valgte lag."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgid "Activate"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417
+msgid "Activate the selected layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472
+msgid "Merge this layer into another layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578
+msgid "Move the selected layer one row up."
+msgstr "Flyt det valgte lag en række op."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597
+msgid "Move the selected layer one row down."
+msgstr "Flyt det valgte lag en række ned."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+msgid "Information about layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+#, java-format
+msgid "This will change up to {0} object."
+msgid_plural "This will change up to {0} objects."
+msgstr[0] "Dette vil ændre på op til {0} objekt."
+msgstr[1] "Dette vil ændre på op til {0} objekter."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+msgid "An empty value deletes the key."
+msgstr "En tom værdi vil slette nøglen."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+msgid "<different>"
+msgstr "<forskellige>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+msgid "Change values?"
+msgstr "Ret værdier?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#, java-format
+msgid "Change properties of up to {0} object"
+msgid_plural "Change properties of up to {0} objects"
+msgstr[0] "Ret egenskaber for op til {0} objekt"
+msgstr[1] "Ret egenskaber for op til {0} objekter"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+msgid "Please select a key"
+msgstr "Vælg venligst en nøgle"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+msgid "Please select a value"
+msgstr "Vælg venligst en værdi"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
+msgid "Please select the objects you want to change properties for."
+msgstr "Vælg de objekter, du vil rette egenskaber for."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
+msgid "Properties/Memberships"
+msgstr "Egenskaber/medlemsskaber"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+msgid "Properties for selected objects."
+msgstr "Egenskaber for valgte objekter."
+
+#. setting up the membership table
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+msgid "Member Of"
+msgstr "Medlem af"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
+msgid "Add Properties"
+msgstr "Tilføj egenskaber"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574
 msgid "Add a new key/value pair to all objects"
@@ -4883,10 +5035,9 @@
 
 #. item "Land use/Quarry" text "Name"
-#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
-#: build/trans_presets.java:3109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168
+#: build/trans_presets.java:3121
 msgid "Relations"
 msgstr "Relationer"
@@ -4896,23 +5047,23 @@
 msgstr "Åbn en liste over alle relationer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relationer: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276
 msgid "Open an editor for the selected relation"
 msgstr "Åbn en editor for den valgte relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
 msgid "Delete the selected relation"
 msgstr "Slet de nvalgte relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349
 msgid "Create a new relation"
 msgstr "Opret en ny relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:373
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1412
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
@@ -4945,5 +5096,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4955,14 +5106,14 @@
 msgstr "Valgt: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441
 msgid "Undock the panel"
 msgstr "Frigør panelet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr "Luk panelet. Du kan genåbne det med knapperne i venstre menubar."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:457
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Klik for at minimere/maksimere panelet"
@@ -5023,5 +5174,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5045,5 +5196,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1502
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1370
 msgid "Download relation members"
 msgstr ""
@@ -5073,5 +5224,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -5079,18 +5230,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
 msgid "Tags and Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:167
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5099,14 +5250,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613
 #, java-format
 msgid ""
@@ -5116,9 +5267,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid ""
@@ -5128,15 +5279,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5144,5 +5295,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5150,20 +5301,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849
 #, java-format
 msgid ""
@@ -5172,57 +5323,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:961
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909
 msgid "Move the currently selected members up"
 msgstr "Flyt det nuværende valgte medlem op"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:979
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:912
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928
 msgid "Move the currently selected members down"
 msgstr "Flyt det nuværende valgte medlem ned"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:998
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:931
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5231,9 +5382,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1058
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
 #, java-format
 msgid ""
@@ -5242,56 +5393,41 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090
+msgid "Apply the current updates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123
+msgid "Apply the updates and close the dialog"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
-msgid "Apply the current updates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
-msgid "Apply the updates and close the dialog"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
-msgid "Delete the currently selected tags"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Hent alle ufuldstændige veje og punkter der er forbundet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 msgid "Download Members"
 msgstr "Hent medlemmer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1208
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1211
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1356
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 #, java-format
 msgid ""
@@ -5301,13 +5437,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1229
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1367
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
 msgid "Confirm empty role"
 msgstr ""
@@ -5394,37 +5530,37 @@
 msgstr "Bogmærker"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:82
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
 msgid "Please enter the desired coordinates first."
 msgstr "Indtast venligst først de ønskede koordinater."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
 msgid "Please enter a name for the location."
 msgstr "Indtast et navn for stedet."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:107
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
 msgid "Select a bookmark first."
 msgstr "Vælg først et bogmærke"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
 msgid "min lat"
 msgstr "min. bredde"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
 msgid "min lon"
 msgstr "min. længde"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid "max lat"
 msgstr "maks. bredde"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
 msgid "max lon"
 msgstr "maks. længde"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5434,26 +5570,26 @@
 "området)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
 msgid "Bounding Box"
 msgstr "Omkransende område"
 
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
 msgid "Data Sources and Types"
 msgstr "Datakilder og typer"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
 msgid "Download as new layer"
 msgstr "Hent som nyt lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
 msgid "Download Area"
 msgstr "Hent område"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
 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:219
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
 msgid "Download area ok, size probably acceptable to server"
 msgstr ""
@@ -5480,7 +5616,7 @@
 msgstr "Indtast et stednavn at søge efter:"
 
-#. <separator/>
+#. group "Geography"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2759
 msgid "Places"
 msgstr "Steder"
@@ -5527,21 +5663,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "type"
 msgstr "type"
@@ -5558,5 +5694,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-#, fuzzy
 msgid ""
 "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
@@ -5564,6 +5699,4 @@
 "Hold left mousebutton and draw a frame."
 msgstr ""
-"Zoom: Musehjul eller dobbeltklik. Flyt kort: Hold højre museknap nede og "
-"flyt musen. Vælg: Klik"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
@@ -6024,4 +6157,6 @@
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
 #. <key key="historic" value="wayside_shrine" />
+#. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
+#. <key key="historic" value="boundary_stone" />
 #. item "Leisure/Water Park" label "Edit Water Park"
 #. <key key="leisure" value="water_park" />
@@ -6393,153 +6528,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/trans_presets.java:66 build/trans_presets.java:102
-#: build/trans_presets.java:142 build/trans_presets.java:179
-#: build/trans_presets.java:199 build/trans_presets.java:217
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:272 build/trans_presets.java:305
-#: build/trans_presets.java:351 build/trans_presets.java:371
-#: build/trans_presets.java:386 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:463 build/trans_presets.java:482
-#: build/trans_presets.java:502 build/trans_presets.java:522
-#: build/trans_presets.java:543 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627 build/trans_presets.java:658
-#: build/trans_presets.java:679 build/trans_presets.java:692
-#: build/trans_presets.java:705 build/trans_presets.java:718
-#: build/trans_presets.java:731 build/trans_presets.java:744
-#: build/trans_presets.java:755 build/trans_presets.java:764
-#: build/trans_presets.java:811 build/trans_presets.java:832
-#: build/trans_presets.java:841 build/trans_presets.java:901
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1067 build/trans_presets.java:1075
-#: build/trans_presets.java:1085 build/trans_presets.java:1093
-#: build/trans_presets.java:1098 build/trans_presets.java:1105
-#: build/trans_presets.java:1112 build/trans_presets.java:1117
-#: build/trans_presets.java:1125 build/trans_presets.java:1134
-#: build/trans_presets.java:1140 build/trans_presets.java:1146
-#: build/trans_presets.java:1151 build/trans_presets.java:1157
-#: build/trans_presets.java:1163 build/trans_presets.java:1172
-#: build/trans_presets.java:1181 build/trans_presets.java:1188
-#: build/trans_presets.java:1196 build/trans_presets.java:1209
-#: build/trans_presets.java:1215 build/trans_presets.java:1224
-#: build/trans_presets.java:1230 build/trans_presets.java:1236
-#: build/trans_presets.java:1244 build/trans_presets.java:1299
-#: build/trans_presets.java:1346 build/trans_presets.java:1352
-#: build/trans_presets.java:1358 build/trans_presets.java:1364
-#: build/trans_presets.java:1370 build/trans_presets.java:1381
-#: build/trans_presets.java:1390 build/trans_presets.java:1405
-#: build/trans_presets.java:1412 build/trans_presets.java:1418
-#: build/trans_presets.java:1426 build/trans_presets.java:1433
-#: build/trans_presets.java:1442 build/trans_presets.java:1450
-#: build/trans_presets.java:1457 build/trans_presets.java:1468
-#: build/trans_presets.java:1478 build/trans_presets.java:1488
-#: build/trans_presets.java:1508 build/trans_presets.java:1520
-#: build/trans_presets.java:1531 build/trans_presets.java:1548
-#: build/trans_presets.java:1555 build/trans_presets.java:1570
-#: build/trans_presets.java:1577 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1594
-#: build/trans_presets.java:1599 build/trans_presets.java:1605
-#: build/trans_presets.java:1611 build/trans_presets.java:1619
-#: build/trans_presets.java:1627 build/trans_presets.java:1635
-#: build/trans_presets.java:1642 build/trans_presets.java:1648
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1670 build/trans_presets.java:1677
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1712 build/trans_presets.java:1719
-#: build/trans_presets.java:1736 build/trans_presets.java:1744
-#: build/trans_presets.java:1759 build/trans_presets.java:1769
-#: build/trans_presets.java:1781 build/trans_presets.java:1788
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:1809 build/trans_presets.java:1817
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1841
-#: build/trans_presets.java:1846 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1864
-#: build/trans_presets.java:1872 build/trans_presets.java:1881
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1908 build/trans_presets.java:1914
-#: build/trans_presets.java:1922 build/trans_presets.java:1928
-#: build/trans_presets.java:1934 build/trans_presets.java:1940
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2013
-#: build/trans_presets.java:2022 build/trans_presets.java:2030
-#: build/trans_presets.java:2036 build/trans_presets.java:2042
-#: build/trans_presets.java:2048 build/trans_presets.java:2054
-#: build/trans_presets.java:2060 build/trans_presets.java:2066
-#: build/trans_presets.java:2072 build/trans_presets.java:2078
-#: build/trans_presets.java:2084 build/trans_presets.java:2090
-#: build/trans_presets.java:2096 build/trans_presets.java:2102
-#: build/trans_presets.java:2108 build/trans_presets.java:2114
-#: build/trans_presets.java:2120 build/trans_presets.java:2126
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2158
-#: build/trans_presets.java:2165 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2186
-#: build/trans_presets.java:2192 build/trans_presets.java:2198
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2218 build/trans_presets.java:2225
-#: build/trans_presets.java:2232 build/trans_presets.java:2239
-#: build/trans_presets.java:2247 build/trans_presets.java:2279
-#: build/trans_presets.java:2284 build/trans_presets.java:2289
-#: build/trans_presets.java:2294 build/trans_presets.java:2300
-#: build/trans_presets.java:2306 build/trans_presets.java:2312
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2354
-#: build/trans_presets.java:2451 build/trans_presets.java:2458
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2485 build/trans_presets.java:2492
-#: build/trans_presets.java:2498 build/trans_presets.java:2504
-#: build/trans_presets.java:2526 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2553 build/trans_presets.java:2559
-#: build/trans_presets.java:2565 build/trans_presets.java:2571
-#: build/trans_presets.java:2577 build/trans_presets.java:2583
-#: build/trans_presets.java:2590 build/trans_presets.java:2597
-#: build/trans_presets.java:2604 build/trans_presets.java:2610
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2661
-#: build/trans_presets.java:2667 build/trans_presets.java:2677
-#: build/trans_presets.java:2686 build/trans_presets.java:2701
-#: build/trans_presets.java:2707 build/trans_presets.java:2715
-#: build/trans_presets.java:2722 build/trans_presets.java:2742
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2783
-#: build/trans_presets.java:2790 build/trans_presets.java:2797
-#: build/trans_presets.java:2803 build/trans_presets.java:2809
-#: build/trans_presets.java:2817 build/trans_presets.java:2824
-#: build/trans_presets.java:2831 build/trans_presets.java:2838
-#: build/trans_presets.java:2844 build/trans_presets.java:2851
-#: build/trans_presets.java:2858 build/trans_presets.java:2867
-#: build/trans_presets.java:2873 build/trans_presets.java:2879
-#: build/trans_presets.java:2885 build/trans_presets.java:2891
-#: build/trans_presets.java:2900 build/trans_presets.java:2910
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2948
-#: build/trans_presets.java:2957 build/trans_presets.java:2963
-#: build/trans_presets.java:2969 build/trans_presets.java:2975
-#: build/trans_presets.java:2981 build/trans_presets.java:2987
-#: build/trans_presets.java:2993 build/trans_presets.java:3000
-#: build/trans_presets.java:3006 build/trans_presets.java:3011
-#: build/trans_presets.java:3018 build/trans_presets.java:3025
-#: build/trans_presets.java:3031 build/trans_presets.java:3040
-#: build/trans_presets.java:3048 build/trans_presets.java:3054
-#: build/trans_presets.java:3060 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3080
-#: build/trans_presets.java:3086 build/trans_presets.java:3092
-#: build/trans_presets.java:3098 build/trans_presets.java:3104
-#: build/trans_presets.java:3117 build/trans_presets.java:3131
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:67 build/trans_presets.java:103
+#: build/trans_presets.java:143 build/trans_presets.java:180
+#: build/trans_presets.java:200 build/trans_presets.java:218
+#: build/trans_presets.java:235 build/trans_presets.java:253
+#: build/trans_presets.java:273 build/trans_presets.java:306
+#: build/trans_presets.java:352 build/trans_presets.java:372
+#: build/trans_presets.java:387 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:503 build/trans_presets.java:523
+#: build/trans_presets.java:544 build/trans_presets.java:565
+#: build/trans_presets.java:586 build/trans_presets.java:607
+#: build/trans_presets.java:628 build/trans_presets.java:659
+#: build/trans_presets.java:680 build/trans_presets.java:693
+#: build/trans_presets.java:706 build/trans_presets.java:719
+#: build/trans_presets.java:732 build/trans_presets.java:745
+#: build/trans_presets.java:756 build/trans_presets.java:765
+#: build/trans_presets.java:812 build/trans_presets.java:833
+#: build/trans_presets.java:842 build/trans_presets.java:902
+#: build/trans_presets.java:1053 build/trans_presets.java:1061
+#: build/trans_presets.java:1069 build/trans_presets.java:1077
+#: build/trans_presets.java:1087 build/trans_presets.java:1095
+#: build/trans_presets.java:1100 build/trans_presets.java:1107
+#: build/trans_presets.java:1114 build/trans_presets.java:1119
+#: build/trans_presets.java:1127 build/trans_presets.java:1136
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1153 build/trans_presets.java:1159
+#: build/trans_presets.java:1165 build/trans_presets.java:1174
+#: build/trans_presets.java:1183 build/trans_presets.java:1190
+#: build/trans_presets.java:1198 build/trans_presets.java:1211
+#: build/trans_presets.java:1217 build/trans_presets.java:1226
+#: build/trans_presets.java:1232 build/trans_presets.java:1238
+#: build/trans_presets.java:1246 build/trans_presets.java:1302
+#: build/trans_presets.java:1349 build/trans_presets.java:1355
+#: build/trans_presets.java:1361 build/trans_presets.java:1367
+#: build/trans_presets.java:1373 build/trans_presets.java:1384
+#: build/trans_presets.java:1393 build/trans_presets.java:1408
+#: build/trans_presets.java:1415 build/trans_presets.java:1421
+#: build/trans_presets.java:1429 build/trans_presets.java:1436
+#: build/trans_presets.java:1445 build/trans_presets.java:1453
+#: build/trans_presets.java:1460 build/trans_presets.java:1471
+#: build/trans_presets.java:1481 build/trans_presets.java:1491
+#: build/trans_presets.java:1511 build/trans_presets.java:1523
+#: build/trans_presets.java:1534 build/trans_presets.java:1551
+#: build/trans_presets.java:1558 build/trans_presets.java:1574
+#: build/trans_presets.java:1581 build/trans_presets.java:1586
+#: build/trans_presets.java:1592 build/trans_presets.java:1598
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1646 build/trans_presets.java:1652
+#: build/trans_presets.java:1659 build/trans_presets.java:1666
+#: build/trans_presets.java:1674 build/trans_presets.java:1681
+#: build/trans_presets.java:1689 build/trans_presets.java:1696
+#: build/trans_presets.java:1702 build/trans_presets.java:1709
+#: build/trans_presets.java:1716 build/trans_presets.java:1723
+#: build/trans_presets.java:1740 build/trans_presets.java:1748
+#: build/trans_presets.java:1763 build/trans_presets.java:1773
+#: build/trans_presets.java:1785 build/trans_presets.java:1792
+#: build/trans_presets.java:1798 build/trans_presets.java:1808
+#: build/trans_presets.java:1813 build/trans_presets.java:1821
+#: build/trans_presets.java:1828 build/trans_presets.java:1834
+#: build/trans_presets.java:1840 build/trans_presets.java:1845
+#: build/trans_presets.java:1850 build/trans_presets.java:1855
+#: build/trans_presets.java:1862 build/trans_presets.java:1868
+#: build/trans_presets.java:1873 build/trans_presets.java:1882
+#: build/trans_presets.java:1891 build/trans_presets.java:1900
+#: build/trans_presets.java:1909 build/trans_presets.java:1918
+#: build/trans_presets.java:1924 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 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:2023 build/trans_presets.java:2032
+#: build/trans_presets.java:2040 build/trans_presets.java:2046
+#: build/trans_presets.java:2052 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 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:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2150
+#: build/trans_presets.java:2156 build/trans_presets.java:2162
+#: build/trans_presets.java:2169 build/trans_presets.java:2176
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2197 build/trans_presets.java:2203
+#: build/trans_presets.java:2209 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2229
+#: build/trans_presets.java:2236 build/trans_presets.java:2243
+#: build/trans_presets.java:2250 build/trans_presets.java:2258
+#: build/trans_presets.java:2290 build/trans_presets.java:2295
+#: build/trans_presets.java:2300 build/trans_presets.java:2305
+#: build/trans_presets.java:2311 build/trans_presets.java:2317
+#: build/trans_presets.java:2323 build/trans_presets.java:2331
+#: build/trans_presets.java:2337 build/trans_presets.java:2343
+#: build/trans_presets.java:2349 build/trans_presets.java:2355
+#: build/trans_presets.java:2365 build/trans_presets.java:2462
+#: build/trans_presets.java:2469 build/trans_presets.java:2483
+#: build/trans_presets.java:2489 build/trans_presets.java:2496
+#: build/trans_presets.java:2503 build/trans_presets.java:2509
+#: build/trans_presets.java:2515 build/trans_presets.java:2537
+#: build/trans_presets.java:2544 build/trans_presets.java:2551
+#: build/trans_presets.java:2557 build/trans_presets.java:2564
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2594 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2615
+#: build/trans_presets.java:2621 build/trans_presets.java:2627
+#: build/trans_presets.java:2633 build/trans_presets.java:2639
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2672 build/trans_presets.java:2678
+#: build/trans_presets.java:2688 build/trans_presets.java:2697
+#: build/trans_presets.java:2712 build/trans_presets.java:2718
+#: build/trans_presets.java:2726 build/trans_presets.java:2733
+#: build/trans_presets.java:2753 build/trans_presets.java:2764
+#: build/trans_presets.java:2770 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2788
+#: build/trans_presets.java:2795 build/trans_presets.java:2802
+#: build/trans_presets.java:2809 build/trans_presets.java:2815
+#: build/trans_presets.java:2821 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2912
+#: build/trans_presets.java:2922 build/trans_presets.java:2931
+#: build/trans_presets.java:2937 build/trans_presets.java:2943
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 build/trans_presets.java:2981
+#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:2999 build/trans_presets.java:3005
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3023 build/trans_presets.java:3030
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3066 build/trans_presets.java:3072
+#: build/trans_presets.java:3079 build/trans_presets.java:3085
+#: build/trans_presets.java:3092 build/trans_presets.java:3098
+#: build/trans_presets.java:3104 build/trans_presets.java:3110
+#: build/trans_presets.java:3116 build/trans_presets.java:3129
+#: build/trans_presets.java:3143 build/trans_presets.java:3157
 msgid "Name"
 msgstr "Navn"
@@ -6573,4 +6709,58 @@
 msgid "Version"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
+#, fuzzy
+msgid "Changeset id:"
+msgstr "rettesæt"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
+#, fuzzy
+msgid "Created at:"
+msgstr "Opret områder"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
+#, fuzzy
+msgid "Changeset comment:"
+msgstr "Indsend kommentar"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
+msgid "No open changeset"
+msgstr "Intet rettesæt åbent"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48
+#, fuzzy
+msgid "<html>Please select the changesets you want to close</html>"
+msgstr "Vælg hvilke ændringer af egenskaber som du vil gennemføre."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
+#, fuzzy
+msgid "Open changesets"
+msgstr "Intet rettesæt åbent"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101
+#, fuzzy
+msgid "Close changesets"
+msgstr "Lukker rettesæt"
+
+#. putValue(SMALL_ICON, ImageProvider.get("cancel"));
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
+#, fuzzy
+msgid "Close the selected open changesets"
+msgstr "Luk det nuværende rettesæt ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126
+#, fuzzy
+msgid "Cancel closeing of changesets"
+msgstr "Lukker rettesæt"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37
+msgid "Closing changeset"
+msgstr "Lukker rettesæt"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77
+#, fuzzy, java-format
+msgid "Closing changeset {0}"
+msgstr "Lukker rettesæt"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
@@ -6599,5 +6789,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be uploaded"
+msgid "Layer ''{0}'' has no modifications to be uploaded."
 msgstr ""
 
@@ -6605,5 +6795,5 @@
 #, java-format
 msgid ""
-"Layer ''{0}'' has modifications which should be saved to its assoicated file "
+"Layer ''{0}'' has modifications which should be saved to its associated file "
 "''{1}''."
 msgstr ""
@@ -6611,5 +6801,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be saved"
+msgid "Layer ''{0}'' has no modifications to be saved."
 msgstr ""
 
@@ -6643,17 +6833,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113
 msgid "Unsaved changes - Save/Upload before exiting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194
 #, java-format
 msgid ""
@@ -6666,10 +6856,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205
 msgid "Unsaved data and conflicts"
-msgstr "Løs konflikter"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212
 #, java-format
 msgid ""
@@ -6683,9 +6872,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223
 msgid "Unsaved data and missing associated file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230
 #, java-format
 msgid ""
@@ -6700,42 +6889,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243
 msgid "Unsaved data non-writable files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
 msgid "Close this dialog and resume editing in JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322
+msgid "Discard and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
-msgid "Discard and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354
+msgid "Save and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
-msgid "Save and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
 msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402
 #, java-format
 msgid "Preparing layer ''{0}'' for upload ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
@@ -6743,5 +6932,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491
 msgid "Incomplete upload and/or save"
 msgstr ""
@@ -6781,21 +6970,21 @@
 #. item "Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:200
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:278
-#: build/trans_presets.java:311 build/trans_presets.java:357
-#: build/trans_presets.java:372 build/trans_presets.java:387
-#: build/trans_presets.java:409 build/trans_presets.java:429
-#: build/trans_presets.java:450 build/trans_presets.java:470
-#: build/trans_presets.java:489 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:549
-#: build/trans_presets.java:570 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:633
-#: build/trans_presets.java:664 build/trans_presets.java:1060
-#: build/trans_presets.java:1068 build/trans_presets.java:1076
-#: build/trans_presets.java:1086 build/trans_presets.java:1305
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:242
+#: build/trans_presets.java:260 build/trans_presets.java:279
+#: build/trans_presets.java:312 build/trans_presets.java:358
+#: build/trans_presets.java:373 build/trans_presets.java:388
+#: build/trans_presets.java:410 build/trans_presets.java:430
+#: build/trans_presets.java:451 build/trans_presets.java:471
+#: build/trans_presets.java:490 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:665 build/trans_presets.java:1062
+#: build/trans_presets.java:1070 build/trans_presets.java:1078
+#: build/trans_presets.java:1088 build/trans_presets.java:1308
 msgid "Layer"
 msgstr "Lag"
@@ -6814,67 +7003,32 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:200
 msgid "Upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-msgid "Use a new changeset and close it"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
-msgid ""
-"Select to upload the data using a new changeset and to close the changeset "
-"after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
-msgid "Use a new changeset and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
-msgid ""
-"Select to upload the data using a new changeset and to leave the changeset "
-"open after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
-msgid "Upload to a new or to an existing changeset?"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
-msgid "upload all changes in one request"
+msgid "Settings"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
-msgid ""
-"Enable to upload all changes in one request, disable to use one request per "
-"changed primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171
-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/gui/io/UploadDialog.java:216
-msgid "Settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908
 msgid "Tags of new changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:221
 msgid "Objects to add:"
 msgstr "Tilføjede objekter:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:227
 msgid "Objects to modify:"
 msgstr "Ændrede objekter:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:233
 msgid "Objects to delete:"
 msgstr "Slettede objekter:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
 #, java-format
 msgid "{0} object to add:"
@@ -6883,5 +7037,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:277
 #, java-format
 msgid "{0} object to modifiy:"
@@ -6890,5 +7044,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:286
 #, java-format
 msgid "{0} object to delete:"
@@ -6897,54 +7051,88 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422
-#, java-format
-msgid "Use the existing changeset {0} and close it after upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:423
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to close the changeset "
-"after this upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426
-#, java-format
-msgid "Use the existing changeset {0} and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:427
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to leave the changeset "
-"open for further uploads"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
-#, java-format
-msgid "Tags of changeset {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:470
 msgid "Upload Changes"
 msgstr "Send ændringer"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472
+msgid "Upload the changed primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
+msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:479
+msgid "Illegal upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
+msgid "Cancel the upload and resume editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606
 #, fuzzy
-msgid "Upload the changed primitives"
-msgstr "Send disse ændringer?"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592
+msgid "Upload all changes in one request"
+msgstr "Send alle ændringer til OSM-serveren."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607
+msgid ""
+"Enable to upload all changes in one request, disable to use one request per "
+"changed primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:617
+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/gui/io/UploadDialog.java:672
 #, fuzzy
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "Indtast et navn for stedet."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:593
-msgid "Illegal upload comment"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
-msgid "Cancel the upload and resume editing"
-msgstr ""
+msgid "Open a new changeset"
+msgstr "Intet rettesæt åbent"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
+msgid "Open a new changeset and use it in the next upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
+#, fuzzy
+msgid "Use an open changeset"
+msgstr "Intet rettesæt åbent"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
+msgid "Upload data to an already opened changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
+#, fuzzy
+msgid "Close changeset after upload"
+msgstr "Ingen ændringer at sende."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
+msgid "Select to close the changeset after the next upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922
+#, java-format
+msgid "Tags of changeset {0}"
+msgstr ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
+#, fuzzy
+msgid "Load the list of your open changesets from the server"
+msgstr "Send de nuværende indstillinger til serveren"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
+#, fuzzy
+msgid "Close the currently selected open changeset"
+msgstr "Luk det nuværende rettesæt ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
+#, fuzzy, java-format
+msgid "changeset id > 0 expected. Got {1}"
+msgstr "Parameteren \"{0}\" > 0 forventet, modtog \"{1}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63
@@ -7022,5 +7210,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
@@ -7058,5 +7246,5 @@
 msgstr "Den indtastede tid kunne ikke forstås."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
@@ -7064,30 +7252,30 @@
 msgstr "gps-punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
 msgid "Customize line drawing"
 msgstr "Tilpas linjetegning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
 msgid "Use global settings."
 msgstr "Brug globale indstillinger."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Draw lines between points for this layer."
 msgstr "Tegn linjer mellem punkter for dette lag."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Do not draw lines between points for this layer."
 msgstr "Tegn ikke linjer mellem punkter for dette lag."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 msgid "Select line drawing options"
 msgstr "Vælg linjetegnings-indstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7095,5 +7283,5 @@
 msgstr "Tilpas farve"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7102,5 +7290,5 @@
 msgstr "Standard"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7109,38 +7297,75 @@
 msgstr "Vælg en farve"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
 msgid "Markers From Named Points"
 msgstr "Markører fra navngivne punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Navngivne punkter fra {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
 msgid "Import Audio"
 msgstr "Importér lyd"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave-lydfiler (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Lyd-markører fra {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
 msgid "Import images"
 msgstr "Importér billeder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#, java-format
+msgid "Name: {0}"
+msgstr "Navn: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#, java-format
+msgid "Description: {0}"
+msgstr "Beskrivelse: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#, fuzzy, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
 msgstr[0] "{0} spor, "
 msgstr[1] "{0} spor, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
+#: build/trans_presets.java:3160
+msgid "Description"
+msgstr "Beskrivelse"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#, fuzzy
+msgid "Timespan"
+msgstr "Tidshorisont: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#, fuzzy
+msgid "Length"
+msgstr "Længde: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
+msgid "URL"
+msgstr "URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+msgid "Length: "
+msgstr "Længde: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
 #, java-format
 msgid "{0} route, "
@@ -7149,5 +7374,5 @@
 msgstr[1] "{0} ruter, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 #, java-format
 msgid "{0} waypoint"
@@ -7156,29 +7381,10 @@
 msgstr[1] "{0} punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
-#, java-format
-msgid "Name: {0}"
-msgstr "Navn: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
-#, java-format
-msgid "Description: {0}"
-msgstr "Beskrivelse: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
-msgid "Timespan: "
-msgstr "Tidshorisont: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
-msgid "Length: "
-msgstr "Længde: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Konvertér til datalag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7188,10 +7394,10 @@
 "<br>Hvis du vil uploade traces, så kig her:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -7202,29 +7408,29 @@
 msgstr "Konverteret fra: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
 msgid "Download from OSM along this track"
 msgstr "Hent fra OSM langs dette spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
 msgid "Download everything within:"
 msgstr "Hent alt inden for:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
 #, java-format
 msgid "{0} meters"
 msgstr "{0} meter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 msgid "Maximum area per request:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
 #, java-format
 msgid ""
@@ -7235,14 +7441,14 @@
 "du<br>at fortsætte?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
 msgid "Download data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
 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:1143
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7250,5 +7456,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7299,30 +7505,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
-#, fuzzy
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
 "<br>If you want to upload traces, look here:</html>"
 msgstr ""
-"<html>Upload af ubehandlet GPS-data som kortdata betragtes som skadeligt "
-"<br>Hvis du vil uploade traces, så kig her:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "track"
 msgid_plural "tracks"
@@ -7455,4 +7658,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
@@ -7681,13 +7885,18 @@
 msgstr "Tegn store GPS-punkter."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+msgid "Draw a circle form HDOP value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Hastighed (rød = langsom, grøn = hurtig)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Opløsning af position (rød = høj, grøn = lav, hvis tilgængelig)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Enkelt farve (kan justeres for navngivne lag)"
@@ -7695,6 +7904,6 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1374
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:1377
 msgid "Car"
 msgstr "Bil"
@@ -7715,14 +7924,14 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:324 build/trans_presets.java:650
-#: build/trans_presets.java:857 build/trans_presets.java:876
-#: build/trans_presets.java:890 build/trans_presets.java:912
-#: build/trans_presets.java:949 build/trans_presets.java:962
-#: build/trans_presets.java:974 build/trans_presets.java:986
-#: build/trans_presets.java:998 build/trans_presets.java:1010
-#: build/trans_presets.java:1020 build/trans_presets.java:1029
-#: build/trans_presets.java:1038 build/trans_presets.java:1437
-#: build/trans_presets.java:1510
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:325 build/trans_presets.java:651
+#: build/trans_presets.java:858 build/trans_presets.java:877
+#: build/trans_presets.java:891 build/trans_presets.java:913
+#: build/trans_presets.java:950 build/trans_presets.java:963
+#: build/trans_presets.java:975 build/trans_presets.java:987
+#: build/trans_presets.java:999 build/trans_presets.java:1011
+#: build/trans_presets.java:1021 build/trans_presets.java:1030
+#: build/trans_presets.java:1039 build/trans_presets.java:1440
+#: build/trans_presets.java:1513
 msgid "Bicycle"
 msgstr "Cykel"
@@ -7755,62 +7964,62 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:325 build/trans_presets.java:649
-#: build/trans_presets.java:856 build/trans_presets.java:875
-#: build/trans_presets.java:889 build/trans_presets.java:911
-#: build/trans_presets.java:948 build/trans_presets.java:961
-#: build/trans_presets.java:973 build/trans_presets.java:985
-#: build/trans_presets.java:997 build/trans_presets.java:1009
-#: build/trans_presets.java:1019 build/trans_presets.java:1028
-#: build/trans_presets.java:1037
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:326 build/trans_presets.java:650
+#: build/trans_presets.java:857 build/trans_presets.java:876
+#: build/trans_presets.java:890 build/trans_presets.java:912
+#: build/trans_presets.java:949 build/trans_presets.java:962
+#: build/trans_presets.java:974 build/trans_presets.java:986
+#: build/trans_presets.java:998 build/trans_presets.java:1010
+#: build/trans_presets.java:1020 build/trans_presets.java:1029
+#: build/trans_presets.java:1038
 msgid "Foot"
 msgstr "Gående"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Tegn retningspile."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Hurtig optegning (ser grimmere ud)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Kun relevante retningsvisere (fx ved ensrettede veje)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Only on the head of a way."
 msgstr "Kun ved enden af vejen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Tegn numre for segment-rækkefølgen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Tegn omfang af hentet data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Tegn virtuelle punkter i valg-tilstand"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Tegn inaktive lag i anden farve"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Udglattet kortgrafik (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:82
 msgid "Draw lines between raw GPS points"
 msgstr "Tegn linjer mellem rå GPS-punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -7820,9 +8029,9 @@
 "at tegne alle linjer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
 msgid "Maximum length for local files (meters)"
 msgstr "Maksimal længde for lokale filer (meter)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
@@ -7831,20 +8040,20 @@
 "linjer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length (meters)"
 msgstr "Maksimal længde (meter)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:129
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Tegn retningspile for linjer, som forbinder GPS-punkter."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:135
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -7852,5 +8061,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:141
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -7858,13 +8067,13 @@
 msgstr "Tegn ikke pile, hvis de ikke er mindst denne afstand fra den forrige."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:144
 msgid "Minimum distance (pixels)"
 msgstr "Mindste afstand (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Draw larger dots for the GPS points."
 msgstr "Tegn større prikker for GPS-punkter."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -7873,9 +8082,9 @@
 "Alle punkter og spor-segmenter får samme farve. Kan justeres i Layer Manager."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Colors points and track segments by velocity."
 msgstr "Farvelægger punkter og spor efter hastighed."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -7885,37 +8094,37 @@
 "sporingsenhed skal logge denne information."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid "Track and Point Coloring"
 msgstr "Farvelægning af spor og punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202
 msgid "GPS Points"
 msgstr "GPS-punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "Draw direction hints for way segments."
 msgstr "Tegn retningsvisere på vejstykker"
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:237
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Brug udjævning på kortvisningen for et mere glat udseende."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Tegn omridset af data hentet fra serveren."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -7923,9 +8132,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257
 msgid "Draw the inactive data layers in a different color."
 msgstr "Tegn inaktive datalag i en anden farve."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "OSM Data"
 msgstr "OSM-data"
@@ -8004,45 +8213,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Configure available plugins."
 msgstr "Indstil tilgængelige udvidelser"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50
+#. buttons at the bottom
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
 msgid "Download List"
 msgstr "Hent liste"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:100
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 msgid "Update"
 msgstr "Opdater"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Configure Sites..."
 msgstr "Indstil sites..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:125
 msgid "Add JOSM Plugin description URL."
 msgstr "Tilføj JOSM-udvidelsers beskrivelses-URL."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:126
 msgid "Enter URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:162
 msgid "Please select an entry."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:147
 msgid "Edit JOSM Plugin description URL."
 msgstr "Ret JOSM-udvidelesers beskrvelses-URL."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:148
 msgid "JOSM Plugin description URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:175
 msgid "Configure Plugin Sites"
 msgstr "Indstil udvidelses-sites"
@@ -8380,6 +8590,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:369
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341
 #, java-format
 msgid "Remove old keys from up to {0} object"
@@ -8388,9 +8598,9 @@
 msgstr[1] "Fjern gamle nøgler fra op til {0} objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135
 msgid "Add a new tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160
 msgid "Delete the selection in the tag table"
 msgstr ""
@@ -8425,7 +8635,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:68
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:75
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -8469,4 +8679,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24
+#, fuzzy, java-format
+msgid "Preset group ''{0}'' of group ''{1}''"
+msgstr "Brug forudindstilling \"{0}\" af gruppe \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
 #, java-format
 msgid "Preset group ''{0}''"
@@ -8487,4 +8702,10 @@
 msgstr "Henter punkter {0} til {1}..."
 
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, fuzzy, java-format
+msgid "parameter ''{0}'' > 0 expected. Got {1}"
+msgstr "Parameteren \"{0}\" > 0 forventet, modtog \"{1}\""
+
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8593,5 +8814,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "Fejl ved fortolkning: ulovlig datastruktur for gpx-dokument"
@@ -8711,10 +8932,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -8722,75 +8944,79 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315
 msgid "Creating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
 #, java-format
 msgid "Successfully opened changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#, java-format
+msgid "id of changeset > 0 required. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
-#, java-format
-msgid "Changeset {0} is unchanged. Skipping update."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
 #, java-format
 msgid "Updating changeset {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
-msgid ""
-"Failed to update changeset. Either there is no current changeset or the id "
-"of the current changeset is 0"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
 msgid "Closing changeset..."
 msgstr "Lukker rettesæt..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
-#, java-format
-msgid "Closing changeset {0}..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
-#, java-format
-msgid "Leaving changeset {0} open..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
 msgid "No changeset present for diff upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414
 msgid "Preparing..."
 msgstr "Forbereder..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419
 msgid "Uploading..."
 msgstr "Uploader..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438
 msgid "Waiting 10 seconds ... "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449
 msgid "OK - trying again."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:485
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517
 #, java-format
 msgid "Starting retry {0} of {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
+msgid "current changeset is null. Can't upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
+#, java-format
+msgid "id of current changeset > required. Current id is {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
+#, java-format
+msgid "Open changeset expected. Got closed changeset with id {0}"
 msgstr ""
 
@@ -8816,33 +9042,92 @@
 msgstr "Ugyldig bz2-fil."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
+#, java-format
+msgid "missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:128
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:134
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
+#, java-format
+msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
+#, java-format
+msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
+#, java-format
+msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#, java-format
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#, java-format
+msgid "Unsupported version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:176
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Aborting."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#, java-format
+msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
+#, fuzzy
+msgid "Parsing list of changesets..."
+msgstr "Lukker rettesæt..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
 msgid "Incorrect password or username."
 msgstr "Forkert brugernavn eller kodeord"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:168
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Advarsel: Kodeordet sendes ukrypteret."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Save user and password (unencrypted)"
 msgstr "Gem brugernavn og kodeord (ukrypteret)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
 msgid "Enter Password"
 msgstr "Indtast kodeord"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 msgid "Login"
 msgstr "Login"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:242
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Basis URLen for OSM serveren (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
 msgid "Login name (e-mail) to the OSM account."
 msgstr "Login-navn (e-mail) til OSM-kontoen."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -8851,17 +9136,17 @@
 "kodeord."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
 msgid "Base Server URL"
 msgstr "Grundlæggende URL til server"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
 msgid "OSM username (e-mail)"
 msgstr "OSM-brugernavn (e-mail)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
 msgid "OSM password"
 msgstr "OSM-kodeord"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -8870,5 +9155,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:51
+#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #, java-format
 msgid "(at line {0}, column {1})"
@@ -8958,20 +9243,5 @@
 msgstr "Fejl ved fortolkning"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124
-#, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
-#, fuzzy, java-format
-msgid "Missing mandatory attribute ''{0}''"
-msgstr "Mangler obligatorisk attribut \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
-#, fuzzy, java-format
-msgid "Unsupported version: {0}"
-msgstr "Ukendt version: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:155
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -8980,38 +9250,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
 msgid "found XML element <nd> element not as direct child of element <way>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
 msgid "Found XML element <member> not as direct child of element <relation>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
 #, java-format
 msgid ""
@@ -9019,24 +9289,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Ufuldstændig <member>-specifikation med ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
-#, java-format
-msgid "Warning: Undefined element ''{0}'' found in input stream. Skipping."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
-#, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Skipping."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
 msgid "Illegal object with id=0"
 msgstr "Ugyldigt objekt med id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #, java-format
 msgid ""
@@ -9044,5 +9309,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:303
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
 #, java-format
 msgid ""
@@ -9051,5 +9316,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
 #, java-format
 msgid ""
@@ -9058,5 +9323,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
@@ -9066,25 +9331,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:316
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#, java-format
 msgid "Unknown or unsupported API version. Got {0}"
-msgstr "Ukendt version: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with id {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#, java-format
 msgid "Missing required attribute ''{0}''."
-msgstr "Mangler obligatorisk attribut \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
 #, java-format
 msgid ""
@@ -9092,5 +9357,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
 #, java-format
 msgid ""
@@ -9099,5 +9364,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
 #, java-format
 msgid ""
@@ -9105,5 +9370,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
 #, java-format
 msgid ""
@@ -9112,17 +9377,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
 msgid "Prepare OSM data..."
 msgstr "Forbereder OSM-data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 msgid "Parsing OSM data..."
-msgstr "Forbereder OSM-data..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
 msgid "Preparing data set..."
-msgstr "Forbereder data..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
@@ -9143,4 +9406,24 @@
 msgid "Downloading referring relations ..."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51
+#, fuzzy
+msgid "Reading changesets..."
+msgstr "Lukker rettesæt..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
+#, fuzzy
+msgid "Downloading changesets ..."
+msgstr "Lukker rettesæt..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85
+#, fuzzy, java-format
+msgid "Reading changeset {0} ..."
+msgstr "Indlæser {0}..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91
+#, fuzzy, java-format
+msgid "Downloading changeset {0} ..."
+msgstr "Henter udvidelsen {0}..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
@@ -9157,10 +9440,14 @@
 msgstr "Forbinder til server..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
 msgid "Failed to open connection to API {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
+msgid "Error: failed to add authentication credentials to the connection."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -9168,33 +9455,52 @@
 "Kunne ikke forbinde til osm server. Tjek venligst din internetforbindelse."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+msgid "XML tag <user> is missing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
+#, fuzzy, java-format
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgstr "Brug forudindstilling \"{0}\" af gruppe \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
+#, java-format
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
 msgid "Starting to upload with one request per primitive ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
 msgid "Starting to upload in one request ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:171
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135
 msgid "Uploading data ..."
-msgstr "Uploader..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:178
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
 msgid ""
 "WARNING: no API version defined for data to upload. Falling back to version "
@@ -9202,5 +9508,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147
 #, java-format
 msgid ""
@@ -9210,10 +9516,10 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
 msgid "Update Plugins"
 msgstr "Opdater udvidelser"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 msgid "Download Plugins"
 msgstr "Hent udvidelser"
@@ -9372,5 +9678,5 @@
 msgstr "Flere detaljer"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -9379,18 +9685,18 @@
 msgstr[1] "Hent udvidelsesinformationer fra {0} sites"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
 msgid "No plugin information found."
 msgstr "Ingen udvidelsesinformationer blev fundet."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:93
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
 msgid "All installed plugins are up to date."
 msgstr "Alle installerede udvidelser er opdaterede."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
 #, java-format
 msgid ""
@@ -9403,9 +9709,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
 msgid "Download missing plugins"
 msgstr "Hent manglende udvidelser"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
 #, java-format
 msgid ""
@@ -9420,43 +9726,43 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
 msgid "unknown"
 msgstr "ukendt"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Version {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 msgid "Plugin bundled with JOSM"
 msgstr "Udvidelse som følger med JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:357
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -9773,10 +10079,4 @@
 msgid "(What does that mean?)"
 msgstr ""
-
-#. item "Relations/Route" text "Symbol description"
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3148
-msgid "Description"
-msgstr "Beskrivelse"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
@@ -10543,6 +10843,7 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
-msgid "Set "
-msgstr ""
+#, fuzzy, java-format
+msgid "Set {0} Lambert coordinates"
+msgstr "Behold deres koordinater"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -11160,6 +11461,6 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 #: build/trans_style.java:990 build/trans_style.java:1007
-#: build/trans_style.java:1023 build/trans_style.java:3392
-#: build/trans_style.java:3400
+#: build/trans_style.java:1023 build/trans_style.java:3400
+#: build/trans_style.java:3408
 msgid "water"
 msgstr "vand"
@@ -11445,4 +11746,55 @@
 msgstr "Mål"
 
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Michigan Left"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Adds no left turn for sets of 4 or 5 ways."
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45
+#, fuzzy
+msgid "Please select 4 or 5 ways to assign no left turns."
+msgstr "Vælg venligst en eller flere lukkede veje på mindst fire punkter."
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61
+#, fuzzy, java-format
+msgid "{0} extrem nodes."
+msgstr "{0} punkt"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69
+#, java-format
+msgid "Via node {0}, {1}"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75
+#, fuzzy, java-format
+msgid "{0} via nodes."
+msgstr "{0} punkt"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78
+msgid "Unable to find via nodes. Please check your selection"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98
+#, fuzzy, java-format
+msgid "MIddle way: {0}"
+msgstr "Tilstand: {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121
+msgid "Create Michigan left turn restriction"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129
+#, fuzzy, java-format
+msgid "Processing {0}"
+msgstr "Version {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142
+#, java-format
+msgid "Relation: from {0} to {1} via {2}"
+msgstr ""
+
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
 msgid "OpenLayers"
@@ -11592,7 +11944,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
-#, fuzzy
 msgid "create new objects"
-msgstr "Opret nyt punkt."
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
@@ -11912,5 +12263,5 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:158
 msgid "JOSM Tag Editor Plugin"
 msgstr "JOSM tag-editor-udvidelse"
@@ -11920,5 +12271,5 @@
 msgstr "Fremhæv"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:370
 #, java-format
 msgid "Updating properties of up to {0} object"
@@ -11927,18 +12278,4 @@
 msgstr[1] ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44
-msgid "INFO: entering compatibilty mode for JOSM with Main.ds"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47
-msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49
-msgid ""
-"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-"found."
-msgstr ""
-
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
 msgid "Group"
@@ -11948,9 +12285,4 @@
 msgid "Item"
 msgstr "Emne"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-msgid "Filter"
-msgstr "Filter"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63
@@ -12036,5 +12368,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2272
 msgid "Street name"
 msgstr "Vejnavn"
@@ -12196,8 +12528,4 @@
 msgid "Zoom (in metres)"
 msgstr "Zoom (i meter)"
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
-msgid "URL"
-msgstr "URL"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -12403,7 +12731,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501
-#, fuzzy
 msgid "Updating map ..."
-msgstr "Gendanner vej..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69
@@ -12896,7 +13223,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
-#: build/trans_style.java:4179
+#: build/trans_style.java:4159 build/trans_style.java:4166
+#: build/trans_style.java:4173 build/trans_style.java:4180
+#: build/trans_style.java:4187
 msgid "building"
 msgstr "bygning"
@@ -12910,5 +13237,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4186
+#: build/trans_style.java:4194
 msgid "area"
 msgstr "område"
@@ -13036,10 +13363,10 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:148
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:155
 msgid "Reached a junction"
 msgstr ""
@@ -13329,17 +13656,14 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
-#, fuzzy
 msgid "Overlap tiles"
-msgstr "Overlappende områder"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
-#, fuzzy
 msgid "% of east:"
-msgstr "% af bredde:"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
-#, fuzzy
 msgid "% of north:"
-msgstr "% af bredde:"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -13494,6 +13818,11 @@
 msgstr ""
 
+#. Plugin michigan_left
+#: build/trans_plugins.java:35
+msgid "Adds no left turn for sets of 4 or 5 ways"
+msgstr ""
+
 #. Plugin nearclick
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid ""
 "Simulates a click when you do a small and short drag. This is usefull for "
@@ -13503,15 +13832,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importerer sager fra OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13520,5 +13849,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13527,5 +13856,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13534,15 +13863,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Let other applications send commands to JOSM."
 msgstr "Tillad andre applikationer at sende kommandoer til JOSM."
 
 #. Plugin routes
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13551,10 +13880,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Provides routing capabilities."
 msgstr "Tilføjer ruteplan-egenskaber"
 
 #. Plugin slippymap
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13563,15 +13892,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Tillad tilføjelse af markører/punkter på de nuværende gps-positioner."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Tilføjer en dialogboks for at rette tags i tabelform."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -13581,10 +13910,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Make terraced houses out of single blocks."
 msgstr "Laver rækkehuse ud af en enkelt blok."
 
 #. Plugin usertools
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -13593,5 +13922,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -13602,5 +13931,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -13611,5 +13940,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -13618,10 +13947,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Let download langs en lang serie af forbundne veje"
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -13678,4 +14007,10 @@
 #. <annotations>
 #: build/trans_presets.java:57
+#, fuzzy
+msgid "Highways"
+msgstr "landevej"
+
+#. group "Highways"
+#: build/trans_presets.java:58
 msgid "Streets"
 msgstr "Veje"
@@ -13686,5 +14021,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:58 build/trans_surveyor.java:72
+#: build/trans_presets.java:59 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Motorvej"
@@ -13693,5 +14028,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:61
+#: build/trans_presets.java:62
 msgid "Edit Motorway"
 msgstr "Ret en motorvej"
@@ -13718,8 +14053,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:120 build/trans_presets.java:140
-#: build/trans_presets.java:177 build/trans_presets.java:197
-#: build/trans_presets.java:1557 build/trans_presets.java:3146
+#: build/trans_presets.java:65 build/trans_presets.java:101
+#: build/trans_presets.java:121 build/trans_presets.java:141
+#: build/trans_presets.java:178 build/trans_presets.java:198
+#: build/trans_presets.java:1560 build/trans_presets.java:3158
 msgid "Reference"
 msgstr "Reference"
@@ -13733,8 +14068,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:358
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:359
 msgid "Lanes"
 msgstr "Baner"
@@ -13751,15 +14086,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:224 build/trans_presets.java:280
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:373 build/trans_presets.java:388
-#: build/trans_presets.java:412 build/trans_presets.java:431
-#: build/trans_presets.java:452 build/trans_presets.java:472
-#: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1307
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:225 build/trans_presets.java:281
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:374 build/trans_presets.java:389
+#: build/trans_presets.java:413 build/trans_presets.java:432
+#: build/trans_presets.java:453 build/trans_presets.java:473
+#: build/trans_presets.java:511 build/trans_presets.java:667
+#: build/trans_presets.java:1310
 msgid "Max. speed (km/h)"
 msgstr "Maks. hastighed (km/t)"
@@ -13796,16 +14131,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:293 build/trans_presets.java:306
-#: build/trans_presets.java:320 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:464
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:659 build/trans_presets.java:1300
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:294 build/trans_presets.java:307
+#: build/trans_presets.java:321 build/trans_presets.java:353
+#: build/trans_presets.java:405 build/trans_presets.java:425
+#: build/trans_presets.java:445 build/trans_presets.java:465
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:660 build/trans_presets.java:1303
 msgid "Oneway"
 msgstr "Ensrettet"
@@ -13847,19 +14182,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:353
-#: build/trans_presets.java:362 build/trans_presets.java:405
-#: build/trans_presets.java:425 build/trans_presets.java:445
-#: build/trans_presets.java:465 build/trans_presets.java:485
-#: build/trans_presets.java:504 build/trans_presets.java:523
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:586 build/trans_presets.java:607
-#: build/trans_presets.java:628 build/trans_presets.java:660
-#: build/trans_presets.java:1301 build/trans_surveyor.java:12
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:354
+#: build/trans_presets.java:363 build/trans_presets.java:406
+#: build/trans_presets.java:426 build/trans_presets.java:446
+#: build/trans_presets.java:466 build/trans_presets.java:486
+#: build/trans_presets.java:505 build/trans_presets.java:524
+#: build/trans_presets.java:545 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629 build/trans_presets.java:661
+#: build/trans_presets.java:1304 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Bro"
@@ -13895,19 +14230,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:354
-#: build/trans_presets.java:378 build/trans_presets.java:406
-#: build/trans_presets.java:426 build/trans_presets.java:446
-#: build/trans_presets.java:466 build/trans_presets.java:486
-#: build/trans_presets.java:505 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629 build/trans_presets.java:661
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:355
+#: build/trans_presets.java:379 build/trans_presets.java:407
+#: build/trans_presets.java:427 build/trans_presets.java:447
+#: build/trans_presets.java:467 build/trans_presets.java:487
+#: build/trans_presets.java:506 build/trans_presets.java:525
+#: build/trans_presets.java:546 build/trans_presets.java:567
+#: build/trans_presets.java:588 build/trans_presets.java:609
+#: build/trans_presets.java:630 build/trans_presets.java:662
+#: build/trans_presets.java:1305
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -13941,18 +14276,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:73 build/trans_presets.java:90
-#: build/trans_presets.java:110 build/trans_presets.java:129
-#: build/trans_presets.java:150 build/trans_presets.java:166
-#: build/trans_presets.java:186 build/trans_presets.java:205
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:355
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:467
-#: build/trans_presets.java:487 build/trans_presets.java:506
-#: build/trans_presets.java:525 build/trans_presets.java:546
-#: build/trans_presets.java:567 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:630
-#: build/trans_presets.java:662 build/trans_presets.java:1303
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:356
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:468
+#: build/trans_presets.java:488 build/trans_presets.java:507
+#: build/trans_presets.java:526 build/trans_presets.java:547
+#: build/trans_presets.java:568 build/trans_presets.java:589
+#: build/trans_presets.java:610 build/trans_presets.java:631
+#: build/trans_presets.java:663 build/trans_presets.java:1306
 msgid "Cutting"
 msgstr "Indhak"
@@ -13986,18 +14321,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:74 build/trans_presets.java:91
-#: build/trans_presets.java:111 build/trans_presets.java:130
-#: build/trans_presets.java:151 build/trans_presets.java:167
-#: build/trans_presets.java:187 build/trans_presets.java:206
-#: build/trans_presets.java:222 build/trans_presets.java:240
-#: build/trans_presets.java:258 build/trans_presets.java:277
-#: build/trans_presets.java:310 build/trans_presets.java:356
-#: build/trans_presets.java:408 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:468
-#: build/trans_presets.java:488 build/trans_presets.java:507
-#: build/trans_presets.java:526 build/trans_presets.java:547
-#: build/trans_presets.java:568 build/trans_presets.java:589
-#: build/trans_presets.java:610 build/trans_presets.java:631
-#: build/trans_presets.java:663 build/trans_presets.java:1304
+#: build/trans_presets.java:75 build/trans_presets.java:92
+#: build/trans_presets.java:112 build/trans_presets.java:131
+#: build/trans_presets.java:152 build/trans_presets.java:168
+#: build/trans_presets.java:188 build/trans_presets.java:207
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:357
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:469
+#: build/trans_presets.java:489 build/trans_presets.java:508
+#: build/trans_presets.java:527 build/trans_presets.java:548
+#: build/trans_presets.java:569 build/trans_presets.java:590
+#: build/trans_presets.java:611 build/trans_presets.java:632
+#: build/trans_presets.java:664 build/trans_presets.java:1307
 msgid "Embankment"
 msgstr "Vold"
@@ -14005,5 +14340,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Motorway Link"
 msgstr "Motorvejsforbindelse"
@@ -14012,5 +14347,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:80
+#: build/trans_presets.java:81
 msgid "Edit Motorway Link"
 msgstr "Ret en motorvejsforbindelse"
@@ -14018,5 +14353,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:94
+#: build/trans_presets.java:95
 msgid "Trunk"
 msgstr "Motortrafikvej"
@@ -14025,5 +14360,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:97
+#: build/trans_presets.java:98
 msgid "Edit Trunk"
 msgstr "Ret motortrafikvej"
@@ -14033,6 +14368,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
 msgid "Motorroad"
 msgstr ""
@@ -14040,5 +14375,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:114
+#: build/trans_presets.java:115
 msgid "Trunk Link"
 msgstr "Motortrafikvejsforbindelse"
@@ -14047,5 +14382,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:117
+#: build/trans_presets.java:118
 msgid "Edit Trunk Link"
 msgstr "Ret motortrafikvejsforbindelse"
@@ -14058,5 +14393,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:134 build/trans_surveyor.java:76
+#: build/trans_presets.java:135 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Primær"
@@ -14065,5 +14400,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:137
+#: build/trans_presets.java:138
 msgid "Edit Primary Road"
 msgstr "Ret en hovedvej"
@@ -14071,10 +14406,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:154
+#: build/trans_presets.java:155
 msgid "Primary Link"
 msgstr "Hovedforbindelse"
 
 #. item
-#: build/trans_presets.java:155
+#: build/trans_presets.java:156
 msgid "Edit Primary Link"
 msgstr "Ret en hovedforbindelse"
@@ -14086,5 +14421,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:170 build/trans_surveyor.java:80
+#: build/trans_presets.java:171 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Sekundær"
@@ -14094,5 +14429,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:174
+#: build/trans_presets.java:175
 msgid "Edit Secondary Road"
 msgstr "Ret en bivej"
@@ -14100,5 +14435,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:190
+#: build/trans_presets.java:191
 msgid "Tertiary"
 msgstr "Tertiær"
@@ -14108,5 +14443,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:194
+#: build/trans_presets.java:195
 msgid "Edit Tertiary Road"
 msgstr "Ret en tertiær vej"
@@ -14118,5 +14453,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:209 build/trans_surveyor.java:84
+#: build/trans_presets.java:210 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Uklassificeret"
@@ -14126,5 +14461,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:213
+#: build/trans_presets.java:214
 msgid "Edit Unclassified Road"
 msgstr "Ret uklassificeret vej"
@@ -14151,19 +14486,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:225 build/trans_presets.java:243
-#: build/trans_presets.java:261 build/trans_presets.java:281
-#: build/trans_presets.java:314 build/trans_presets.java:359
-#: build/trans_presets.java:375 build/trans_presets.java:389
-#: build/trans_presets.java:413 build/trans_presets.java:432
-#: build/trans_presets.java:453 build/trans_presets.java:473
-#: build/trans_presets.java:491 build/trans_presets.java:511
-#: build/trans_presets.java:532 build/trans_presets.java:553
-#: build/trans_presets.java:574 build/trans_presets.java:595
-#: build/trans_presets.java:616 build/trans_presets.java:637
-#: build/trans_presets.java:667 build/trans_presets.java:680
-#: build/trans_presets.java:693 build/trans_presets.java:706
-#: build/trans_presets.java:719 build/trans_presets.java:732
-#: build/trans_presets.java:745 build/trans_presets.java:1308
-#: build/trans_presets.java:1498 build/trans_presets.java:1540
+#: build/trans_presets.java:226 build/trans_presets.java:244
+#: build/trans_presets.java:262 build/trans_presets.java:282
+#: build/trans_presets.java:315 build/trans_presets.java:360
+#: build/trans_presets.java:376 build/trans_presets.java:390
+#: build/trans_presets.java:414 build/trans_presets.java:433
+#: build/trans_presets.java:454 build/trans_presets.java:474
+#: build/trans_presets.java:492 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:554
+#: build/trans_presets.java:575 build/trans_presets.java:596
+#: build/trans_presets.java:617 build/trans_presets.java:638
+#: build/trans_presets.java:668 build/trans_presets.java:681
+#: build/trans_presets.java:694 build/trans_presets.java:707
+#: build/trans_presets.java:720 build/trans_presets.java:733
+#: build/trans_presets.java:746 build/trans_presets.java:1311
+#: build/trans_presets.java:1501 build/trans_presets.java:1543
 msgid "Width (meters)"
 msgstr "Bredde (meter)"
@@ -14175,5 +14510,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:228 build/trans_surveyor.java:88
+#: build/trans_presets.java:229 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Beboelse"
@@ -14182,5 +14517,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:231
+#: build/trans_presets.java:232
 msgid "Edit Residential Street"
 msgstr "Ret en beboelsesgade"
@@ -14205,14 +14540,14 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:611
-#: build/trans_presets.java:632 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "Surface"
 msgstr "Overflade"
@@ -14233,53 +14568,53 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paved"
 msgstr "asfalteret"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "unpaved"
 msgstr "uasfalteret"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "concrete"
 msgstr "beton"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
 msgid "metal"
 msgstr ""
@@ -14293,22 +14628,22 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
-#: build/trans_style.java:3367
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
+#: build/trans_style.java:3375
 msgid "wood"
 msgstr "træ"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paving_stones"
 msgstr ""
@@ -14316,77 +14651,77 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "cobblestone"
 msgstr "toppede brosten"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "gravel"
 msgstr "grus"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "grass"
 msgstr "græs"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "sand"
 msgstr "sand"
@@ -14394,13 +14729,13 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "ground"
 msgstr "jord"
@@ -14408,5 +14743,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:246
+#: build/trans_presets.java:247
 msgid "Living Street"
 msgstr ""
@@ -14415,5 +14750,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:249
+#: build/trans_presets.java:250
 msgid "Edit Living Street"
 msgstr ""
@@ -14421,5 +14756,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:264
+#: build/trans_presets.java:265
 msgid "Service"
 msgstr "Service"
@@ -14428,5 +14763,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:267
+#: build/trans_presets.java:268
 msgid "Edit Serviceway"
 msgstr "Ret servicevej"
@@ -14436,18 +14771,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "alley"
 msgstr "gyde"
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "parking_aisle"
 msgstr ""
@@ -14455,5 +14790,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:284
+#: build/trans_presets.java:285
 msgid "Parking Aisle"
 msgstr "Parkeringsvej"
@@ -14463,5 +14798,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:288
+#: build/trans_presets.java:289
 msgid "Edit Parking Aisle"
 msgstr ""
@@ -14469,5 +14804,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:298
+#: build/trans_presets.java:299
 msgid "Road (Unknown Type)"
 msgstr "Vej (ukendt type)"
@@ -14476,5 +14811,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Edit Road of unknown type"
 msgstr "Ret vej af ukendt type"
@@ -14483,20 +14818,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:318
+#: build/trans_presets.java:319
 msgid "Road Restrictions"
 msgstr "Adgangsbegrænsninger"
 
 #. item
-#: build/trans_presets.java:319
+#: build/trans_presets.java:320
 msgid "Edit Road Restrictions"
 msgstr "Ret adgangsbegrænsninger"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:321
+#: build/trans_presets.java:322
 msgid "Toll"
 msgstr "Betalingsanlæg"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:322
+#: build/trans_presets.java:323
 msgid "No exit (cul-de-sac)"
 msgstr "Blind vej"
@@ -14509,8 +14844,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:323 build/trans_presets.java:529
-#: build/trans_presets.java:550 build/trans_presets.java:571
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:634
+#: build/trans_presets.java:324 build/trans_presets.java:530
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:593 build/trans_presets.java:614
+#: build/trans_presets.java:635
 msgid "Access"
 msgstr "Adgang"
@@ -14564,29 +14899,29 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1397
-#: build/trans_presets.java:1398 build/trans_presets.java:1399
-#: build/trans_presets.java:1763 build/trans_presets.java:1773
-#: build/trans_presets.java:2397 build/trans_presets.java:2433
-#: build/trans_presets.java:2442 build/trans_presets.java:2443
-#: build/trans_presets.java:2444 build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:1396
+#: build/trans_presets.java:1397 build/trans_presets.java:1400
+#: build/trans_presets.java:1401 build/trans_presets.java:1402
+#: build/trans_presets.java:1767 build/trans_presets.java:1777
+#: build/trans_presets.java:2408 build/trans_presets.java:2444
+#: build/trans_presets.java:2453 build/trans_presets.java:2454
+#: build/trans_presets.java:2455 build/trans_presets.java:2725
 msgid "yes"
 msgstr "ja"
@@ -14599,40 +14934,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:212
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:212
 msgid "private"
 msgstr "privat"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655
 msgid "designated"
 msgstr "designeret"
@@ -14645,19 +14980,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:219
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:219
 msgid "destination"
 msgstr "destination"
@@ -14680,71 +15015,71 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:205
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:205
 msgid "permissive"
 msgstr "tilladt"
 
-#: build/trans_presets.java:323 build/trans_presets.java:327
-#: build/trans_presets.java:330 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636
+#: build/trans_presets.java:324 build/trans_presets.java:328
+#: build/trans_presets.java:331 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637
 msgid "agricultural"
 msgstr "landbrug"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
-#: build/trans_presets.java:2433 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1396 build/trans_presets.java:1397
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
+#: build/trans_presets.java:2444 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
+#: build/trans_presets.java:2725
 msgid "no"
 msgstr "nej"
 
-#: build/trans_presets.java:326
+#: build/trans_presets.java:327
 msgid "Goods"
 msgstr "Varer"
 
-#: build/trans_presets.java:327
+#: build/trans_presets.java:328
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Lastbil"
@@ -14759,10 +15094,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:328 build/trans_presets.java:651
-#: build/trans_presets.java:858 build/trans_presets.java:891
-#: build/trans_presets.java:913 build/trans_presets.java:950
-#: build/trans_presets.java:963 build/trans_presets.java:975
-#: build/trans_presets.java:987 build/trans_presets.java:999
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:329 build/trans_presets.java:652
+#: build/trans_presets.java:859 build/trans_presets.java:892
+#: build/trans_presets.java:914 build/trans_presets.java:951
+#: build/trans_presets.java:964 build/trans_presets.java:976
+#: build/trans_presets.java:988 build/trans_presets.java:1000
+#: build/trans_presets.java:1040
 msgid "Horse"
 msgstr "Hest"
@@ -14778,13 +15113,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:329 build/trans_presets.java:530
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:635 build/trans_presets.java:859
-#: build/trans_presets.java:877 build/trans_presets.java:892
-#: build/trans_presets.java:914 build/trans_presets.java:951
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:330 build/trans_presets.java:531
+#: build/trans_presets.java:552 build/trans_presets.java:573
+#: build/trans_presets.java:594 build/trans_presets.java:615
+#: build/trans_presets.java:636 build/trans_presets.java:860
+#: build/trans_presets.java:878 build/trans_presets.java:893
+#: build/trans_presets.java:915 build/trans_presets.java:952
+#: build/trans_presets.java:965 build/trans_presets.java:977
+#: build/trans_presets.java:989 build/trans_presets.java:1001
+#: build/trans_presets.java:1041
 msgid "Motorcycle"
 msgstr "Motorcykel"
@@ -14799,30 +15134,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:330 build/trans_presets.java:531
-#: build/trans_presets.java:552 build/trans_presets.java:573
-#: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:636 build/trans_presets.java:654
-#: build/trans_presets.java:878 build/trans_presets.java:893
-#: build/trans_presets.java:915 build/trans_presets.java:952
-#: build/trans_presets.java:965 build/trans_presets.java:977
-#: build/trans_presets.java:989 build/trans_presets.java:1001
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:331 build/trans_presets.java:532
+#: build/trans_presets.java:553 build/trans_presets.java:574
+#: build/trans_presets.java:595 build/trans_presets.java:616
+#: build/trans_presets.java:637 build/trans_presets.java:655
+#: build/trans_presets.java:879 build/trans_presets.java:894
+#: build/trans_presets.java:916 build/trans_presets.java:953
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1042
 msgid "Motorcar"
 msgstr "Motorkøretøj"
 
-#: build/trans_presets.java:331
+#: build/trans_presets.java:332
 msgid "Public Service Vehicles (psv)"
 msgstr "Offentlig transport"
 
-#: build/trans_presets.java:332
+#: build/trans_presets.java:333
 msgid "Motorboat"
 msgstr "Motorbåd"
 
-#: build/trans_presets.java:333
+#: build/trans_presets.java:334
 msgid "Boat"
 msgstr "Båd"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:336
 msgid "Min. speed (km/h)"
 msgstr "Min. hastighed (km/t)"
@@ -14830,25 +15165,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:336 build/trans_presets.java:374
+#: build/trans_presets.java:337 build/trans_presets.java:375
 msgid "Max. weight (tonnes)"
 msgstr "Maks. vægt (ton)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:337
+#: build/trans_presets.java:338
 msgid "Max. Height (meters)"
 msgstr "Maks. højde (meter)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Max. Width (meters)"
 msgstr "Maks. bredde (meter)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:339
+#: build/trans_presets.java:340
 msgid "Max. Length (meters)"
 msgstr "Maks. længde (meter)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:341
+#: build/trans_presets.java:342
 msgid "Roundabout"
 msgstr "Rundkørsel"
@@ -14859,5 +15194,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:346
+#: build/trans_presets.java:347
 msgid "Edit Junction"
 msgstr "Ret trafikknudepunkt"
@@ -14879,9 +15214,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:349 build/trans_presets.java:648
-#: build/trans_presets.java:788 build/trans_presets.java:1135
-#: build/trans_presets.java:1392 build/trans_presets.java:2353
-#: build/trans_presets.java:2901 build/trans_presets.java:2911
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:350 build/trans_presets.java:649
+#: build/trans_presets.java:789 build/trans_presets.java:1137
+#: build/trans_presets.java:1395 build/trans_presets.java:2364
+#: build/trans_presets.java:2913 build/trans_presets.java:2923
+#: build/trans_presets.java:2932
 msgid "Type"
 msgstr "Type"
@@ -14901,10 +15236,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:547
+#: build/trans_presets.java:350 build/trans_style.java:547
 #: build/trans_style.java:555
 msgid "motorway"
 msgstr "motorvej"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "motorway_link"
 msgstr "motorvejsforbindelse"
@@ -14926,10 +15261,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:563
+#: build/trans_presets.java:350 build/trans_style.java:563
 #: build/trans_style.java:571
 msgid "trunk"
 msgstr "forbindelse"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "trunk_link"
 msgstr ""
@@ -14951,10 +15286,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:579
+#: build/trans_presets.java:350 build/trans_style.java:579
 #: build/trans_style.java:587
 msgid "primary"
 msgstr "primær"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "primary_link"
 msgstr ""
@@ -14976,5 +15311,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:595
+#: build/trans_presets.java:350 build/trans_style.java:595
 #: build/trans_style.java:603
 msgid "secondary"
@@ -14989,9 +15324,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:349 build/trans_style.java:611
+#: build/trans_presets.java:350 build/trans_style.java:611
 msgid "tertiary"
 msgstr "tertiær"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "unclassified"
 msgstr ""
@@ -15005,9 +15340,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:349 build/trans_style.java:3143
+#: build/trans_presets.java:350 build/trans_style.java:3151
 msgid "residential"
 msgstr "beboelse"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "living_street"
 msgstr ""
@@ -15037,10 +15372,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:349 build/trans_style.java:667
-#: build/trans_style.java:4244
+#: build/trans_presets.java:350 build/trans_style.java:667
+#: build/trans_style.java:4252
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "bus_guideway"
 msgstr ""
@@ -15070,6 +15405,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:349 build/trans_style.java:877
-#: build/trans_style.java:3208 build/trans_style.java:3209
+#: build/trans_presets.java:350 build/trans_style.java:877
+#: build/trans_style.java:3216 build/trans_style.java:3217
 msgid "construction"
 msgstr ""
@@ -15080,10 +15415,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Edit Bridge"
 msgstr "Ret bro"
 
 #. item
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "Edit Tunnel"
 msgstr "Ret en tunnel"
@@ -15091,19 +15426,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:393
+#: build/trans_presets.java:394
 msgid "Ways"
 msgstr "Stier"
 
 #. group "Ways"
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Construction"
 msgstr "Under udførelse"
 
 #. item
-#: build/trans_presets.java:395
+#: build/trans_presets.java:396
 msgid "Edit Highway Under Construction"
 msgstr "Ret vej under udførelse"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "Junction"
 msgstr "Kryds"
@@ -15119,5 +15454,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:411 build/trans_style.java:895
+#: build/trans_presets.java:412 build/trans_style.java:895
 msgid "roundabout"
 msgstr "rundkørsel"
@@ -15126,5 +15461,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:417
+#: build/trans_presets.java:418
 msgid "Bridleway"
 msgstr "Ridesti"
@@ -15132,5 +15467,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:419
+#: build/trans_presets.java:420
 msgid "Edit Bridleway"
 msgstr "Ret ridesti"
@@ -15138,5 +15473,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:435
+#: build/trans_presets.java:436
 msgid "Cycleway"
 msgstr "Cykelsti"
@@ -15146,10 +15481,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:439
+#: build/trans_presets.java:440
 msgid "Edit Cycleway"
 msgstr "Ret cykelsti"
 
 #. item "Ways/Cycleway" check "Embankment"
-#: build/trans_presets.java:449
+#: build/trans_presets.java:450
 msgid "Pedestrians"
 msgstr ""
@@ -15157,5 +15492,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Footway"
 msgstr "Gangsti"
@@ -15164,10 +15499,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Footway"
 msgstr "Ret gangsti"
 
 #. item "Ways/Footway" check "Embankment"
-#: build/trans_presets.java:469
+#: build/trans_presets.java:470
 msgid "Bikes"
 msgstr ""
@@ -15175,5 +15510,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:476
+#: build/trans_presets.java:477
 msgid "Pedestrian"
 msgstr "Gågade"
@@ -15182,5 +15517,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Edit Pedestrian Street"
 msgstr "Ret gågade"
@@ -15188,5 +15523,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:494
+#: build/trans_presets.java:495
 msgid "Steps"
 msgstr "Trin"
@@ -15196,5 +15531,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:498
+#: build/trans_presets.java:499
 msgid "Edit Flight of Steps"
 msgstr "Ret trappetrin"
@@ -15203,5 +15538,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:515
+#: build/trans_presets.java:516
 msgid "Track"
 msgstr "Spor"
@@ -15210,5 +15545,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:518
+#: build/trans_presets.java:519
 msgid "Edit Track"
 msgstr "Ret spor"
@@ -15216,5 +15551,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:535
+#: build/trans_presets.java:536
 msgid "Track Grade 1"
 msgstr "Spor-niveau 1"
@@ -15223,5 +15558,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:538
+#: build/trans_presets.java:539
 msgid "Edit Track of grade 1"
 msgstr "Ret et spor af første niveau"
@@ -15229,5 +15564,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:556
+#: build/trans_presets.java:557
 msgid "Track Grade 2"
 msgstr "Spor-niveau 2"
@@ -15236,5 +15571,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:559
+#: build/trans_presets.java:560
 msgid "Edit Track of grade 2"
 msgstr "Ret et spor af andet niveau"
@@ -15242,5 +15577,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:577
+#: build/trans_presets.java:578
 msgid "Track Grade 3"
 msgstr "Spor-niveau 3"
@@ -15249,5 +15584,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:580
+#: build/trans_presets.java:581
 msgid "Edit Track of grade 3"
 msgstr "Ret et spor af tredje niveau"
@@ -15255,5 +15590,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:598
+#: build/trans_presets.java:599
 msgid "Track Grade 4"
 msgstr "Spor-niveau 4"
@@ -15262,5 +15597,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:601
+#: build/trans_presets.java:602
 msgid "Edit Track of grade 4"
 msgstr "Ret et spor af fjerde niveau"
@@ -15268,5 +15603,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:619
+#: build/trans_presets.java:620
 msgid "Track Grade 5"
 msgstr "Spor-niveau 5"
@@ -15275,5 +15610,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:622
+#: build/trans_presets.java:623
 msgid "Edit Track of grade 5"
 msgstr "Ret et spor af femte niveau"
@@ -15282,5 +15617,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:641
+#: build/trans_presets.java:642
 msgid "Path"
 msgstr "Sti"
@@ -15289,13 +15624,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:644
+#: build/trans_presets.java:645
 msgid "Edit Path"
 msgstr "Ret sti"
 
-#: build/trans_presets.java:652
+#: build/trans_presets.java:653
 msgid "Ski"
 msgstr "Ski"
 
-#: build/trans_presets.java:653
+#: build/trans_presets.java:654
 msgid "Snowmobile"
 msgstr "Motorslæde"
@@ -15305,6 +15640,6 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:670 build/trans_presets.java:1725
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:671 build/trans_presets.java:1729
+#: build/trans_presets.java:1752
 msgid "Hiking"
 msgstr "Vandring"
@@ -15314,5 +15649,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:674
+#: build/trans_presets.java:675
 msgid "Edit Hiking"
 msgstr "Ret vandring"
@@ -15320,5 +15655,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:683
+#: build/trans_presets.java:684
 msgid "Mountain Hiking"
 msgstr "Bjergvandring"
@@ -15328,5 +15663,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:687
+#: build/trans_presets.java:688
 msgid "Edit Mountain Hiking"
 msgstr "Ret bjergvandring"
@@ -15334,5 +15669,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:696
+#: build/trans_presets.java:697
 msgid "Demanding Mountain Hiking"
 msgstr "Krævende bjergvandring"
@@ -15342,5 +15677,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:700
+#: build/trans_presets.java:701
 msgid "Edit Demanding Mountain Hiking"
 msgstr "Ret krævende bjergvandring"
@@ -15348,5 +15683,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:709
+#: build/trans_presets.java:710
 msgid "Alpine Hiking"
 msgstr "Alpevandring"
@@ -15356,5 +15691,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:713
+#: build/trans_presets.java:714
 msgid "Edit Alpine Hiking"
 msgstr "Ret alpevandring"
@@ -15362,5 +15697,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:723
 msgid "Demanding Alpine Hiking"
 msgstr "Krævende alpevandring"
@@ -15370,5 +15705,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:726
+#: build/trans_presets.java:727
 msgid "Edit Demanding Alpine Hiking"
 msgstr "Ret krævende alpevandring"
@@ -15376,5 +15711,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:735
+#: build/trans_presets.java:736
 msgid "Difficult Alpine Hiking"
 msgstr "Hård alpevandring"
@@ -15384,5 +15719,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:739
+#: build/trans_presets.java:740
 msgid "Edit Difficult Alpine Hiking"
 msgstr "Ret hård alpevandring"
@@ -15390,10 +15725,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:749
+#: build/trans_presets.java:750
 msgid "Waypoints"
 msgstr "Vejpunkter"
 
 #. group "Waypoints"
-#: build/trans_presets.java:750
+#: build/trans_presets.java:751
 msgid "Motorway Junction"
 msgstr "Motorvejskryds"
@@ -15401,15 +15736,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:752
+#: build/trans_presets.java:753
 msgid "Edit Motorway Junction"
 msgstr "Ret motorvejskryds"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:757
 msgid "Number"
 msgstr "Nummer"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:759
 msgid "Services"
 msgstr "Tankstation"
@@ -15417,5 +15752,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:761
 msgid "Edit Service Station"
 msgstr "Ret tankstation"
@@ -15453,15 +15788,15 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:765 build/trans_presets.java:902
-#: build/trans_presets.java:1382 build/trans_presets.java:1406
-#: build/trans_presets.java:1413 build/trans_presets.java:1419
-#: build/trans_presets.java:1427 build/trans_presets.java:1434
-#: build/trans_presets.java:1761 build/trans_presets.java:1771
-#: build/trans_presets.java:2361 build/trans_presets.java:2368
-#: build/trans_presets.java:2384 build/trans_presets.java:2395
-#: build/trans_presets.java:2403 build/trans_presets.java:2410
-#: build/trans_presets.java:2464 build/trans_presets.java:2512
-#: build/trans_presets.java:2678 build/trans_presets.java:2693
-#: build/trans_presets.java:2732 build/trans_presets.java:3151
+#: build/trans_presets.java:766 build/trans_presets.java:903
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
+#: build/trans_presets.java:1416 build/trans_presets.java:1422
+#: build/trans_presets.java:1430 build/trans_presets.java:1437
+#: build/trans_presets.java:1765 build/trans_presets.java:1775
+#: build/trans_presets.java:2372 build/trans_presets.java:2379
+#: build/trans_presets.java:2395 build/trans_presets.java:2406
+#: build/trans_presets.java:2414 build/trans_presets.java:2421
+#: build/trans_presets.java:2475 build/trans_presets.java:2523
+#: build/trans_presets.java:2689 build/trans_presets.java:2704
+#: build/trans_presets.java:2743 build/trans_presets.java:3163
 msgid "Operator"
 msgstr "Selskab"
@@ -15470,5 +15805,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:769
+#: build/trans_presets.java:770
 msgid "Traffic Signal"
 msgstr "Færdselssignal"
@@ -15478,5 +15813,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:774
 msgid "Pedestrian crossing type"
 msgstr "Type af fodgængerfelt"
@@ -15485,27 +15820,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "island"
 msgstr "helleanlæg"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:774 build/trans_presets.java:790
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:775 build/trans_presets.java:791
+#: build/trans_presets.java:1334
 msgid "Cross on horseback"
 msgstr ""
@@ -15513,6 +15848,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:775 build/trans_presets.java:789
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:776 build/trans_presets.java:790
+#: build/trans_presets.java:1335
 msgid "Cross by bicycle"
 msgstr ""
@@ -15521,11 +15856,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:776 build/trans_presets.java:791
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:1336
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:778
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -15533,30 +15868,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "zebra"
 msgstr "fodgængerfelt"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pelican"
 msgstr "fodgængerfelt med trafikstyring"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:780
+#: build/trans_presets.java:781
 msgid "Stop"
 msgstr "Stop"
@@ -15564,5 +15899,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:783
+#: build/trans_presets.java:784
 msgid "Pedestrian Crossing"
 msgstr "Fodgængerfelt"
@@ -15571,14 +15906,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:786
+#: build/trans_presets.java:787
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:793
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:795
 msgid "Mini-roundabout"
 msgstr "Mini-rundkørsel"
@@ -15589,14 +15924,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "Direction"
 msgstr "Retning"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "clockwise"
 msgstr "i urets retning"
 
-#: build/trans_presets.java:801
+#: build/trans_presets.java:802
 msgid "Turning Circle"
 msgstr "Vendeplads"
@@ -15606,20 +15941,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:806
+#: build/trans_presets.java:807
 msgid "City Limit"
 msgstr "Bygrænse"
 
 #. item
-#: build/trans_presets.java:807
+#: build/trans_presets.java:808
 msgid "Edit City Limit Sign"
 msgstr "Ret et bygrænse-skilt"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:812
+#: build/trans_presets.java:813
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:814
+#: build/trans_presets.java:815
 msgid "Speed Camera"
 msgstr "Fartkamera"
@@ -15627,5 +15962,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:817
+#: build/trans_presets.java:818
 msgid "Emergency Phone"
 msgstr "Nødtelefon"
@@ -15633,5 +15968,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:820
+#: build/trans_presets.java:821
 msgid "Incline"
 msgstr ""
@@ -15639,5 +15974,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:823
+#: build/trans_presets.java:824
 msgid "Incline Steep"
 msgstr ""
@@ -15646,10 +15981,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:827
+#: build/trans_presets.java:828
 msgid "Ford"
 msgstr "Vadested"
 
 #. item
-#: build/trans_presets.java:828
+#: build/trans_presets.java:829
 msgid "Edit Ford"
 msgstr "Ret vadested"
@@ -15657,5 +15992,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:835
+#: build/trans_presets.java:836
 msgid "Mountain Pass"
 msgstr "Bjergpas"
@@ -15663,5 +15998,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:837
+#: build/trans_presets.java:838
 msgid "Edit Mountain Pass"
 msgstr "Ret bjergpas"
@@ -15673,7 +16008,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:842 build/trans_presets.java:1600
-#: build/trans_presets.java:1745 build/trans_presets.java:2845
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:843 build/trans_presets.java:1604
+#: build/trans_presets.java:1749 build/trans_presets.java:2857
+#: build/trans_presets.java:2864 build/trans_presets.java:2871
 msgid "Elevation"
 msgstr "Højde"
@@ -15681,5 +16016,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:846
+#: build/trans_presets.java:847
 msgid "Barriers"
 msgstr "Barrierer"
@@ -15687,5 +16022,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:849
+#: build/trans_presets.java:850
 msgid "Bollard"
 msgstr "Pæl"
@@ -15693,5 +16028,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:852
 msgid "Edit Bollard"
 msgstr "Ret en pæl"
@@ -15736,16 +16071,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:854 build/trans_presets.java:873
-#: build/trans_presets.java:887 build/trans_presets.java:909
-#: build/trans_presets.java:946 build/trans_presets.java:959
-#: build/trans_presets.java:971 build/trans_presets.java:983
-#: build/trans_presets.java:995 build/trans_presets.java:1007
-#: build/trans_presets.java:1017 build/trans_presets.java:1026
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:855 build/trans_presets.java:874
+#: build/trans_presets.java:888 build/trans_presets.java:910
+#: build/trans_presets.java:947 build/trans_presets.java:960
+#: build/trans_presets.java:972 build/trans_presets.java:984
+#: build/trans_presets.java:996 build/trans_presets.java:1008
+#: build/trans_presets.java:1018 build/trans_presets.java:1027
+#: build/trans_presets.java:1036
 msgid "Allowed traffic:"
 msgstr "Tilladt trafik:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:861
+#: build/trans_presets.java:862
 msgid "Cycle Barrier"
 msgstr ""
@@ -15754,5 +16089,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:865
+#: build/trans_presets.java:866
 msgid "Block"
 msgstr ""
@@ -15760,5 +16095,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:868
+#: build/trans_presets.java:869
 msgid "Cattle Grid"
 msgstr "Kreaturrist"
@@ -15766,10 +16101,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:870
+#: build/trans_presets.java:871
 msgid "Edit Cattle Grid"
 msgstr "Ret en kreaturrist"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:880
+#: build/trans_presets.java:881
 msgid "Bus Trap"
 msgstr "Bussluse"
@@ -15777,15 +16112,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:883
+#: build/trans_presets.java:884
 msgid "Spikes"
 msgstr "Pigge"
 
 #. item
-#: build/trans_presets.java:884
+#: build/trans_presets.java:885
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:896
 msgid "Toll Booth"
 msgstr "Betalingsanlæg"
@@ -15793,5 +16128,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:897
+#: build/trans_presets.java:898
 msgid "Edit Toll Booth"
 msgstr "Ret betalingsanlæg"
@@ -15799,10 +16134,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:905
+#: build/trans_presets.java:906
 msgid "Border Control"
 msgstr "Grænsekontrol"
 
 #. item
-#: build/trans_presets.java:906
+#: build/trans_presets.java:907
 msgid "Edit Border Control"
 msgstr "Ret grænsekontrol"
@@ -15812,5 +16147,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:920
+#: build/trans_presets.java:921
 msgid "Hedge"
 msgstr "Hæk"
@@ -15819,5 +16154,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:925
 msgid "Fence"
 msgstr "Hegn"
@@ -15826,5 +16161,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:929
 msgid "Wall"
 msgstr "Mur"
@@ -15832,5 +16167,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:931
+#: build/trans_presets.java:932
 msgid "City Wall"
 msgstr "Bymur"
@@ -15839,5 +16174,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:935
+#: build/trans_presets.java:936
 msgid "Retaining Wall"
 msgstr "Støttemur"
@@ -15849,15 +16184,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:942
+#: build/trans_presets.java:943
 msgid "Entrance"
 msgstr "Indgang"
 
 #. item
-#: build/trans_presets.java:943
+#: build/trans_presets.java:944
 msgid "Edit Entrance"
 msgstr "Ret indgang"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:954
+#: build/trans_presets.java:955
 msgid "Gate"
 msgstr "Port"
@@ -15865,50 +16200,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:956
+#: build/trans_presets.java:957
 msgid "Edit Gate"
 msgstr "Ret en port"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:967
+#: build/trans_presets.java:968
 msgid "Lift Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:968
+#: build/trans_presets.java:969
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:979
+#: build/trans_presets.java:980
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:980
+#: build/trans_presets.java:981
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:991
+#: build/trans_presets.java:992
 msgid "Bump Gate"
 msgstr "Skubbeport"
 
 #. item
-#: build/trans_presets.java:992
+#: build/trans_presets.java:993
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:1003
+#: build/trans_presets.java:1004
 msgid "Kissing Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1004
+#: build/trans_presets.java:1005
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1013
 msgid "Stile"
 msgstr "Stente"
@@ -15916,25 +16251,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1014
+#: build/trans_presets.java:1015
 msgid "Edit Stile"
 msgstr "Ret en stente"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1023
 msgid "Turnstile"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1024
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1032
 msgid "Sally Port"
 msgstr "Udfaldsport"
 
 #. item
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1033
 msgid "Edit Sally Port"
 msgstr "Ret en udfaldsport"
@@ -15942,13 +16277,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #.
-#. <separator/>
+#. group "Water"
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1046 build/trans_presets.java:1089
+#: build/trans_presets.java:1047 build/trans_presets.java:1048
+#: build/trans_presets.java:1091
 msgid "Water"
 msgstr "Vand"
 
 #. group "Water"
-#: build/trans_presets.java:1047
+#: build/trans_presets.java:1049
 msgid "Spring"
 msgstr "Udspring"
@@ -15956,5 +16292,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1049
+#: build/trans_presets.java:1051
 msgid "Edit Spring"
 msgstr "Ret udspring"
@@ -15962,5 +16298,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1056
 msgid "Drain"
 msgstr "Dræn"
@@ -15968,10 +16304,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1058
 msgid "Edit Drain"
 msgstr "Ret dræn"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1064
 msgid "Stream"
 msgstr "Strøm"
@@ -15979,10 +16315,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1066
 msgid "Edit Stream"
 msgstr "Ret strøm"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1072
 msgid "Canal"
 msgstr "Kanal"
@@ -15990,10 +16326,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1074
 msgid "Edit Canal"
 msgstr "Ret kanal"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1080
 msgid "River"
 msgstr "Flod"
@@ -16003,5 +16339,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1084
 msgid "Edit River"
 msgstr "Ret flod"
@@ -16009,15 +16345,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1093
 msgid "Edit Water"
 msgstr "Ret vand"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1097
 msgid "Land"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1098
 msgid "Edit Land"
 msgstr "Ret land"
@@ -16025,15 +16361,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1103
 msgid "Basin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1104
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1109
 msgid "Reservoir"
 msgstr "Vandreservoir"
@@ -16041,15 +16377,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1109
+#: build/trans_presets.java:1111
 msgid "Edit Reservoir Landuse"
 msgstr "Ret område for vandreservoir"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1116
 msgid "Covered Reservoir"
 msgstr "Overdækket reservoir"
 
 #. item
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1117
 msgid "Edit Covered Reservoir"
 msgstr "Ret overdækket reservoir"
@@ -16057,5 +16393,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1120
+#: build/trans_presets.java:1122
 msgid "Riverbank"
 msgstr "Flodbred"
@@ -16064,10 +16400,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1125
 msgid "Edit Riverbank"
 msgstr "Ret flodbred"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1127
+#: build/trans_presets.java:1129
 msgid "Wetland"
 msgstr "Vådområde"
@@ -16078,14 +16414,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1134
 msgid "Edit Wetland"
 msgstr "Ret vådområde"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "swamp"
 msgstr "Sump"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "bog"
 msgstr "mose"
@@ -16099,35 +16435,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1135 build/trans_style.java:3384
+#: build/trans_presets.java:1137 build/trans_style.java:3392
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "saltmarsh"
 msgstr "saltmarsk"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1139
 msgid "Mud"
 msgstr "Mudder"
 
 #. item
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1140
 msgid "Edit Mud"
 msgstr ""
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1144
 msgid "Beach"
 msgstr "Strand"
@@ -16135,20 +16471,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1144
+#: build/trans_presets.java:1146
 msgid "Edit Beach"
 msgstr "Ret strand"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1150
 msgid "Bay"
 msgstr "Bugt"
 
 #. item
-#: build/trans_presets.java:1149
+#: build/trans_presets.java:1151
 msgid "Edit Bay"
 msgstr "Ret bugt"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1155
 msgid "Cliff"
 msgstr "Klippe"
@@ -16156,10 +16492,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1157
 msgid "Edit Cliff"
 msgstr "Ret klippe"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1159
+#: build/trans_presets.java:1161
 msgid "Coastline"
 msgstr "Kystlinje"
@@ -16167,5 +16503,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1163
 msgid "Edit Coastline"
 msgstr "Ret kystlinje"
@@ -16173,5 +16509,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1168
 msgid "Ferry Route"
 msgstr "Færgerute"
@@ -16179,5 +16515,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1170
 msgid "Edit Ferry"
 msgstr "Ret færge"
@@ -16186,5 +16522,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1176
+#: build/trans_presets.java:1178
 msgid "Boatyard"
 msgstr ""
@@ -16192,10 +16528,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:1180
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1185
 msgid "Dock"
 msgstr "Dok"
@@ -16203,5 +16539,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1187
 msgid "Edit Dock"
 msgstr "Ret dok"
@@ -16209,5 +16545,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1193
 msgid "Dam"
 msgstr "Dæmning"
@@ -16215,15 +16551,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1195
 msgid "Edit Dam"
 msgstr "Ret dæmning"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1199
+#: build/trans_presets.java:1201
 msgid "Waterway Point"
 msgstr "Vandvejs-punkt"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1202
 msgid "Lock Gate"
 msgstr ""
@@ -16232,5 +16568,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1206
 msgid "Weir"
 msgstr ""
@@ -16238,20 +16574,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1208
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1213
 msgid "Waterfall"
 msgstr "Vandfald"
 
 #. item
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1214
 msgid "Edit Waterfall"
 msgstr "Ret vandfald"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1219
 msgid "Turning Point"
 msgstr ""
@@ -16260,15 +16596,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1221
+#: build/trans_presets.java:1223
 msgid "Marina"
 msgstr "Lystbådehavn"
 
 #. item
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1224
 msgid "Edit Marina"
 msgstr "Ret lystbådehavn"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1228
 msgid "Pier"
 msgstr "Mole"
@@ -16276,10 +16612,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1230
 msgid "Edit Pier"
 msgstr "Ret mole"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1234
 msgid "Ferry Terminal"
 msgstr "Færgehavn"
@@ -16287,10 +16623,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1236
 msgid "Edit Ferry Terminal"
 msgstr "Ret færgehavn"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1240
 msgid "Slipway"
 msgstr "Slæbested"
@@ -16300,16 +16636,21 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1244
 msgid "Edit Slipway"
 msgstr "Ret slæbested"
 
 #. item "Waterway Point/Slipway" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1250
+#, fuzzy
+msgid "Transport"
+msgstr "Offentlig transport"
+
+#. group "Transport"
+#: build/trans_presets.java:1251
 msgid "Railway"
 msgstr "Jernbane"
 
 #. group "Railway"
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1252
 msgid "Rail"
 msgstr "Spor"
@@ -16317,5 +16658,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:1254
 msgid "Edit Rail"
 msgstr "Ret spor"
@@ -16345,8 +16686,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "Optional Types"
 msgstr "Valgfri typer"
@@ -16360,35 +16701,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "spur"
 msgstr "sidespor"
 
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1259
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1257
+#: build/trans_presets.java:1260
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1265
 msgid "Monorail"
 msgstr "Monorail"
@@ -16396,45 +16737,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1267
 msgid "Edit Monorail"
 msgstr "Ret monorail"
 
-#: build/trans_presets.java:1269
+#: build/trans_presets.java:1272
 msgid "Preserved"
 msgstr "Bevaret"
 
 #. item
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1273
 msgid "Edit Preserved Railway"
 msgstr "Ret bevaret jernbane"
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1278
 msgid "Light Rail"
 msgstr "Letbane"
 
 #. item
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1279
 msgid "Edit Light Rail"
 msgstr "Ret letbane"
 
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1284
 msgid "Subway"
 msgstr "Metro"
 
 #. item
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1285
 msgid "Edit Subway"
 msgstr "Ret metro"
 
-#: build/trans_presets.java:1287
+#: build/trans_presets.java:1290
 msgid "Tram"
 msgstr "Sporvogn"
 
 #. item
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1291
 msgid "Edit Tram"
 msgstr "Ret sporvogn"
 
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1296
 msgid "Bus Guideway"
 msgstr "Styreskinne til bus"
@@ -16442,5 +16783,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1295
+#: build/trans_presets.java:1298
 msgid "Edit Bus Guideway"
 msgstr "Ret styreskinne til bus"
@@ -16449,14 +16790,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1315
 msgid "Disused Rail"
 msgstr "Ubrugt jernbanespor"
 
 #. item
-#: build/trans_presets.java:1313
+#: build/trans_presets.java:1316
 msgid "Edit Disused Railway"
 msgstr "Ret ubrugt jernbanespor"
 
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1321
 msgid "Abandoned Rail"
 msgstr "Fjernet jernbane"
@@ -16465,5 +16806,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1325
 msgid "Level Crossing"
 msgstr "Jernbaneoverskæring"
@@ -16472,5 +16813,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1329
 msgid "Crossing"
 msgstr "Fodgængerovergang"
@@ -16480,5 +16821,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1333
 msgid "Crossing type"
 msgstr ""
@@ -16486,5 +16827,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1339
 msgid "Turntable"
 msgstr "Drejeskive"
@@ -16493,10 +16834,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1344
 msgid "Aerialway"
 msgstr "Luftvej"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1345
 msgid "Chair Lift"
 msgstr "Skilift"
@@ -16504,10 +16845,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1347
 msgid "Edit Chair Lift"
 msgstr "Ret skilift"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1351
 msgid "Drag Lift"
 msgstr "Træklift"
@@ -16515,10 +16856,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1353
 msgid "Edit Drag Lift"
 msgstr "Ret træklift"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1357
 msgid "Cable Car"
 msgstr "Tovbane"
@@ -16526,10 +16867,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1359
 msgid "Edit Cable Car"
 msgstr "Ret tovbane"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1360
+#: build/trans_presets.java:1363
 msgid "Gondola"
 msgstr ""
@@ -16537,5 +16878,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1365
 msgid "Edit Gondola"
 msgstr ""
@@ -16543,5 +16884,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1366 build/trans_presets.java:1461
+#: build/trans_presets.java:1369 build/trans_presets.java:1464
 msgid "Station"
 msgstr "Station"
@@ -16552,10 +16893,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1368 build/trans_presets.java:1464
+#: build/trans_presets.java:1371 build/trans_presets.java:1467
 msgid "Edit Station"
 msgstr "Ret station"
 
 #. group "Car"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1378
 msgid "Fuel"
 msgstr "Benzin"
@@ -16565,5 +16906,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1382
 msgid "Edit Fuel"
 msgstr "Ret benzin"
@@ -16621,32 +16962,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1671 build/trans_presets.java:1678
-#: build/trans_presets.java:1686 build/trans_presets.java:1699
-#: build/trans_presets.java:1713 build/trans_presets.java:1810
-#: build/trans_presets.java:1818 build/trans_presets.java:1909
-#: build/trans_presets.java:1915 build/trans_presets.java:2226
-#: build/trans_presets.java:2250 build/trans_presets.java:2465
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1703
+#: build/trans_presets.java:1717 build/trans_presets.java:1814
+#: build/trans_presets.java:1822 build/trans_presets.java:1919
+#: build/trans_presets.java:1925 build/trans_presets.java:2237
+#: build/trans_presets.java:2261 build/trans_presets.java:2476
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Opening Hours"
 msgstr "Åbningstider"
@@ -16705,91 +17046,91 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -16804,5 +17145,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1385 build/trans_presets.java:1438
+#: build/trans_presets.java:1388 build/trans_presets.java:1441
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -16812,5 +17153,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1391
 msgid "Edit Parking"
 msgstr "Ret parkering"
@@ -16821,24 +17162,24 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1391 build/trans_presets.java:1762
-#: build/trans_presets.java:1772 build/trans_presets.java:2396
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:1394 build/trans_presets.java:1766
+#: build/trans_presets.java:1776 build/trans_presets.java:2407
+#: build/trans_presets.java:2524
 msgid "Reference number"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "multi-storey"
 msgstr "fleretages"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "surface"
 msgstr "overflade"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1396
 msgid "Park and Ride"
 msgstr ""
@@ -16847,38 +17188,38 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1394 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
+#: build/trans_presets.java:1397 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
 msgid "Fee"
 msgstr "Gebyr"
 
 #. <space />
-#: build/trans_presets.java:1396
+#: build/trans_presets.java:1399
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1400
 msgid "Spaces for Disabled"
 msgstr "Handicapplads"
 
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1401
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1402
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1403
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1405
 msgid "Wash"
 msgstr "Vask"
 
 #. item
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1406
 msgid "Edit Car Wash"
 msgstr "Ret bilvask"
@@ -16886,5 +17227,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1408 build/trans_presets.java:1452
+#: build/trans_presets.java:1411 build/trans_presets.java:1455
 msgid "Shop"
 msgstr ""
@@ -16892,15 +17233,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1413
 msgid "Edit Car Shop"
 msgstr ""
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1418
 msgid "Repair"
 msgstr "Bilmekaniker"
 
 #. item
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1419
 msgid "Edit Car Repair"
 msgstr "Ret bilmekaniker"
@@ -16908,5 +17249,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1421 build/trans_presets.java:1445
+#: build/trans_presets.java:1424 build/trans_presets.java:1448
 msgid "Rental"
 msgstr "Udlejning"
@@ -16915,10 +17256,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1427
 msgid "Edit Car Rental"
 msgstr "Ret biludlejning"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1432
 msgid "Sharing"
 msgstr "Deling"
@@ -16926,5 +17267,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1434
 msgid "Edit Car Sharing"
 msgstr ""
@@ -16932,10 +17273,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Parking"
 msgstr "Ret cykelparkering"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1446
 msgid "Capacity"
 msgstr "Kapacitet"
@@ -16944,5 +17285,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1448
+#: build/trans_presets.java:1451
 msgid "Edit Bicycle Rental"
 msgstr "Ret cykeludlejning"
@@ -16951,15 +17292,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1458
 msgid "Edit Bicycle Shop"
 msgstr "Ret cykelhandler"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1463
 msgid "Public Transport"
 msgstr "Offentlig transport"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:1472
 msgid "UIC-Reference"
 msgstr "UIC-reference"
@@ -16967,5 +17308,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1475
 msgid "Railway Halt"
 msgstr "Jernbane-stop"
@@ -16973,5 +17314,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1477
 msgid "Edit Halt"
 msgstr "Ret stop"
@@ -16979,5 +17320,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1484
 msgid "Tram Stop"
 msgstr "Sporvogns-stop"
@@ -16986,5 +17327,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1484
+#: build/trans_presets.java:1487
 msgid "Edit Tram Stop"
 msgstr "Ret sporvogns-stop"
@@ -16992,5 +17333,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1494
 msgid "Railway Platform"
 msgstr "Jernbaneplatform"
@@ -16999,5 +17340,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1497
 msgid "Edit Railway Platform"
 msgstr "Redigér jernbaneplatform"
@@ -17009,5 +17350,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1497 build/trans_presets.java:1539
+#: build/trans_presets.java:1500 build/trans_presets.java:1542
 msgid "Reference (track number)"
 msgstr "Spornummer"
@@ -17015,10 +17356,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1499 build/trans_presets.java:1541
+#: build/trans_presets.java:1502 build/trans_presets.java:1544
 msgid "Area"
 msgstr "Område"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1504
 msgid "Subway Entrance"
 msgstr "Indgang til undergrundsbane"
@@ -17027,10 +17368,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1507
 msgid "Edit Subway Entrance"
 msgstr "Ret indgang til undergrundsbane"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1512
 msgid "Wheelchair"
 msgstr "kørestol"
@@ -17039,5 +17380,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1517
 msgid "Bus Station"
 msgstr "Rutebilstation"
@@ -17046,5 +17387,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1520
 msgid "Edit Bus Station"
 msgstr "Ret rutebilstation"
@@ -17052,5 +17393,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1526
 msgid "Bus Stop"
 msgstr "Busstop"
@@ -17060,5 +17401,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1530
 msgid "Edit Bus Stop"
 msgstr "Ret busstop"
@@ -17067,6 +17408,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1532 build/trans_presets.java:1785
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:1535 build/trans_presets.java:1789
+#: build/trans_presets.java:2453
 msgid "Shelter"
 msgstr ""
@@ -17074,10 +17415,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1538
 msgid "Bus Platform"
 msgstr "Rutebil-platform"
 
 #. item
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1539
 msgid "Edit Bus Platform"
 msgstr "Ret rutebil-platform"
@@ -17085,5 +17426,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1547
 msgid "Taxi"
 msgstr "Taxi"
@@ -17091,5 +17432,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1549
 msgid "Edit Taxi station"
 msgstr "Ret taxiholdeplads"
@@ -17097,5 +17438,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1554
 msgid "Airport"
 msgstr "Lufthavn"
@@ -17103,15 +17444,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1556
 msgid "Edit Airport"
 msgstr "Ret lufthavn"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1561
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1559
+#: build/trans_presets.java:1562
 msgid "ICAO"
 msgstr "ICAO"
@@ -17119,6 +17460,11 @@
 #. item "Public Transport/Airport" text "ICAO"
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1567
+#, fuzzy
+msgid "Travel"
+msgstr "grus"
+
+#. group "Travel"
+#: build/trans_presets.java:1568
 msgid "Accomodation"
 msgstr "Overnatning"
@@ -17130,5 +17476,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1565 build/trans_surveyor.java:43
+#: build/trans_presets.java:1569 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -17137,15 +17483,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:1568
+#: build/trans_presets.java:1572
 msgid "Edit Hotel"
 msgstr "Ret hotel"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1575
 msgid "Stars"
 msgstr "Stjerner"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1577
 msgid "Motel"
 msgstr "Motel"
@@ -17153,20 +17499,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1579
 msgid "Edit Motel"
 msgstr "Ret motel"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1583
 msgid "Guest House"
 msgstr "Gæstehus"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1584
 msgid "Edit Guest House"
 msgstr "Ret gæstehus"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1588
 msgid "Chalet"
 msgstr "Feriehytte"
@@ -17174,10 +17520,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1590
 msgid "Edit Chalet"
 msgstr "Ret feriehytte"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1594
 msgid "Hostel"
 msgstr "Vandrerhjem"
@@ -17185,30 +17531,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1592
+#: build/trans_presets.java:1596
 msgid "Edit Hostel"
 msgstr "Ret vandrerhjem"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1600
 msgid "Alpine Hut"
 msgstr "Alpin hytte"
 
 #. item
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1601
 msgid "Edit Alpine Hut"
 msgstr "Redigér alpin hytte"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1606
 msgid "Caravan Site"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1607
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1611
 msgid "Camping Site"
 msgstr "Camping plads"
@@ -17216,10 +17562,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1613
 msgid "Edit Camping Site"
 msgstr "Redigér camping plads"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1618
 msgid "Food+Drinks"
 msgstr "Mad+drikke"
@@ -17230,5 +17576,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1615 build/trans_surveyor.java:47
+#: build/trans_presets.java:1619 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -17236,5 +17582,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1621
 msgid "Edit Restaurant"
 msgstr "Ret restaurant"
@@ -17242,5 +17588,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "Cuisine"
 msgstr "Køkken"
@@ -17248,61 +17594,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "italian"
 msgstr "italiensk"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "chinese"
 msgstr "kinesisk"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "burger"
 msgstr "burger"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "greek"
 msgstr "græsk"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "german"
 msgstr "tysk"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "indian"
 msgstr "indisk"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "turkish"
 msgstr "tyrkisk"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "asian"
 msgstr "asiatisk"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "mexican"
 msgstr "mexicansk"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "japanese"
 msgstr "japansk"
 
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1627
 msgid "Fast Food"
 msgstr "Fastfood"
@@ -17310,9 +17656,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1629
 msgid "Edit Fast Food Restaurant"
 msgstr "Ret fastfood-restaurant"
 
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1635
 msgid "Cafe"
 msgstr "Café"
@@ -17320,9 +17666,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1633
+#: build/trans_presets.java:1637
 msgid "Edit Cafe"
 msgstr "Ret café"
 
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1642
 msgid "Pub"
 msgstr "Pub"
@@ -17330,18 +17676,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1644
 msgid "Edit Pub"
 msgstr "Ret pub"
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1649
 msgid "Biergarten"
 msgstr "Ølhal"
 
 #. item
-#: build/trans_presets.java:1646
+#: build/trans_presets.java:1650
 msgid "Edit Biergarten"
 msgstr "Redigér Ølhal"
 
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1655
 msgid "Bar"
 msgstr "Bar"
@@ -17349,9 +17695,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1657
 msgid "Edit Bar"
 msgstr "Redigér bar"
 
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1662
 msgid "Nightclub"
 msgstr "Natklub"
@@ -17359,24 +17705,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1664
 msgid "Edit Nightclub"
 msgstr "Ret natklub"
 
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1670
 msgid "Tourism"
 msgstr "Turisme"
 
 #. group "Tourism"
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1671
 msgid "Attraction"
 msgstr "Forlystelse"
 
 #. item
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1672
 msgid "Edit Attraction"
 msgstr "Ret forlystelse"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1677
 msgid "Museum"
 msgstr "Museum"
@@ -17384,9 +17730,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1679
 msgid "Edit Museum"
 msgstr "Ret museum"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1684
 msgid "Zoo"
 msgstr "Zoo"
@@ -17395,9 +17741,9 @@
 #. <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:1683
+#: build/trans_presets.java:1687
 msgid "Edit Zoo"
 msgstr "Ret zoo"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1692
 msgid "Viewpoint"
 msgstr "Udsigtspunkt"
@@ -17405,24 +17751,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1694
 msgid "Edit Viewpoint"
 msgstr "Redigér udsigtspunkt"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1697
 msgid "Look-Out Tower"
 msgstr "Udkigstårn"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1699
 msgid "Theme Park"
 msgstr "Forlystelsespark"
 
 #. item
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1700
 msgid "Edit Theme Park"
 msgstr "Ret forlystelsespark"
 
-#: build/trans_presets.java:1701
+#: build/trans_presets.java:1705
 msgid "Artwork"
 msgstr "Kunstværk"
@@ -17430,5 +17776,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1707
 msgid "Edit Artwork"
 msgstr "Redigér kunstværk"
@@ -17436,19 +17782,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1712
 msgid "Information Office"
 msgstr "Informationskontor"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1719
 msgid "Map"
 msgstr "Kort"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "topo"
 msgstr ""
@@ -17486,5 +17832,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1720 build/trans_style.java:619
+#: build/trans_presets.java:1724 build/trans_style.java:619
 #: build/trans_style.java:635 build/trans_style.java:651
 #: build/trans_style.java:659
@@ -17492,28 +17838,28 @@
 msgstr "gade"
 
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1722 build/trans_presets.java:1738
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1726 build/trans_presets.java:1742
+#: build/trans_presets.java:1786
 msgid "Closer Description"
 msgstr "Nærmere beskrivelse"
@@ -17523,5 +17869,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1724 build/trans_presets.java:1747
+#: build/trans_presets.java:1728 build/trans_presets.java:1751
 msgid "Routes shown for:"
 msgstr ""
@@ -17529,6 +17875,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1726 build/trans_presets.java:1749
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1965
 msgid "Cycling"
 msgstr "Cykling"
@@ -17536,5 +17882,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1727 build/trans_presets.java:1750
+#: build/trans_presets.java:1731 build/trans_presets.java:1754
 msgid "Mountainbiking"
 msgstr ""
@@ -17542,6 +17888,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1728 build/trans_presets.java:1751
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:1732 build/trans_presets.java:1755
+#: build/trans_presets.java:2019
 msgid "Skiing"
 msgstr "Skisport"
@@ -17549,5 +17895,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1729 build/trans_presets.java:1752
+#: build/trans_presets.java:1733 build/trans_presets.java:1756
 msgid "Riding"
 msgstr ""
@@ -17555,46 +17901,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1734 build/trans_presets.java:1757
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1736
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "history"
 msgstr "historie"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "nature"
 msgstr "natur"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "wildlife"
 msgstr "dyreliv"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1744
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1759
 msgid "Information Terminal"
 msgstr ""
@@ -17602,29 +17948,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1760 build/trans_presets.java:1770
+#: build/trans_presets.java:1764 build/trans_presets.java:1774
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1769
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1779
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1780
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1778
+#: build/trans_presets.java:1782
 msgid "Other Information Points"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1790
 msgid "Edit Shelter"
 msgstr ""
@@ -17632,25 +17978,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1789 build/trans_presets.java:1795
+#: build/trans_presets.java:1793 build/trans_presets.java:1799
 msgid "Fireplace"
 msgstr "Bålplads"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1791
+#: build/trans_presets.java:1795
 msgid "Picnic Site"
 msgstr "Picnic sted"
 
 #. item
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1796
 msgid "Edit Picnic Site"
 msgstr "Redigér picnic sted"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1802
 msgid "Historic Places"
 msgstr "Historiske steder"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1799
+#: build/trans_presets.java:1803
 msgid "Castle"
 msgstr "Borg"
@@ -17659,19 +18005,19 @@
 #. <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:1802
+#: build/trans_presets.java:1806
 msgid "Edit Castle"
 msgstr "Ret borg"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1810
 msgid "Ruins"
 msgstr "Ruiner"
 
 #. item
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1811
 msgid "Edit Ruins"
 msgstr "Ret ruiner"
 
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1816
 msgid "Archaeological Site"
 msgstr "Arkæologisk sted"
@@ -17680,9 +18026,9 @@
 #. <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:1815
+#: build/trans_presets.java:1819
 msgid "Edit Archaeological Site"
 msgstr "Ret arkæologisk sted"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1824
 msgid "Battlefield"
 msgstr "Slagmark"
@@ -17690,5 +18036,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1826
 msgid "Edit Battlefield"
 msgstr "Ret slagmark"
@@ -17696,15 +18042,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1831
 msgid "Monument"
 msgstr "Monument"
 
 #. item
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1832
 msgid "Edit Monument"
 msgstr "Ret monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1836
 msgid "Memorial"
 msgstr "Mindesmærke"
@@ -17712,45 +18058,57 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1838
 msgid "Edit Memorial"
 msgstr "Ret mindesmærke"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1842
 msgid "Wayside Cross"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1843
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1847
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1848
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1852
+#, fuzzy
+msgid "Boundary Stone"
+msgstr "Grænser"
+
+#. item
+#: build/trans_presets.java:1853
+#, fuzzy
+msgid "Edit Boundary Stone"
+msgstr "Ret busstop"
+
+#. item "Historic Places/Boundary Stone" text "Name"
+#: build/trans_presets.java:1858
 msgid "Leisure"
 msgstr "Rekreation"
 
 #. group "Leisure"
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1859
 msgid "Water Park"
 msgstr "Badeland"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1860
 msgid "Edit Water Park"
 msgstr "Ret badeland"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1864
 msgid "Playground"
 msgstr "Legeplads"
@@ -17758,31 +18116,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1866
 msgid "Edit Playground"
 msgstr "Ret legeplads"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1870
 msgid "Fishing"
 msgstr "Fiskeri"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1871
 msgid "Edit Fishing"
 msgstr "Ret fiskeri"
 
 #. item "Leisure/Fishing" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1877 build/trans_presets.java:2669
+msgid "Sports"
+msgstr "Sport"
+
+#. group "Sports"
+#: build/trans_presets.java:1878
 msgid "Sport Facilities"
 msgstr "Sportsfaciliteter"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1879
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1880
 msgid "Edit Stadium"
 msgstr "Ret stadion"
@@ -17796,6 +18158,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1874 build/trans_presets.java:1883
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1902 build/trans_presets.java:1911
 msgid "select sport:"
 msgstr "vælg sportsgren:"
@@ -18187,30 +18549,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884 build/trans_style.java:3892
-#: build/trans_style.java:3900 build/trans_style.java:3908
-#: build/trans_style.java:3916 build/trans_style.java:3924
-#: build/trans_style.java:3932
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_style.java:3572 build/trans_style.java:3580
+#: build/trans_style.java:3588 build/trans_style.java:3596
+#: build/trans_style.java:3604 build/trans_style.java:3612
+#: build/trans_style.java:3620 build/trans_style.java:3628
+#: build/trans_style.java:3636 build/trans_style.java:3644
+#: build/trans_style.java:3652 build/trans_style.java:3660
+#: build/trans_style.java:3668 build/trans_style.java:3676
+#: build/trans_style.java:3684 build/trans_style.java:3692
+#: build/trans_style.java:3700 build/trans_style.java:3708
+#: build/trans_style.java:3716 build/trans_style.java:3724
+#: build/trans_style.java:3732 build/trans_style.java:3740
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3764 build/trans_style.java:3772
+#: build/trans_style.java:3780 build/trans_style.java:3788
+#: build/trans_style.java:3796 build/trans_style.java:3804
+#: build/trans_style.java:3812 build/trans_style.java:3820
+#: build/trans_style.java:3828 build/trans_style.java:3836
+#: build/trans_style.java:3844 build/trans_style.java:3852
+#: build/trans_style.java:3860 build/trans_style.java:3868
+#: build/trans_style.java:3876 build/trans_style.java:3884
+#: build/trans_style.java:3892 build/trans_style.java:3900
+#: build/trans_style.java:3908 build/trans_style.java:3916
+#: build/trans_style.java:3924 build/trans_style.java:3932
+#: build/trans_style.java:3940
 msgid "sport"
 msgstr "sport"
@@ -18220,225 +18582,225 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "archery"
 msgstr "bueskydning"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "athletics"
 msgstr "atletik"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "australian_football"
 msgstr "australsk fodbold"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "boules"
 msgstr "petanque"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "canoe"
 msgstr "kano"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "climbing"
 msgstr "klatring"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "croquet"
 msgstr "kroket"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "dog_racing"
 msgstr "hundeløb"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "equestrian"
 msgstr "ridning"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "football"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "gymnastics"
 msgstr "gymnastik"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "horse_racing"
 msgstr "travbane"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "shooting"
 msgstr "skydebane"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skating"
 msgstr "skating"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skiing"
 msgstr "skisport"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "soccer"
 msgstr "fodbold"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "swimming"
 msgstr "svømning"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "table_tennis"
 msgstr "bordtennis"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1888
 msgid "Sports Centre"
 msgstr "Idrætscenter"
 
 #. item
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1889
 msgid "Edit Sports Centre"
 msgstr "Ret idrætscenter"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1897
 msgid "Pitch"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1898
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1906
 msgid "Racetrack"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1907
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1915
 msgid "Golf Course"
 msgstr "Golfbane"
 
 #. item
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1916
 msgid "Edit Golf Course"
 msgstr "Ret golfbane"
 
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1921
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1922
 msgid "Edit Miniature Golf"
 msgstr "Ret minigolf"
 
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1928
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1929
 msgid "Multi"
 msgstr "Multi"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1930
 msgid "Edit Multi"
 msgstr "Ret multi"
@@ -18477,183 +18839,183 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "pitch"
 msgstr "bane"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1935
 msgid "10pin"
 msgstr "Bowling"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1936
 msgid "Edit 10pin"
 msgstr "Ret bowling"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1941
 msgid "Athletics"
 msgstr "Atletik"
 
 #. item
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1942
 msgid "Edit Athletics"
 msgstr "Ret atletik"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1947
 msgid "Archery"
 msgstr "Bueskydning"
 
 #. item
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1948
 msgid "Edit Archery"
 msgstr "Ret bueskydning"
 
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1953
 msgid "Climbing"
 msgstr "Klatring"
 
 #. item
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:1954
 msgid "Edit Climbing"
 msgstr "Ret klatring"
 
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1959
 msgid "Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1960
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1966
 msgid "Edit Cycling"
 msgstr "Redigér cykling"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1971
 msgid "Dog Racing"
 msgstr "Hundeløb"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1972
 msgid "Edit Dog Racing"
 msgstr "Ret hundeløb"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1977
 msgid "Equestrian"
 msgstr "Ridning"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1978
 msgid "Edit Equestrian"
 msgstr "Ret ridning"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1983
 msgid "Horse Racing"
 msgstr "Galopbane"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1984
 msgid "Edit Horse Racing"
 msgstr "Ret galopbane"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1989
 msgid "Gymnastics"
 msgstr "Gymnastik"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1990
 msgid "Edit Gymnastics"
 msgstr "Ret gymnastik"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1995
 msgid "Motor Sports"
 msgstr "Motorsport"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1996
 msgid "Edit Motor Sports"
 msgstr "Ret motorsport"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2001
 msgid "Skating"
 msgstr "Skating"
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2002
 msgid "Edit Skating"
 msgstr "Ret skating"
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2007
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2008
 msgid "Edit Skateboard"
 msgstr "Ret Skateboard"
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2013
 msgid "Swimming"
 msgstr "Svømning"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2014
 msgid "Edit Swimming"
 msgstr "Ret svømning"
@@ -18661,56 +19023,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2021
 msgid "Edit Skiing"
 msgstr "Ret skisport"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "Difficulty"
 msgstr "Sværhedsgrad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "novice"
 msgstr "nybegynder"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "easy"
 msgstr "let"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "advanced"
 msgstr "avanceret"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "expert"
 msgstr "ekspert"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2028
 msgid "Shooting"
 msgstr "Skydning"
@@ -18718,178 +19080,183 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2030
 msgid "Edit Shooting"
 msgstr "Ret skydning"
 
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2036
 msgid "Sport (Ball)"
 msgstr "Sport (bold)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2037
 msgid "Soccer"
 msgstr "Fodbold"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2038
 msgid "Edit Soccer"
 msgstr "Ret fodbold"
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2043
 msgid "Football"
 msgstr "Amerikansk fodbold"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2044
 msgid "Edit Football"
 msgstr "Ret amerikansk fodbold"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2049
 msgid "Australian Football"
 msgstr "Australsk fodbold"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2050
 msgid "Edit Australian Football"
 msgstr "Ret australsk fodbold"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2055
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2056
 msgid "Edit Baseball"
 msgstr "Ret Baseball"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2061
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2062
 msgid "Edit Basketball"
 msgstr "Ret Basketball"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2067
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2068
 msgid "Edit Golf"
 msgstr "Ret Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2071
 msgid "golf_course"
 msgstr "Golfbane"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2073
 msgid "Boule"
 msgstr "Petanque"
 
 #. item
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2074
 msgid "Edit Boule"
 msgstr "Ret petanque"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2079
 msgid "Bowls"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2080
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2085
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2086
 msgid "Edit Cricket"
 msgstr "Ret cricket"
 
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2091
 msgid "Cricket Nets"
 msgstr "Cricketnet"
 
 #. item
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2092
 msgid "Edit Cricket Nets"
 msgstr "Ret cricketnet"
 
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2097
 msgid "Croquet"
 msgstr "Kroket"
 
 #. item
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2098
 msgid "Edit Croquet"
 msgstr "Ret kroket"
 
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2103
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2104
 msgid "Edit Hockey"
 msgstr "Ret hockey"
 
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2109
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2110
 msgid "Edit Pelota"
 msgstr "Ret pelota"
 
-#: build/trans_presets.java:2105
+#: build/trans_presets.java:2115
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2116
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2121
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2122
 msgid "Edit Rugby"
 msgstr "Ret rugby"
 
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2127
 msgid "Table Tennis"
 msgstr "Bordtennis"
 
 #. item
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2128
 msgid "Edit Table Tennis"
 msgstr "Ret bordtennis"
 
-#: build/trans_presets.java:2123
+#: build/trans_presets.java:2133
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2134
 msgid "Edit Tennis"
 msgstr "Ret tennis"
 
-#. <separator/>
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2141
+#, fuzzy
+msgid "Man-Made"
+msgstr "Menneskeskabt"
+
+#. group "Man-Made"
+#: build/trans_presets.java:2142
 msgid "Buildings"
 msgstr "Bygninger"
 
 #. group "Buildings"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2143
 msgid "Building"
 msgstr "Bygning"
@@ -18897,5 +19264,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Public Building"
 msgstr "Offentlig bygning"
@@ -18903,10 +19270,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2148
 msgid "Edit Public Building"
 msgstr "Ret offentlig bygning"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2152
 msgid "Town hall"
 msgstr "Rådhus"
@@ -18914,10 +19281,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2154
 msgid "Edit Town hall"
 msgstr "Ret rådhus"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:2158
 msgid "Embassy"
 msgstr "Ambassade"
@@ -18925,10 +19292,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Edit Embassy"
 msgstr "Ret ambassade"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2164
 msgid "Courthouse"
 msgstr "Domhus"
@@ -18937,10 +19304,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:2156
+#: build/trans_presets.java:2167
 msgid "Edit Courthouse"
 msgstr "Ret domhus"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2171
 msgid "Prison"
 msgstr "Fængsel"
@@ -18949,10 +19316,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:2163
+#: build/trans_presets.java:2174
 msgid "Edit Prison"
 msgstr "Ret fængsel"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2178
 msgid "Police"
 msgstr "Politi"
@@ -18962,10 +19329,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:2171
+#: build/trans_presets.java:2182
 msgid "Edit Police"
 msgstr "Ret politi"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2186
 msgid "Fire Station"
 msgstr "Brandstation"
@@ -18974,10 +19341,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:2178
+#: build/trans_presets.java:2189
 msgid "Edit Fire Station"
 msgstr "Ret brandstation"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "Post Office"
 msgstr "Posthus"
@@ -18985,5 +19352,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Edit Post Office"
 msgstr "Ret posthus"
@@ -18991,15 +19358,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2200
 msgid "Kindergarten"
 msgstr "Børnehave"
 
 #. item
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Kindergarten"
 msgstr "Ret børnehave"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2205
 msgid "School"
 msgstr "Skole"
@@ -19007,10 +19374,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Edit School"
 msgstr "Ret skole"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2211
 msgid "University"
 msgstr "Universitet"
@@ -19018,10 +19385,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit University"
 msgstr "Ret universitet"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "College"
 msgstr ""
@@ -19029,5 +19396,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2219
 msgid "Edit College"
 msgstr ""
@@ -19035,5 +19402,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2224
 msgid "Cinema"
 msgstr "Biograf"
@@ -19042,10 +19409,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:2216
+#: build/trans_presets.java:2227
 msgid "Edit Cinema"
 msgstr "Ret biograf"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2231
 msgid "Library"
 msgstr "Bibliotek"
@@ -19054,9 +19421,9 @@
 #. <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:2223
+#: build/trans_presets.java:2234
 msgid "Edit Library"
 msgstr "Ret bibliotek"
 
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Arts Centre"
 msgstr "Kunstcenter"
@@ -19064,10 +19431,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Arts Centre"
 msgstr "Redigér kunstcenter"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Theatre"
 msgstr "Teater"
@@ -19076,10 +19443,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:2237
+#: build/trans_presets.java:2248
 msgid "Edit Theatre"
 msgstr "Ret teater"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2252
 msgid "Place of Worship"
 msgstr "Sted for tilbedelse"
@@ -19089,5 +19456,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:2245
+#: build/trans_presets.java:2256
 msgid "Edit Place of Worship"
 msgstr "Ret sted for tilbedelse"
@@ -19096,6 +19463,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "Religion"
 msgstr "Religion"
@@ -19104,66 +19471,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "buddhist"
 msgstr "buddhistisk"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "christian"
 msgstr "kristen"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "hindu"
 msgstr "hinduistisk"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jain"
 msgstr "jainistisk"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jewish"
 msgstr "jødisk"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "muslim"
 msgstr "muslimsk"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "spiritualist"
 msgstr "spiritistisk"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "taoist"
 msgstr "taoistisk"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "unitarian"
 msgstr "unitar"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "zoroastrian"
 msgstr "zoroastristisk"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "Denomination"
 msgstr "Trosretning"
@@ -19172,81 +19539,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "anglican"
 msgstr "anglikansk"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "baptist"
 msgstr "baptistisk"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "catholic"
 msgstr "katolsk"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "evangelical"
 msgstr "evangelisk"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "jehovahs_witness"
 msgstr "Jehovas Vidner"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "lutheran"
 msgstr "luthersk"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "methodist"
 msgstr "metodistisk"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "mormon"
 msgstr "mormonsk"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "orthodox"
 msgstr "ortodoks"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "pentecostal"
 msgstr "pinsebevægelsen"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "presbyterian"
 msgstr "prebyteriansk"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "protestant"
 msgstr "protestantisk"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "quaker"
 msgstr "kvæker"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "shia"
 msgstr "shiitisk"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "sunni"
 msgstr "sunnitisk"
 
 #. <separator/>
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2264
 msgid "Addresses"
 msgstr "Adresser"
@@ -19255,5 +19622,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:2256
+#: build/trans_presets.java:2267
 msgid "Edit Address Information"
 msgstr "Ret adresseinformation"
@@ -19261,5 +19628,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2269
 msgid "House number"
 msgstr "Husnummer"
@@ -19267,20 +19634,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "House name"
 msgstr "Husnavn"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "City name"
 msgstr "Bynavn"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2274
 msgid "Post code"
 msgstr "Postnummer"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2275
 msgid "Country code"
 msgstr "Landekode"
@@ -19288,5 +19655,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Address Interpolation"
 msgstr "Adresse-interpolering"
@@ -19295,5 +19662,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:2270
+#: build/trans_presets.java:2281
 msgid "Edit Address Interpolation"
 msgstr "Ret adresse-interpolering"
@@ -19301,67 +19668,67 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "Numbering scheme"
 msgstr "Nummereringssystem"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "odd"
 msgstr "ulige"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "even"
 msgstr "lige"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "alphabetic"
 msgstr "alfabetisk"
 
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2286
 msgid "Man Made"
 msgstr "Menneskeskabt"
 
 #. group "Man Made"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Works"
 msgstr "Fabrik"
 
 #. item
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2288
 msgid "Edit Works"
 msgstr "Ret fabrik"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2292
 msgid "Tower"
 msgstr "Tårn"
 
 #. item
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2293
 msgid "Edit Tower"
 msgstr "Ret tårn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Water Tower"
 msgstr "Vandtårn"
 
 #. item
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2298
 msgid "Edit Water Tower"
 msgstr "Ret vandtårn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Gasometer"
 msgstr "Gasbeholder"
 
 #. item
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2303
 msgid "Edit Gasometer"
 msgstr "Ret gasbeholder"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Lighthouse"
 msgstr "Fyrtårn"
@@ -19369,10 +19736,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2309
 msgid "Edit Lighthouse"
 msgstr "Ret fyrtårn"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Windmill"
 msgstr "Vejrmølle"
@@ -19380,10 +19747,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2315
 msgid "Edit Windmill"
 msgstr "Ret vejrmølle"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2319
 msgid "Pipeline"
 msgstr "Rørledning"
@@ -19391,10 +19758,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Edit Pipeline"
 msgstr "Ret rørledning"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2325
 msgid "Wastewater Plant"
 msgstr "Rensningsanlæg"
@@ -19404,10 +19771,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:2318
+#: build/trans_presets.java:2329
 msgid "Edit Wastewater Plant"
 msgstr "Ret rensningsanlæg"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2333
 msgid "Crane"
 msgstr "Kran"
@@ -19415,10 +19782,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2335
 msgid "Edit Crane"
 msgstr "Ret kran"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Beacon"
 msgstr "Pejlemærke"
@@ -19426,10 +19793,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2341
 msgid "Edit Beacon"
 msgstr "Ret Pejlemærke"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2345
 msgid "Survey Point"
 msgstr ""
@@ -19437,10 +19804,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2351
 msgid "Surveillance"
 msgstr "Overvågning"
@@ -19448,5 +19815,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2353
 msgid "Edit Surveillance Camera"
 msgstr "Ret overvågningskamera"
@@ -19454,5 +19821,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Power Generator"
 msgstr "Generator"
@@ -19462,39 +19829,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:2351
+#: build/trans_presets.java:2362
 msgid "Edit Power Generator"
 msgstr "Ret generator"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "wind"
 msgstr "vind"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "hydro"
 msgstr "vand"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "nuclear"
 msgstr "arom"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "coal"
 msgstr "kul"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "photovoltaic"
 msgstr "sol"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "gas"
 msgstr "gas"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2367
 msgid "Power Station"
 msgstr "Kraftværk"
@@ -19503,10 +19870,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:2359
+#: build/trans_presets.java:2370
 msgid "Edit Power Station"
 msgstr "Ret kraftværk"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2374
 msgid "Power Sub Station"
 msgstr "Transformatorstation"
@@ -19515,5 +19882,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:2366
+#: build/trans_presets.java:2377
 msgid "Edit Power Sub Station"
 msgstr "Ret transformatorstation"
@@ -19521,10 +19888,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2369 build/trans_presets.java:2385
+#: build/trans_presets.java:2380 build/trans_presets.java:2396
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2382
 msgid "Power Tower"
 msgstr "Elmast"
@@ -19535,5 +19902,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:2376
+#: build/trans_presets.java:2387
 msgid "Edit Power Tower"
 msgstr "Ret elmast"
@@ -19541,5 +19908,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2390
 msgid "Power Line"
 msgstr "Strømkabel"
@@ -19548,40 +19915,40 @@
 #. <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:2382
+#: build/trans_presets.java:2393
 msgid "Edit Power Line"
 msgstr "Ret strømkabel"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Voltage"
 msgstr "Spænding"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2398
 msgid "Amount of Wires"
 msgstr "Antal kabler"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Amenities"
 msgstr "Faciliteter"
 
 #. group "Amenities"
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2402
 msgid "Toilets"
 msgstr "Toiletter"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2398 build/trans_presets.java:2514
+#: build/trans_presets.java:2409 build/trans_presets.java:2525
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2411
 msgid "Post Box"
 msgstr "Postkasse"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2416
 msgid "Telephone"
 msgstr "Telefon"
@@ -19590,5 +19957,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:2408
+#: build/trans_presets.java:2419
 msgid "Edit Telephone"
 msgstr "Ret telefon"
@@ -19596,5 +19963,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2411 build/trans_presets.java:2515
+#: build/trans_presets.java:2422 build/trans_presets.java:2526
 msgid "Coins"
 msgstr "Mønter"
@@ -19602,5 +19969,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2412 build/trans_presets.java:2516
+#: build/trans_presets.java:2423 build/trans_presets.java:2527
 msgid "Notes"
 msgstr "Sedler"
@@ -19608,5 +19975,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2413 build/trans_presets.java:2517
+#: build/trans_presets.java:2424 build/trans_presets.java:2528
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -19614,5 +19981,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2414 build/trans_presets.java:2518
+#: build/trans_presets.java:2425 build/trans_presets.java:2529
 msgid "Debit cards"
 msgstr ""
@@ -19620,15 +19987,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2415 build/trans_presets.java:2519
+#: build/trans_presets.java:2426 build/trans_presets.java:2530
 msgid "Credit cards"
 msgstr "Kreditkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2427
 msgid "Telephone cards"
 msgstr "Telefonkort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2429
 msgid "Recycling"
 msgstr "Genbrug"
@@ -19637,5 +20004,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:2421
+#: build/trans_presets.java:2432
 msgid "Edit Recycling station"
 msgstr "Ret genbrugsplads"
@@ -19643,35 +20010,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Batteries"
 msgstr "Batterier"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2435
 msgid "Cans"
 msgstr "Dåser"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Clothes"
 msgstr "Tøj"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2437
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2438
 msgid "Paper"
 msgstr "Papir"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2439
 msgid "Scrap Metal"
 msgstr "Skrotjern"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2441
 msgid "Bench"
 msgstr "Bænk"
@@ -19680,40 +20047,33 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2433
-#, fuzzy
+#: build/trans_presets.java:2444
 msgid "Backrest"
-msgstr "Tilbage"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "Material"
-msgstr "Mindesmærke"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2434
-#, fuzzy
+#: build/trans_presets.java:2445
 msgid "stone"
-msgstr "intet"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "plastic"
-msgstr "sted"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "Colour"
-msgstr "Farve"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "black"
-msgstr "Tilbage"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "brown"
-msgstr "ned"
+msgstr ""
 
 #. color historic
@@ -19782,39 +20142,35 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2435 build/trans_style.java:3055
-#: build/trans_style.java:3063 build/trans_style.java:3071
-#: build/trans_style.java:3079 build/trans_style.java:3127
-#: build/trans_style.java:3135 build/trans_style.java:3233
-#: build/trans_style.java:3241
+#: build/trans_presets.java:2446 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3135
+#: build/trans_style.java:3143 build/trans_style.java:3241
+#: build/trans_style.java:3249
 msgid "green"
 msgstr ""
 
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "red"
-msgstr "slut"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "blue"
-msgstr "Værdi"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "white"
-msgstr "vand"
-
-#: build/trans_presets.java:2436
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2447
 msgid "Amount of Seats"
-msgstr "Antal kabler"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2449
 msgid "Hunting Stand"
 msgstr "Skydetelt"
 
 #. item
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2450
 msgid "Edit Hunting Stand"
 msgstr "Ret skydetelt"
@@ -19823,30 +20179,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2441 build/trans_presets.java:2902
+#: build/trans_presets.java:2452 build/trans_presets.java:2914
 msgid "Height"
 msgstr "Højde"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "low"
 msgstr "lav"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "half"
 msgstr "halv"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "full"
 msgstr "fuld"
 
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2454
 msgid "Hide"
 msgstr "Skjul"
 
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2455
 msgid "Lock"
 msgstr "Lås"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Fountain"
 msgstr "Springvand"
@@ -19855,10 +20211,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:2449
+#: build/trans_presets.java:2460
 msgid "Edit Fountain"
 msgstr "Ret springvand"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2464
 msgid "Drinking Water"
 msgstr "Vandpost"
@@ -19867,10 +20223,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:2456
+#: build/trans_presets.java:2467
 msgid "Edit Drinking Water"
 msgstr "Ret vandpost"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2471
 msgid "Baby Hatch"
 msgstr "Babyluge"
@@ -19878,33 +20234,33 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Baby Hatch"
 msgstr "Ret babyluge"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2479
 msgid "Shops"
 msgstr "Butikker"
 
 #. group "Shops"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2480
 msgid "Supermarket"
 msgstr "Supermarked"
 
 #. item
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2481
 msgid "Edit Supermarket"
 msgstr "Ret supermarked"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2486
 msgid "Chemist"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2487
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2492
 msgid "Convenience Store"
 msgstr "Købmand"
@@ -19912,9 +20268,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Edit Convenience Store"
 msgstr "Ret købmand"
 
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2499
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -19922,27 +20278,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Kiosk"
 msgstr "Ret kiosk"
 
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Book Store"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2507
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2512
 msgid "Travel Agency"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2513
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2518
 msgid "Vending machine"
 msgstr "Automat"
@@ -19950,5 +20306,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Edit Vending machine"
 msgstr "Ret automat"
@@ -19956,88 +20312,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "Vending products"
 msgstr "Varer i automat"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "parking_tickets"
 msgstr "P-automat"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "food"
 msgstr "mad"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "drinks"
 msgstr "drikke"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "cigarettes"
 msgstr "cigaretter"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "photos"
 msgstr "billeder"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "animal_food"
 msgstr "dyremad"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "news_papers"
 msgstr "aviser"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "toys"
 msgstr "legetøj"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "stamps"
 msgstr "frimærker"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "SIM-cards"
 msgstr "SIM-kort"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "condoms"
 msgstr "kondomer"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "tampons"
 msgstr "tamponer"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "excrement_bags"
 msgstr "høm-høm-pose"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Butcher"
 msgstr "Slagter"
@@ -20045,9 +20401,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2535
 msgid "Edit Butcher"
 msgstr "Ret slagter"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2540
 msgid "Baker"
 msgstr "Bager"
@@ -20055,9 +20411,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2542
 msgid "Edit Baker"
 msgstr "Ret bager"
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2547
 msgid "Florist"
 msgstr "Blomsterhandler"
@@ -20065,18 +20421,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Florist"
 msgstr "Ret blomsterhandler"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2554
 msgid "Organic"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Edit Organic Shop"
 msgstr ""
 
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2560
 msgid "Alcohol"
 msgstr "Sprit"
@@ -20084,54 +20440,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2562
 msgid "Edit Alcohol Shop"
 msgstr "Redigér spritbutik"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2567
 msgid "Beverages"
 msgstr "Drikkevarer"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2568
 msgid "Edit Beverages Shop"
 msgstr "Redigér drikkevarebutik"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2573
 msgid "Computer"
 msgstr "Computer"
 
 #. item
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2574
 msgid "Edit Computer Shop"
 msgstr "Ret computerforretning"
 
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Electronics"
 msgstr "Elektronik"
 
 #. item
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2580
 msgid "Edit Electronics Shop"
 msgstr "Ret elektronikforretning"
 
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2585
 msgid "Hifi"
 msgstr "Hi-fi"
 
 #. item
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2586
 msgid "Edit Hifi Shop"
 msgstr "Ret hi-fi-forhandler"
 
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2591
 msgid "Furniture"
 msgstr "Møbelforretning"
 
 #. item
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Edit Furniture Shop"
 msgstr "Ret møbelforretning"
 
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Garden Centre"
 msgstr "Havecenter"
@@ -20139,9 +20495,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2599
 msgid "Edit Garden Centre"
 msgstr "Redigér havecenter"
 
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Hardware"
 msgstr ""
@@ -20149,9 +20505,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2606
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "Do-it-yourself-store"
 msgstr "Gør-det-selv-butik"
@@ -20159,54 +20515,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2613
 msgid "Edit Do-it-yourself-store"
 msgstr "Ret gør-det-selv-butik"
 
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2618
 msgid "Stationery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2619
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Hairdresser"
 msgstr "Frisør"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Hairdresser"
 msgstr "Ret frisør"
 
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Shoes"
 msgstr "Sko"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Shoe Shop"
 msgstr "Ret skobutik"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2636
 msgid "Toys"
 msgstr "Legetøjsbutik"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit Toy Shop"
 msgstr "Redigér legetøjsbutik"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Video"
 msgstr "Video"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Video Shop"
 msgstr "Redigér videobutik"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "Dry Cleaning"
 msgstr "Kemisk renseri"
@@ -20214,9 +20570,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2650
 msgid "Edit Dry Cleaning"
 msgstr "Ret kemisk renseri"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "Laundry"
 msgstr "Vaskeri"
@@ -20224,9 +20580,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2657
 msgid "Edit Laundry"
 msgstr "Ret vaskeri"
 
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2662
 msgid "Outdoor"
 msgstr ""
@@ -20234,32 +20590,28 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2664
 msgid "Edit Outdoor Shop"
 msgstr ""
 
-#: build/trans_presets.java:2658
-msgid "Sports"
-msgstr "Sport"
-
-#. item
-#: build/trans_presets.java:2659
+#. item
+#: build/trans_presets.java:2670
 msgid "Edit Sports Shop"
 msgstr "Ret sportsbutik"
 
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Optician"
 msgstr "Optiker"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Optician"
 msgstr "Ret optiker"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2683
 msgid "Cash"
 msgstr "Penge"
 
 #. group "Cash"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2684
 msgid "Bank"
 msgstr "Bank"
@@ -20267,14 +20619,14 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2686
 msgid "Edit Bank"
 msgstr "Ret bank"
 
-#: build/trans_presets.java:2680 build/trans_presets.java:2689
+#: build/trans_presets.java:2691 build/trans_presets.java:2700
 msgid "Automated Teller Machine"
 msgstr "Pengeautomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2693
 msgid "Money Exchange"
 msgstr "Vekselkontor"
@@ -20282,5 +20634,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Edit Money Exchange"
 msgstr "Ret vekselkontor"
@@ -20288,15 +20640,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2691
+#: build/trans_presets.java:2702
 msgid "Edit Automated Teller Machine"
 msgstr "Ret pengeautomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2707
 msgid "Health"
 msgstr "Sundhed"
 
 #. group "Health"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2708
 msgid "Doctors"
 msgstr "Lægehus"
@@ -20304,18 +20656,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2710
 msgid "Edit Doctors"
 msgstr "Ret lægehus"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2715
 msgid "Dentist"
 msgstr "Tandlæge"
 
 #. item
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Edit Dentist"
 msgstr "Ret tandlæge"
 
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2721
 msgid "Pharmacy"
 msgstr "Apotek"
@@ -20323,5 +20675,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Edit Pharmacy"
 msgstr "Ret apotek"
@@ -20329,9 +20681,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Dispensing"
 msgstr "Håndkøb"
 
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2729
 msgid "Hospital"
 msgstr "Hospital"
@@ -20339,10 +20691,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Edit Hospital"
 msgstr "Ret Hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2735
 msgid "Emergency Access Point"
 msgstr ""
@@ -20351,5 +20703,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:2727
+#: build/trans_presets.java:2738
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -20358,20 +20710,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2741
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2742
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(brug forvalgskode, fx +12-345-67890)"
@@ -20379,5 +20731,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2748
 msgid "Veterinary"
 msgstr "Dyrlæge"
@@ -20386,55 +20738,59 @@
 #. <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:2740
+#: build/trans_presets.java:2751
 msgid "Edit Veterinary"
 msgstr "Ret dyrlæge"
 
+#: build/trans_presets.java:2758
+msgid "Geography"
+msgstr ""
+
 #. group "Places"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2760
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2761
 msgid "Edit Continent"
 msgstr "Ret et kontinent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2766
 msgid "Country"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2767
 msgid "Edit Country"
 msgstr "Ret land"
 
 #. item "Places/Country" text "Name"
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2772
 msgid "State"
 msgstr "Stat"
 
 #. item
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2773
 msgid "Edit State"
 msgstr "Ret stat"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2778
 msgid "Region"
 msgstr "Region"
 
 #. item
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2779
 msgid "Edit Region"
 msgstr "Ret region"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2784
 msgid "County"
 msgstr "Amt"
 
 #. item
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2785
 msgid "Edit County"
 msgstr "Ret amt"
@@ -20442,15 +20798,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2791
 msgid "City"
 msgstr "By"
 
 #. item
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2792
 msgid "Edit City"
 msgstr "Ret by"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2797
 msgid "Town"
 msgstr "Mindre by"
@@ -20458,10 +20814,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2799
 msgid "Edit Town"
 msgstr "Ret mindre by"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2804
 msgid "Suburb"
 msgstr "Forstad"
@@ -20469,25 +20825,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2806
 msgid "Edit Suburb"
 msgstr "Ret forstad"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2811
 msgid "Village"
 msgstr "By"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2812
 msgid "Edit Village"
 msgstr "Ret by"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2817
 msgid "Hamlet"
 msgstr "Landsby"
 
 #. item
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2818
 msgid "Edit Hamlet"
 msgstr "Ret landsby"
@@ -20495,5 +20851,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2824
 msgid "Locality"
 msgstr "Egn"
@@ -20501,10 +20857,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2826
 msgid "Edit Locality"
 msgstr "Ret lokalitet"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2831
 msgid "Island"
 msgstr "Ø"
@@ -20512,10 +20868,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2833
 msgid "Edit Island"
 msgstr "Ret ø"
 
 #. item "Places/Island" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2838
 msgid "Islet"
 msgstr ""
@@ -20523,5 +20879,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2840
 msgid "Edit Islet"
 msgstr ""
@@ -20529,5 +20885,5 @@
 #. item "Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2846
 msgid "Cave Entrance"
 msgstr "Huleindgang"
@@ -20535,10 +20891,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2848
 msgid "Edit Cave Entrance"
 msgstr "Ret huleindgang"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2852
 msgid "Peak"
 msgstr "Tinde"
@@ -20546,10 +20902,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2854
 msgid "Edit Peak"
 msgstr "Ret tinde"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2859
 msgid "Glacier"
 msgstr "Gletsjer"
@@ -20557,10 +20913,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2861
 msgid "Edit Glacier"
 msgstr "Ret gletsjer"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2854
+#: build/trans_presets.java:2866
 msgid "Volcano"
 msgstr "Vulkan"
@@ -20568,70 +20924,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2868
 msgid "Edit Volcano"
 msgstr "Ret vulkan"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2874
 msgid "Boundaries"
 msgstr "Grænser"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2875
 msgid "National"
 msgstr "National"
 
 #. item
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2876
 msgid "Edit National Boundary"
 msgstr "Ret landegrænser"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2881
 msgid "Administrative"
 msgstr "Administrativt"
 
 #. item
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2882
 msgid "Edit Administrative Boundary"
 msgstr "Ret administrativ grænse"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:2887
 msgid "Civil"
 msgstr "Civil"
 
 #. item
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2888
 msgid "Edit Civil Boundary"
 msgstr "Ret civil-grænse"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2893
 msgid "Political"
 msgstr "Politisk"
 
 #. item
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2894
 msgid "Edit Political Boundary"
 msgstr "Ret politisk grænse"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2899
 msgid "National park"
 msgstr "Nationalpark"
 
 #. item
-#: build/trans_presets.java:2888
+#: build/trans_presets.java:2900
 msgid "Edit National Park Boundary"
 msgstr "Ret grænser for nationalpark"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2906
 msgid "Land use"
 msgstr "Brug af land"
 
 #. group "Land use"
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2907
 msgid "Tree"
 msgstr "Træ"
@@ -20640,15 +20996,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:2898
+#: build/trans_presets.java:2910
 msgid "Edit Tree"
 msgstr "Ret et træ"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2915
 msgid "Botanical Name"
 msgstr "Botanisk navn"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2917
 msgid "Wood"
 msgstr "Skov"
@@ -20657,5 +21013,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:2908
+#: build/trans_presets.java:2920
 msgid "Edit Wood"
 msgstr "Ret skov"
@@ -20663,17 +21019,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "coniferous"
 msgstr "Nåleskov"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "deciduous"
 msgstr "Løvskov"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "mixed"
 msgstr "blandet"
 
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2925
 msgid "Forest"
 msgstr "Skov"
@@ -20682,14 +21038,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:2916
+#: build/trans_presets.java:2928
 msgid "Edit Forest Landuse"
 msgstr "Ret skovområde"
 
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2934
 msgid "Nature Reserve"
 msgstr "Naturreservat"
 
 #. item
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2935
 msgid "Edit Nature Reserve"
 msgstr "Ret naturreservat"
@@ -20697,25 +21053,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2940
 msgid "Scree"
 msgstr "Ur"
 
 #. item
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2941
 msgid "Edit Scree"
 msgstr "Ret ur"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2945
 msgid "Scrub"
 msgstr "Krat"
 
 #. item
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2946
 msgid "Edit Scrub"
 msgstr "Ret krat"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2950
 msgid "Fell"
 msgstr "Højdedrag"
@@ -20723,10 +21079,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2952
 msgid "Edit Fell"
 msgstr "Ret højdedrag"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2956
 msgid "Heath"
 msgstr "Hede"
@@ -20734,5 +21090,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2958
 msgid "Edit Heath"
 msgstr "Ret hede"
@@ -20740,5 +21096,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2963
 msgid "Farmyard"
 msgstr "Gårdsplads"
@@ -20747,45 +21103,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:2954
+#: build/trans_presets.java:2966
 msgid "Edit Farmyard Landuse"
 msgstr "Ret gårdsplads"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2971
 msgid "Farmland"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2972
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2977
 msgid "Meadow"
 msgstr "Eng"
 
 #. item
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2978
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2983
 msgid "Vineyard"
 msgstr "Vingård"
 
 #. item
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2984
 msgid "Edit Vineyard Landuse"
 msgstr "Ret vingård"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:2989
 msgid "Allotments"
 msgstr "Kolonihaver"
 
 #. item
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2990
 msgid "Edit Allotments Landuse"
 msgstr "Ret kolonihave-område"
@@ -20793,25 +21149,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2996
 msgid "Garden"
 msgstr "Have"
 
 #. item
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2997
 msgid "Edit Garden"
 msgstr "Ret have"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3001
 msgid "Grass"
 msgstr "Græs"
 
 #. item
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3002
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3007
 msgid "Village Green"
 msgstr ""
@@ -20819,10 +21175,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3009
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3014
 msgid "Common"
 msgstr ""
@@ -20830,20 +21186,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3004
+#: build/trans_presets.java:3016
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3020
 msgid "Park"
 msgstr "Park"
 
 #. item
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3021
 msgid "Edit Park"
 msgstr "Ret park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3025
 msgid "Recreation Ground"
 msgstr "Rekreativt område"
@@ -20851,5 +21207,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3027
 msgid "Edit Recreation Ground Landuse"
 msgstr "Ret rekreativt område"
@@ -20857,15 +21213,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3033
 msgid "Residential area"
 msgstr "Beboelseområde"
 
 #. item
-#: build/trans_presets.java:3022
+#: build/trans_presets.java:3034
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3039
 msgid "Graveyard"
 msgstr "Kirkegård"
@@ -20873,9 +21229,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3029
+#: build/trans_presets.java:3041
 msgid "Edit Graveyard"
 msgstr "Ret kirkegård"
 
-#: build/trans_presets.java:3035
+#: build/trans_presets.java:3047
 msgid "Cemetery"
 msgstr "Kirkegård"
@@ -20883,39 +21239,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3049
 msgid "Edit Cemetery Landuse"
 msgstr "Ret kirkegård"
 
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3056
 msgid "Retail"
 msgstr "Detailhandel"
 
 #. item
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3057
 msgid "Edit Retail Landuse"
 msgstr "Ret område for detailhandel"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3062
 msgid "Commercial"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3063
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3056
+#: build/trans_presets.java:3068
 msgid "Industrial"
 msgstr "Industri"
 
 #. item
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3069
 msgid "Edit Industrial Landuse"
 msgstr "Ret industri-område"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3074
 msgid "Railway land"
 msgstr ""
@@ -20923,15 +21279,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3076
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3081
 msgid "Military"
 msgstr "Militært område"
 
 #. item
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3082
 msgid "Edit Military Landuse"
 msgstr "Ret militært område"
@@ -20939,55 +21295,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3088
 msgid "Construction area"
 msgstr "Byggeplads"
 
 #. item
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3089
 msgid "Edit Construction Landuse"
 msgstr "Ret område for byggeplads"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3094
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3095
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3100
 msgid "Greenfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3101
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3106
 msgid "Landfill"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3107
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3112
 msgid "Quarry"
 msgstr "Stenbrud"
 
 #. item
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3113
 msgid "Edit Quarry Landuse"
 msgstr "Ret stenbrudsområde"
 
 #. group "Relations"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3122
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -20997,5 +21353,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:3114
+#: build/trans_presets.java:3126
 msgid "Edit Multipolygon"
 msgstr "Ret multipolygon"
@@ -21004,10 +21360,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3132
 msgid "outer segment"
 msgstr "ydre segment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3133
 msgid "inner segment"
 msgstr "indre segment"
@@ -21015,5 +21371,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3136
 msgid "Turn restriction"
 msgstr ""
@@ -21022,5 +21378,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3139
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -21028,34 +21384,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_straight_on"
 msgstr ""
@@ -21064,15 +21420,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3146
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3147
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3148
 msgid "to way"
 msgstr ""
@@ -21080,5 +21436,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3151
 msgid "Route"
 msgstr "Rute"
@@ -21087,5 +21443,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3154
 msgid "Edit Route"
 msgstr "Ret rute"
@@ -21093,5 +21449,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "Route type"
 msgstr ""
@@ -21163,5 +21519,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3144 build/trans_style.java:233
+#: build/trans_presets.java:3156 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -21170,17 +21526,17 @@
 msgstr "cykel"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "road"
 msgstr "vej"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ferry"
 msgstr "færge"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ski"
 msgstr "ski"
@@ -21233,5 +21589,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3144 build/trans_style.java:247
+#: build/trans_presets.java:3156 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -21240,13 +21596,13 @@
 msgstr "fod"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "hiking"
 msgstr "vandre"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "detour"
 msgstr "omvej"
@@ -21260,10 +21616,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3144 build/trans_style.java:1206
+#: build/trans_presets.java:3156 build/trans_style.java:1206
 msgid "subway"
 msgstr "undergrundsbane"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3159
 msgid "Symbol description"
 msgstr "Symbol beskrivelse"
@@ -21271,31 +21627,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3162
 msgid "Network"
 msgstr "Netværk"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "proposed"
 msgstr "foreslået"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "temporary"
 msgstr "midlertidig"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "connection"
 msgstr "forbindelse"
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "Color (hex)"
 msgstr "Farve (hex)"
@@ -21304,30 +21660,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3168
 msgid "route segment"
 msgstr "rute-segment"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3169
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3170
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3171
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3172
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3173
 msgid "backward halt point"
 msgstr ""
@@ -21765,11 +22121,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3375 build/trans_style.java:3376
-#: build/trans_style.java:3946 build/trans_style.java:4254
-#: build/trans_style.java:4263 build/trans_style.java:4272
-#: build/trans_style.java:4281 build/trans_style.java:4290
-#: build/trans_style.java:4299 build/trans_style.java:4308
-#: build/trans_style.java:4309 build/trans_style.java:4318
-#: build/trans_style.java:4327
+#: build/trans_style.java:3383 build/trans_style.java:3384
+#: build/trans_style.java:3954 build/trans_style.java:4262
+#: build/trans_style.java:4271 build/trans_style.java:4280
+#: build/trans_style.java:4289 build/trans_style.java:4298
+#: build/trans_style.java:4307 build/trans_style.java:4316
+#: build/trans_style.java:4317 build/trans_style.java:4326
+#: build/trans_style.java:4335
 msgid "deprecated"
 msgstr ""
@@ -23793,5 +24149,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3294
+#: build/trans_style.java:3302
 msgid "light_water"
 msgstr ""
@@ -24473,8 +24829,17 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="boundary_stone"/>
+#. <icon annotate="true" src="historic/boundary_stone.png"/>
 #: build/trans_style.java:2990 build/trans_style.java:2998
 #: build/trans_style.java:3006 build/trans_style.java:3014
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
+#: build/trans_style.java:3054
 msgid "historic"
 msgstr "historisk"
@@ -24488,5 +24853,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3095
 msgid "quarry"
 msgstr "stenbrud"
@@ -24500,5 +24865,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "landfill"
 msgstr ""
@@ -24520,5 +24885,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3103 build/trans_style.java:3111
+#: build/trans_style.java:3111 build/trans_style.java:3119
 msgid "basin"
 msgstr ""
@@ -24532,5 +24897,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3127
 msgid "forest"
 msgstr "skov"
@@ -24544,5 +24909,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3159
 msgid "farmyard"
 msgstr ""
@@ -24565,5 +24930,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3160 build/trans_style.java:3168
+#: build/trans_style.java:3168 build/trans_style.java:3176
 msgid "retail"
 msgstr ""
@@ -24577,5 +24942,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3176
+#: build/trans_style.java:3184
 msgid "industrial"
 msgstr "industri"
@@ -24589,5 +24954,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "brownfield"
 msgstr ""
@@ -24601,5 +24966,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "greenfield"
 msgstr ""
@@ -24613,5 +24978,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "railland"
 msgstr ""
@@ -24668,7 +25033,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3217 build/trans_style.java:3252
-#: build/trans_style.java:3260 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3225 build/trans_style.java:3260
+#: build/trans_style.java:3268 build/trans_style.java:3276
+#: build/trans_style.java:3284 build/trans_style.java:3292
 msgid "military"
 msgstr "militær"
@@ -24682,5 +25047,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3225
+#: build/trans_style.java:3233
 msgid "cemetery"
 msgstr "kirkegård"
@@ -24693,5 +25058,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3301
+#: build/trans_style.java:3309
 msgid "peak"
 msgstr ""
@@ -24706,5 +25071,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3310
+#: build/trans_style.java:3318
 msgid "glacier"
 msgstr "gletsjer"
@@ -24718,5 +25083,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "volcano"
 msgstr "vulkan"
@@ -24771,8 +25136,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3326 build/trans_style.java:3327
-#: build/trans_style.java:3335 build/trans_style.java:3351
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440
+#: build/trans_style.java:3334 build/trans_style.java:3335
+#: build/trans_style.java:3343 build/trans_style.java:3359
+#: build/trans_style.java:3432 build/trans_style.java:3440
+#: build/trans_style.java:3448
 msgid "natural"
 msgstr ""
@@ -24786,5 +25151,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3343
+#: build/trans_style.java:3351
 msgid "scrub"
 msgstr "buskads"
@@ -24798,5 +25163,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3359
+#: build/trans_style.java:3367
 msgid "heath"
 msgstr "hede"
@@ -24810,5 +25175,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3408
+#: build/trans_style.java:3416
 msgid "mud"
 msgstr ""
@@ -24822,5 +25187,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "beach"
 msgstr "strand"
@@ -24898,8 +25263,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
-#: build/trans_style.java:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496 build/trans_style.java:3504
+#: build/trans_style.java:3512 build/trans_style.java:3520
 msgid "route"
 msgstr ""
@@ -24947,7 +25312,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3522 build/trans_style.java:3530
-#: build/trans_style.java:3538 build/trans_style.java:3546
-#: build/trans_style.java:3554
+#: build/trans_style.java:3530 build/trans_style.java:3538
+#: build/trans_style.java:3546 build/trans_style.java:3554
+#: build/trans_style.java:3562
 msgid "boundary"
 msgstr "grænse"
@@ -25097,11 +25462,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090
+#: build/trans_style.java:4002 build/trans_style.java:4010
+#: build/trans_style.java:4018 build/trans_style.java:4026
+#: build/trans_style.java:4034 build/trans_style.java:4042
+#: build/trans_style.java:4050 build/trans_style.java:4058
+#: build/trans_style.java:4066 build/trans_style.java:4074
+#: build/trans_style.java:4082 build/trans_style.java:4090
+#: build/trans_style.java:4098
 msgid "place"
 msgstr "sted"
@@ -25149,6 +25514,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4207 build/trans_style.java:4214
-#: build/trans_style.java:4221 build/trans_style.java:4228
+#: build/trans_style.java:4215 build/trans_style.java:4222
+#: build/trans_style.java:4229 build/trans_style.java:4236
 msgid "address"
 msgstr "adresse"
@@ -25456,37 +25821,12 @@
 msgstr ""
 
-#~ msgid "All the ways were empty"
-#~ msgstr "Alle vejene var tomme"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Foren punkter med forskellige medlemsskaber?"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Sammenflet alligevel"
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr ""
-#~ "De valgte punkter tilhører forskellige relationer. Vil du stadigvæk "
-#~ "sammenflette dem?"
-
-#~ msgid "Unknown version"
-#~ msgstr "Ukendt version"
-
-#~ msgid "Version number missing from OSM data"
-#~ msgstr "Versionsnummer mangler fra OSM-data."
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "Fandt <nd>-element i en ikke-vej"
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> har nul ref"
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Fandt <member>-element i en ikke-relation."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Defekt id for punkt"
+#~ msgid "Close current changeset"
+#~ msgstr "Luk nuværende rettesæt"
+
+#~ msgid "There is currently no changeset open."
+#~ msgstr "Der er ingen rettesæt åbne."
+
+#~ msgid "- running version is {0}"
+#~ msgstr "- nuværende version er {0}"
 
 #~ msgid "Move"
@@ -25507,4 +25847,13 @@
 #~ "igen om kort tid."
 
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "Fandt <nd>-element i en ikke-vej"
+
+#~ msgid "Unknown version"
+#~ msgstr "Ukendt version"
+
+#~ msgid "<nd> has zero ref"
+#~ msgstr "<nd> har nul ref"
+
 #~ msgid "Aborting..."
 #~ msgstr "Afbryder..."
@@ -25528,7 +25877,4 @@
 #~ msgid "Add all currently selected objects as members"
 #~ msgstr "Tilføj alle valgte objekter som medlemmer"
-
-#~ msgid "Add Selected"
-#~ msgstr "Tilføj valgte"
 
 #~ msgid "Error parsing server response."
@@ -25613,4 +25959,7 @@
 #~ msgstr "EPSG:4326"
 
+#~ msgid "All the ways were empty"
+#~ msgstr "Alle vejene var tomme"
+
 #~ msgid "Email"
 #~ msgstr "E-mail"
@@ -25646,6 +25995,9 @@
 #~ msgstr "Tryk Genindlæs for at genopfriske listen"
 
-#~ msgid "Commit comment"
-#~ msgstr "Indsend kommentar"
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "Fandt <member>-element i en ikke-relation."
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "Defekt id for punkt"
 
 #~ msgid "Server does not support changesets"
@@ -25680,4 +26032,7 @@
 #~ msgid "Data Layer"
 #~ msgstr "Datalag"
+
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "Foren punkter med forskellige medlemsskaber?"
 
 #~ msgid "Drawbridge"
@@ -25778,4 +26133,14 @@
 #~ msgid "Edit Portcullis"
 #~ msgstr "Ret et faldgitter"
+
+#~ msgid "Merge Anyway"
+#~ msgstr "Sammenflet alligevel"
+
+#~ msgid ""
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
+#~ msgstr ""
+#~ "De valgte punkter tilhører forskellige relationer. Vil du stadigvæk "
+#~ "sammenflette dem?"
 
 #~ msgid ""
@@ -25933,7 +26298,4 @@
 #~ msgstr "Tjekker om primitiven {0} er væk ..."
 
-#~ msgid "Delete mine"
-#~ msgstr "Slet mine"
-
 #~ msgid "Missing primitive"
 #~ msgstr "Mangler primitiv"
@@ -25954,6 +26316,6 @@
 #~ msgstr "veje"
 
-#~ msgid "changesets"
-#~ msgstr "rettesæt"
+#~ msgid "Version number missing from OSM data"
+#~ msgstr "Versionsnummer mangler fra OSM-data."
 
 #~ msgid "% of lon:"
Index: applications/editors/josm/i18n/po/de.po
===================================================================
--- applications/editors/josm/i18n/po/de.po	(revision 17655)
+++ applications/editors/josm/i18n/po/de.po	(revision 17697)
@@ -9,6 +9,6 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-12 18:11+0200\n"
-"PO-Revision-Date: 2009-09-11 19:19+0000\n"
+"POT-Creation-Date: 2009-09-19 13:00+0200\n"
+"PO-Revision-Date: 2009-09-19 10:37+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Deutsch\n"
@@ -17,5 +17,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-09-12 16:04+0000\n"
+"X-Launchpad-Export-Date: 2009-09-19 10:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -45,10 +45,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:543
 #: ../core/src/org/openstreetmap/josm/Main.java:551
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -73,5 +73,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -89,6 +89,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:358
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
@@ -104,6 +104,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
@@ -131,10 +131,10 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
 msgid "Save and Exit"
 msgstr "Speichern und Beenden"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
 msgid "Discard and Exit"
 msgstr "Verwerfen und Beenden"
@@ -145,4 +145,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
@@ -150,27 +151,28 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:296
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:258
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:613
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
@@ -178,5 +180,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -196,6 +198,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
@@ -212,17 +214,17 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:654
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1528
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -233,6 +235,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
@@ -264,4 +266,6 @@
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
 msgstr ""
+"<html>Datei \"{0}\" kann nicht gelesen werden.<br>Fehler lautet: <br>{1}</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
@@ -285,9 +289,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:607
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:609
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -347,5 +351,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
 msgid "Plugins"
@@ -366,4 +370,7 @@
 "page for OSM primitive will probably fail. API base URL is: ''{0}''"
 msgstr ""
+"WARNUNG: unerwartetes Format der API-Basis-URL. Die Weiterleitung zu den "
+"Informations- und Chronikseiten für OSM Primitive wird wahrscheinlich "
+"fehlschlagen. API-Basis-URL lautet: \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
@@ -373,4 +380,6 @@
 "user will probably fail. API base URL is: ''{0}''"
 msgstr ""
+"WARNUNG: unerwartetes Format der API-Basis-URL. Die Weiterleitung zu den OSM-"
+"Nutzerseiten wird wahrscheinlich fehlschlagen. API-Basis-URL lautet: \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:94
@@ -386,5 +395,5 @@
 "primitives only"
 msgstr ""
-"Achtung: Nur die ersten {0} von {1} markierten Elementen werden im Browser "
+"Warnung: Nur die ersten {0} von {1} markierten Elementen werden im Browser "
 "angezeigt."
 
@@ -399,5 +408,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Vereinen"
@@ -487,5 +496,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -498,4 +507,5 @@
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -531,6 +541,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
@@ -539,6 +549,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:346
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
@@ -583,6 +593,6 @@
 "{1}"
 msgstr ""
-"Achtung: Der Wert der Eigenschaft \"{0}\" des Elements {1} wird automatisch "
-"abgeschnitten"
+"Warnung: Der Wert des Merkmals \"{0}\" des gelöschten Objekts {1} wird "
+"automatisch abgeschnitten"
 
 #: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
@@ -653,4 +663,46 @@
 msgid "No conflicts to zoom to"
 msgstr "Keine Konflikte, auf die gezoomt werden kann."
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#, fuzzy
+msgid "Close open changesets"
+msgstr "Kein offener Änderungssatz"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#, fuzzy
+msgid "Closes open changesets"
+msgstr "Kein offener Änderungssatz"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
+#: ../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:114
+#, java-format
+msgid "File: {0}"
+msgstr "Datei: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
+#, fuzzy
+msgid "There are no open changesets"
+msgstr "Kein offener Änderungssatz"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
+#, fuzzy
+msgid "No open changesets"
+msgstr "Kein offener Änderungssatz"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
+#, fuzzy
+msgid "Downloading open changesets ..."
+msgstr "Änderungssatz schließen..."
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
@@ -751,10 +803,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:123
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
@@ -797,31 +850,30 @@
 msgstr "Gewählte Punkte gleichmäßig auf einer Linie verteilen."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
 msgid "Download from OSM..."
 msgstr "Von OSM-Server herunterladen..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
 msgid "Download map data from the OSM server."
 msgstr "Kartendaten vom OSM-Server laden."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
-#, java-format
-msgid "File: {0}"
-msgstr "Datei: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
 msgid "Download"
 msgstr "Daten herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
 msgid "Please select at least one task to download"
 msgstr "Bitte wählen Sie mindestens eine Aufgabe zum Herunterladen"
@@ -842,5 +894,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1527
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307
@@ -856,10 +908,10 @@
 #, java-format
 msgid "({0}/{1}) Loading parents of primitive {2}"
-msgstr "({0}/{1}) Lade Eltern des Primitiven {2}"
+msgstr "({0}/{1}) Eltern des Objekts {2} laden"
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:376
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1415
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
 msgid "Duplicate"
 msgstr "Duplizieren"
@@ -932,10 +984,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
@@ -985,5 +1038,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
 msgid "Display history information about OSM ways, nodes, or relations."
-msgstr "Die History der Wege, Knoten oder Relationen anzeigen"
+msgstr "Versionsverlauf der Wege, Knoten oder Relationen anzeigen"
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
@@ -1021,25 +1074,26 @@
 msgstr "Aktuelle Ebene mit einer anderen zusammenführen"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 msgid "Merge Nodes"
 msgstr "Knotenpunkte vereinigen"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
 msgid "Merge nodes into the oldest one."
 msgstr "Mehrere Knotenpunkte zum ältesten vereinigen."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
 msgid "Please select at least two nodes to merge."
 msgstr "Bitte mindestens zwei Knotenpunkte zum Vereinigen wählen."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:394
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
@@ -1055,8 +1109,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -1082,6 +1136,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
@@ -1090,5 +1148,5 @@
 msgstr "Parameter \"{0}\" darf nicht NULL sein"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
@@ -1096,5 +1154,5 @@
 "gelöscht werden."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283
 #, java-format
 msgid "Merge {0} nodes"
@@ -1108,5 +1166,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeSelectionAction.java:19
 msgid "Merge the currently selected primitives into another layer"
-msgstr "Führt die ausgewählte Primitive in eine andere Schicht"
+msgstr "Ausgewählte Objekte mit einer anderen Ebene verbinden"
 
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:33
@@ -1166,5 +1224,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "New"
 msgstr "Neu"
@@ -1287,6 +1345,6 @@
 msgid "to {0} primitive"
 msgid_plural "to {0} primtives"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "zu {0} Objekt"
+msgstr[1] "zu {0} Objekten"
 
 #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
@@ -1443,14 +1501,15 @@
 msgstr "Hilfe: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
 msgid "Status Report"
 msgstr "Statusbericht"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 msgid "Copy to clipboard and close"
 msgstr "In die Zwischenablage kopieren und schließen"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
@@ -1537,25 +1596,4 @@
 msgstr "Weg {0} in {1} Teile teilen"
 
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24
-msgid "Close current changeset"
-msgstr "Aktuellen Änderungssatz schließen"
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-msgid "Close the current changeset ..."
-msgstr "Den aktuelle Änderungssatz schließen..."
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41
-msgid "There is currently no changeset open."
-msgstr "Es gibt momentan kein offenes Changeset."
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42
-msgid "No open changeset"
-msgstr "Kein offener Änderungssatz"
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60
-msgid "Closing changeset"
-msgstr "Änderungssatz schließen"
-
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
@@ -1720,5 +1758,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120
 msgid "There are no selected primitives to update."
-msgstr "Es sind keine Objekte zum Aktualisieren ausgewählt."
+msgstr "Es sind keine Objekte zur Aktualisierung ausgewählt."
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:121
@@ -1726,41 +1764,41 @@
 msgstr "Auswahl leer"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Zum OSM-Server hochladen..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 msgid "Upload all changes to the OSM server."
 msgstr "Alle Änderungen zum OSM-Server hochladen."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#, java-format
 msgid ""
 "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
 "resolve them first.</html>"
 msgstr ""
-"<html>Es gibt unbehandelte Konflilte in Ebene \"{0}\".<br>Sie müssen diese "
-"zuerst auflösen.<html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155
+"<html>Es gibt ungelöste Konflikte in der Ebene \"{0}\",<br>welche zuerst "
+"gelöst werden müssen.</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
 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:166
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 msgid "No changes to upload."
 msgstr "Keine Änderungen zum Hochladen vorhanden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Nur {0} {1} synchronisieren"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
 msgid "Synchronize entire dataset"
 msgstr "Ganzen Datensatz synchronisieren"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
 #, java-format
 msgid ""
@@ -1783,17 +1821,17 @@
 "weiterzuarbeiten.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
 msgid "Conflict detected"
 msgstr "Konflikt festgestellt"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr "Unerwarteter Rückgabewert: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:267
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
 #, java-format
 msgid ""
@@ -1809,10 +1847,22 @@
 "weiterzuarbeiten.</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
+msgid ""
+"<html>Uploading <strong>failed</strong> because you've been "
+"using<br>changeset {0} which was already closed at {1}.<br>Please upload "
+"again with a new or an existing open changeset."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+#, fuzzy
+msgid "Changeset closed"
+msgstr "Informationen zum Änderungssatz"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr "Warnung: Die Fehlermeldung \"{0}\" passt nicht in das Muster \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
@@ -1820,18 +1870,18 @@
 "Fehler-Kopfzeile \"{0}\" entspricht nicht dem erwarteten Muster \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr "<html>Hochladen <strong>fehlgeschlagen</strong>.<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
 msgid "Upload to OSM API failed"
 msgstr "Hochladen zu OSM-API fehlgeschlagen"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
 msgid "Updating primitive"
 msgstr "Objekt aktualisieren"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -2060,14 +2110,14 @@
 msgstr "Knotenpunkt in einen Weg einfügen und verbinden"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:930
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:932
 msgid "Create new node."
 msgstr "Einen neuen Knoten erstellen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
 msgid "Select node under cursor."
 msgstr "Knoten unter Mauszeiger wählen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939
 #, java-format
 msgid "Insert new node into way."
@@ -2076,14 +2126,14 @@
 msgstr[1] "Neuen Knoten in {0} Wege einfügen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
 msgid "Start new way from last node."
 msgstr "Neuen Weg an letztem Knoten beginnen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951
 msgid "Continue way from last node."
 msgstr "Weg am letzten Knoten fortsetzen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:972
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:974
 msgid "Finish drawing."
 msgstr "Zeichnen beenden."
@@ -2168,8 +2218,11 @@
 "Really move them?"
 msgstr ""
+"Sie haben mehr als {0} Elemente verschoben. Das Verschieben einer großen "
+"Anzahl von Elementen ist oftmals unbeabsichtigt.\n"
+"Wollen Sie sie wirklich verschieben?"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478
 msgid "Always move and don't show dialog again"
-msgstr ""
+msgstr "Immer verschieben und diese Meldung nicht mehr anzeigen"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
@@ -2205,44 +2258,54 @@
 "runter, rechts; Zoom verschieben mit rechter Maus"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Suchen..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Nach Objekten suchen."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
 msgid "Can't search because there is no loaded data."
 msgstr "Es kann nicht gesucht werden, da keine Daten geladen sind."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
+#, fuzzy
+msgid "Please enter a filter string."
+msgstr "Bitte einen Suchbegriff eingeben."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
 msgid "Please enter a search string."
 msgstr "Bitte einen Suchbegriff eingeben."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
 msgid "replace selection"
 msgstr "Auswahl ersetzen"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72
 msgid "add to selection"
 msgstr "zur Auswahl hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73
 msgid "remove from selection"
 msgstr "aus der Auswahl entfernen"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
+#, fuzzy
+msgid "find in selection"
+msgstr "zur Auswahl hinzufügen"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81
 msgid "case sensitive"
 msgstr "Groß-/Kleinschreibung beachten"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82
 msgid "regular expression"
 msgstr "Regulärer Ausdruck"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
 msgstr ""
@@ -2250,18 +2313,18 @@
 "Namen."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
 msgstr ""
 "<b>\"Berliner Straße\"</b> - 'Berliner Straße' in einem Schlüssel oder Namen."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
 msgstr "<b>name:Ber</b> - 'Ber' irgendwo im Namen."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
 msgstr "<b>type=route</b> - Schlüssel 'type' mit exakt dem Wert 'route'."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid ""
 "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
@@ -2271,17 +2334,17 @@
 "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
 msgstr "<b>-name:Ber</b> - kein 'Ber' im Namen."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - Schlüssel=foot mit beliebigem Wert."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
 msgid "<u>Special targets:</u>"
 msgstr "<u>Spezialsuchen:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
@@ -2289,33 +2352,33 @@
 "<b>type:</b> - Typ des Objektes (<b>node</b>, <b>way</b>, <b>relation</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - Alle von diesem Nutzer geänderten Objekte"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
+msgstr "<b>id:</b>... - Objekte mit der angegebenen ID (0 für neue Objekte)"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 msgid "<b>nodes:</b>... - object with given number of nodes"
 msgstr "<b>nodes:</b>... - Objekte mit gegebener Knotenanzahl"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - Alle geänderten Objekte"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - Alle ausgewählten Objekte"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - Alle unvollständigen Objekte"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - Alle Objekte ohne Merkmale"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2324,5 +2387,5 @@
 "Ausdrucks"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2331,56 +2394,73 @@
 "Ausdrucks"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
 "Nutzung von <b>|</b> oder <b>OR</b> zum Kombinieren mittels logischem Oder."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
 "Nutzung von <b>\"</b> zum Zusammenfassen (z.B. falls ein Schlüssel : enthält)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Nutzung von <b>(</b> und <b>)</b> zum Gruppieren von Ausdrücken."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
+msgid "Filter"
+msgstr "Filter"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Suche"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
+msgid "Submit filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "Start Search"
 msgstr "Suche starten"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Nichts gefunden für Suche ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Nichts zur Auswahl hinzugefügt durch Suche nach ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Nichts aus der Auswahl entfernt durch Suche ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#, fuzzy, java-format
+msgid "Nothing find in selection by searching for ''{0}''"
+msgstr "Nichts zur Auswahl hinzugefügt durch Suche nach ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262
 #, java-format
 msgid "Found {0} matches"
 msgstr "{0} Treffer gefunden"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283
 msgid "RX"
 msgstr "RX"
@@ -2481,10 +2561,10 @@
 #, java-format
 msgid "Add node {0}"
-msgstr ""
+msgstr "Knoten {0} hinzufügen"
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
 #, java-format
 msgid "Add way {0}"
-msgstr ""
+msgstr "Weg {0} hinzufügen"
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68
@@ -2496,10 +2576,10 @@
 #, java-format
 msgid "Change node {0}"
-msgstr ""
+msgstr "Knoten {0} verändern"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50
 #, java-format
 msgid "Change way {0}"
-msgstr ""
+msgstr "Weg {0} verändern"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51
@@ -2511,10 +2591,10 @@
 #, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
-msgstr ""
+msgstr "\"{0}\" vom Knoten \"{1}\" entfernen"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
 #, java-format
 msgid "Remove \"{0}\" for way ''{1}''"
-msgstr ""
+msgstr "\"{0}\" vom Weg \"{1}\" entfernen"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
@@ -2526,15 +2606,15 @@
 #, java-format
 msgid "Set {0}={1} for node ''{2}''"
-msgstr ""
+msgstr "{0}={1} für Knoten \"{2}\" setzen"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
 #, java-format
 msgid "Set {0}={1} for way ''{2}''"
-msgstr ""
+msgstr "{0}={1} für Weg \"{2}\" setzen"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
 #, java-format
 msgid "Set {0}={1} for relation ''{2}''"
-msgstr ""
+msgstr "{0}={1} für Relation \"{2}\" setzen"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
@@ -2572,5 +2652,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
 msgid "Double conflict"
 msgstr "Doppelter Konflikt"
@@ -2652,4 +2732,6 @@
 "from relation?</html>"
 msgstr ""
+"<html>Die Auswahl \"{0}\" wird von der Relation \"{1}\" in der Rolle {2} "
+"verwendet.<br>Aus Relation entfernen?</html>"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:213
@@ -2659,4 +2741,6 @@
 "</html>"
 msgstr ""
+"<html>Die Auswahl \"{0}\" wird von der Relation \"{1}\" verwendet.<br>Aus "
+"Relation entfernen?</html>"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:446
@@ -2724,15 +2808,15 @@
 #, java-format
 msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
+msgstr "Knoten \"{0}\" an Position {1} aus der Relation \"{2}\" entfernen"
 
 #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:70
 #, java-format
 msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
+msgstr "Weg \"{0}\" an Position {1} aus der Relation \"{2}\" entfernen"
 
 #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:71
 #, java-format
 msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
+msgstr "Relation \"{0}\" an Position {1} aus der Relation \"{2}\" entfernen"
 
 #: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:141
@@ -2750,15 +2834,15 @@
 #, java-format
 msgid "Resolve {0} tag conflicts in node {1}"
-msgstr ""
+msgstr "{0} Merkmalskonflikte im Knoten {1} auflösen"
 
 #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:70
 #, java-format
 msgid "Resolve {0} tag conflicts in way {1}"
-msgstr ""
+msgstr "{0} Merkmalskonflikte im Weg {1} auflösen"
 
 #: ../core/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java:71
 #, java-format
 msgid "Resolve {0} tag conflicts in relation {1}"
-msgstr ""
+msgstr "{0} Merkmalskonflikte in Relation {1} auflösen"
 
 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:66
@@ -2821,4 +2905,5 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:134
 msgid "Old value"
 msgstr "Alter Wert"
@@ -2860,5 +2945,5 @@
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
-msgstr ""
+msgstr "Achtung: Fehler beim speichern der Voreinstellungen in \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:368
@@ -2873,4 +2958,6 @@
 "isn't a directory."
 msgstr ""
+"Achtung: Fehler beim Setzen der Voreinstellungen, da das angegebene "
+"Verzeichnis \"{0}\" ist kein Verzeichnis ist."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
@@ -2880,4 +2967,6 @@
 "isn't a directory.</html>"
 msgstr ""
+"<html>Fehler beim Setzen der Voreinstellungen, da das angegebene Verzeichnis "
+"\"{0}\" ist kein Verzeichnis ist.</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:388
@@ -2887,4 +2976,6 @@
 "preference directory: {0}"
 msgstr ""
+"Achtung: Fehler beim Setzen der Voreinstellungen, da das Verzeichnis \"{0}\" "
+"nicht erstellt werden konnte."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:391
@@ -2894,4 +2985,6 @@
 "preference directory: {0}</html>"
 msgstr ""
+"<html>Initialisierung der Einstellungen fehlgeschlagen.<br>Fehlendes "
+"Einstellungsverzeichnis konnte nicht erstellt werden: {0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
@@ -2909,4 +3002,6 @@
 "file."
 msgstr ""
+"Warnung: Vorhandene Einstellungsdatei \"{0}\" wird mit den "
+"Standardeinstellungen ersetzt."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
@@ -2916,4 +3011,6 @@
 "to default: {0}</html>"
 msgstr ""
+"<html>Initialisierung der Einstellungen fehlgeschlagen.<br>Einstellungsdatei "
+"konnte nicht auf Standardwerte zurückgesetzt werden: {0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
@@ -2923,4 +3020,7 @@
 "<br> and creating a new default preference file.</html>"
 msgstr ""
+"<html>Die Einstellungsdatei enthielt Fehler.<br>Ein Backup der alten Datei "
+"wurde unter <br>{0}<br> erstellt und eine neue Einstellungsdatei mit den "
+"Standardwerten erstellt.</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
@@ -2930,4 +3030,6 @@
 "default: {0}"
 msgstr ""
+"Warnung: Initialisierung der Einstellungen fehlgeschlagen. Einstellungsdatei "
+"konnte nicht auf Standardwerte zurückgesetzt werden: {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87
@@ -2986,27 +3088,59 @@
 
 #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
 msgid "E"
 msgstr "O"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:59
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:203
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
 msgid "Changeset {0}"
 msgstr "Änderungssatz {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:323
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
 msgstr "Der Parameter \"{0}\" muss größer als 0 sein. Er ist aber \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:325
-#, fuzzy, java-format
-msgid "paramete''{0}'' must not be null"
-msgstr "Parameter \"{0}\" darf nicht NULL sein"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331
-#, fuzzy, java-format
-msgid "unsupported value ''{0}'' or parameter ''{1}''"
-msgstr "\"{0}\" ist keine sinnvolle Rolle für den Weg \"{1}\"."
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "H"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "Text"
+msgstr "Text"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "C"
+msgstr "CS"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "I"
+msgstr "CI"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "M"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#, fuzzy
+msgid "R"
+msgstr "RX"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+msgid "A"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+msgid "D"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+msgid "F"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
@@ -3020,24 +3154,24 @@
 msgstr "Warnung: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
+#, java-format
 msgid "expected id >= 0. Got {0}"
-msgstr "Unerwarteter Spaltenindex ({0})"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:257
+msgstr "ID >= 0 erwartet, jedoch {0} erhalten."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
 msgid "a primitive with id=0 can't be invisible"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:293
-#, fuzzy, java-format
+msgstr "Ein Objekt mit ID=0 darf nicht unsichtbar sein"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
+#, java-format
 msgid "id > 0 expected. Got {0}"
-msgstr "id > 0 erwartet, aber {0} erhalten"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295
-#, fuzzy, java-format
+msgstr "ID >= 0 erwartet, jedoch {0} erhalten."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
+#, java-format
 msgid "version > 0 expected. Got {0}"
-msgstr "id > 0 erwartet, aber {0} erhalten"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26
+msgstr "Version > 0 erwartet, jedoch {0} erhalten."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
 msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
@@ -3046,5 +3180,5 @@
 "Name."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
 msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
@@ -3060,4 +3194,6 @@
 "multiple values"
 msgstr ""
+"Merkmalsammlung konnte nicht auf ein Objekt angewendet werden,  da sie "
+"Schlüssel mit mehreren Werten enthält"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:212
@@ -3065,4 +3201,5 @@
 msgid "can't add node {0} to incomplete way {1}"
 msgstr ""
+"Knoten \"{0}\" konnte nicht zu unvollständigem Weg \"{1}\" hinzufügt werden."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154
@@ -3115,9 +3252,9 @@
 msgstr "Parameter {0} außerhalb des Bereichs 0..{1}: Wert ist {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:247
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:249
 msgid "Area style way is not closed."
 msgstr "Flächenförmiger Weg ist nicht geschlossen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:478
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:482
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
@@ -3126,118 +3263,118 @@
 #. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
 #. TODO Remove useless nullcheck when RelationMember.member is encalupsed
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:851
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855
 msgid "Empty member in relation."
 msgstr "Leeres Element in der Relation."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:853
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Gelöschtes Element ''{0}'' in der Relation."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:864
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Weg ''{0}'' mit weniger als zwei Knoten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "More than one \"from\" way found."
 msgstr "Mehr als ein Weg mit \"from\" gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "More than one \"to\" way found."
 msgstr "Mehr als ein Weg mit \"to\" gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "More than one \"via\" found."
 msgstr "Mehr als ein Element mit \"via\" gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Unbekannte Role \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Unbekannter Elementtyp für \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"from\" way found."
 msgstr "Kein \"from\"-Weg gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"to\" way found."
 msgstr "Kein \"to\"-Weg gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652
 msgid "No \"via\" node or way found."
 msgstr "Kein \"via\"-Knoten oder Weg gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "Der \"from\"-Weg beginnt oder endet nicht an dem \"via\"-Knoten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "Der \"to\"-Weg beginnt oder endet nicht an dem \"via\"-Knoten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "Der \"from\"-Weg beginnt oder endet nicht an dem \"via\"-Weg."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "Der \"from\"-Weg beginnt oder endet nicht an dem \"via\"-Weg."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Kein Zeichenstil für Abbiegeregel {0} gefunden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "\"{0}\" ist keine sinnvolle Rolle für den Weg \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:885
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Nicht-Weg ''{0}'' im Multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:943
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Kein äußerer Weg im Multipolygon ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1032
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Die Wege ''{0}'' und {1}'' kreuzen sich."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1044
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Innerer Weg \"{0}\" ist außerhalb."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1097
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Zeichenstil des inneren Weges''{0}'' entspricht dem Multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1123
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Zeichenstil für den äußeren Weg ''{0}'' stimmt nicht überein."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1327
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331
 msgid "untagged"
 msgstr "Ohne Merkmale"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1328
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332
 msgid "text"
 msgstr "Text"
@@ -3260,5 +3397,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
@@ -3279,5 +3416,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
@@ -3331,5 +3468,5 @@
 msgstr "Lambert-Zone (Frankreich)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambert-Zone (Estland)"
@@ -3364,4 +3501,6 @@
 msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
 msgstr ""
+"<html>Lesezeichen konnten nicht von <br>\"{0}\"<br>gelesen werden. Der "
+"Fehler war: {1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:69
@@ -3371,9 +3510,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:38
 msgid "Do not show again"
 msgstr "Nicht noch einmal zeigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
 #, java-format
@@ -3381,31 +3520,31 @@
 msgstr " [ID: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:91
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:116
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154
 msgid "incomplete"
 msgstr "unvollständig"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
 msgid "highway"
 msgstr "Straße"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
-#: build/trans_presets.java:3144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: build/trans_presets.java:3156
 msgid "railway"
 msgstr "Eisenbahn"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
 msgid "waterway"
 msgstr "Gewässer"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "landuse"
 msgstr "Landfläche"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:474
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
@@ -3415,5 +3554,5 @@
 msgstr[1] "{0} Knoten"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
 #, java-format
 msgid "{0} member"
@@ -3443,7 +3582,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
-#, fuzzy
 msgid "Bad Request"
-msgstr "Schlagball (Racquet)-Platz bearbeiten"
+msgstr "Fehlerhafte Anfrage"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144
@@ -3459,10 +3597,5 @@
 msgstr "Nachricht des Tages nicht verfügbar"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67
-#, java-format
-msgid "- running version is {0}"
-msgstr "- aktive Version ist {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:95
 msgid "Downloading \"Message of the day\""
 msgstr "Nachricht des Tages herunterladen"
@@ -3536,10 +3669,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:162
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
 msgid "Username"
 msgstr "Benutzername"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
 msgid "Password"
 msgstr "Passwort"
@@ -3595,5 +3728,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:114
 msgid "options provided as Java system properties"
-msgstr ""
+msgstr "Optionen über die Java-Systemeinstellungen"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
@@ -3603,5 +3736,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "Change the folder for all user settings"
-msgstr ""
+msgstr "Verzeichnis für alle Benutzereinstellungen ändern"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
@@ -3611,4 +3744,8 @@
 "      Java option to increase the maximum size of allocated memory"
 msgstr ""
+"Bedenke, dass JOSM für einige Aufgaben sehr viel Speicher benötigt. Füge "
+"folgende\n"
+"      Java-Option hinzu, damit der für das Programm nutzbare Speicher erhöht "
+"wird."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:119
@@ -3663,5 +3800,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226
 msgid "Presets"
 msgstr "Vorlagen"
@@ -3735,38 +3872,49 @@
 msgstr "Skala"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Die geographische Länge an der Mausposition."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The name of the object at the mouse pointer."
 msgstr "Der Name des Objekts unter der Mausposition."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Die geographische Breite an der Mausposition."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The angle between the previous and the current way segment."
 msgstr "Der Winkel zwischen vorherigem und aktuellem Wegabschnitt."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "Die (Kompass-)Richtung des zu zeichnenden Wegabschnittes."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The length of the new way segment being drawn."
 msgstr "Die Länge des neu zu zeichnenden Wegabschnittes."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199
+msgid ""
+"Middle click again to cycle through.<br>Hold CTRL to select directly from "
+"this list with the mouse.<hr>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290
 msgid "(no object)"
 msgstr "(kein Objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:301
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418
+#, fuzzy
+msgid "User:"
+msgstr "Nutzer"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
 msgid "layer not in list."
 msgstr "Ebene nicht in der Liste."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:488
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3838,7 +3986,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:224
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Tags"
 msgstr "Merkmale"
@@ -3853,5 +4001,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
@@ -3865,5 +4013,5 @@
 #, java-format
 msgid "Tags({0} conflicts)"
-msgstr "Merkmale({0} Konflikte)"
+msgstr "Merkmale ({0} Konflikte)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
@@ -4051,4 +4199,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
 msgid "Up"
 msgstr "Hoch"
@@ -4059,4 +4208,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Down"
 msgstr "Runter"
@@ -4069,5 +4219,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
@@ -4346,4 +4496,7 @@
 "yo agree?</html>"
 msgstr ""
+"<html>Um Ihre lokale Version zu behalten muss JOSM die ID des Objekts {0} "
+"auf 0 setzen.<br>Beim nächsten Hochladen wird der Server eine neue ID "
+"zuweisen.<br>Möchten Sie fortfahren?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590
@@ -4365,5 +4518,5 @@
 "dataset.<br>Do you agree?</html>"
 msgstr ""
-"<html>JOSM wird das Element {0} im lokalen Datensatz löschen. <br> Sind sie "
+"<html>JOSM wird das Objekt {0} im lokalen Datensatz löschen.<br>Sind Sie "
 "damit einverstanden?</html>"
 
@@ -4487,5 +4640,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:382
 msgid "Mark the selected tags as undecided"
-msgstr "Markiere das gewählte Merkmal als unentschieden"
+msgstr "Gewähltes Merkmal als unentschieden markieren"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java:48
@@ -4497,35 +4650,34 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97
 msgid "Conflicts when combining primitives"
-msgstr ""
+msgstr "Konflikte beim Verbinden der Objekte"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
-msgstr ""
+msgstr "Konflikte beim Verbinden der Wege. Verbundener Weg ist \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110
 #, java-format
 msgid "Conflicts when merging nodes - merged node is ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:236
-#, fuzzy
+msgstr "Konflikte beim Zusammenführen der Knoten. Neuer Knoten ist \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239
 msgid "No conflicts to resolve"
-msgstr "Keine verbleibenden Merkmalskonflikte zu beheben"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:295
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257
+msgstr "Es sind keine Konflikte zu lösen."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254
 msgid "Cancel conflict resolution"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:310
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272
+msgstr "Konfliktlösung abbrechen"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269
 msgid "Apply resolved conflicts"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
+msgstr "Übernehme gelöste Konflikte"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Apply"
 msgstr "Übernehmen"
@@ -4537,5 +4689,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "all"
 msgstr "alle"
@@ -4547,15 +4699,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:54
 msgid "Please decided which values to keep"
-msgstr ""
+msgstr "Bitte entscheide, welche Werte behalten werden sollen."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:59
 #, java-format
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
-msgstr ""
+msgstr "Der Wert \"{0}\" wird auf den Schlüssel \"{1}\" angewandt"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:65
 #, java-format
 msgid "The key ''{0}'' and all it's values are going to be removed"
-msgstr ""
+msgstr "Der Schlüssel \"{0}\" und alle dazugehörigen Werte werden entfernt"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:70
@@ -4579,7 +4731,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
-msgid "not yet decided"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:213
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
@@ -4588,25 +4737,25 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
 msgid "Not decided yet"
-msgstr ""
+msgstr "Noch ohne Lösung"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49
 msgid "Tags from nodes"
-msgstr ""
+msgstr "Merkmale von Knoten"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50
 msgid "Tags from ways"
-msgstr ""
+msgstr "Merkmale von Wegen"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51
 msgid "Tags from relations"
-msgstr ""
+msgstr "Merkmale von Relationen"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78
 msgid "Conflicts in pasted tags"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:475
+msgstr "Konflikte in eingefügten Tags"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
@@ -4616,7 +4765,7 @@
 msgstr[1] "{0} Wege"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:152
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
@@ -4626,25 +4775,25 @@
 msgstr[1] "{0} Relationen"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "Paste ..."
 msgstr "Einfügen..."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "From ..."
 msgstr "Von..."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:372
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "To ..."
 msgstr "Nach..."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:428
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
 #, java-format
 msgid "{0} tag"
 msgid_plural "{0} tags"
-msgstr[0] "{0} Tag"
-msgstr[1] "{0} Tags"
+msgstr[0] "{0} Merkmal"
+msgstr[1] "{0} Merkmale"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
@@ -4655,13 +4804,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
-#, fuzzy
 msgid "Remove this relation member from the relation"
-msgstr "Das aktuell ausgewählte Element aus dieser Beziehung entfernen"
+msgstr "Lösche dieses Miglied aus der Relation."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-#, fuzzy
 msgid "Replace"
-msgstr "Ort"
+msgstr "Ersetzen"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
@@ -4669,14 +4816,15 @@
 msgid "Replace the way this member refers to with the combined way"
 msgstr ""
+"Ersetze den Weg in den zugehörigen Relationen durch den neuen verbundenen "
+"Weg."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
-#, fuzzy
 msgid "Undecided"
-msgstr "Unentschieden"
+msgstr "Ungelöst."
 
 #. --- role editing
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:56
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510
 msgid "Role:"
 msgstr "Rolle:"
@@ -4684,5 +4832,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:65
 msgid "Tag modified relations with   "
-msgstr ""
+msgstr "Kennzeichnen die geänderten Relationen mit   "
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:68
@@ -4692,25 +4840,22 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70
-#, fuzzy
 msgid "Value:"
-msgstr "Wert"
+msgstr "Wert:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86
 msgid "Apply this role to all members"
-msgstr ""
+msgstr "Füge die Rolle zu allen Mitglieder hinzu."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33
 msgid "Pos."
-msgstr ""
+msgstr "Pos."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51
-#, fuzzy
 msgid "Orig. Way"
-msgstr "Einbahnstraße"
+msgstr "Orig. Weg"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
-#, fuzzy
 msgid "Decision"
-msgstr "Version"
+msgstr "Entscheidung"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -4726,6 +4871,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
@@ -4822,171 +4968,13 @@
 msgstr "Konflikte lösen für ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-msgid "History"
-msgstr "Verlauf"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-msgid "Display the history of all selected items."
-msgstr "Versionen aller gewählten Objekte anzeigen."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
-#, java-format
-msgid "index out of bounds Got {0}"
-msgstr "Tabellenindex außerhalb der Grenzen ({0})"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr "Knoten {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr "Weg {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr "Relation {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
-msgid "History item"
-msgstr "History-Eintrag"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Alle ausgewählten Objekte neu laden und die Liste aktualisieren."
-
-#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
-msgid "Show"
-msgstr "Anzeigen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
-msgstr "History der markierten Elemente anzeigen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
-msgid "Dialog not created yet. Invoke createInstance() first"
-msgstr ""
-"Der Dialog wurde noch nicht angelegt. Rufen Sie zunächst createInstance() "
-"auf."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
-msgid "Layers"
-msgstr "Ebenen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-msgid "Open a list of all loaded layers."
-msgstr "Liste aller geladenen Ebenen öffnen."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:297
-msgid "Delete the selected layer."
-msgstr "Ausgewählte Ebene löschen."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:367
-msgid "Show/Hide"
-msgstr "Anzeigen/Ausblenden"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:378
-msgid "Toggle visible state of the selected layer."
-msgstr "Sichtbarkeit der Ebene umschalten."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414
-msgid "Activate"
-msgstr "Aktivieren"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:420
-msgid "Activate the selected layer"
-msgstr "Die ausgewählte Ebene aktivieren"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:475
-msgid "Merge this layer into another layer"
-msgstr "Aktuelle Eben mit einer anderen Ebene verbinden"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:581
-msgid "Move the selected layer one row up."
-msgstr "Gewählte Ebene eine Zeile nach oben verschieben"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:600
-msgid "Move the selected layer one row down."
-msgstr "Gewählte Ebene eine Zeile nach unten verschieben."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
-msgid "Information about layer"
-msgstr "Ebeneninformation"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
-#, java-format
-msgid "This will change up to {0} object."
-msgid_plural "This will change up to {0} objects."
-msgstr[0] "Damit wird maximal {0} Objekt geändert."
-msgstr[1] "Damit werden maximal {0} Objekte geändert."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
-msgid "An empty value deletes the key."
-msgstr "Ein leerer Wert löscht den Schlüssel."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
-msgid "<different>"
-msgstr "<unterschiedlich>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
-msgid "Change values?"
-msgstr "Werte ändern?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
-#, java-format
-msgid "Change properties of up to {0} object"
-msgid_plural "Change properties of up to {0} objects"
-msgstr[0] "Ändere Eigenschaften für bis zu {0} Objekt"
-msgstr[1] "Ändere Eigenschaften für bis zu {0} Objekte"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
-msgid "Please select a key"
-msgstr "Bitte wählen Sie einen Schlüssel"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
-msgid "Please select a value"
-msgstr "Bitte wählen Sie einen Wert"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
-msgid "Please select the objects you want to change properties for."
-msgstr "Bitte wählen Sie die Objekte, deren Eigenschaften Sie ändern wollen."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
-msgid "Properties/Memberships"
-msgstr "Eigenschaften/Mitgliedschaften"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-msgid "Properties for selected objects."
-msgstr "Eigenschaften der ausgewählten Objekte."
-
-#. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-msgid "Member Of"
-msgstr "Element von"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
-msgid "Add Properties"
-msgstr "Eigenschaften hinzufügen"
-
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+msgid "Filter objects and hide/disable them."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
@@ -5000,4 +4988,213 @@
 msgstr "Hinzufügen"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+msgid "Add filter."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
+#, fuzzy
+msgid "Edit filter."
+msgstr "Anlegestelle (Pier) bearbeiten"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#, fuzzy
+msgid "Delete filter."
+msgstr "Ebene löschen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
+#, fuzzy
+msgid "Move filter up."
+msgstr "Nach oben verschieben"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
+#, fuzzy
+msgid "Move filter down."
+msgstr "Nach unten verschieben"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128
+msgid "Enable filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
+#, fuzzy
+msgid "Hide elements"
+msgstr "Einzelne Elemente"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
+msgid "Apply also for children"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
+msgid "Inverse filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
+#, fuzzy
+msgid "Filter mode"
+msgstr "Filter"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
+msgid "History"
+msgstr "Verlauf"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+msgid "Display the history of all selected items."
+msgstr "Versionen aller gewählten Objekte anzeigen."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr "Tabellenindex außerhalb der Grenzen ({0})"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr "Knoten {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr "Weg {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr "Relation {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
+msgid "History item"
+msgstr "History-Eintrag"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
+msgid "Reload all currently selected objects and refresh the list."
+msgstr "Alle ausgewählten Objekte neu laden und die Liste aktualisieren."
+
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
+msgid "Show"
+msgstr "Anzeigen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
+msgid "Display the history of the selected primitive"
+msgstr "History der markierten Elemente anzeigen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84
+msgid "Dialog not created yet. Invoke createInstance() first"
+msgstr ""
+"Der Dialog wurde noch nicht angelegt. Rufen Sie zunächst createInstance() "
+"auf."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
+msgid "Layers"
+msgstr "Ebenen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+msgid "Open a list of all loaded layers."
+msgstr "Liste aller geladenen Ebenen öffnen."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294
+msgid "Delete the selected layer."
+msgstr "Ausgewählte Ebene löschen."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364
+msgid "Show/Hide"
+msgstr "Anzeigen/Ausblenden"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375
+msgid "Toggle visible state of the selected layer."
+msgstr "Sichtbarkeit der Ebene umschalten."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgid "Activate"
+msgstr "Aktivieren"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417
+msgid "Activate the selected layer"
+msgstr "Die ausgewählte Ebene aktivieren"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472
+msgid "Merge this layer into another layer"
+msgstr "Aktuelle Eben mit einer anderen Ebene verbinden"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578
+msgid "Move the selected layer one row up."
+msgstr "Gewählte Ebene eine Zeile nach oben verschieben"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597
+msgid "Move the selected layer one row down."
+msgstr "Gewählte Ebene eine Zeile nach unten verschieben."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+msgid "Information about layer"
+msgstr "Ebeneninformation"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+#, java-format
+msgid "This will change up to {0} object."
+msgid_plural "This will change up to {0} objects."
+msgstr[0] "Damit wird maximal {0} Objekt geändert."
+msgstr[1] "Damit werden maximal {0} Objekte geändert."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+msgid "An empty value deletes the key."
+msgstr "Ein leerer Wert löscht den Schlüssel."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+msgid "<different>"
+msgstr "<unterschiedlich>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+msgid "Change values?"
+msgstr "Werte ändern?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#, java-format
+msgid "Change properties of up to {0} object"
+msgid_plural "Change properties of up to {0} objects"
+msgstr[0] "Ändere Eigenschaften für bis zu {0} Objekt"
+msgstr[1] "Ändere Eigenschaften für bis zu {0} Objekte"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+msgid "Please select a key"
+msgstr "Bitte wählen Sie einen Schlüssel"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+msgid "Please select a value"
+msgstr "Bitte wählen Sie einen Wert"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
+msgid "Please select the objects you want to change properties for."
+msgstr "Bitte wählen Sie die Objekte, deren Eigenschaften Sie ändern wollen."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
+msgid "Properties/Memberships"
+msgstr "Eigenschaften/Mitgliedschaften"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+msgid "Properties for selected objects."
+msgstr "Eigenschaften der ausgewählten Objekte."
+
+#. setting up the membership table
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+msgid "Member Of"
+msgstr "Element von"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
+msgid "Add Properties"
+msgstr "Eigenschaften hinzufügen"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574
 msgid "Add a new key/value pair to all objects"
@@ -5039,10 +5236,9 @@
 
 #. item "Land use/Quarry" text "Name"
-#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
-#: build/trans_presets.java:3109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168
+#: build/trans_presets.java:3121
 msgid "Relations"
 msgstr "Relationen"
@@ -5052,23 +5248,23 @@
 msgstr "Eine Liste aller Relationen öffnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relationen: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276
 msgid "Open an editor for the selected relation"
 msgstr "Editor für die gewählte Relation öffnen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
 msgid "Delete the selected relation"
 msgstr "Gewählte Relation löschen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349
 msgid "Create a new relation"
 msgstr "Eine neue Relation erstellen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:373
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1412
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
@@ -5103,5 +5299,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5113,9 +5309,9 @@
 msgstr "Auswahl: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441
 msgid "Undock the panel"
 msgstr "Ansicht separat darstellen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5124,5 +5320,5 @@
 "Werkzeugleiste."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:457
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Klicken Sie zum Minimieren oder Maximieren der Ansicht"
@@ -5149,5 +5345,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142
 msgid "Select primitives submitted by this user"
-msgstr ""
+msgstr "Objekte auswählen, die dieser Nutzer eingetragen hat"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172
@@ -5157,5 +5353,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173
 msgid "Launches a browser with information about the user"
-msgstr ""
+msgstr "Informationsseite über den Nutzer im Browser öffnen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185
@@ -5164,4 +5360,6 @@
 "Warning: only launching info browsers for the first {0} of {1} selected users"
 msgstr ""
+"Warnung: es werden nur Informationsseiten für die ersten {0} der {1} "
+"ausgewählten Nutzer im Browser geöffnet"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208
@@ -5171,8 +5369,10 @@
 "missing on this system.</html>"
 msgstr ""
+"<html>Fehler beim Erstellen der URL, da die Kodierung \"{0}\"<br>auf diesem "
+"System nicht verfügbar ist.</hml>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210
 msgid "Missing encoding"
-msgstr ""
+msgstr "Fehlende Kodierung"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272
@@ -5185,5 +5385,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr "Die zugehörige Relation des ausgewählten Relationselements bearbeiten"
@@ -5207,5 +5407,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1502
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1370
 msgid "Download relation members"
 msgstr "Relationselemente herunterladen"
@@ -5237,5 +5437,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -5244,18 +5444,18 @@
 "Warnung: Ignoriere Fehler, weil die Aufgabe abgebrochen wurde: Fehler: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
 msgid "Tags and Members"
 msgstr "Merkmale und Elemente"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:167
 msgid "Parent Relations"
 msgstr "Relationen der Eltern"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
 msgid "Child Relations"
 msgstr "Child-Verknüpfungen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5267,14 +5467,14 @@
 "Sie die zirkuläre Abhängigkeit behandeln?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
 msgid "Remove them, clean up relation"
 msgstr "Objekt entfernen und Verbindung lösen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
 msgid "Ignore them, leave relation as is"
 msgstr "Ignorieren und die aktuelle Verbindung belassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613
 #, java-format
 msgid ""
@@ -5283,13 +5483,12 @@
 "html>"
 msgstr ""
-"<html>Das Element <br>{0}<br>ist bereits in den Elementen der Relation "
-"enthalten.<br><br>Wollen Sie es ein weiteres Mal in Elemente der Relation "
-"aufnehmen?</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:690
+"<html>Das Objekt <br>{0}<br>ist bereits in der Relation enthalten."
+"<br><br>Wollen Sie es ein weiteres Mal in die Relation aufnehmen?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
 msgid "Multiple members referring to same primitive"
-msgstr "Mehrere Elemente verweisen auf das gleiche Primitiv"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
+msgstr "Mehrere Elemente verweisen auf das gleiche Objekt"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid ""
@@ -5302,5 +5501,5 @@
 "Relation ''{0}''.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
@@ -5309,5 +5508,5 @@
 "hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
@@ -5316,5 +5515,5 @@
 "hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5324,5 +5523,5 @@
 "ausgewählten Element hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5332,17 +5531,15 @@
 "ausgewählten Element hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
 msgid "Remove all members referring to one of the selected primitives"
-msgstr ""
-"Alle Elemente welche sich auf eines der selektierten Primitive beziehen "
-"entfernen"
+msgstr "Alle Elemente mit Verweis zu einem der ausgewählten Objekte entfernen"
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
 msgid "Relation Editor: Remove Selected"
 msgstr "Relations-Editor: Ausgewählte entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851
 msgid ""
 "Select relation members which refer to primitives in the current selection"
@@ -5350,5 +5547,5 @@
 "Wählen Sie Relationselemente aus, die in der aktuellen Auswahl vorkommen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849
 #, java-format
 msgid ""
@@ -5359,57 +5556,57 @@
 "Auswahl vorkommen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873
 msgid "Select primitives for selected relation members"
 msgstr "Objekte für gewählte Relationselemente auswählen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:961
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
 msgid "Sort the relation members"
 msgstr "Relationselemente sortieren"
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897
 msgid "Relation Editor: Sort"
 msgstr "Relations-Editor: Sortieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909
 msgid "Move the currently selected members up"
 msgstr "Ausgewählte Elemente nach oben schieben"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:979
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:912
 msgid "Relation Editor: Move Up"
 msgstr "Relations-Editor: Nach oben verschieben"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928
 msgid "Move the currently selected members down"
 msgstr "Ausgewählte Elemente nach unten schieben"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:998
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:931
 msgid "Relation Editor: Move Down"
 msgstr "Relations-Editor: Nach unten verschieben"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947
 msgid "Remove the currently selected members from this relation"
 msgstr "Das aktuell ausgewählte Element aus dieser Beziehung entfernen"
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
 msgid "Relation Editor: Remove"
 msgstr "Relations-Editor: Entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
 msgid "Delete the currently edited relation"
 msgstr "Die aktuell bearbeitete Beziehung löschen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Yes, create a conflict and close"
 msgstr "Konflikt erstellen und schließen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050
 msgid "No, continue editing"
 msgstr "Bearbeitung fortsetzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5421,9 +5618,9 @@
 "<br><br>Soll ein Konflikt erstellt und der Editor geschlossen werden?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1058
 msgid "Conflict in data"
 msgstr "Datenkonflikt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
 #, java-format
 msgid ""
@@ -5431,59 +5628,44 @@
 "<br>Please resolve this conflict first, then try again.</html>"
 msgstr ""
-"<html>Ebene ''{0}'' kennt bereits einen Konflikt für das Element<br>''{1}''."
-"<br>Bitte lösen Sie diesen Konflikt zunächst auf.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
+"<html>Ebene ''{0}'' enthält bereits einen Konflikt für das "
+"Element<br>''{1}''.<br>Bitte lösen Sie diesen Konflikt zunächst auf.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090
 msgid "Apply the current updates"
 msgstr "Aktualisierung übernehmen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123
 msgid "Apply the updates and close the dialog"
 msgstr "Updates anwenden und den Dialog schliessen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Cancel the updates and close the dialog"
 msgstr "Updates abbrechen und den Dialog schliessen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 msgid "Add an empty tag"
 msgstr "Einen leeren Schlüssel hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
-msgid "Delete the currently selected tags"
-msgstr "Die ausgewählten Merkmale löschen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Alle nicht vollständigen Wege und Knoten der Relation herunterladen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 msgid "Download Members"
 msgstr "Elemente herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Relation Editor: Download Members"
 msgstr "Relations-Editor: Elemente herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1208
 msgid "Sets a role for the selected members"
 msgstr "Definiert eine Rolle für die ausgewählten Elemente"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1211
 msgid "Apply Role"
 msgstr "Rolle anwenden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1356
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 #, java-format
 msgid ""
@@ -5496,13 +5678,13 @@
 "</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228
 msgid "Yes, apply it"
 msgstr "Übernehmen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1229
 msgid "No, don't apply"
 msgstr "Nicht übernehmen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1367
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
 msgid "Confirm empty role"
 msgstr "Leere Rolle bestätigen"
@@ -5541,7 +5723,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
-#, fuzzy, java-format
+#, java-format
 msgid "child.getId() >0 expected. Got {1}"
-msgstr "Erwarte child.id > 0. Erhielt {1}"
+msgstr "Es wurde child.getId() >0 erwartet, aber stattdessen {1} erhalten."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
@@ -5555,5 +5737,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109
 msgid "Loading parent relations"
-msgstr ""
+msgstr "Elternrelationen laden"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142
@@ -5587,6 +5769,6 @@
 msgid "Warning: ignoring exception because task was cancelled. Exception was: "
 msgstr ""
-"Warnung: ignoriere eine Fehlermedlung, weil der zugrundeliegende Vorgang "
-"abgebrochen wurde. Fehlermeldung war: "
+"Warnung: Ignoriere Fehlermedlung, da der zugrundeliegende Vorgang "
+"abgebrochen wurde. Die Fehlermeldung lautete: "
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:44
@@ -5594,37 +5776,37 @@
 msgstr "Lesezeichen"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:82
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
 msgid "Please enter the desired coordinates first."
 msgstr "Bitte wählen Sie zuerst die gewünschten Koordinaten."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
 msgid "Please enter a name for the location."
 msgstr "Bitte geben Sie einen Namen für den Ort an."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
 msgid "Name of location"
 msgstr "Name des Ortes"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:107
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
 msgid "Select a bookmark first."
 msgstr "Bitte wählen Sie erst ein Lesezeichen."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
 msgid "min lat"
 msgstr "min Breite"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
 msgid "min lon"
 msgstr "min Länge"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid "max lat"
 msgstr "max Breite"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
 msgid "max lon"
 msgstr "max Länge"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5634,26 +5816,26 @@
 "zu laden)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
 msgid "Bounding Box"
 msgstr "Koordinaten"
 
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
 msgid "Data Sources and Types"
 msgstr "Datenquellen und Typen"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
 msgid "Download as new layer"
 msgstr "Als neue Ebene laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
 msgid "Download Area"
 msgstr "Bereich laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
 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:219
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
 msgid "Download area ok, size probably acceptable to server"
 msgstr "Bereich korrekt, Größe ist wahrscheinlich akzeptabel für den Server"
@@ -5678,7 +5860,7 @@
 msgstr "Bitte einen Ortsnamen eingeben, nach dem gesucht werden soll:"
 
-#. <separator/>
+#. group "Geography"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2759
 msgid "Places"
 msgstr "Orte"
@@ -5725,21 +5907,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "type"
 msgstr "Typ"
@@ -5756,5 +5938,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-#, fuzzy
 msgid ""
 "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
@@ -5762,7 +5943,4 @@
 "Hold left mousebutton and draw a frame."
 msgstr ""
-"<b>Zoom:</b> Mausrad, Doppelklick oder Strg + Hoch/Runter <b>Karte bewegen:</"
-"b> Rechte Maustaste halten und Maus bewegen oder Pfeiltasten nutzen. "
-"<b>Auswahl:</b> Klick."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
@@ -5812,5 +5990,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
 msgid "Reload the history from the server"
-msgstr ""
+msgstr "Geschichte erneut vom Server laden"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:180
@@ -6231,4 +6409,6 @@
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
 #. <key key="historic" value="wayside_shrine" />
+#. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
+#. <key key="historic" value="boundary_stone" />
 #. item "Leisure/Water Park" label "Edit Water Park"
 #. <key key="leisure" value="water_park" />
@@ -6600,158 +6780,159 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/trans_presets.java:66 build/trans_presets.java:102
-#: build/trans_presets.java:142 build/trans_presets.java:179
-#: build/trans_presets.java:199 build/trans_presets.java:217
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:272 build/trans_presets.java:305
-#: build/trans_presets.java:351 build/trans_presets.java:371
-#: build/trans_presets.java:386 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:463 build/trans_presets.java:482
-#: build/trans_presets.java:502 build/trans_presets.java:522
-#: build/trans_presets.java:543 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627 build/trans_presets.java:658
-#: build/trans_presets.java:679 build/trans_presets.java:692
-#: build/trans_presets.java:705 build/trans_presets.java:718
-#: build/trans_presets.java:731 build/trans_presets.java:744
-#: build/trans_presets.java:755 build/trans_presets.java:764
-#: build/trans_presets.java:811 build/trans_presets.java:832
-#: build/trans_presets.java:841 build/trans_presets.java:901
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1067 build/trans_presets.java:1075
-#: build/trans_presets.java:1085 build/trans_presets.java:1093
-#: build/trans_presets.java:1098 build/trans_presets.java:1105
-#: build/trans_presets.java:1112 build/trans_presets.java:1117
-#: build/trans_presets.java:1125 build/trans_presets.java:1134
-#: build/trans_presets.java:1140 build/trans_presets.java:1146
-#: build/trans_presets.java:1151 build/trans_presets.java:1157
-#: build/trans_presets.java:1163 build/trans_presets.java:1172
-#: build/trans_presets.java:1181 build/trans_presets.java:1188
-#: build/trans_presets.java:1196 build/trans_presets.java:1209
-#: build/trans_presets.java:1215 build/trans_presets.java:1224
-#: build/trans_presets.java:1230 build/trans_presets.java:1236
-#: build/trans_presets.java:1244 build/trans_presets.java:1299
-#: build/trans_presets.java:1346 build/trans_presets.java:1352
-#: build/trans_presets.java:1358 build/trans_presets.java:1364
-#: build/trans_presets.java:1370 build/trans_presets.java:1381
-#: build/trans_presets.java:1390 build/trans_presets.java:1405
-#: build/trans_presets.java:1412 build/trans_presets.java:1418
-#: build/trans_presets.java:1426 build/trans_presets.java:1433
-#: build/trans_presets.java:1442 build/trans_presets.java:1450
-#: build/trans_presets.java:1457 build/trans_presets.java:1468
-#: build/trans_presets.java:1478 build/trans_presets.java:1488
-#: build/trans_presets.java:1508 build/trans_presets.java:1520
-#: build/trans_presets.java:1531 build/trans_presets.java:1548
-#: build/trans_presets.java:1555 build/trans_presets.java:1570
-#: build/trans_presets.java:1577 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1594
-#: build/trans_presets.java:1599 build/trans_presets.java:1605
-#: build/trans_presets.java:1611 build/trans_presets.java:1619
-#: build/trans_presets.java:1627 build/trans_presets.java:1635
-#: build/trans_presets.java:1642 build/trans_presets.java:1648
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1670 build/trans_presets.java:1677
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1712 build/trans_presets.java:1719
-#: build/trans_presets.java:1736 build/trans_presets.java:1744
-#: build/trans_presets.java:1759 build/trans_presets.java:1769
-#: build/trans_presets.java:1781 build/trans_presets.java:1788
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:1809 build/trans_presets.java:1817
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1841
-#: build/trans_presets.java:1846 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1864
-#: build/trans_presets.java:1872 build/trans_presets.java:1881
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1908 build/trans_presets.java:1914
-#: build/trans_presets.java:1922 build/trans_presets.java:1928
-#: build/trans_presets.java:1934 build/trans_presets.java:1940
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2013
-#: build/trans_presets.java:2022 build/trans_presets.java:2030
-#: build/trans_presets.java:2036 build/trans_presets.java:2042
-#: build/trans_presets.java:2048 build/trans_presets.java:2054
-#: build/trans_presets.java:2060 build/trans_presets.java:2066
-#: build/trans_presets.java:2072 build/trans_presets.java:2078
-#: build/trans_presets.java:2084 build/trans_presets.java:2090
-#: build/trans_presets.java:2096 build/trans_presets.java:2102
-#: build/trans_presets.java:2108 build/trans_presets.java:2114
-#: build/trans_presets.java:2120 build/trans_presets.java:2126
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2158
-#: build/trans_presets.java:2165 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2186
-#: build/trans_presets.java:2192 build/trans_presets.java:2198
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2218 build/trans_presets.java:2225
-#: build/trans_presets.java:2232 build/trans_presets.java:2239
-#: build/trans_presets.java:2247 build/trans_presets.java:2279
-#: build/trans_presets.java:2284 build/trans_presets.java:2289
-#: build/trans_presets.java:2294 build/trans_presets.java:2300
-#: build/trans_presets.java:2306 build/trans_presets.java:2312
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2354
-#: build/trans_presets.java:2451 build/trans_presets.java:2458
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2485 build/trans_presets.java:2492
-#: build/trans_presets.java:2498 build/trans_presets.java:2504
-#: build/trans_presets.java:2526 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2553 build/trans_presets.java:2559
-#: build/trans_presets.java:2565 build/trans_presets.java:2571
-#: build/trans_presets.java:2577 build/trans_presets.java:2583
-#: build/trans_presets.java:2590 build/trans_presets.java:2597
-#: build/trans_presets.java:2604 build/trans_presets.java:2610
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2661
-#: build/trans_presets.java:2667 build/trans_presets.java:2677
-#: build/trans_presets.java:2686 build/trans_presets.java:2701
-#: build/trans_presets.java:2707 build/trans_presets.java:2715
-#: build/trans_presets.java:2722 build/trans_presets.java:2742
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2783
-#: build/trans_presets.java:2790 build/trans_presets.java:2797
-#: build/trans_presets.java:2803 build/trans_presets.java:2809
-#: build/trans_presets.java:2817 build/trans_presets.java:2824
-#: build/trans_presets.java:2831 build/trans_presets.java:2838
-#: build/trans_presets.java:2844 build/trans_presets.java:2851
-#: build/trans_presets.java:2858 build/trans_presets.java:2867
-#: build/trans_presets.java:2873 build/trans_presets.java:2879
-#: build/trans_presets.java:2885 build/trans_presets.java:2891
-#: build/trans_presets.java:2900 build/trans_presets.java:2910
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2948
-#: build/trans_presets.java:2957 build/trans_presets.java:2963
-#: build/trans_presets.java:2969 build/trans_presets.java:2975
-#: build/trans_presets.java:2981 build/trans_presets.java:2987
-#: build/trans_presets.java:2993 build/trans_presets.java:3000
-#: build/trans_presets.java:3006 build/trans_presets.java:3011
-#: build/trans_presets.java:3018 build/trans_presets.java:3025
-#: build/trans_presets.java:3031 build/trans_presets.java:3040
-#: build/trans_presets.java:3048 build/trans_presets.java:3054
-#: build/trans_presets.java:3060 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3080
-#: build/trans_presets.java:3086 build/trans_presets.java:3092
-#: build/trans_presets.java:3098 build/trans_presets.java:3104
-#: build/trans_presets.java:3117 build/trans_presets.java:3131
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:67 build/trans_presets.java:103
+#: build/trans_presets.java:143 build/trans_presets.java:180
+#: build/trans_presets.java:200 build/trans_presets.java:218
+#: build/trans_presets.java:235 build/trans_presets.java:253
+#: build/trans_presets.java:273 build/trans_presets.java:306
+#: build/trans_presets.java:352 build/trans_presets.java:372
+#: build/trans_presets.java:387 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:503 build/trans_presets.java:523
+#: build/trans_presets.java:544 build/trans_presets.java:565
+#: build/trans_presets.java:586 build/trans_presets.java:607
+#: build/trans_presets.java:628 build/trans_presets.java:659
+#: build/trans_presets.java:680 build/trans_presets.java:693
+#: build/trans_presets.java:706 build/trans_presets.java:719
+#: build/trans_presets.java:732 build/trans_presets.java:745
+#: build/trans_presets.java:756 build/trans_presets.java:765
+#: build/trans_presets.java:812 build/trans_presets.java:833
+#: build/trans_presets.java:842 build/trans_presets.java:902
+#: build/trans_presets.java:1053 build/trans_presets.java:1061
+#: build/trans_presets.java:1069 build/trans_presets.java:1077
+#: build/trans_presets.java:1087 build/trans_presets.java:1095
+#: build/trans_presets.java:1100 build/trans_presets.java:1107
+#: build/trans_presets.java:1114 build/trans_presets.java:1119
+#: build/trans_presets.java:1127 build/trans_presets.java:1136
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1153 build/trans_presets.java:1159
+#: build/trans_presets.java:1165 build/trans_presets.java:1174
+#: build/trans_presets.java:1183 build/trans_presets.java:1190
+#: build/trans_presets.java:1198 build/trans_presets.java:1211
+#: build/trans_presets.java:1217 build/trans_presets.java:1226
+#: build/trans_presets.java:1232 build/trans_presets.java:1238
+#: build/trans_presets.java:1246 build/trans_presets.java:1302
+#: build/trans_presets.java:1349 build/trans_presets.java:1355
+#: build/trans_presets.java:1361 build/trans_presets.java:1367
+#: build/trans_presets.java:1373 build/trans_presets.java:1384
+#: build/trans_presets.java:1393 build/trans_presets.java:1408
+#: build/trans_presets.java:1415 build/trans_presets.java:1421
+#: build/trans_presets.java:1429 build/trans_presets.java:1436
+#: build/trans_presets.java:1445 build/trans_presets.java:1453
+#: build/trans_presets.java:1460 build/trans_presets.java:1471
+#: build/trans_presets.java:1481 build/trans_presets.java:1491
+#: build/trans_presets.java:1511 build/trans_presets.java:1523
+#: build/trans_presets.java:1534 build/trans_presets.java:1551
+#: build/trans_presets.java:1558 build/trans_presets.java:1574
+#: build/trans_presets.java:1581 build/trans_presets.java:1586
+#: build/trans_presets.java:1592 build/trans_presets.java:1598
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1646 build/trans_presets.java:1652
+#: build/trans_presets.java:1659 build/trans_presets.java:1666
+#: build/trans_presets.java:1674 build/trans_presets.java:1681
+#: build/trans_presets.java:1689 build/trans_presets.java:1696
+#: build/trans_presets.java:1702 build/trans_presets.java:1709
+#: build/trans_presets.java:1716 build/trans_presets.java:1723
+#: build/trans_presets.java:1740 build/trans_presets.java:1748
+#: build/trans_presets.java:1763 build/trans_presets.java:1773
+#: build/trans_presets.java:1785 build/trans_presets.java:1792
+#: build/trans_presets.java:1798 build/trans_presets.java:1808
+#: build/trans_presets.java:1813 build/trans_presets.java:1821
+#: build/trans_presets.java:1828 build/trans_presets.java:1834
+#: build/trans_presets.java:1840 build/trans_presets.java:1845
+#: build/trans_presets.java:1850 build/trans_presets.java:1855
+#: build/trans_presets.java:1862 build/trans_presets.java:1868
+#: build/trans_presets.java:1873 build/trans_presets.java:1882
+#: build/trans_presets.java:1891 build/trans_presets.java:1900
+#: build/trans_presets.java:1909 build/trans_presets.java:1918
+#: build/trans_presets.java:1924 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 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:2023 build/trans_presets.java:2032
+#: build/trans_presets.java:2040 build/trans_presets.java:2046
+#: build/trans_presets.java:2052 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 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:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2150
+#: build/trans_presets.java:2156 build/trans_presets.java:2162
+#: build/trans_presets.java:2169 build/trans_presets.java:2176
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2197 build/trans_presets.java:2203
+#: build/trans_presets.java:2209 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2229
+#: build/trans_presets.java:2236 build/trans_presets.java:2243
+#: build/trans_presets.java:2250 build/trans_presets.java:2258
+#: build/trans_presets.java:2290 build/trans_presets.java:2295
+#: build/trans_presets.java:2300 build/trans_presets.java:2305
+#: build/trans_presets.java:2311 build/trans_presets.java:2317
+#: build/trans_presets.java:2323 build/trans_presets.java:2331
+#: build/trans_presets.java:2337 build/trans_presets.java:2343
+#: build/trans_presets.java:2349 build/trans_presets.java:2355
+#: build/trans_presets.java:2365 build/trans_presets.java:2462
+#: build/trans_presets.java:2469 build/trans_presets.java:2483
+#: build/trans_presets.java:2489 build/trans_presets.java:2496
+#: build/trans_presets.java:2503 build/trans_presets.java:2509
+#: build/trans_presets.java:2515 build/trans_presets.java:2537
+#: build/trans_presets.java:2544 build/trans_presets.java:2551
+#: build/trans_presets.java:2557 build/trans_presets.java:2564
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2594 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2615
+#: build/trans_presets.java:2621 build/trans_presets.java:2627
+#: build/trans_presets.java:2633 build/trans_presets.java:2639
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2672 build/trans_presets.java:2678
+#: build/trans_presets.java:2688 build/trans_presets.java:2697
+#: build/trans_presets.java:2712 build/trans_presets.java:2718
+#: build/trans_presets.java:2726 build/trans_presets.java:2733
+#: build/trans_presets.java:2753 build/trans_presets.java:2764
+#: build/trans_presets.java:2770 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2788
+#: build/trans_presets.java:2795 build/trans_presets.java:2802
+#: build/trans_presets.java:2809 build/trans_presets.java:2815
+#: build/trans_presets.java:2821 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2912
+#: build/trans_presets.java:2922 build/trans_presets.java:2931
+#: build/trans_presets.java:2937 build/trans_presets.java:2943
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 build/trans_presets.java:2981
+#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:2999 build/trans_presets.java:3005
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3023 build/trans_presets.java:3030
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3066 build/trans_presets.java:3072
+#: build/trans_presets.java:3079 build/trans_presets.java:3085
+#: build/trans_presets.java:3092 build/trans_presets.java:3098
+#: build/trans_presets.java:3104 build/trans_presets.java:3110
+#: build/trans_presets.java:3116 build/trans_presets.java:3129
+#: build/trans_presets.java:3143 build/trans_presets.java:3157
 msgid "Name"
 msgstr "Name"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:50
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
@@ -6759,18 +6940,18 @@
 msgstr ""
 "<html>Version <strong>{0}</strong> erstellt am <strong>{1}</strong> von "
-"<strong>{2}</strong> im Changeset <strong>{3}</strong>"
+"<strong>{2}</strong> im Änderungssatz <strong>{3}</strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
 msgid "Changeset info"
-msgstr ""
+msgstr "Informationen zum Änderungssatz"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119
 msgid "Launch browser with information about the changeset"
-msgstr ""
+msgstr "Externen Browser mit Informationen zum Änderungssatz öffnen"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:138
 #, java-format
 msgid "Show changeset {0}"
-msgstr "Changeset {0} anzeigen"
+msgstr "Änderungssatz {0} anzeigen"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:72
@@ -6783,7 +6964,61 @@
 msgstr "Version"
 
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
+#, fuzzy
+msgid "Changeset id:"
+msgstr "Informationen zum Änderungssatz"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
+#, fuzzy
+msgid "Created at:"
+msgstr "Gebiete erstellen"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
+#, fuzzy
+msgid "Changeset comment:"
+msgstr "Informationen zum Änderungssatz"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
+msgid "No open changeset"
+msgstr "Kein offener Änderungssatz"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48
+#, fuzzy
+msgid "<html>Please select the changesets you want to close</html>"
+msgstr "Bitte wählen Sie welche, Objekteigenschaften geändert werden sollen."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
+#, fuzzy
+msgid "Open changesets"
+msgstr "Kein offener Änderungssatz"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101
+#, fuzzy
+msgid "Close changesets"
+msgstr "Änderungssatz schließen"
+
+#. putValue(SMALL_ICON, ImageProvider.get("cancel"));
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
+#, fuzzy
+msgid "Close the selected open changesets"
+msgstr "Den aktuelle Änderungssatz schließen..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126
+#, fuzzy
+msgid "Cancel closeing of changesets"
+msgstr "Änderungssatz schließen"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37
+msgid "Closing changeset"
+msgstr "Änderungssatz schließen"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77
+#, fuzzy, java-format
+msgid "Closing changeset {0}"
+msgstr "Änderungssatz {0} schließen..."
+
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
 msgid "Launch a file chooser to select a file"
-msgstr ""
+msgstr "Auswahldialog für Datei öffnen"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148
@@ -6805,29 +7040,33 @@
 msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
 msgstr ""
+"Ebene \"{0}\" enthält Modifikationen, die zum Server hochgeladen werden "
+"sollen."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50
-#, java-format
-msgid "Layer ''{0}'' has no modifications to be uploaded"
-msgstr ""
+#, fuzzy, java-format
+msgid "Layer ''{0}'' has no modifications to be uploaded."
+msgstr "Ebene \"{0}\" enthält keine Modifikationen zum Hochladen"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:61
-#, java-format
-msgid ""
-"Layer ''{0}'' has modifications which should be saved to its assoicated file "
+#, fuzzy, java-format
+msgid ""
+"Layer ''{0}'' has modifications which should be saved to its associated file "
 "''{1}''."
 msgstr ""
+"Ebene \"{0}\" enthält Modifikationen, die zum Server hochgeladen werden "
+"sollen."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63
-#, java-format
-msgid "Layer ''{0}'' has no modifications to be saved"
-msgstr ""
+#, fuzzy, java-format
+msgid "Layer ''{0}'' has no modifications to be saved."
+msgstr "Ebene \"{0}\" enthält keine Modifikationen zum Speichern"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:81
 msgid "No file associated with this layer"
-msgstr ""
+msgstr "Keine Datei ist mit dieser Ebene verknüpft"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84
 msgid "Please select a file"
-msgstr ""
+msgstr "Bitte wählen Sie eine Datei"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87
@@ -6840,4 +7079,6 @@
 msgid "File ''{0}'' is not writable. Please enter another file name."
 msgstr ""
+"Datei \"{0}\" kann nicht geschrieben werden. Bitte wählen Sie einen anderen "
+"Dateinamen."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:110
@@ -6845,24 +7086,24 @@
 #, java-format
 msgid "Select to upload layer ''{0}'' to the server ''{1}''"
-msgstr ""
+msgstr "Auswählen, um die Ebene \"{0}\" zum Server \"{1}\" hochzuladen"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:49
 #, java-format
 msgid "Saving layer to ''{0}'' ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114
+msgstr "Ebene in \"{0}\" speichern..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113
 msgid "Unsaved changes - Save/Upload before exiting?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120
+msgstr "Ungespeicherte Änderungen - Vor dem Beenden speichern/hochladen?"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119
 msgid "Unsaved changes - Save/Upload before deleting?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140
+msgstr "Ungespeicherte Änderungen - Vor dem Löschen speichern/hochladen?"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139
 msgid "Uploading and saving modified layers ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195
+msgstr "Veränderte Ebenen hochladen und speichern..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194
 #, java-format
 msgid ""
@@ -6875,10 +7116,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205
 msgid "Unsaved data and conflicts"
-msgstr "Konflikte auflösen"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
+msgstr "Ungespeicherte Daten und Konflikte"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212
 #, java-format
 msgid ""
@@ -6892,9 +7132,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223
 msgid "Unsaved data and missing associated file"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
+msgstr "Ungespeicherte Daten und fehlende Dateiverknüpfung"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230
 #, java-format
 msgid ""
@@ -6907,30 +7147,35 @@
 "changes.<br>Layers with non-writable files:</html>"
 msgstr[0] ""
+"<html>{0} Ebene sollte gespeichert werden, jedoch ist die<br>zugehörige "
+"Datei schreibgeschützt.<br>Wähle eine andere Datei aus oder verwerfe die "
+"Änderungen.<br>Ebene mit schreibgeschützter Datei:</html>"
 msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
-#, fuzzy
+"<html>{0} Ebenen sollten gespeichert werden, jedoch sind die<br>zugehörigen "
+"Dateien schreibgeschützt.<br>Wähle andere Dateien aus oder verwerfe die "
+"Änderungen.<br>Ebenen mit schreibgeschützten Dateien:</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243
 msgid "Unsaved data non-writable files"
-msgstr "Standarddatei zum Merkmale ignorieren verwenden."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286
+msgstr "Ungespeicherte Daten schreibgeschützter Dateien"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
 msgid "Close this dialog and resume editing in JOSM"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318
+msgstr "Diesen Dialog schließen und Bearbeitung in JOSM fortsetzen"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 "JOSM ohne Speichern verlassen. Ungespeicherte Änderungen gehen verloren."
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322
+msgid "Discard and Delete"
+msgstr "Verwerfen und Löschen"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
-msgid "Discard and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
 "Ebene ohne Speichern löschen. Ungespeicherte Änderungen gehen verloren."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
@@ -6938,18 +7183,20 @@
 "und/oder gespeichert."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354
 msgid "Save and Delete"
 msgstr "Speichern und Löschen"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
 msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403
+"Ebene vor dem Löschen speichern/hochladen. Ungespeicherte Änderungen gehen "
+"nicht verloren."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402
 #, java-format
 msgid "Preparing layer ''{0}'' for upload ..."
 msgstr "Ebene \"{0}\" für Hochladen vorbereiten..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
@@ -6959,5 +7206,5 @@
 "Modifikationen<br>wurde abgebrochen oder ist fehlgeschlagen.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491
 msgid "Incomplete upload and/or save"
 msgstr "Unvollständiges Hochladen und/oder Speichern"
@@ -6997,21 +7244,21 @@
 #. item "Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:200
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:278
-#: build/trans_presets.java:311 build/trans_presets.java:357
-#: build/trans_presets.java:372 build/trans_presets.java:387
-#: build/trans_presets.java:409 build/trans_presets.java:429
-#: build/trans_presets.java:450 build/trans_presets.java:470
-#: build/trans_presets.java:489 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:549
-#: build/trans_presets.java:570 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:633
-#: build/trans_presets.java:664 build/trans_presets.java:1060
-#: build/trans_presets.java:1068 build/trans_presets.java:1076
-#: build/trans_presets.java:1086 build/trans_presets.java:1305
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:242
+#: build/trans_presets.java:260 build/trans_presets.java:279
+#: build/trans_presets.java:312 build/trans_presets.java:358
+#: build/trans_presets.java:373 build/trans_presets.java:388
+#: build/trans_presets.java:410 build/trans_presets.java:430
+#: build/trans_presets.java:451 build/trans_presets.java:471
+#: build/trans_presets.java:490 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:665 build/trans_presets.java:1062
+#: build/trans_presets.java:1070 build/trans_presets.java:1078
+#: build/trans_presets.java:1088 build/trans_presets.java:1308
 msgid "Layer"
 msgstr "Ebene"
@@ -7019,9 +7266,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29
 msgid "Should upload?"
-msgstr ""
+msgstr "Hochladen empfohlen?"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37
 msgid "Should save?"
-msgstr ""
+msgstr "Speichern empfohlen?"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45
@@ -7030,73 +7277,32 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:200
 msgid "Upload"
 msgstr "Hochladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-msgid "Use a new changeset and close it"
-msgstr "Neuen Änderungssatz erstellen und danach schließen"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
-msgid ""
-"Select to upload the data using a new changeset and to close the changeset "
-"after the upload"
-msgstr ""
-"Auswählen, um in ein neues Changeset hochzuladen und das Changeset dann zu "
-"schließen"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
-msgid "Use a new changeset and leave it open"
-msgstr "Neuen Änderungssatz erstellen und geöffnet lassen"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
-msgid ""
-"Select to upload the data using a new changeset and to leave the changeset "
-"open after the upload"
-msgstr ""
-"Auswählen, um in ein neues Changeset hochzuladen und das Changeset für "
-"weitere Uploads geöffnet zu lassen"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
-msgid "Upload to a new or to an existing changeset?"
-msgstr "In einem neuen oder vorhandenen Änderungssatz hochladen?"
-
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
-msgid "upload all changes in one request"
-msgstr "Alle Änderungen mit einer Anfrage hochladen"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
-msgid ""
-"Enable to upload all changes in one request, disable to use one request per "
-"changed primitive"
-msgstr ""
-"Zum Hochladen aller Änderungen mit nur einer Anfrage aktivieren. "
-"Deaktivieren zur Nutzung eine Anfrage je geändertem Objekt."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171
-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/gui/io/UploadDialog.java:216
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908
 msgid "Tags of new changeset"
 msgstr "Merkmale des neuen Änderungssatzes"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:221
 msgid "Objects to add:"
 msgstr "Neue Objekte:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:227
 msgid "Objects to modify:"
 msgstr "Geänderte Objekte:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:233
 msgid "Objects to delete:"
 msgstr "Zu löschende Objekte:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
 #, java-format
 msgid "{0} object to add:"
@@ -7105,5 +7311,5 @@
 msgstr[1] "{0} hinzugefügte Objekte:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:277
 #, java-format
 msgid "{0} object to modifiy:"
@@ -7112,5 +7318,5 @@
 msgstr[1] "{0} bearbeitete Objekte:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:286
 #, java-format
 msgid "{0} object to delete:"
@@ -7119,63 +7325,99 @@
 msgstr[1] "{0} zu löschende Objekte:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422
-#, java-format
-msgid "Use the existing changeset {0} and close it after upload"
-msgstr "Vorhandenes Changeset {0} verwenden und nach dem Upload schließen"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:423
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to close the changeset "
-"after this upload"
-msgstr ""
-"Auswählen, um in das vorhandene Changeset {0} hochzuladen und das Changeset "
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:470
+msgid "Upload Changes"
+msgstr "Änderungen hochladen"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472
+msgid "Upload the changed primitives"
+msgstr "Geänderte Objekte hochladen"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
+msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+msgstr "Bitte gib einen Kommentar für den Änderungssatz ein. (mind. 3 Zeichen)"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:479
+msgid "Illegal upload comment"
+msgstr "Ungültiger Kommentar"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
+msgid "Cancel the upload and resume editing"
+msgstr "Hochladen abbrechend und Bearbeitung fortsetzen"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606
+#, fuzzy
+msgid "Upload all changes in one request"
+msgstr "Alle Änderungen mit einer Anfrage hochladen"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607
+msgid ""
+"Enable to upload all changes in one request, disable to use one request per "
+"changed primitive"
+msgstr ""
+"Zum Hochladen aller Änderungen mit nur einer Anfrage aktivieren. "
+"Deaktivieren zur Nutzung eine Anfrage je geändertem Objekt."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:617
+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/gui/io/UploadDialog.java:672
+#, fuzzy
+msgid "Open a new changeset"
+msgstr "Merkmale des neuen Änderungssatzes"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
+#, fuzzy
+msgid "Open a new changeset and use it in the next upload"
+msgstr "Neuen Änderungssatz erstellen und geöffnet lassen"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
+#, fuzzy
+msgid "Use an open changeset"
+msgstr "Kein offener Änderungssatz"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
+#, fuzzy
+msgid "Upload data to an already opened changeset"
+msgstr "In einem neuen oder vorhandenen Änderungssatz hochladen?"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
+#, fuzzy
+msgid "Close changeset after upload"
+msgstr "Keine Änderungen zum Hochladen vorhanden."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
+#, fuzzy
+msgid "Select to close the changeset after the next upload"
+msgstr ""
+"Auswählen, um in einen neuen Änderungssatz hochzuladen und den Änderungssatz "
 "dann zu schließen"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426
-#, java-format
-msgid "Use the existing changeset {0} and leave it open"
-msgstr "Vorhandenes Changeset {0} verwenden und geöffnet lassen"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:427
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to leave the changeset "
-"open for further uploads"
-msgstr ""
-"Auswählen, um in das vorhandene Changeset {0} hochzuladen und das Changeset "
-"für weitere Uploads geöffnet zu lassen"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922
 #, java-format
 msgid "Tags of changeset {0}"
 msgstr "Merkmale für Änderungssatz {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584
-msgid "Upload Changes"
-msgstr "Änderungen hochladen"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
 #, fuzzy
-msgid "Upload the changed primitives"
-msgstr "Diese Änderungen hochladen?"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592
+msgid "Load the list of your open changesets from the server"
+msgstr "Geschichte erneut vom Server laden"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
 #, fuzzy
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "Bitte geben Sie einen Namen für den Ort an."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:593
-msgid "Illegal upload comment"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
-#, fuzzy
-msgid "Cancel the upload and resume editing"
-msgstr "Updates abbrechen und den Dialog schliessen"
+msgid "Close the currently selected open changeset"
+msgstr "Die ausgewählten Merkmale löschen"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
+#, fuzzy, java-format
+msgid "changeset id > 0 expected. Got {1}"
+msgstr "Es wurde child.getId() >0 erwartet, aber stattdessen {1} erhalten."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63
 msgid "Preparing primitives to upload ..."
-msgstr ""
+msgstr "Objekte zum Hochladen vorbereiten..."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
@@ -7249,5 +7491,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
@@ -7285,5 +7527,5 @@
 msgstr "Die eingegebene Zeit konnte nicht eingelesen werden."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
@@ -7291,30 +7533,30 @@
 msgstr "GPS-Punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
 msgid "Customize line drawing"
 msgstr "Linienaussehen anpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
 msgid "Use global settings."
 msgstr "Globale Einstellungen verwenden."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Draw lines between points for this layer."
 msgstr "Linien zwischen Punkten dieser Ebene zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Do not draw lines between points for this layer."
 msgstr "Keine Linien zwischen Punkten dieser Ebene zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 msgid "Select line drawing options"
 msgstr "Linienaussehen wählen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7322,5 +7564,5 @@
 msgstr "Farben anpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7329,5 +7571,5 @@
 msgstr "Voreinstellung"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7336,38 +7578,75 @@
 msgstr "Farbe auswählen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
 msgid "Markers From Named Points"
 msgstr "Marken von benannten Punkten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Benannte GPS-Punkte von {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
 msgid "Import Audio"
 msgstr "Audio importieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
 msgid "Wave Audio files (*.wav)"
 msgstr "Audio-Dateien im Wave-Format (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Audio-Marken von {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
 msgid "Import images"
 msgstr "Bilder importieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#, java-format
+msgid "Name: {0}"
+msgstr "Name: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#, java-format
+msgid "Description: {0}"
+msgstr "Beschreibung: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#, fuzzy, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
 msgstr[0] "{0} GPS-Spur, "
 msgstr[1] "{0} GPS-Spuren, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
+#: build/trans_presets.java:3160
+msgid "Description"
+msgstr "Beschreibung"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#, fuzzy
+msgid "Timespan"
+msgstr "Zeitspanne: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#, fuzzy
+msgid "Length"
+msgstr "Länge: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
+msgid "URL"
+msgstr "URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+msgid "Length: "
+msgstr "Länge: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
 #, java-format
 msgid "{0} route, "
@@ -7376,5 +7655,5 @@
 msgstr[1] "{0} Routen, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 #, java-format
 msgid "{0} waypoint"
@@ -7383,29 +7662,10 @@
 msgstr[1] "{0} Wegpunkte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
-#, java-format
-msgid "Name: {0}"
-msgstr "Name: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
-#, java-format
-msgid "Description: {0}"
-msgstr "Beschreibung: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
-msgid "Timespan: "
-msgstr "Zeitspanne: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
-msgid "Length: "
-msgstr "Länge: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Zur Daten-Ebene konvertieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7415,10 +7675,10 @@
 "<br>Weitere Informationen, falls Sie die GPX-Spur hochladen möchten:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -7429,29 +7689,29 @@
 msgstr "Konvertiert von: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
 msgid "Download from OSM along this track"
 msgstr "OSM-Daten entlang der GPS-Spur herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
 msgid "Download everything within:"
 msgstr "Alles im Bereich herunterladen:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
 #, java-format
 msgid "{0} meters"
 msgstr "{0} Meter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 msgid "Maximum area per request:"
 msgstr "Maximalgebiet je Anfrage:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
 #, java-format
 msgid ""
@@ -7462,9 +7722,9 @@
 "fortfahren?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
 msgid "Download data"
 msgstr "Daten herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
@@ -7472,5 +7732,5 @@
 "werden kann."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7480,5 +7740,5 @@
 "wurden ignoriert oder an den Anfang verschoben."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7532,30 +7792,29 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
-#, fuzzy
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
 "<br>If you want to upload traces, look here:</html>"
 msgstr ""
-"<html>Hochladen von unbearbeiteten GPS-Daten als Kartendaten ist unerwünscht!"
-"<br>Weitere Informationen, falls Sie die GPX-Spur hochladen möchten:"
+"<html>Das Hochladen unbearbeiteter GPS-Daten wird als schädlich angesehen."
+"<br>Informationen zum Hochladen von Tracks finden Sie hier:</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "track"
 msgid_plural "tracks"
@@ -7696,4 +7955,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
@@ -7938,13 +8198,18 @@
 msgstr "Große GPS-Punkte zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+msgid "Draw a circle form HDOP value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Geschwindigkeit (rot = langsam, grün = schnell)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Positionsverschlechterung (rot = hoch, grün = langsam, wenn verfügbar)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Einzelne Farbe (kann für benannte Ebenen angepasst werden)"
@@ -7952,6 +8217,6 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1374
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:1377
 msgid "Car"
 msgstr "Auto"
@@ -7972,14 +8237,14 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:324 build/trans_presets.java:650
-#: build/trans_presets.java:857 build/trans_presets.java:876
-#: build/trans_presets.java:890 build/trans_presets.java:912
-#: build/trans_presets.java:949 build/trans_presets.java:962
-#: build/trans_presets.java:974 build/trans_presets.java:986
-#: build/trans_presets.java:998 build/trans_presets.java:1010
-#: build/trans_presets.java:1020 build/trans_presets.java:1029
-#: build/trans_presets.java:1038 build/trans_presets.java:1437
-#: build/trans_presets.java:1510
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:325 build/trans_presets.java:651
+#: build/trans_presets.java:858 build/trans_presets.java:877
+#: build/trans_presets.java:891 build/trans_presets.java:913
+#: build/trans_presets.java:950 build/trans_presets.java:963
+#: build/trans_presets.java:975 build/trans_presets.java:987
+#: build/trans_presets.java:999 build/trans_presets.java:1011
+#: build/trans_presets.java:1021 build/trans_presets.java:1030
+#: build/trans_presets.java:1039 build/trans_presets.java:1440
+#: build/trans_presets.java:1513
 msgid "Bicycle"
 msgstr "Fahrrad"
@@ -8012,62 +8277,62 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:325 build/trans_presets.java:649
-#: build/trans_presets.java:856 build/trans_presets.java:875
-#: build/trans_presets.java:889 build/trans_presets.java:911
-#: build/trans_presets.java:948 build/trans_presets.java:961
-#: build/trans_presets.java:973 build/trans_presets.java:985
-#: build/trans_presets.java:997 build/trans_presets.java:1009
-#: build/trans_presets.java:1019 build/trans_presets.java:1028
-#: build/trans_presets.java:1037
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:326 build/trans_presets.java:650
+#: build/trans_presets.java:857 build/trans_presets.java:876
+#: build/trans_presets.java:890 build/trans_presets.java:912
+#: build/trans_presets.java:949 build/trans_presets.java:962
+#: build/trans_presets.java:974 build/trans_presets.java:986
+#: build/trans_presets.java:998 build/trans_presets.java:1010
+#: build/trans_presets.java:1020 build/trans_presets.java:1029
+#: build/trans_presets.java:1038
 msgid "Foot"
 msgstr "Zu Fuß"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Richtungspfeile zeichnen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Schnelles Zeichnen (schlechtere Qualität)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Nur interessante Richtungspfeile (z.B. bei Einbahnstraßen)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Only on the head of a way."
 msgstr "Nur am Ende des Weges"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Ordnungsnummer des Abschnitts anzeigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Zeichne Grenzen der geladenen Daten"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Virtuelle Knoten im Auswahlmodus zeichnen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Inaktive Ebenen in anderer Farbe zeichnen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Glätten der Kartengrafik (Anti-Aliasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:82
 msgid "Draw lines between raw GPS points"
 msgstr "Zeichne Linien zwischen GPS-Rohdatenpunkten"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -8077,9 +8342,9 @@
 "\"-1\", um alle Linien zu zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
 msgid "Maximum length for local files (meters)"
 msgstr "Maximallänge für lokale Dateien (Meter)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
@@ -8088,10 +8353,10 @@
 "Linien zu zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length (meters)"
 msgstr "Maximallänge (Meter)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -8100,10 +8365,10 @@
 "Informationen enthalten."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:129
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Richtungspfeile an Linien zwischen GPS-Punkten zeichnen."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:135
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -8112,5 +8377,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:141
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -8119,13 +8384,13 @@
 "Keine Pfeile zeichnen, wenn sie nicht den angegebenen Mindestabstand haben."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:144
 msgid "Minimum distance (pixels)"
 msgstr "Mindestabstand (Pixel)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Draw larger dots for the GPS points."
 msgstr "Größere Punkte für GPS-Punkte zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -8135,9 +8400,9 @@
 "Ebenenübersicht angepasst werden."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Colors points and track segments by velocity."
 msgstr "Punkte und GPS-Spuren nach Geschwindigkeit einfärben."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -8147,5 +8412,5 @@
 "GPS-Empfänger muss diese Information aufzeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
@@ -8153,23 +8418,23 @@
 "Durchschnittsgeschwindigkeiten."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid "Track and Point Coloring"
 msgstr "Färbung von GPS-Spuren und Punkten"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202
 msgid "GPS Points"
 msgstr "GPS-Punkte"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "Draw direction hints for way segments."
 msgstr "Richtungspfeile für Wegabschnitte zeichnen."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:237
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Ordnungsnummer für alle Abschnitte innerhalb des Weges anzeigen."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -8178,10 +8443,10 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Grenze des vom OSM-Server geladenen Bereichs anzeigen."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -8190,9 +8455,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257
 msgid "Draw the inactive data layers in a different color."
 msgstr "Inaktive Datenebenen in einer anderen Farbe zeichnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "OSM Data"
 msgstr "OSM-Daten"
@@ -8271,45 +8536,46 @@
 msgstr "Benutzter Stil"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Configure available plugins."
 msgstr "Verfügbare Plugins bearbeiten."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50
+#. buttons at the bottom
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
 msgid "Download List"
 msgstr "Liste laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:100
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Configure Sites..."
 msgstr "Seiten konfigurieren..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:125
 msgid "Add JOSM Plugin description URL."
 msgstr "JOSM-Pluginbeschreibungsdatei hinzufügen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:126
 msgid "Enter URL"
 msgstr "URL eingeben"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:162
 msgid "Please select an entry."
 msgstr "Bitte einen Eintrag wählen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:147
 msgid "Edit JOSM Plugin description URL."
 msgstr "JOSM-Pluginbeschreibungsdatei ändern."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:148
 msgid "JOSM Plugin description URL"
 msgstr "URL der JOSM Plugin Beschreibung"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:175
 msgid "Configure Plugin Sites"
 msgstr "Pluginquellen bearbeiten"
@@ -8660,6 +8926,6 @@
 msgstr "<mehrere>"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:369
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341
 #, java-format
 msgid "Remove old keys from up to {0} object"
@@ -8668,9 +8934,9 @@
 msgstr[1] "Entferne alte Schlüssel von bis zu {0} Objekten"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135
 msgid "Add a new tag"
 msgstr "Neues Tag hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160
 msgid "Delete the selection in the tag table"
 msgstr ""
@@ -8705,7 +8971,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:68
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:75
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -8749,4 +9015,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24
+#, fuzzy, java-format
+msgid "Preset group ''{0}'' of group ''{1}''"
+msgstr "Verwende Vorlage \"{0}\" aus Gruppe \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
 #, java-format
 msgid "Preset group ''{0}''"
@@ -8767,4 +9038,10 @@
 msgstr "Punkte {0} bis {1} werden heruntergeladen..."
 
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, fuzzy, java-format
+msgid "parameter ''{0}'' > 0 expected. Got {1}"
+msgstr "Parameter ''{0}'' größer als 0 erwartet. Der Wert ist ''{1}''"
+
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8873,5 +9150,5 @@
 msgstr "Fehler beim Einlesen von Datei \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "Fehler: ungültige Dokumentenstruktur in GPX-Dokument"
@@ -8886,6 +9163,6 @@
 msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
 msgstr ""
-"Im lokalem Datensatz ist kein Element mit der Nummer {0} vorhanden. Typ ist "
-"daher unklar."
+"Im lokalem Datensatz ist kein Objekt mit der ID {0} vorhanden. Typ ist daher "
+"unklar."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:312
@@ -8901,15 +9178,15 @@
 #, java-format
 msgid "Fetching node with id {0} from ''{1}''"
-msgstr ""
+msgstr "Knoten mit der ID {0} von \"{1}\" abrufen"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366
 #, java-format
 msgid "Fetching way with id {0} from ''{1}''"
-msgstr ""
+msgstr "Weg mit der ID {0} von \"{1}\" abrufen"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367
 #, java-format
 msgid "Fetching relation with id {0} from ''{1}''"
-msgstr ""
+msgstr "Relation mit der ID {0} von \"{1}\" abrufen"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373
@@ -8921,15 +9198,15 @@
 #, java-format
 msgid "Fetching a package of nodes from ''{0}''"
-msgstr ""
+msgstr "Mehrere Knoten von \"{0}\" abrufen"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404
 #, java-format
 msgid "Fetching a package of ways from ''{0}''"
-msgstr ""
+msgstr "Mehrere Wege von \"{0}\" abrufen"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405
 #, java-format
 msgid "Fetching a package of relations from ''{0}''"
-msgstr ""
+msgstr "Mehrere Relationen von \"{0}\" abrufen"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416
@@ -8995,10 +9272,11 @@
 msgstr "Kommunikation mit {0} mittels Protokollversion {1} etabliert."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
 msgstr "Unerwartetes Format der ID vom Server erhalten. Wert ist \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -9008,76 +9286,80 @@
 "\"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315
 msgid "Creating changeset..."
-msgstr "Changeset erstellen..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:293
+msgstr "Änderungssatz erstellen..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
 #, java-format
 msgid "Successfully opened changeset {0}"
-msgstr "Changeset {0} erfolgreich geöffnet"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309
+msgstr "Änderungssatz {0} erfolgreich geöffnet"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#, fuzzy, java-format
+msgid "id of changeset > 0 required. Got {0}"
+msgstr "Id-Parameter ''{0}'' > 0 verlangt. Wert ist {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
-msgstr "Changeset aktualisieren..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
-#, java-format
-msgid "Changeset {0} is unchanged. Skipping update."
-msgstr "Changeset {0} ist unverändert. Aktualisierung überspringen."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317
+msgstr "Änderungssatz aktualisieren..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
 #, java-format
 msgid "Updating changeset {0}..."
-msgstr "Changeset {0} aktualisieren..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
-msgid ""
-"Failed to update changeset. Either there is no current changeset or the id "
-"of the current changeset is 0"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
+msgstr "Änderungssatz {0} aktualisieren..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
 msgid "Closing changeset..."
-msgstr "Schließe Änderungssatz..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
-#, java-format
-msgid "Closing changeset {0}..."
-msgstr "Changeset {0} schließen..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
-#, java-format
-msgid "Leaving changeset {0} open..."
-msgstr "Changeset {0} geöffnet lassen..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:372
+msgstr "Änderungssatz schließen..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
 msgid "No changeset present for diff upload"
 msgstr "Kein Änderungssatz zum Hochladen vorhanden"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414
 msgid "Preparing..."
 msgstr "Daten vorbereiten..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419
 msgid "Uploading..."
 msgstr "Daten hochladen..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438
 msgid "Waiting 10 seconds ... "
 msgstr "Warte 10 Sekunden... "
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr "Starte Versuch {0} von {1} in {2} Sekunden..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449
 msgid "OK - trying again."
 msgstr "OK - erneuter Versuch."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:485
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr "Starte Wiederholung {0} von {1}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
+msgid "current changeset is null. Can't upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
+#, java-format
+msgid "id of current changeset > required. Current id is {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, fuzzy, java-format
+msgid "Changeset id > 0 expected. Got {0}"
+msgstr "ID >= 0 erwartet, jedoch {0} erhalten."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
+#, java-format
+msgid "Open changeset expected. Got closed changeset with id {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
@@ -9102,33 +9384,92 @@
 msgstr "Ungültige bz2-Datei."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
+#, fuzzy, java-format
+msgid "missing mandatory attribute ''{0}''"
+msgstr "notwendiges Attribut \"{0}\" fehlt"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:128
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:134
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
+#, fuzzy, java-format
+msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgstr "Ungültiger langer Wert für Attribut \"{0}\". Erhaltener Wert \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
+#, fuzzy, java-format
+msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgstr "Ungültiger langer Wert für Attribut \"{0}\". Erhaltener Wert \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
+#, fuzzy, java-format
+msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgstr "Ungültiger langer Wert für Attribut \"{0}\". Erhaltener Wert \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#, java-format
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#, java-format
+msgid "Unsupported version: {0}"
+msgstr "Nicht unterstützte Version: {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:176
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Aborting."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#, java-format
+msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgstr "Ungültiger Wert für Attribut \"uid\". Erhaltener Wert \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
+#, fuzzy
+msgid "Parsing list of changesets..."
+msgstr "Änderungssatz schließen..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
 msgid "Incorrect password or username."
 msgstr "Passwort oder Benutzername falsch."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:168
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Achtung: Das Passwort wird unverschlüsselt übertragen."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Save user and password (unencrypted)"
 msgstr "Benutzername und Passwort (unverschlüsselt) speichern"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
 msgid "Enter Password"
 msgstr "Passwort eingeben"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 msgid "Login"
 msgstr "Anmelden"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:242
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Die Basis-URL des OSM Servers (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
 msgid "Login name (e-mail) to the OSM account."
 msgstr "Benutzername (E-Mail) für den OSM-Server."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -9137,17 +9478,17 @@
 "soll."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
 msgid "Base Server URL"
 msgstr "Server Basis-URL"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
 msgid "OSM username (e-mail)"
 msgstr "OSM-Benutzername (E-Mail)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
 msgid "OSM password"
 msgstr "OSM-Passwort"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -9159,8 +9500,8 @@
 "übertragen.<br><b>Benutzen Sie kein wertvolles Passwort.</b></html>"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:51
+#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #, java-format
 msgid "(at line {0}, column {1})"
-msgstr ""
+msgstr "(in Zeile {0}, Spalte {1})"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26
@@ -9262,20 +9603,5 @@
 msgstr "Fehler beim Parsen."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124
-#, fuzzy, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr "notwendiges Attribut \"{0}\" fehlt"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
-#, fuzzy, java-format
-msgid "Missing mandatory attribute ''{0}''"
-msgstr "notwendiges Attribut \"{0}\" fehlt"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
-#, fuzzy, java-format
-msgid "Unsupported version: {0}"
-msgstr "Unbekannte Version: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:155
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -9284,74 +9610,69 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
 msgid "found XML element <nd> element not as direct child of element <way>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
-msgstr "notwendiges Attribut \"{0}\" fehlt"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
 msgstr ""
-"Ungültger Wert \"{1}\" des \"ref\"-Attributs eines Elements der Relation {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+"Ungültiger Wert des Attributs \"ref\" im Element <nd>. Wert lautete {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
 msgid "Found XML element <member> not as direct child of element <relation>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}"
-msgstr "Fehlendes \"ref\"-Attribut bei Element der Relation {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217
-#, fuzzy, java-format
+msgstr "Fehlendes Attribut \"ref\" bei Mitglied der Relation {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
-"Ungültger Wert \"{1}\" des \"ref\"-Attributs eines Elements der Relation {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
-#, fuzzy, java-format
+"Ungültiger Wert für Attribut \"ref\" bei Mitglied der Relation {0}. "
+"Erhaltener Wert {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}"
-msgstr "Fehlendes \"type\"-Attribut bei Element {0} der Relation {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
-#, fuzzy, java-format
+msgstr "Fehlendes Attributs \"type\" bei Mitglied {0} der Relation {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#, java-format
 msgid ""
 "Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}."
 msgstr ""
-"Ungültger Wert \"{1}\" des \"ref\"-Attributs eines Elements der Relation {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
+"Ungültiger Wert des Attributs \"type\" bei Mitglied {0} der Relation {1}. "
+"Wert lautete {2}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Unvollständige <member>-Beschreibung mit ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
-#, java-format
-msgid "Warning: Undefined element ''{0}'' found in input stream. Skipping."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
-#, fuzzy, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
-msgstr ""
-"ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ Ganzzahl"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Skipping."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
 msgid "Illegal object with id=0"
 msgstr "Illegales Objekt mit id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#, java-format
 msgid ""
 "Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
 msgstr ""
-"Ungültiger Wert \"{1}\" des \"version\"-Attributs des OSM-Objekts mit ID {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:303
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
 #, java-format
 msgid ""
@@ -9360,5 +9681,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
 #, java-format
 msgid ""
@@ -9366,6 +9687,9 @@
 "version is ''0.5''. Got {1}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+"WARNUNG: setze den Wert des Attributs ''version'' für das XML Element {0} "
+"auf den Standardwert 1. Die Version des API ist ''0.5''. Der Wert von "
+"''version'' war {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
@@ -9375,32 +9699,33 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:316
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#, java-format
 msgid "Unknown or unsupported API version. Got {0}"
-msgstr "Unbekannte Version: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
-#, fuzzy, java-format
+msgstr "Unbekannte oder nicht unterstützte API-Version. Erhaltener Wert: {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#, java-format
 msgid "Missing attribute ''version'' on OSM primitive with id {0}"
-msgstr "Fehlendes \"version\"-Attribut bei OSM-Objekt mit ID {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
-#, fuzzy, java-format
+msgstr "Das Attribut ''version'' für das OSM Element mit der ID {0} fehlt"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#, java-format
 msgid "Missing required attribute ''{0}''."
-msgstr "Erforderliches Attribut \"{0}\" nicht vorhanden."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#, fuzzy, java-format
+msgstr "Fehlendes erforderliches Attribut \"{0}\"."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
-msgstr ""
-"ungültiger Wert \"{1}\" für notwendiges Attribut \"{0}\" vom Typ Ganzzahl"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
+msgstr "Ungültiger langer Wert für Attribut \"{0}\". Erhaltener Wert \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
 #, java-format
 msgid ""
 "way with external id ''{0}'' includes missing node with external id ''{1}''"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:381
+"Der Weg mit der externen ID ''{0}'' enthält einen Knoten mit externer ID "
+"''{1}'', der im Datenstrom nicht gefunden wurde."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
 #, java-format
 msgid ""
@@ -9411,32 +9736,32 @@
 "einer der referenzierten Knoten nicht in den geladenen Daten enthalten war."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
+#, java-format
 msgid ""
 "Unknown relation member type ''{0}'' in relation with external id ''{1}''"
-msgstr "Unbekannter Relationselementtyp {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
-#, fuzzy, java-format
+msgstr ""
+"Unbekannter Typ ''{0}'' für ein Relationselement in der Relation mit "
+"externer ID ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#, java-format
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
 "id ''{1}''"
 msgstr ""
-"Das Objekt mit der ID \"{0}\" kann nicht mit dem Objekt mit der ID \"{1}\" "
-"verglichen werden"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+"Die Relation mit externer ID ''{0}'' referenziert ein nicht vorhandendes OSM "
+"Element mit externer ID ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
 msgid "Prepare OSM data..."
 msgstr "OSM-Daten werden vorbereitet...."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 msgid "Parsing OSM data..."
-msgstr "Lese OSM-Verlaufsdaten ein..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487
-#, fuzzy
+msgstr "OSM-Daten einlesen..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
 msgid "Preparing data set..."
-msgstr "Daten werden vorbereitet...."
+msgstr "Datensatz wird vorbereitet ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
@@ -9458,4 +9783,24 @@
 msgstr "Lade referenzierende Relationen herunter..."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51
+#, fuzzy
+msgid "Reading changesets..."
+msgstr "Änderungssatz erstellen..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
+#, fuzzy
+msgid "Downloading changesets ..."
+msgstr "Änderungssatz schließen..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85
+#, fuzzy, java-format
+msgid "Reading changeset {0} ..."
+msgstr "Änderungssatz {0} geöffnet lassen..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91
+#, fuzzy, java-format
+msgid "Downloading changeset {0} ..."
+msgstr "Änderungssatz {0} schließen..."
+
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
@@ -9472,10 +9817,14 @@
 msgstr "Serververbindung..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
 msgid "Failed to open connection to API {0}"
 msgstr "Verbindung  zu API {0} konnte nicht geöffnet werden"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
+msgid "Error: failed to add authentication credentials to the connection."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -9484,39 +9833,60 @@
 "Internetverbindung."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+msgid "XML tag <user> is missing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
+#, fuzzy, java-format
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgstr "Fehlendes Attribut \"ref\" bei Mitglied der Relation {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
+#, fuzzy, java-format
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgstr "Ungültiger langer Wert für Attribut \"{0}\". Erhaltener Wert \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
 msgid "Starting to upload with one request per primitive ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
+msgstr "Hochladen mit einer Anfrage pro Objekt beginnen..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
 msgstr "{0}% ({1}/{2}), {3} verbleiben. Knoten ''{4}'' (id: {5}) hochladen"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
 msgstr "{0}% ({1}/{2}), {3} verbleiben. Weg ''{4}'' (id: {5}) hochladen"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
 msgstr "{0}% ({1}/{2}), {3} verbleiben. Relation ''{4}'' (id: {5}) hochladen"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
 msgid "Starting to upload in one request ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:171
-#, fuzzy
+msgstr "Übertragung in einer Anfrage wird gestartet ..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135
 msgid "Uploading data ..."
-msgstr "Daten hochladen..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:178
+msgstr "Übertragung zum Server ..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
 msgid ""
 "WARNING: no API version defined for data to upload. Falling back to version "
 "0.6"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:183
+"Achtung: Für die Übertragung ist keine API-Version definiert. Es wird daher "
+"Version 0.6 benutzt."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147
 #, java-format
 msgid ""
@@ -9524,12 +9894,15 @@
 "use diff uploads, but API is not able to handle them. Ignoring diff upload."
 msgstr ""
+"Achtung: Voreinstellung \"{0}\" oder API-Version \"{1}\" des Datensatzes "
+"benötigen eine Übertragung der Änderungen. Dies wird ignoriert, da die "
+"Server-API es nicht versteht."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
 msgid "Update Plugins"
 msgstr "Plugins aktualisieren"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 msgid "Download Plugins"
 msgstr "Plugins herunterladen"
@@ -9642,5 +10015,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:290
 msgid "<html>"
-msgstr ""
+msgstr "<html>"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291
@@ -9695,5 +10068,5 @@
 msgstr "Mehr Details"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -9702,18 +10075,18 @@
 msgstr[1] "Plugin-Informationen von {0} Quellen geladen"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
 msgid "No plugin information found."
 msgstr "Keine Plugin-Informationen gefunden."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr "Plug-in {0} ist nicht verfügbar. Update wurde übersprungen."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:93
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
 msgid "All installed plugins are up to date."
 msgstr "Alle installierten Plugins sind aktuell."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
 #, java-format
 msgid ""
@@ -9726,9 +10099,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
 msgid "Download missing plugins"
 msgstr "Fehlende Plugins herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
 #, java-format
 msgid ""
@@ -9743,43 +10116,43 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
 msgid "unknown"
 msgstr "unbekannt"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Version {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 msgid "Plugin bundled with JOSM"
 msgstr "Plugin mit JOSM ausgeliefert"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:357
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -9851,4 +10224,7 @@
 "the server URL in your preferences and your internet connection.</html>"
 msgstr ""
+"<html>Initialisierung der Verbindung mit dem OSM-Server {0} fehlgeschlagen."
+"<br>Prüfen Sie die Server-URL in den Einstellungen und Ihre "
+"Internetverbindung.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:47
@@ -9858,4 +10234,7 @@
 "changeset will automatically be closed by the server after a timeout.</html>"
 msgstr ""
+"<html>Änderungssatz \"{0}\" konnte auf dem OSM-Server \"{1}\" nicht "
+"geschlossen werden.<br>Der Änderungssatz wird vom Server nach einem "
+"Zeitablauf automatisch geschlossen.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:62
@@ -9905,12 +10284,14 @@
 "<br>This is most likely a temporary problem. Please try again later.</html>"
 msgstr ""
+"<html>Der OSM-Server<br>''{0}''<br>hat einen internen Serverfehler gemeldet."
+"<br>Meist ist dies ein vorübergehendes Problem. Bitte versuchen Sie es "
+"später erneut.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:162
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
-msgstr ""
+msgstr "Der OSM-Server \"{0}\" meldet eine Fehlerhafte Anfrage. <br>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:165
-#, fuzzy
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -9918,12 +10299,12 @@
 "community."
 msgstr ""
-"Die maximale Downloadgröße ist 0.25 und Ihre Anfrage war zu groß. Fordern "
-"Sie entweder einen kleineren Ausschnitt an oder nutzen Sie die Datei planet."
-"osm."
+"Der angeforderte Bereich ist zu groß oder enthält zu viele Daten."
+"<br>Versuche einen kleineren Bereich herunterzuladen oder nutze ein "
+"Datenbankexport."
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:168
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
-msgstr ""
+msgstr "<br>Fehlermeldung (englisch): {0}"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:192
@@ -10034,4 +10415,6 @@
 "geometry from preferences."
 msgstr ""
+"Voreinstellung des Schlüssels \"{0}\" enthält \"{1}\" nicht. Fenstergröße "
+"kann nicht aus den Einstellungen geladen werden."
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:110
@@ -10041,4 +10424,6 @@
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
+"Einstellung mit Schlüssel \"{0}\" liefert keine Ganzzahl für \"{1}\", "
+"sondern {2}. Fenstergröße kann nicht aus den Einstellungen geladen werden."
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:112
@@ -10048,4 +10433,7 @@
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
+"Das Feld \"{1}\" in den Einstellungen mit Schlüssel \"{0}\" konnte nicht "
+"ausgelesen werden. Der Fehler war: {2}. Fenstergröße kann nicht aus den "
+"Einstellungen geladen werden."
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:119
@@ -10055,4 +10443,6 @@
 "from preferences."
 msgstr ""
+"Voreinstellung des Schlüssels \"{0}\" existiert nicht. Fenstergröße kann "
+"nicht aus den Einstellungen geladen werden."
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158
@@ -10062,4 +10452,6 @@
 "default geometry. Details: {1}"
 msgstr ""
+"Achtung: Fenstergröße konnte nicht vom Schlüssel \"{0}\" geladen werden. Es "
+"werden die Standardeinstellungen genutzt. Details: {1}"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
@@ -10133,10 +10525,4 @@
 msgid "(What does that mean?)"
 msgstr "(Was bedeutet das?)"
-
-#. item "Relations/Route" text "Symbol description"
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3148
-msgid "Description"
-msgstr "Beschreibung"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
@@ -10680,5 +11066,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:174
 msgid "Disable image cropping during georeferencing."
-msgstr ""
+msgstr "Deaktiviere die Bildbeschneidung während des Georeferenzierens."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50
@@ -10876,4 +11262,7 @@
 "projections and retry"
 msgstr ""
+"Um das Cadastre-WMS-Plugin zu aktivieren, muss\n"
+"die derzeitige Projektion in eine von Cadastre\n"
+"unterstützte Projektion geändert werden."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:47
@@ -10896,5 +11285,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:177
 msgid "Image cropping"
-msgstr ""
+msgstr "Bild beschneiden"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:176
@@ -10913,9 +11302,9 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:216
 msgid "Image georeferencing"
-msgstr ""
+msgstr "Bild georeferenzieren"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:215
 msgid "Click second Lambert crosspiece for georeferencing"
-msgstr ""
+msgstr "Klicken Sie auf das zweite Lambert-Kreuzstück zur Georeferenzierung"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:233
@@ -10924,4 +11313,6 @@
 "or just retry "
 msgstr ""
+"Möchten Sie komplett abbrechen\n"
+"oder es erneut versuchen "
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:249
@@ -10942,6 +11333,7 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
-msgid "Set "
-msgstr ""
+#, fuzzy, java-format
+msgid "Set {0} Lambert coordinates"
+msgstr "Lambertkoordinaten eingeben"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -11574,6 +11966,6 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 #: build/trans_style.java:990 build/trans_style.java:1007
-#: build/trans_style.java:1023 build/trans_style.java:3392
-#: build/trans_style.java:3400
+#: build/trans_style.java:1023 build/trans_style.java:3400
+#: build/trans_style.java:3408
 msgid "water"
 msgstr "Wasser"
@@ -11873,4 +12265,56 @@
 msgstr "Messungen"
 
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Michigan Left"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Adds no left turn for sets of 4 or 5 ways."
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45
+#, fuzzy
+msgid "Please select 4 or 5 ways to assign no left turns."
+msgstr ""
+"Bitte geschlossene(n) Weg(e) mit mindestens vier Knotenpunkten auswählen."
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61
+#, fuzzy, java-format
+msgid "{0} extrem nodes."
+msgstr "{0} Knoten"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69
+#, fuzzy, java-format
+msgid "Via node {0}, {1}"
+msgstr "{0} {1} ändern"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75
+#, fuzzy, java-format
+msgid "{0} via nodes."
+msgstr "{0} Knoten"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78
+msgid "Unable to find via nodes. Please check your selection"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98
+#, fuzzy, java-format
+msgid "MIddle way: {0}"
+msgstr "Weg {0} hinzufügen"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121
+msgid "Create Michigan left turn restriction"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129
+#, fuzzy, java-format
+msgid "Processing {0}"
+msgstr "Version {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142
+#, fuzzy, java-format
+msgid "Relation: from {0} to {1} via {2}"
+msgstr "Version {0} erzeugt am {1} von {2}"
+
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
 msgid "OpenLayers"
@@ -12032,7 +12476,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
-#, fuzzy
 msgid "create new objects"
-msgstr "Einen neuen Knoten erstellen."
+msgstr "Erstelle neue Objekte"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
@@ -12096,7 +12539,8 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
-#, fuzzy
 msgid "Remote Control has been asked to create a new node."
-msgstr "Die Fernsteuerung soll Daten vom API herunterladen."
+msgstr ""
+"Das Plugin \"Remote Control\" hat gefragt, ob es einen neuen Knoten "
+"erstellen kann."
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
@@ -12357,5 +12801,5 @@
 msgstr "Merkmalseditor aufrufen"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:158
 msgid "JOSM Tag Editor Plugin"
 msgstr "JOSM Mermalseditorplugin"
@@ -12365,5 +12809,5 @@
 msgstr "Hervorheben"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:370
 #, java-format
 msgid "Updating properties of up to {0} object"
@@ -12372,21 +12816,4 @@
 msgstr[1] "Eigenschaften von bis zu {0} Objekten aktualisieren"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44
-msgid "INFO: entering compatibilty mode for JOSM with Main.ds"
-msgstr "INFO: Gehe in den Kompatibilitätsmodus von JOSM mit Main.ds"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47
-msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
-msgstr ""
-"INFO: Gehe in den Kompatibilitätsmodus von JOSM mit Main.getCurrentDataSet()"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49
-msgid ""
-"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-"found."
-msgstr ""
-"Unerwartete Version von JOSM. Weder Main.ds noch Main.getCurrentDataSet() "
-"gefunden."
-
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
 msgid "Group"
@@ -12396,9 +12823,4 @@
 msgid "Item"
 msgstr "Element"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-msgid "Filter"
-msgstr "Filter"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63
@@ -12487,5 +12909,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2272
 msgid "Street name"
 msgstr "Straßenname"
@@ -12628,5 +13050,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:853
 msgid "Remove tags from inner ways"
-msgstr "Entferne Merkmale von inneren Wegen"
+msgstr "Merkmale von inneren Wegen entfernen"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:882
@@ -12653,8 +13075,4 @@
 msgid "Zoom (in metres)"
 msgstr "Zoom (in Meter)"
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
-msgid "URL"
-msgstr "URL"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -12856,17 +13274,15 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:460
-#, fuzzy
 msgid "Fixing errors ..."
-msgstr "Warte 10 Sekunden... "
+msgstr "Fehler werden berichtigt ..."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:484
 #, java-format
 msgid "Fixing ({0}/{1}): ''{2}''"
-msgstr ""
+msgstr "Berichtigung ({0}/{1}): ''{2}''"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501
-#, fuzzy
 msgid "Updating map ..."
-msgstr "Changeset aktualisieren..."
+msgstr "Karte wird aktuallisiert ..."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69
@@ -12902,5 +13318,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
 msgid "Crossing buildings"
-msgstr ""
+msgstr "Überschneidende Gebäude"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
@@ -13369,7 +13785,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
-#: build/trans_style.java:4179
+#: build/trans_style.java:4159 build/trans_style.java:4166
+#: build/trans_style.java:4173 build/trans_style.java:4180
+#: build/trans_style.java:4187
 msgid "building"
 msgstr "Gebäude"
@@ -13383,5 +13799,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4186
+#: build/trans_style.java:4194
 msgid "area"
 msgstr "Fläche"
@@ -13520,10 +13936,10 @@
 msgstr "Startknoten an einem Wegende auswählen"
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:148
 msgid "Reached the end of the line"
 msgstr "Ende des Pfades erreicht"
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:155
 msgid "Reached a junction"
 msgstr "Kreuzung erreicht"
@@ -13680,4 +14096,5 @@
 "or a trailing '?'."
 msgstr ""
+"Achtung: Die Adresse \"{0}\" des WMS-Dienstes enhällt kein '&' oder '?'."
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112
@@ -13686,4 +14103,6 @@
 "settings."
 msgstr ""
+"Achtung: WMS-Bilder konnten nicht geladen werden. Überprüfe die "
+"Einstellungen."
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
@@ -13839,5 +14258,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
 msgid "Please select at least one row to copy."
-msgstr ""
+msgstr "Bitte wählen Sie mindestens eine Zeile, die kopiert werden soll."
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
@@ -13846,16 +14265,14 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
-#, fuzzy
 msgid "Overlap tiles"
-msgstr "Überlappende Flächen"
+msgstr "Kacheln überlappen"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
 msgid "% of east:"
-msgstr ""
+msgstr "Ost-West (%):"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
-#, fuzzy
 msgid "% of north:"
-msgstr "Nord"
+msgstr "Nord-Süd (%):"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -14030,6 +14447,11 @@
 "auch von einer GPS-Ebene importiert werden können) angelegt werden."
 
+#. Plugin michigan_left
+#: build/trans_plugins.java:35
+msgid "Adds no left turn for sets of 4 or 5 ways"
+msgstr ""
+
 #. Plugin nearclick
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid ""
 "Simulates a click when you do a small and short drag. This is usefull for "
@@ -14042,15 +14464,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid "Displays an OpenLayers background image"
 msgstr "Zeigt ein OpenLayers Hintergrundbild"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importiert Berichte von OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -14060,5 +14482,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -14067,5 +14489,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -14076,15 +14498,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Das großartige Plastic-Design von JGoodies."
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Let other applications send commands to JOSM."
 msgstr "Erlaubt anderen Programmen Kommandos an JOSM zu senden."
 
 #. Plugin routes
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -14095,10 +14517,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Provides routing capabilities."
 msgstr "Bietet Routenführungsmöglichkeiten."
 
 #. Plugin slippymap
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -14109,15 +14531,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Erlaubt Markierungen/Knoten an der aktuellen GPS Position einzufügen."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Provides a dialog for editing tags in a tabular grid."
-msgstr "Bietet einen Dialog um Merkmale in einer Tabelle zu editieren."
+msgstr "Öffnet einen Dialog, um Merkmale in einer Tabelle zu bearbeiten."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -14130,10 +14552,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Make terraced houses out of single blocks."
 msgstr "Erstellt Reihenhäuser aus einem Häuserblock."
 
 #. Plugin usertools
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -14145,5 +14567,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -14154,5 +14576,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -14164,5 +14586,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -14174,10 +14596,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Leichtes Herunterladen entlang einer langen Reihe verbundener Wege"
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -14235,4 +14657,10 @@
 #. <annotations>
 #: build/trans_presets.java:57
+#, fuzzy
+msgid "Highways"
+msgstr "Straße"
+
+#. group "Highways"
+#: build/trans_presets.java:58
 msgid "Streets"
 msgstr "Straßen"
@@ -14243,5 +14671,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:58 build/trans_surveyor.java:72
+#: build/trans_presets.java:59 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Autobahn"
@@ -14250,5 +14678,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:61
+#: build/trans_presets.java:62
 msgid "Edit Motorway"
 msgstr "Autobahn bearbeiten"
@@ -14275,8 +14703,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:120 build/trans_presets.java:140
-#: build/trans_presets.java:177 build/trans_presets.java:197
-#: build/trans_presets.java:1557 build/trans_presets.java:3146
+#: build/trans_presets.java:65 build/trans_presets.java:101
+#: build/trans_presets.java:121 build/trans_presets.java:141
+#: build/trans_presets.java:178 build/trans_presets.java:198
+#: build/trans_presets.java:1560 build/trans_presets.java:3158
 msgid "Reference"
 msgstr "Referenz"
@@ -14290,8 +14718,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:358
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:359
 msgid "Lanes"
 msgstr "Spuren"
@@ -14308,15 +14736,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:224 build/trans_presets.java:280
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:373 build/trans_presets.java:388
-#: build/trans_presets.java:412 build/trans_presets.java:431
-#: build/trans_presets.java:452 build/trans_presets.java:472
-#: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1307
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:225 build/trans_presets.java:281
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:374 build/trans_presets.java:389
+#: build/trans_presets.java:413 build/trans_presets.java:432
+#: build/trans_presets.java:453 build/trans_presets.java:473
+#: build/trans_presets.java:511 build/trans_presets.java:667
+#: build/trans_presets.java:1310
 msgid "Max. speed (km/h)"
 msgstr "Höchstgeschwindigkeit (km/h)"
@@ -14353,16 +14781,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:293 build/trans_presets.java:306
-#: build/trans_presets.java:320 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:464
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:659 build/trans_presets.java:1300
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:294 build/trans_presets.java:307
+#: build/trans_presets.java:321 build/trans_presets.java:353
+#: build/trans_presets.java:405 build/trans_presets.java:425
+#: build/trans_presets.java:445 build/trans_presets.java:465
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:660 build/trans_presets.java:1303
 msgid "Oneway"
 msgstr "Einbahnstraße"
@@ -14404,19 +14832,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:353
-#: build/trans_presets.java:362 build/trans_presets.java:405
-#: build/trans_presets.java:425 build/trans_presets.java:445
-#: build/trans_presets.java:465 build/trans_presets.java:485
-#: build/trans_presets.java:504 build/trans_presets.java:523
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:586 build/trans_presets.java:607
-#: build/trans_presets.java:628 build/trans_presets.java:660
-#: build/trans_presets.java:1301 build/trans_surveyor.java:12
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:354
+#: build/trans_presets.java:363 build/trans_presets.java:406
+#: build/trans_presets.java:426 build/trans_presets.java:446
+#: build/trans_presets.java:466 build/trans_presets.java:486
+#: build/trans_presets.java:505 build/trans_presets.java:524
+#: build/trans_presets.java:545 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629 build/trans_presets.java:661
+#: build/trans_presets.java:1304 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Brücke"
@@ -14452,19 +14880,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:354
-#: build/trans_presets.java:378 build/trans_presets.java:406
-#: build/trans_presets.java:426 build/trans_presets.java:446
-#: build/trans_presets.java:466 build/trans_presets.java:486
-#: build/trans_presets.java:505 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629 build/trans_presets.java:661
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:355
+#: build/trans_presets.java:379 build/trans_presets.java:407
+#: build/trans_presets.java:427 build/trans_presets.java:447
+#: build/trans_presets.java:467 build/trans_presets.java:487
+#: build/trans_presets.java:506 build/trans_presets.java:525
+#: build/trans_presets.java:546 build/trans_presets.java:567
+#: build/trans_presets.java:588 build/trans_presets.java:609
+#: build/trans_presets.java:630 build/trans_presets.java:662
+#: build/trans_presets.java:1305
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -14498,18 +14926,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:73 build/trans_presets.java:90
-#: build/trans_presets.java:110 build/trans_presets.java:129
-#: build/trans_presets.java:150 build/trans_presets.java:166
-#: build/trans_presets.java:186 build/trans_presets.java:205
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:355
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:467
-#: build/trans_presets.java:487 build/trans_presets.java:506
-#: build/trans_presets.java:525 build/trans_presets.java:546
-#: build/trans_presets.java:567 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:630
-#: build/trans_presets.java:662 build/trans_presets.java:1303
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:356
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:468
+#: build/trans_presets.java:488 build/trans_presets.java:507
+#: build/trans_presets.java:526 build/trans_presets.java:547
+#: build/trans_presets.java:568 build/trans_presets.java:589
+#: build/trans_presets.java:610 build/trans_presets.java:631
+#: build/trans_presets.java:663 build/trans_presets.java:1306
 msgid "Cutting"
 msgstr "Senke"
@@ -14543,18 +14971,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:74 build/trans_presets.java:91
-#: build/trans_presets.java:111 build/trans_presets.java:130
-#: build/trans_presets.java:151 build/trans_presets.java:167
-#: build/trans_presets.java:187 build/trans_presets.java:206
-#: build/trans_presets.java:222 build/trans_presets.java:240
-#: build/trans_presets.java:258 build/trans_presets.java:277
-#: build/trans_presets.java:310 build/trans_presets.java:356
-#: build/trans_presets.java:408 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:468
-#: build/trans_presets.java:488 build/trans_presets.java:507
-#: build/trans_presets.java:526 build/trans_presets.java:547
-#: build/trans_presets.java:568 build/trans_presets.java:589
-#: build/trans_presets.java:610 build/trans_presets.java:631
-#: build/trans_presets.java:663 build/trans_presets.java:1304
+#: build/trans_presets.java:75 build/trans_presets.java:92
+#: build/trans_presets.java:112 build/trans_presets.java:131
+#: build/trans_presets.java:152 build/trans_presets.java:168
+#: build/trans_presets.java:188 build/trans_presets.java:207
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:357
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:469
+#: build/trans_presets.java:489 build/trans_presets.java:508
+#: build/trans_presets.java:527 build/trans_presets.java:548
+#: build/trans_presets.java:569 build/trans_presets.java:590
+#: build/trans_presets.java:611 build/trans_presets.java:632
+#: build/trans_presets.java:664 build/trans_presets.java:1307
 msgid "Embankment"
 msgstr "Straßendamm"
@@ -14562,5 +14990,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Motorway Link"
 msgstr "Autobahnanschluß"
@@ -14569,5 +14997,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:80
+#: build/trans_presets.java:81
 msgid "Edit Motorway Link"
 msgstr "Autobahnanschluß bearbeiten"
@@ -14575,5 +15003,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:94
+#: build/trans_presets.java:95
 msgid "Trunk"
 msgstr "Schnellstraße"
@@ -14582,5 +15010,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:97
+#: build/trans_presets.java:98
 msgid "Edit Trunk"
 msgstr "Schnellstraße bearbeiten"
@@ -14590,6 +15018,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
 msgid "Motorroad"
 msgstr "Kraftfahrstraße"
@@ -14597,5 +15025,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:114
+#: build/trans_presets.java:115
 msgid "Trunk Link"
 msgstr "Schnellstraßenanschluß"
@@ -14604,5 +15032,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:117
+#: build/trans_presets.java:118
 msgid "Edit Trunk Link"
 msgstr "Schnellstraßenanschluß bearbeiten"
@@ -14615,5 +15043,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:134 build/trans_surveyor.java:76
+#: build/trans_presets.java:135 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Bundesstraße"
@@ -14622,5 +15050,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:137
+#: build/trans_presets.java:138
 msgid "Edit Primary Road"
 msgstr "Bundesstraße bearbeiten"
@@ -14628,10 +15056,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:154
+#: build/trans_presets.java:155
 msgid "Primary Link"
 msgstr "Bundesstraßenanschluß"
 
 #. item
-#: build/trans_presets.java:155
+#: build/trans_presets.java:156
 msgid "Edit Primary Link"
 msgstr "Bundesstraßenanschluß bearbeiten"
@@ -14643,5 +15071,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:170 build/trans_surveyor.java:80
+#: build/trans_presets.java:171 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Landesstraße"
@@ -14651,5 +15079,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:174
+#: build/trans_presets.java:175
 msgid "Edit Secondary Road"
 msgstr "Landesstraße bearbeiten"
@@ -14657,5 +15085,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:190
+#: build/trans_presets.java:191
 msgid "Tertiary"
 msgstr "Kreisstraße"
@@ -14665,5 +15093,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:194
+#: build/trans_presets.java:195
 msgid "Edit Tertiary Road"
 msgstr "Kreisstraße bearbeiten"
@@ -14675,5 +15103,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:209 build/trans_surveyor.java:84
+#: build/trans_presets.java:210 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Verbindungsstraße"
@@ -14683,5 +15111,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:213
+#: build/trans_presets.java:214
 msgid "Edit Unclassified Road"
 msgstr "Verbindungsstraße bearbeiten"
@@ -14708,19 +15136,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:225 build/trans_presets.java:243
-#: build/trans_presets.java:261 build/trans_presets.java:281
-#: build/trans_presets.java:314 build/trans_presets.java:359
-#: build/trans_presets.java:375 build/trans_presets.java:389
-#: build/trans_presets.java:413 build/trans_presets.java:432
-#: build/trans_presets.java:453 build/trans_presets.java:473
-#: build/trans_presets.java:491 build/trans_presets.java:511
-#: build/trans_presets.java:532 build/trans_presets.java:553
-#: build/trans_presets.java:574 build/trans_presets.java:595
-#: build/trans_presets.java:616 build/trans_presets.java:637
-#: build/trans_presets.java:667 build/trans_presets.java:680
-#: build/trans_presets.java:693 build/trans_presets.java:706
-#: build/trans_presets.java:719 build/trans_presets.java:732
-#: build/trans_presets.java:745 build/trans_presets.java:1308
-#: build/trans_presets.java:1498 build/trans_presets.java:1540
+#: build/trans_presets.java:226 build/trans_presets.java:244
+#: build/trans_presets.java:262 build/trans_presets.java:282
+#: build/trans_presets.java:315 build/trans_presets.java:360
+#: build/trans_presets.java:376 build/trans_presets.java:390
+#: build/trans_presets.java:414 build/trans_presets.java:433
+#: build/trans_presets.java:454 build/trans_presets.java:474
+#: build/trans_presets.java:492 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:554
+#: build/trans_presets.java:575 build/trans_presets.java:596
+#: build/trans_presets.java:617 build/trans_presets.java:638
+#: build/trans_presets.java:668 build/trans_presets.java:681
+#: build/trans_presets.java:694 build/trans_presets.java:707
+#: build/trans_presets.java:720 build/trans_presets.java:733
+#: build/trans_presets.java:746 build/trans_presets.java:1311
+#: build/trans_presets.java:1501 build/trans_presets.java:1543
 msgid "Width (meters)"
 msgstr "Breite (Meter)"
@@ -14732,5 +15160,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:228 build/trans_surveyor.java:88
+#: build/trans_presets.java:229 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Ortsstraße"
@@ -14739,5 +15167,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:231
+#: build/trans_presets.java:232
 msgid "Edit Residential Street"
 msgstr "Ortsstraße bearbeiten"
@@ -14762,14 +15190,14 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:611
-#: build/trans_presets.java:632 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "Surface"
 msgstr "Oberfläche"
@@ -14790,53 +15218,53 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paved"
 msgstr "befestigt"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "unpaved"
 msgstr "unbefestigt"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "asphalt"
 msgstr "asphaltiert"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "concrete"
 msgstr "Beton"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
 msgid "metal"
 msgstr "metall"
@@ -14850,22 +15278,22 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
-#: build/trans_style.java:3367
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
+#: build/trans_style.java:3375
 msgid "wood"
 msgstr "Naturwald"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paving_stones"
 msgstr "Platte"
@@ -14873,77 +15301,77 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "cobblestone"
 msgstr "gepflastert"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "gravel"
 msgstr "Schotter"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "pebblestone"
-msgstr ""
-
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+msgstr "Kies"
+
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "compacted"
 msgstr "verdichtet"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "grass_paver"
 msgstr "Rasengitterstein"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "grass"
 msgstr "Gras"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "sand"
 msgstr "Sand"
@@ -14951,13 +15379,13 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "ground"
 msgstr "Erde"
@@ -14965,5 +15393,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:246
+#: build/trans_presets.java:247
 msgid "Living Street"
 msgstr "Spielstraße"
@@ -14972,5 +15400,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:249
+#: build/trans_presets.java:250
 msgid "Edit Living Street"
 msgstr "Spielstraße bearbeiten"
@@ -14978,5 +15406,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:264
+#: build/trans_presets.java:265
 msgid "Service"
 msgstr "Zufahrtsstraße"
@@ -14985,5 +15413,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:267
+#: build/trans_presets.java:268
 msgid "Edit Serviceway"
 msgstr "Zufahrtsstraße bearbeiten"
@@ -14993,18 +15421,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "Serviceway type"
 msgstr "Zufahrtsstraßentyp"
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "alley"
 msgstr "Gasse"
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "driveway"
 msgstr "Auffahrt"
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "parking_aisle"
 msgstr "Parkplatzweg"
@@ -15012,5 +15440,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:284
+#: build/trans_presets.java:285
 msgid "Parking Aisle"
 msgstr "Parkplatzweg"
@@ -15020,5 +15448,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:288
+#: build/trans_presets.java:289
 msgid "Edit Parking Aisle"
 msgstr "Parkplatzweg bearbeiten"
@@ -15026,5 +15454,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:298
+#: build/trans_presets.java:299
 msgid "Road (Unknown Type)"
 msgstr "Unbekannter Straßentyp"
@@ -15033,5 +15461,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Edit Road of unknown type"
 msgstr "Straße mit unbekanntem Typ bearbeiten"
@@ -15040,20 +15468,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:318
+#: build/trans_presets.java:319
 msgid "Road Restrictions"
 msgstr "Straßeneinschränkungen"
 
 #. item
-#: build/trans_presets.java:319
+#: build/trans_presets.java:320
 msgid "Edit Road Restrictions"
 msgstr "Straßeneinschränkungen bearbeiten"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:321
+#: build/trans_presets.java:322
 msgid "Toll"
 msgstr "Maut"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:322
+#: build/trans_presets.java:323
 msgid "No exit (cul-de-sac)"
 msgstr "Kein Ausgang (Sackgasse)"
@@ -15066,8 +15494,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:323 build/trans_presets.java:529
-#: build/trans_presets.java:550 build/trans_presets.java:571
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:634
+#: build/trans_presets.java:324 build/trans_presets.java:530
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:593 build/trans_presets.java:614
+#: build/trans_presets.java:635
 msgid "Access"
 msgstr "Zugang"
@@ -15121,29 +15549,29 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1397
-#: build/trans_presets.java:1398 build/trans_presets.java:1399
-#: build/trans_presets.java:1763 build/trans_presets.java:1773
-#: build/trans_presets.java:2397 build/trans_presets.java:2433
-#: build/trans_presets.java:2442 build/trans_presets.java:2443
-#: build/trans_presets.java:2444 build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:1396
+#: build/trans_presets.java:1397 build/trans_presets.java:1400
+#: build/trans_presets.java:1401 build/trans_presets.java:1402
+#: build/trans_presets.java:1767 build/trans_presets.java:1777
+#: build/trans_presets.java:2408 build/trans_presets.java:2444
+#: build/trans_presets.java:2453 build/trans_presets.java:2454
+#: build/trans_presets.java:2455 build/trans_presets.java:2725
 msgid "yes"
 msgstr "ja"
@@ -15156,40 +15584,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:212
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:212
 msgid "private"
 msgstr "Privat"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655
 msgid "designated"
 msgstr "Nutzungsart beschildert"
@@ -15202,19 +15630,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:219
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:219
 msgid "destination"
 msgstr "Anlieger"
@@ -15237,71 +15665,71 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:205
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:205
 msgid "permissive"
 msgstr "privat gestattet"
 
-#: build/trans_presets.java:323 build/trans_presets.java:327
-#: build/trans_presets.java:330 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636
+#: build/trans_presets.java:324 build/trans_presets.java:328
+#: build/trans_presets.java:331 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637
 msgid "agricultural"
 msgstr "Agrar & Forst"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
-#: build/trans_presets.java:2433 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1396 build/trans_presets.java:1397
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
+#: build/trans_presets.java:2444 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
+#: build/trans_presets.java:2725
 msgid "no"
 msgstr "nein"
 
-#: build/trans_presets.java:326
+#: build/trans_presets.java:327
 msgid "Goods"
 msgstr "Waren"
 
-#: build/trans_presets.java:327
+#: build/trans_presets.java:328
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Schwerlast (hgv)"
@@ -15316,10 +15744,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:328 build/trans_presets.java:651
-#: build/trans_presets.java:858 build/trans_presets.java:891
-#: build/trans_presets.java:913 build/trans_presets.java:950
-#: build/trans_presets.java:963 build/trans_presets.java:975
-#: build/trans_presets.java:987 build/trans_presets.java:999
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:329 build/trans_presets.java:652
+#: build/trans_presets.java:859 build/trans_presets.java:892
+#: build/trans_presets.java:914 build/trans_presets.java:951
+#: build/trans_presets.java:964 build/trans_presets.java:976
+#: build/trans_presets.java:988 build/trans_presets.java:1000
+#: build/trans_presets.java:1040
 msgid "Horse"
 msgstr "Pferd"
@@ -15335,13 +15763,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:329 build/trans_presets.java:530
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:635 build/trans_presets.java:859
-#: build/trans_presets.java:877 build/trans_presets.java:892
-#: build/trans_presets.java:914 build/trans_presets.java:951
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:330 build/trans_presets.java:531
+#: build/trans_presets.java:552 build/trans_presets.java:573
+#: build/trans_presets.java:594 build/trans_presets.java:615
+#: build/trans_presets.java:636 build/trans_presets.java:860
+#: build/trans_presets.java:878 build/trans_presets.java:893
+#: build/trans_presets.java:915 build/trans_presets.java:952
+#: build/trans_presets.java:965 build/trans_presets.java:977
+#: build/trans_presets.java:989 build/trans_presets.java:1001
+#: build/trans_presets.java:1041
 msgid "Motorcycle"
 msgstr "Motorrad"
@@ -15356,30 +15784,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:330 build/trans_presets.java:531
-#: build/trans_presets.java:552 build/trans_presets.java:573
-#: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:636 build/trans_presets.java:654
-#: build/trans_presets.java:878 build/trans_presets.java:893
-#: build/trans_presets.java:915 build/trans_presets.java:952
-#: build/trans_presets.java:965 build/trans_presets.java:977
-#: build/trans_presets.java:989 build/trans_presets.java:1001
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:331 build/trans_presets.java:532
+#: build/trans_presets.java:553 build/trans_presets.java:574
+#: build/trans_presets.java:595 build/trans_presets.java:616
+#: build/trans_presets.java:637 build/trans_presets.java:655
+#: build/trans_presets.java:879 build/trans_presets.java:894
+#: build/trans_presets.java:916 build/trans_presets.java:953
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1042
 msgid "Motorcar"
 msgstr "Automobil"
 
-#: build/trans_presets.java:331
+#: build/trans_presets.java:332
 msgid "Public Service Vehicles (psv)"
 msgstr "Öffentlicher Service (psv)"
 
-#: build/trans_presets.java:332
+#: build/trans_presets.java:333
 msgid "Motorboat"
 msgstr "Motorboot"
 
-#: build/trans_presets.java:333
+#: build/trans_presets.java:334
 msgid "Boat"
 msgstr "Boot"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:336
 msgid "Min. speed (km/h)"
 msgstr "Min. Geschwindigkeit (km/h)"
@@ -15387,25 +15815,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:336 build/trans_presets.java:374
+#: build/trans_presets.java:337 build/trans_presets.java:375
 msgid "Max. weight (tonnes)"
 msgstr "Max. Gewicht (Tonnen)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:337
+#: build/trans_presets.java:338
 msgid "Max. Height (meters)"
 msgstr "Max. Höhe (Meter)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Max. Width (meters)"
 msgstr "Max. Breite (Meter)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:339
+#: build/trans_presets.java:340
 msgid "Max. Length (meters)"
 msgstr "Max. Länge (Meter)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:341
+#: build/trans_presets.java:342
 msgid "Roundabout"
 msgstr "Kreisverkehr"
@@ -15416,5 +15844,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:346
+#: build/trans_presets.java:347
 msgid "Edit Junction"
 msgstr "Kreuzung bearbeiten"
@@ -15436,9 +15864,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:349 build/trans_presets.java:648
-#: build/trans_presets.java:788 build/trans_presets.java:1135
-#: build/trans_presets.java:1392 build/trans_presets.java:2353
-#: build/trans_presets.java:2901 build/trans_presets.java:2911
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:350 build/trans_presets.java:649
+#: build/trans_presets.java:789 build/trans_presets.java:1137
+#: build/trans_presets.java:1395 build/trans_presets.java:2364
+#: build/trans_presets.java:2913 build/trans_presets.java:2923
+#: build/trans_presets.java:2932
 msgid "Type"
 msgstr "Typ"
@@ -15458,10 +15886,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:547
+#: build/trans_presets.java:350 build/trans_style.java:547
 #: build/trans_style.java:555
 msgid "motorway"
 msgstr "Autobahn"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "motorway_link"
 msgstr "Autobahnanschluß"
@@ -15483,10 +15911,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:563
+#: build/trans_presets.java:350 build/trans_style.java:563
 #: build/trans_style.java:571
 msgid "trunk"
 msgstr "Schnellstraße"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "trunk_link"
 msgstr "Schnellstraßenanschluß"
@@ -15508,10 +15936,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:579
+#: build/trans_presets.java:350 build/trans_style.java:579
 #: build/trans_style.java:587
 msgid "primary"
 msgstr "Bundesstraße"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "primary_link"
 msgstr "Bundesstraßenanschluß"
@@ -15533,5 +15961,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:595
+#: build/trans_presets.java:350 build/trans_style.java:595
 #: build/trans_style.java:603
 msgid "secondary"
@@ -15546,9 +15974,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:349 build/trans_style.java:611
+#: build/trans_presets.java:350 build/trans_style.java:611
 msgid "tertiary"
 msgstr "Kreisstraße"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "unclassified"
 msgstr "Verbindungsstraße"
@@ -15562,9 +15990,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:349 build/trans_style.java:3143
+#: build/trans_presets.java:350 build/trans_style.java:3151
 msgid "residential"
 msgstr "Ortsstraße"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "living_street"
 msgstr "Spielstraße"
@@ -15594,10 +16022,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:349 build/trans_style.java:667
-#: build/trans_style.java:4244
+#: build/trans_presets.java:350 build/trans_style.java:667
+#: build/trans_style.java:4252
 msgid "service"
 msgstr "Service"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "bus_guideway"
 msgstr "Spurbus"
@@ -15627,6 +16055,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:349 build/trans_style.java:877
-#: build/trans_style.java:3208 build/trans_style.java:3209
+#: build/trans_presets.java:350 build/trans_style.java:877
+#: build/trans_style.java:3216 build/trans_style.java:3217
 msgid "construction"
 msgstr "Baustelle"
@@ -15637,10 +16065,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Edit Bridge"
 msgstr "Brücke bearbeiten"
 
 #. item
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "Edit Tunnel"
 msgstr "Tunnel bearbeiten"
@@ -15648,19 +16076,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:393
+#: build/trans_presets.java:394
 msgid "Ways"
 msgstr "Wege"
 
 #. group "Ways"
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Construction"
 msgstr "Baustelle"
 
 #. item
-#: build/trans_presets.java:395
+#: build/trans_presets.java:396
 msgid "Edit Highway Under Construction"
 msgstr "Eine im Bau befindliche Straße bearbeiten"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "Junction"
 msgstr "Kreuzung"
@@ -15676,5 +16104,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:411 build/trans_style.java:895
+#: build/trans_presets.java:412 build/trans_style.java:895
 msgid "roundabout"
 msgstr "Kreisverkehr"
@@ -15683,5 +16111,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:417
+#: build/trans_presets.java:418
 msgid "Bridleway"
 msgstr "Reitweg"
@@ -15689,5 +16117,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:419
+#: build/trans_presets.java:420
 msgid "Edit Bridleway"
 msgstr "Reitweg bearbeiten"
@@ -15695,5 +16123,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:435
+#: build/trans_presets.java:436
 msgid "Cycleway"
 msgstr "Fahrradweg"
@@ -15703,10 +16131,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:439
+#: build/trans_presets.java:440
 msgid "Edit Cycleway"
 msgstr "Fahrradweg bearbeiten"
 
 #. item "Ways/Cycleway" check "Embankment"
-#: build/trans_presets.java:449
+#: build/trans_presets.java:450
 msgid "Pedestrians"
 msgstr "Fußgänger"
@@ -15714,5 +16142,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Footway"
 msgstr "Fußweg"
@@ -15721,10 +16149,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Footway"
 msgstr "Fußweg bearbeiten"
 
 #. item "Ways/Footway" check "Embankment"
-#: build/trans_presets.java:469
+#: build/trans_presets.java:470
 msgid "Bikes"
 msgstr "Fahrräder"
@@ -15732,5 +16160,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:476
+#: build/trans_presets.java:477
 msgid "Pedestrian"
 msgstr "Fußgängerzone"
@@ -15739,5 +16167,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Edit Pedestrian Street"
 msgstr "Fußgängerzone bearbeiten"
@@ -15745,5 +16173,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:494
+#: build/trans_presets.java:495
 msgid "Steps"
 msgstr "Treppe"
@@ -15753,5 +16181,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:498
+#: build/trans_presets.java:499
 msgid "Edit Flight of Steps"
 msgstr "Treppe bearbeiten"
@@ -15760,5 +16188,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:515
+#: build/trans_presets.java:516
 msgid "Track"
 msgstr "Feld- oder Waldweg"
@@ -15767,5 +16195,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:518
+#: build/trans_presets.java:519
 msgid "Edit Track"
 msgstr "Feld- oder Waldweg bearbeiten"
@@ -15773,5 +16201,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:535
+#: build/trans_presets.java:536
 msgid "Track Grade 1"
 msgstr "Feldweg Grad 1 (asphaltiert)"
@@ -15780,5 +16208,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:538
+#: build/trans_presets.java:539
 msgid "Edit Track of grade 1"
 msgstr "Feld- oder Waldweg Grad 1 (asphaltiert) bearbeiten"
@@ -15786,5 +16214,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:556
+#: build/trans_presets.java:557
 msgid "Track Grade 2"
 msgstr "Feldweg Grad 2 (Schotter)"
@@ -15793,5 +16221,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:559
+#: build/trans_presets.java:560
 msgid "Edit Track of grade 2"
 msgstr "Feld- oder Waldweg Grad 2 (Schotter) bearbeiten"
@@ -15799,5 +16227,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:577
+#: build/trans_presets.java:578
 msgid "Track Grade 3"
 msgstr "Feldweg Grad 3 (befestigt)"
@@ -15806,5 +16234,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:580
+#: build/trans_presets.java:581
 msgid "Edit Track of grade 3"
 msgstr "Feld- oder Waldweg Grad 3 (befestigt) bearbeiten"
@@ -15812,5 +16240,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:598
+#: build/trans_presets.java:599
 msgid "Track Grade 4"
 msgstr "Feldweg Grad 4 (wenig befestigt)"
@@ -15819,5 +16247,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:601
+#: build/trans_presets.java:602
 msgid "Edit Track of grade 4"
 msgstr "Feld- oder Waldweg Grad 4 (wenig befestigt) bearbeiten"
@@ -15825,5 +16253,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:619
+#: build/trans_presets.java:620
 msgid "Track Grade 5"
 msgstr "Feldweg Grad 5 (unbefestigt)"
@@ -15832,5 +16260,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:622
+#: build/trans_presets.java:623
 msgid "Edit Track of grade 5"
 msgstr "Feld- oder Waldweg Grad 5 (unbefestigt) bearbeiten"
@@ -15839,5 +16267,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:641
+#: build/trans_presets.java:642
 msgid "Path"
 msgstr "Pfad"
@@ -15846,13 +16274,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:644
+#: build/trans_presets.java:645
 msgid "Edit Path"
 msgstr "Pfad bearbeiten"
 
-#: build/trans_presets.java:652
+#: build/trans_presets.java:653
 msgid "Ski"
 msgstr "Ski"
 
-#: build/trans_presets.java:653
+#: build/trans_presets.java:654
 msgid "Snowmobile"
 msgstr "Schneemobil"
@@ -15862,6 +16290,6 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:670 build/trans_presets.java:1725
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:671 build/trans_presets.java:1729
+#: build/trans_presets.java:1752
 msgid "Hiking"
 msgstr "Wanderweg"
@@ -15871,5 +16299,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:674
+#: build/trans_presets.java:675
 msgid "Edit Hiking"
 msgstr "Wanderweg bearbeiten"
@@ -15877,5 +16305,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:683
+#: build/trans_presets.java:684
 msgid "Mountain Hiking"
 msgstr "Bergwanderweg"
@@ -15885,5 +16313,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:687
+#: build/trans_presets.java:688
 msgid "Edit Mountain Hiking"
 msgstr "Bergwanderweg bearbeiten"
@@ -15891,5 +16319,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:696
+#: build/trans_presets.java:697
 msgid "Demanding Mountain Hiking"
 msgstr "Anspruchsvoller Bergwanderweg"
@@ -15899,5 +16327,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:700
+#: build/trans_presets.java:701
 msgid "Edit Demanding Mountain Hiking"
 msgstr "Anspruchsvollen Bergwanderweg bearbeiten"
@@ -15905,5 +16333,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:709
+#: build/trans_presets.java:710
 msgid "Alpine Hiking"
 msgstr "Alpiner Wanderweg"
@@ -15913,5 +16341,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:713
+#: build/trans_presets.java:714
 msgid "Edit Alpine Hiking"
 msgstr "Alpinen Wanderweg bearbeiten"
@@ -15919,5 +16347,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:723
 msgid "Demanding Alpine Hiking"
 msgstr "Anspruchsvoller alpiner Wanderweg"
@@ -15927,5 +16355,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:726
+#: build/trans_presets.java:727
 msgid "Edit Demanding Alpine Hiking"
 msgstr "Anspruchsvollen alpinen Wanderweg bearbeiten"
@@ -15933,5 +16361,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:735
+#: build/trans_presets.java:736
 msgid "Difficult Alpine Hiking"
 msgstr "Schwerer alpiner Wanderweg"
@@ -15941,5 +16369,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:739
+#: build/trans_presets.java:740
 msgid "Edit Difficult Alpine Hiking"
 msgstr "Schweren alpinen Wanderweg bearbeiten"
@@ -15947,10 +16375,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:749
+#: build/trans_presets.java:750
 msgid "Waypoints"
 msgstr "Wegpunkte"
 
 #. group "Waypoints"
-#: build/trans_presets.java:750
+#: build/trans_presets.java:751
 msgid "Motorway Junction"
 msgstr "Autobahnkreuz"
@@ -15958,15 +16386,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:752
+#: build/trans_presets.java:753
 msgid "Edit Motorway Junction"
 msgstr "Autobahnkreuz bearbeiten"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:757
 msgid "Number"
 msgstr "Nummer"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:759
 msgid "Services"
 msgstr "Rastplatz / Autohof"
@@ -15974,5 +16402,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:761
 msgid "Edit Service Station"
 msgstr "Rastplatz / Autohof bearbeiten"
@@ -16010,15 +16438,15 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:765 build/trans_presets.java:902
-#: build/trans_presets.java:1382 build/trans_presets.java:1406
-#: build/trans_presets.java:1413 build/trans_presets.java:1419
-#: build/trans_presets.java:1427 build/trans_presets.java:1434
-#: build/trans_presets.java:1761 build/trans_presets.java:1771
-#: build/trans_presets.java:2361 build/trans_presets.java:2368
-#: build/trans_presets.java:2384 build/trans_presets.java:2395
-#: build/trans_presets.java:2403 build/trans_presets.java:2410
-#: build/trans_presets.java:2464 build/trans_presets.java:2512
-#: build/trans_presets.java:2678 build/trans_presets.java:2693
-#: build/trans_presets.java:2732 build/trans_presets.java:3151
+#: build/trans_presets.java:766 build/trans_presets.java:903
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
+#: build/trans_presets.java:1416 build/trans_presets.java:1422
+#: build/trans_presets.java:1430 build/trans_presets.java:1437
+#: build/trans_presets.java:1765 build/trans_presets.java:1775
+#: build/trans_presets.java:2372 build/trans_presets.java:2379
+#: build/trans_presets.java:2395 build/trans_presets.java:2406
+#: build/trans_presets.java:2414 build/trans_presets.java:2421
+#: build/trans_presets.java:2475 build/trans_presets.java:2523
+#: build/trans_presets.java:2689 build/trans_presets.java:2704
+#: build/trans_presets.java:2743 build/trans_presets.java:3163
 msgid "Operator"
 msgstr "Betreiber"
@@ -16027,5 +16455,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:769
+#: build/trans_presets.java:770
 msgid "Traffic Signal"
 msgstr "Ampel"
@@ -16035,5 +16463,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:774
 msgid "Pedestrian crossing type"
 msgstr "Typ des Fußgängerüberwegs"
@@ -16042,27 +16470,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "uncontrolled"
 msgstr "unkontrolliert"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "traffic_signals"
 msgstr "Ampel"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "island"
 msgstr "Insel"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "unmarked"
 msgstr "unmarkiert"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:774 build/trans_presets.java:790
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:775 build/trans_presets.java:791
+#: build/trans_presets.java:1334
 msgid "Cross on horseback"
 msgstr "Zu Pferd"
@@ -16070,6 +16498,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:775 build/trans_presets.java:789
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:776 build/trans_presets.java:790
+#: build/trans_presets.java:1335
 msgid "Cross by bicycle"
 msgstr "Mit Fahrrad"
@@ -16078,11 +16506,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:776 build/trans_presets.java:791
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:1336
 msgid "Crossing attendant"
 msgstr "Begleitperson"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:778
 msgid "Crossing type name (UK)"
 msgstr "Übergangstyp (UK)"
@@ -16090,30 +16518,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "zebra"
 msgstr "Zebrastreifen"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pelican"
 msgstr "Ampel (Pelikan)"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "toucan"
 msgstr "Fußgängerampel (Toukan)"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "puffin"
 msgstr "Fußgängerampel (Puffin)"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pegasus"
 msgstr "Ampel für Füßgänger, Fahrrad, Pferd (Pegasus)"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "tiger"
 msgstr "Zebrastreifen (Tiger)"
 
 #. </optional>
-#: build/trans_presets.java:780
+#: build/trans_presets.java:781
 msgid "Stop"
 msgstr "Stopp-Schild"
@@ -16121,5 +16549,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:783
+#: build/trans_presets.java:784
 msgid "Pedestrian Crossing"
 msgstr "Fußgängerüberweg"
@@ -16128,14 +16556,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:786
+#: build/trans_presets.java:787
 msgid "Edit Crossing"
 msgstr "Fußgängerüberweg bearbeiten"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:793
 msgid "Type name (UK)"
 msgstr "Typname (UK)"
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:795
 msgid "Mini-roundabout"
 msgstr "Kleiner Kreisverkehr"
@@ -16146,14 +16574,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "Direction"
 msgstr "Richtung"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "clockwise"
 msgstr "Im Uhrzeigersinn"
 
-#: build/trans_presets.java:801
+#: build/trans_presets.java:802
 msgid "Turning Circle"
 msgstr "Wendestelle"
@@ -16163,20 +16591,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:806
+#: build/trans_presets.java:807
 msgid "City Limit"
 msgstr "Ortseingangsschild"
 
 #. item
-#: build/trans_presets.java:807
+#: build/trans_presets.java:808
 msgid "Edit City Limit Sign"
 msgstr "Ortseingangsschild bearbeiten"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:812
+#: build/trans_presets.java:813
 msgid "Second Name"
 msgstr "Zweiter Name"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:814
+#: build/trans_presets.java:815
 msgid "Speed Camera"
 msgstr "Geschwindigkeitsüberwachung"
@@ -16184,5 +16612,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:817
+#: build/trans_presets.java:818
 msgid "Emergency Phone"
 msgstr "Notfalltelefon"
@@ -16190,5 +16618,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:820
+#: build/trans_presets.java:821
 msgid "Incline"
 msgstr "Steigung"
@@ -16196,5 +16624,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:823
+#: build/trans_presets.java:824
 msgid "Incline Steep"
 msgstr "Starke Steigung"
@@ -16203,10 +16631,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:827
+#: build/trans_presets.java:828
 msgid "Ford"
 msgstr "Furt"
 
 #. item
-#: build/trans_presets.java:828
+#: build/trans_presets.java:829
 msgid "Edit Ford"
 msgstr "Furt bearbeiten"
@@ -16214,5 +16642,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:835
+#: build/trans_presets.java:836
 msgid "Mountain Pass"
 msgstr "Gebirgspass"
@@ -16220,5 +16648,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:837
+#: build/trans_presets.java:838
 msgid "Edit Mountain Pass"
 msgstr "Gebirgspass bearbeiten"
@@ -16230,7 +16658,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:842 build/trans_presets.java:1600
-#: build/trans_presets.java:1745 build/trans_presets.java:2845
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:843 build/trans_presets.java:1604
+#: build/trans_presets.java:1749 build/trans_presets.java:2857
+#: build/trans_presets.java:2864 build/trans_presets.java:2871
 msgid "Elevation"
 msgstr "Höhe"
@@ -16238,5 +16666,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:846
+#: build/trans_presets.java:847
 msgid "Barriers"
 msgstr "Barrieren"
@@ -16244,5 +16672,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:849
+#: build/trans_presets.java:850
 msgid "Bollard"
 msgstr "Poller"
@@ -16250,5 +16678,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:852
 msgid "Edit Bollard"
 msgstr "Poller bearbeiten"
@@ -16293,16 +16721,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:854 build/trans_presets.java:873
-#: build/trans_presets.java:887 build/trans_presets.java:909
-#: build/trans_presets.java:946 build/trans_presets.java:959
-#: build/trans_presets.java:971 build/trans_presets.java:983
-#: build/trans_presets.java:995 build/trans_presets.java:1007
-#: build/trans_presets.java:1017 build/trans_presets.java:1026
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:855 build/trans_presets.java:874
+#: build/trans_presets.java:888 build/trans_presets.java:910
+#: build/trans_presets.java:947 build/trans_presets.java:960
+#: build/trans_presets.java:972 build/trans_presets.java:984
+#: build/trans_presets.java:996 build/trans_presets.java:1008
+#: build/trans_presets.java:1018 build/trans_presets.java:1027
+#: build/trans_presets.java:1036
 msgid "Allowed traffic:"
 msgstr "Erlaubter Verkehr:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:861
+#: build/trans_presets.java:862
 msgid "Cycle Barrier"
 msgstr "Umlaufgitter"
@@ -16311,5 +16739,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:865
+#: build/trans_presets.java:866
 msgid "Block"
 msgstr "Steinblock"
@@ -16317,5 +16745,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:868
+#: build/trans_presets.java:869
 msgid "Cattle Grid"
 msgstr "Viehgitter"
@@ -16323,10 +16751,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:870
+#: build/trans_presets.java:871
 msgid "Edit Cattle Grid"
 msgstr "Viehgitter bearbeiten"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:880
+#: build/trans_presets.java:881
 msgid "Bus Trap"
 msgstr "Busschleuse"
@@ -16334,15 +16762,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:883
+#: build/trans_presets.java:884
 msgid "Spikes"
 msgstr "Spikes / Dornen"
 
 #. item
-#: build/trans_presets.java:884
+#: build/trans_presets.java:885
 msgid "Edit Spikes"
 msgstr "Spikes / Dornen bearbeiten"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:896
 msgid "Toll Booth"
 msgstr "Mautstation"
@@ -16350,5 +16778,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:897
+#: build/trans_presets.java:898
 msgid "Edit Toll Booth"
 msgstr "Mautstation bearbeiten"
@@ -16356,10 +16784,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:905
+#: build/trans_presets.java:906
 msgid "Border Control"
 msgstr "Grenzkontolle"
 
 #. item
-#: build/trans_presets.java:906
+#: build/trans_presets.java:907
 msgid "Edit Border Control"
 msgstr "Grenzkontrolle bearbeiten"
@@ -16369,5 +16797,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:920
+#: build/trans_presets.java:921
 msgid "Hedge"
 msgstr "Hecke"
@@ -16376,5 +16804,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:925
 msgid "Fence"
 msgstr "Zaun"
@@ -16383,5 +16811,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:929
 msgid "Wall"
 msgstr "Mauer"
@@ -16389,5 +16817,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:931
+#: build/trans_presets.java:932
 msgid "City Wall"
 msgstr "Stadtmauer"
@@ -16396,5 +16824,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:935
+#: build/trans_presets.java:936
 msgid "Retaining Wall"
 msgstr "Stützmauer"
@@ -16406,15 +16834,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:942
+#: build/trans_presets.java:943
 msgid "Entrance"
 msgstr "Eingang"
 
 #. item
-#: build/trans_presets.java:943
+#: build/trans_presets.java:944
 msgid "Edit Entrance"
 msgstr "Eingang bearbeiten"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:954
+#: build/trans_presets.java:955
 msgid "Gate"
 msgstr "Gatter / Tor"
@@ -16422,50 +16850,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:956
+#: build/trans_presets.java:957
 msgid "Edit Gate"
 msgstr "Gatter / Tor bearbeiten"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:967
+#: build/trans_presets.java:968
 msgid "Lift Gate"
 msgstr "Schlagbaum"
 
 #. item
-#: build/trans_presets.java:968
+#: build/trans_presets.java:969
 msgid "Edit Lift Gate"
 msgstr "Schlagbaum bearbeiten"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:979
+#: build/trans_presets.java:980
 msgid "Hampshire Gate"
 msgstr "Drahtgatter"
 
 #. item
-#: build/trans_presets.java:980
+#: build/trans_presets.java:981
 msgid "Edit Hampshire Gate"
 msgstr "Drahtgatter bearbeiten"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:991
+#: build/trans_presets.java:992
 msgid "Bump Gate"
 msgstr "Fahrzeuggatter"
 
 #. item
-#: build/trans_presets.java:992
+#: build/trans_presets.java:993
 msgid "Edit Bump Gate"
 msgstr "Fahrzeuggatter bearbeiten"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:1003
+#: build/trans_presets.java:1004
 msgid "Kissing Gate"
 msgstr "Personengatter"
 
 #. item
-#: build/trans_presets.java:1004
+#: build/trans_presets.java:1005
 msgid "Edit Kissing Gate"
 msgstr "Personengatter bearbeiten"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1013
 msgid "Stile"
 msgstr "Zauntreppe"
@@ -16473,25 +16901,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1014
+#: build/trans_presets.java:1015
 msgid "Edit Stile"
 msgstr "Zauntreppe bearbeiten"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1023
 msgid "Turnstile"
 msgstr "Drehsperre"
 
 #. item
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1024
 msgid "Edit Turnstile"
 msgstr "Drehsperre bearbeiten"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1032
 msgid "Sally Port"
 msgstr "Durchgangsschleuse"
 
 #. item
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1033
 msgid "Edit Sally Port"
 msgstr "Durchgangsschleuse bearbeiten"
@@ -16499,13 +16927,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #.
-#. <separator/>
+#. group "Water"
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1046 build/trans_presets.java:1089
+#: build/trans_presets.java:1047 build/trans_presets.java:1048
+#: build/trans_presets.java:1091
 msgid "Water"
 msgstr "Wasser"
 
 #. group "Water"
-#: build/trans_presets.java:1047
+#: build/trans_presets.java:1049
 msgid "Spring"
 msgstr "Quelle"
@@ -16513,5 +16942,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1049
+#: build/trans_presets.java:1051
 msgid "Edit Spring"
 msgstr "Quelle bearbeiten"
@@ -16519,5 +16948,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1056
 msgid "Drain"
 msgstr "Abwassergraben"
@@ -16525,10 +16954,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1058
 msgid "Edit Drain"
 msgstr "Abwassergraben bearbeiten"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1064
 msgid "Stream"
 msgstr "Bach"
@@ -16536,10 +16965,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1066
 msgid "Edit Stream"
 msgstr "Bach bearbeiten"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1072
 msgid "Canal"
 msgstr "Kanal"
@@ -16547,10 +16976,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1074
 msgid "Edit Canal"
 msgstr "Kanal bearbeiten"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1080
 msgid "River"
 msgstr "Fluß"
@@ -16560,5 +16989,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1084
 msgid "Edit River"
 msgstr "Fluss bearbeiten"
@@ -16566,15 +16995,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1093
 msgid "Edit Water"
 msgstr "Wasserfläche bearbeiten"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1097
 msgid "Land"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1098
 msgid "Edit Land"
 msgstr "Landfläche bearbeiten"
@@ -16582,15 +17011,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1103
 msgid "Basin"
 msgstr "Wasserbecken"
 
 #. item
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1104
 msgid "Edit Basin Landuse"
 msgstr "Wasserbecken bearbeiten"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1109
 msgid "Reservoir"
 msgstr "Speicherbecken"
@@ -16598,15 +17027,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1109
+#: build/trans_presets.java:1111
 msgid "Edit Reservoir Landuse"
 msgstr "Speicherbecken bearbeiten"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1116
 msgid "Covered Reservoir"
 msgstr "Überdecktes Speicherbassin"
 
 #. item
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1117
 msgid "Edit Covered Reservoir"
 msgstr "Überdecktes Speicherbassin bearbeiten"
@@ -16614,5 +17043,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1120
+#: build/trans_presets.java:1122
 msgid "Riverbank"
 msgstr "Flußbett"
@@ -16621,10 +17050,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1125
 msgid "Edit Riverbank"
 msgstr "Flußbett bearbeiten"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1127
+#: build/trans_presets.java:1129
 msgid "Wetland"
 msgstr "Feuchtgebiet"
@@ -16635,14 +17064,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1134
 msgid "Edit Wetland"
 msgstr "Feuchtgebiet bearbeiten"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "swamp"
 msgstr "Sumpf"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "bog"
 msgstr "Moor"
@@ -16656,35 +17085,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1135 build/trans_style.java:3384
+#: build/trans_presets.java:1137 build/trans_style.java:3392
 msgid "marsh"
 msgstr "Marsch"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "reedbed"
 msgstr "Röhricht"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "saltmarsh"
 msgstr "Salzwiese"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "tidalflat"
 msgstr "Watt"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "mangrove"
 msgstr "Mangroven"
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1139
 msgid "Mud"
 msgstr "Schlick & Moor"
 
 #. item
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1140
 msgid "Edit Mud"
 msgstr "Schlickiges Gebiet bearbeiten"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1144
 msgid "Beach"
 msgstr "Strand"
@@ -16692,20 +17121,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1144
+#: build/trans_presets.java:1146
 msgid "Edit Beach"
 msgstr "Strand bearbeiten"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1150
 msgid "Bay"
 msgstr "Meeresbucht"
 
 #. item
-#: build/trans_presets.java:1149
+#: build/trans_presets.java:1151
 msgid "Edit Bay"
 msgstr "Meeresbucht bearbeiten"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1155
 msgid "Cliff"
 msgstr "Klippe"
@@ -16713,10 +17142,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1157
 msgid "Edit Cliff"
 msgstr "Klippe bearbeiten"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1159
+#: build/trans_presets.java:1161
 msgid "Coastline"
 msgstr "Küstenlinie"
@@ -16724,5 +17153,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1163
 msgid "Edit Coastline"
 msgstr "Küstenlinie bearbeiten"
@@ -16730,5 +17159,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1168
 msgid "Ferry Route"
 msgstr "Fährroute"
@@ -16736,5 +17165,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1170
 msgid "Edit Ferry"
 msgstr "Fährroute bearbeiten"
@@ -16743,5 +17172,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1176
+#: build/trans_presets.java:1178
 msgid "Boatyard"
 msgstr "Bootswerft"
@@ -16749,10 +17178,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:1180
 msgid "Edit Boatyard"
 msgstr "Bootswerft bearbeiten"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1185
 msgid "Dock"
 msgstr "Dock"
@@ -16760,5 +17189,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1187
 msgid "Edit Dock"
 msgstr "Dock bearbeiten"
@@ -16766,5 +17195,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1193
 msgid "Dam"
 msgstr "Damm"
@@ -16772,15 +17201,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1195
 msgid "Edit Dam"
 msgstr "Damm bearbeiten"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1199
+#: build/trans_presets.java:1201
 msgid "Waterway Point"
 msgstr "Gewässerpunkte"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1202
 msgid "Lock Gate"
 msgstr "Schleusentor"
@@ -16789,5 +17218,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1206
 msgid "Weir"
 msgstr "Wehr"
@@ -16795,20 +17224,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1208
 msgid "Edit Weir"
 msgstr "Wehr bearbeiten"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1213
 msgid "Waterfall"
 msgstr "Wasserfall"
 
 #. item
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1214
 msgid "Edit Waterfall"
 msgstr "Wasserfall bearbeiten"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1219
 msgid "Turning Point"
 msgstr "Wendepunkt"
@@ -16817,15 +17246,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1221
+#: build/trans_presets.java:1223
 msgid "Marina"
 msgstr "Jachthafen"
 
 #. item
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1224
 msgid "Edit Marina"
 msgstr "Jachthafen bearbeiten"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1228
 msgid "Pier"
 msgstr "Anlegestelle (Pier)"
@@ -16833,10 +17262,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1230
 msgid "Edit Pier"
 msgstr "Anlegestelle (Pier) bearbeiten"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1234
 msgid "Ferry Terminal"
 msgstr "Fährstelle"
@@ -16844,10 +17273,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1236
 msgid "Edit Ferry Terminal"
 msgstr "Fährstelle bearbeiten"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1240
 msgid "Slipway"
 msgstr "Bootshebeanlage"
@@ -16857,16 +17286,21 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1244
 msgid "Edit Slipway"
 msgstr "Bootshebeanlage bearbeiten"
 
 #. item "Waterway Point/Slipway" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1250
+#, fuzzy
+msgid "Transport"
+msgstr "Öffentliche Verkehrsmittel"
+
+#. group "Transport"
+#: build/trans_presets.java:1251
 msgid "Railway"
 msgstr "Eisenbahn"
 
 #. group "Railway"
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1252
 msgid "Rail"
 msgstr "Eisenbahn"
@@ -16874,5 +17308,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:1254
 msgid "Edit Rail"
 msgstr "Eisenbahn bearbeiten"
@@ -16902,8 +17336,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "Optional Types"
 msgstr "Optionale Typen"
@@ -16917,35 +17351,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "yard"
 msgstr "Rangiergleis"
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "siding"
 msgstr "Abstellgleis"
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "spur"
 msgstr "Firmenanschlußgleis"
 
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1259
 msgid "Narrow Gauge Rail"
 msgstr "Schmalspurbahn"
 
 #. item
-#: build/trans_presets.java:1257
+#: build/trans_presets.java:1260
 msgid "Edit Narrow Gauge Rail"
 msgstr "Schmalspurbahn bearbeiten"
 
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1265
 msgid "Monorail"
 msgstr "Einschienenbahn"
@@ -16953,45 +17387,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1267
 msgid "Edit Monorail"
 msgstr "Einschienenbahn bearbeiten"
 
-#: build/trans_presets.java:1269
+#: build/trans_presets.java:1272
 msgid "Preserved"
 msgstr "Museumsbahn"
 
 #. item
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1273
 msgid "Edit Preserved Railway"
 msgstr "Museumsbahn bearbeiten"
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1278
 msgid "Light Rail"
 msgstr "S-Bahn"
 
 #. item
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1279
 msgid "Edit Light Rail"
 msgstr "S-Bahn bearbeiten"
 
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1284
 msgid "Subway"
 msgstr "U-Bahn"
 
 #. item
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1285
 msgid "Edit Subway"
 msgstr "U-Bahn bearbeiten"
 
-#: build/trans_presets.java:1287
+#: build/trans_presets.java:1290
 msgid "Tram"
 msgstr "Straßenbahn"
 
 #. item
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1291
 msgid "Edit Tram"
 msgstr "Straßenbahn bearbeiten"
 
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1296
 msgid "Bus Guideway"
 msgstr "Spurbus"
@@ -16999,5 +17433,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1295
+#: build/trans_presets.java:1298
 msgid "Edit Bus Guideway"
 msgstr "Spurbusstrecke bearbeiten"
@@ -17006,14 +17440,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1315
 msgid "Disused Rail"
 msgstr "Stillgelegte Strecke"
 
 #. item
-#: build/trans_presets.java:1313
+#: build/trans_presets.java:1316
 msgid "Edit Disused Railway"
 msgstr "Stillgelegte Strecke bearbeiten"
 
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1321
 msgid "Abandoned Rail"
 msgstr "Strecke abgebaut"
@@ -17022,5 +17456,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1325
 msgid "Level Crossing"
 msgstr "Bahnübergang"
@@ -17029,5 +17463,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1329
 msgid "Crossing"
 msgstr "(Fuß-)Übergang"
@@ -17037,5 +17471,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1333
 msgid "Crossing type"
 msgstr "Type des Übergangs"
@@ -17043,5 +17477,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1339
 msgid "Turntable"
 msgstr "Drehscheibe"
@@ -17050,10 +17484,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1344
 msgid "Aerialway"
 msgstr "Seilbahnen"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1345
 msgid "Chair Lift"
 msgstr "Sessellift"
@@ -17061,10 +17495,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1347
 msgid "Edit Chair Lift"
 msgstr "Sessellift bearbeiten"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1351
 msgid "Drag Lift"
 msgstr "Schlepplift"
@@ -17072,10 +17506,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1353
 msgid "Edit Drag Lift"
 msgstr "Schlepplift bearbeiten"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1357
 msgid "Cable Car"
 msgstr "Seilbahn"
@@ -17083,10 +17517,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1359
 msgid "Edit Cable Car"
 msgstr "Seilbahn bearbeiten"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1360
+#: build/trans_presets.java:1363
 msgid "Gondola"
 msgstr "Gondelbahn"
@@ -17094,5 +17528,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1365
 msgid "Edit Gondola"
 msgstr "Gondelbahn bearbeiten"
@@ -17100,5 +17534,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1366 build/trans_presets.java:1461
+#: build/trans_presets.java:1369 build/trans_presets.java:1464
 msgid "Station"
 msgstr "Station"
@@ -17109,10 +17543,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1368 build/trans_presets.java:1464
+#: build/trans_presets.java:1371 build/trans_presets.java:1467
 msgid "Edit Station"
 msgstr "Bahnhof bearbeiten"
 
 #. group "Car"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1378
 msgid "Fuel"
 msgstr "Tankstelle"
@@ -17122,5 +17556,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1382
 msgid "Edit Fuel"
 msgstr "Tankstelle bearbeiten"
@@ -17178,32 +17612,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1671 build/trans_presets.java:1678
-#: build/trans_presets.java:1686 build/trans_presets.java:1699
-#: build/trans_presets.java:1713 build/trans_presets.java:1810
-#: build/trans_presets.java:1818 build/trans_presets.java:1909
-#: build/trans_presets.java:1915 build/trans_presets.java:2226
-#: build/trans_presets.java:2250 build/trans_presets.java:2465
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1703
+#: build/trans_presets.java:1717 build/trans_presets.java:1814
+#: build/trans_presets.java:1822 build/trans_presets.java:1919
+#: build/trans_presets.java:1925 build/trans_presets.java:2237
+#: build/trans_presets.java:2261 build/trans_presets.java:2476
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Opening Hours"
 msgstr "Öffnungszeiten"
@@ -17262,93 +17696,93 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Mo-Fr 08:30-20:00"
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
+msgstr "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 
 #. group "Bicycle"
@@ -17361,5 +17795,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1385 build/trans_presets.java:1438
+#: build/trans_presets.java:1388 build/trans_presets.java:1441
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -17369,5 +17803,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1391
 msgid "Edit Parking"
 msgstr "Parken bearbeiten"
@@ -17378,24 +17812,24 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1391 build/trans_presets.java:1762
-#: build/trans_presets.java:1772 build/trans_presets.java:2396
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:1394 build/trans_presets.java:1766
+#: build/trans_presets.java:1776 build/trans_presets.java:2407
+#: build/trans_presets.java:2524
 msgid "Reference number"
 msgstr "Referenznummer"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "multi-storey"
 msgstr "Parkhaus"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "surface"
 msgstr "ebenerdig"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "underground"
 msgstr "Tiefgarage"
 
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1396
 msgid "Park and Ride"
 msgstr "Park and Ride"
@@ -17404,38 +17838,38 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1394 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
+#: build/trans_presets.java:1397 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
 msgid "Fee"
 msgstr "Gebühr"
 
 #. <space />
-#: build/trans_presets.java:1396
+#: build/trans_presets.java:1399
 msgid "Capacity (overall)"
 msgstr "Gesamtkapazität"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1400
 msgid "Spaces for Disabled"
 msgstr "Behindertenparkplätze"
 
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1401
 msgid "Spaces for Women"
 msgstr "Stellplätze für Frauen"
 
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1402
 msgid "Spaces for Parents"
 msgstr "Stellplätze für Eltern"
 
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1403
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr "Siehe Wiki für weitere Werte capacity:[types]=*."
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1405
 msgid "Wash"
 msgstr "Autowäsche"
 
 #. item
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1406
 msgid "Edit Car Wash"
 msgstr "Autowäsche bearbeiten"
@@ -17443,5 +17877,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1408 build/trans_presets.java:1452
+#: build/trans_presets.java:1411 build/trans_presets.java:1455
 msgid "Shop"
 msgstr "Geschäft"
@@ -17449,15 +17883,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1413
 msgid "Edit Car Shop"
 msgstr "Autohaus bearbeiten"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1418
 msgid "Repair"
 msgstr "Werkstatt"
 
 #. item
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1419
 msgid "Edit Car Repair"
 msgstr "Autowerkstatt bearbeiten"
@@ -17465,5 +17899,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1421 build/trans_presets.java:1445
+#: build/trans_presets.java:1424 build/trans_presets.java:1448
 msgid "Rental"
 msgstr "Vermietung"
@@ -17472,10 +17906,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1427
 msgid "Edit Car Rental"
 msgstr "Autovermietung bearbeiten"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1432
 msgid "Sharing"
 msgstr "Autotausch / Car Sharing"
@@ -17483,5 +17917,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1434
 msgid "Edit Car Sharing"
 msgstr "Autotausch (Car Sharing) bearbeiten"
@@ -17489,10 +17923,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Parking"
 msgstr "Fahrradparkplatz bearbeiten"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1446
 msgid "Capacity"
 msgstr "Kapazität"
@@ -17501,5 +17935,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1448
+#: build/trans_presets.java:1451
 msgid "Edit Bicycle Rental"
 msgstr "Fahrradleihstelle bearbeiten"
@@ -17508,15 +17942,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1458
 msgid "Edit Bicycle Shop"
 msgstr "Fahrradladen bearbeiten"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1463
 msgid "Public Transport"
 msgstr "Öffentliche Verkehrsmittel"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:1472
 msgid "UIC-Reference"
 msgstr "UIC-Referenz"
@@ -17524,5 +17958,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1475
 msgid "Railway Halt"
 msgstr "Eisenbahnhaltepunkt"
@@ -17530,5 +17964,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1477
 msgid "Edit Halt"
 msgstr "Haltepunkt bearbeiten"
@@ -17536,5 +17970,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1484
 msgid "Tram Stop"
 msgstr "Straßenbahnhaltestelle"
@@ -17543,5 +17977,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1484
+#: build/trans_presets.java:1487
 msgid "Edit Tram Stop"
 msgstr "Straßenbahnhaltestelle bearbeiten"
@@ -17549,5 +17983,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1494
 msgid "Railway Platform"
 msgstr "Bahnsteig"
@@ -17556,5 +17990,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1497
 msgid "Edit Railway Platform"
 msgstr "Bahnsteig bearbeiten"
@@ -17566,5 +18000,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1497 build/trans_presets.java:1539
+#: build/trans_presets.java:1500 build/trans_presets.java:1542
 msgid "Reference (track number)"
 msgstr "Referenznummer (Steig)"
@@ -17572,10 +18006,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1499 build/trans_presets.java:1541
+#: build/trans_presets.java:1502 build/trans_presets.java:1544
 msgid "Area"
 msgstr "Fläche"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1504
 msgid "Subway Entrance"
 msgstr "U-Bahn-Eingang"
@@ -17584,10 +18018,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1507
 msgid "Edit Subway Entrance"
 msgstr "U-Bahn-Eingang bearbeiten"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1512
 msgid "Wheelchair"
 msgstr "Rollstuhl"
@@ -17596,5 +18030,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1517
 msgid "Bus Station"
 msgstr "Busbahnhof"
@@ -17603,5 +18037,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1520
 msgid "Edit Bus Station"
 msgstr "Busbahnhof bearbeiten"
@@ -17609,5 +18043,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1526
 msgid "Bus Stop"
 msgstr "Bushaltestelle"
@@ -17617,5 +18051,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1530
 msgid "Edit Bus Stop"
 msgstr "Bushaltestelle bearbeiten"
@@ -17624,6 +18058,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1532 build/trans_presets.java:1785
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:1535 build/trans_presets.java:1789
+#: build/trans_presets.java:2453
 msgid "Shelter"
 msgstr "Schutzraum"
@@ -17631,10 +18065,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1538
 msgid "Bus Platform"
 msgstr "Bussteig"
 
 #. item
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1539
 msgid "Edit Bus Platform"
 msgstr "Bussteig bearbeiten"
@@ -17642,5 +18076,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1547
 msgid "Taxi"
 msgstr "Taxi"
@@ -17648,5 +18082,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1549
 msgid "Edit Taxi station"
 msgstr "Taxihaltepunkt bearbeiten"
@@ -17654,5 +18088,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1554
 msgid "Airport"
 msgstr "Flughafen"
@@ -17660,15 +18094,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1556
 msgid "Edit Airport"
 msgstr "Flughafen bearbeiten"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1561
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1559
+#: build/trans_presets.java:1562
 msgid "ICAO"
 msgstr "ICAO"
@@ -17676,6 +18110,11 @@
 #. item "Public Transport/Airport" text "ICAO"
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1567
+#, fuzzy
+msgid "Travel"
+msgstr "Schotter"
+
+#. group "Travel"
+#: build/trans_presets.java:1568
 msgid "Accomodation"
 msgstr "Unterkunft"
@@ -17687,5 +18126,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1565 build/trans_surveyor.java:43
+#: build/trans_presets.java:1569 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -17694,15 +18133,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:1568
+#: build/trans_presets.java:1572
 msgid "Edit Hotel"
 msgstr "Hotel bearbeiten"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1575
 msgid "Stars"
 msgstr "Sterne"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1577
 msgid "Motel"
 msgstr "Motel"
@@ -17710,20 +18149,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1579
 msgid "Edit Motel"
 msgstr "Motel bearbeiten"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1583
 msgid "Guest House"
 msgstr "Gästehaus (Bed & Breakfast)"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1584
 msgid "Edit Guest House"
 msgstr "Gästehaus bearbeiten"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1588
 msgid "Chalet"
 msgstr "Ferienhaus"
@@ -17731,10 +18170,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1590
 msgid "Edit Chalet"
 msgstr "Ferienhaus bearbeiten"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1594
 msgid "Hostel"
 msgstr "Jugendherberge"
@@ -17742,30 +18181,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1592
+#: build/trans_presets.java:1596
 msgid "Edit Hostel"
 msgstr "Jugendherberge bearbeiten"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1600
 msgid "Alpine Hut"
 msgstr "Alpenhütte"
 
 #. item
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1601
 msgid "Edit Alpine Hut"
 msgstr "Alpenhütte bearbeiten"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1606
 msgid "Caravan Site"
 msgstr "Wohnwagenstellplätze"
 
 #. item
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1607
 msgid "Edit Caravan Site"
 msgstr "Wohnwagenstellplätze bearbeiten"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1611
 msgid "Camping Site"
 msgstr "Campingplatz"
@@ -17773,10 +18212,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1613
 msgid "Edit Camping Site"
 msgstr "Campingplatz bearbeiten"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1618
 msgid "Food+Drinks"
 msgstr "Essen & Trinken"
@@ -17787,5 +18226,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1615 build/trans_surveyor.java:47
+#: build/trans_presets.java:1619 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -17793,5 +18232,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1621
 msgid "Edit Restaurant"
 msgstr "Restaurant bearbeiten"
@@ -17799,5 +18238,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "Cuisine"
 msgstr "Küche"
@@ -17805,61 +18244,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "italian"
 msgstr "italienisch"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "chinese"
 msgstr "chinesisch"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "pizza"
 msgstr "Pizza"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "burger"
 msgstr "Hamburger"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "greek"
 msgstr "griechisch"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "german"
 msgstr "deutsch"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "indian"
 msgstr "indisch"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "kebab"
 msgstr "Döner"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "turkish"
 msgstr "türkisch"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "asian"
 msgstr "asiatisch"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "thai"
 msgstr "thailändisch"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "mexican"
 msgstr "mexikanisch"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "japanese"
 msgstr "japanisch"
 
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1627
 msgid "Fast Food"
 msgstr "Imbiss (Fast Food)"
@@ -17867,9 +18306,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1629
 msgid "Edit Fast Food Restaurant"
 msgstr "Imbiss (Fast Food-Restaurant) bearbeiten"
 
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1635
 msgid "Cafe"
 msgstr "Café"
@@ -17877,9 +18316,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1633
+#: build/trans_presets.java:1637
 msgid "Edit Cafe"
 msgstr "Café bearbeiten"
 
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1642
 msgid "Pub"
 msgstr "Kneipe"
@@ -17887,18 +18326,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1644
 msgid "Edit Pub"
 msgstr "Kneipe bearbeiten"
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1649
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item
-#: build/trans_presets.java:1646
+#: build/trans_presets.java:1650
 msgid "Edit Biergarten"
 msgstr "Biergarten bearbeiten"
 
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1655
 msgid "Bar"
 msgstr "Bar"
@@ -17906,9 +18345,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1657
 msgid "Edit Bar"
 msgstr "Bar bearbeiten"
 
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1662
 msgid "Nightclub"
 msgstr "Nachtclub"
@@ -17916,24 +18355,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1664
 msgid "Edit Nightclub"
 msgstr "Nachtclub bearbeiten"
 
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1670
 msgid "Tourism"
 msgstr "Tourismus"
 
 #. group "Tourism"
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1671
 msgid "Attraction"
 msgstr "Attraktion"
 
 #. item
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1672
 msgid "Edit Attraction"
 msgstr "Attraktion bearbeiten"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1677
 msgid "Museum"
 msgstr "Museum"
@@ -17941,9 +18380,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1679
 msgid "Edit Museum"
 msgstr "Museum bearbeiten"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1684
 msgid "Zoo"
 msgstr "Zoo"
@@ -17952,9 +18391,9 @@
 #. <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:1683
+#: build/trans_presets.java:1687
 msgid "Edit Zoo"
 msgstr "Zoo bearbeiten"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1692
 msgid "Viewpoint"
 msgstr "Aussichtspunkt"
@@ -17962,24 +18401,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1694
 msgid "Edit Viewpoint"
 msgstr "Aussichtspunkt bearbeiten"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1697
 msgid "Look-Out Tower"
 msgstr "Aussichtsturm"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1699
 msgid "Theme Park"
 msgstr "Themenpark"
 
 #. item
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1700
 msgid "Edit Theme Park"
 msgstr "Themenpark bearbeiten"
 
-#: build/trans_presets.java:1701
+#: build/trans_presets.java:1705
 msgid "Artwork"
 msgstr "Kunstausstellung"
@@ -17987,5 +18426,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1707
 msgid "Edit Artwork"
 msgstr "Kunstausstellung bearbeiten"
@@ -17993,19 +18432,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1712
 msgid "Information Office"
 msgstr "Informationsbüro"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1719
 msgid "Map"
 msgstr "Karte"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "Detail Grade"
 msgstr "Detailgrad"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "topo"
 msgstr "topograhisch"
@@ -18043,5 +18482,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1720 build/trans_style.java:619
+#: build/trans_presets.java:1724 build/trans_style.java:619
 #: build/trans_style.java:635 build/trans_style.java:651
 #: build/trans_style.java:659
@@ -18049,28 +18488,28 @@
 msgstr "Straße"
 
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "scheme"
 msgstr "schematisch"
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "Shown Area"
 msgstr "Kartenausschnitt"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "site"
 msgstr "Örtlichkeit"
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "city"
 msgstr "Stadt"
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "region"
 msgstr "Region"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1722 build/trans_presets.java:1738
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1726 build/trans_presets.java:1742
+#: build/trans_presets.java:1786
 msgid "Closer Description"
 msgstr "Nähere Beschreibung"
@@ -18080,12 +18519,12 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1724 build/trans_presets.java:1747
+#: build/trans_presets.java:1728 build/trans_presets.java:1751
 msgid "Routes shown for:"
-msgstr ""
+msgstr "Dargestellte Routen für:"
 
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1726 build/trans_presets.java:1749
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1965
 msgid "Cycling"
 msgstr "Radfahren"
@@ -18093,5 +18532,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1727 build/trans_presets.java:1750
+#: build/trans_presets.java:1731 build/trans_presets.java:1754
 msgid "Mountainbiking"
 msgstr "Mountainbike fahren"
@@ -18099,6 +18538,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1728 build/trans_presets.java:1751
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:1732 build/trans_presets.java:1755
+#: build/trans_presets.java:2019
 msgid "Skiing"
 msgstr "Skifahren"
@@ -18106,5 +18545,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1729 build/trans_presets.java:1752
+#: build/trans_presets.java:1733 build/trans_presets.java:1756
 msgid "Riding"
 msgstr "Reiten"
@@ -18112,76 +18551,76 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1734 build/trans_presets.java:1757
 msgid "... other transportation modes possible"
 msgstr "...andere mögliche Transportarten"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1736
 msgid "Information Board"
 msgstr "Informationstafel"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "Board Content"
 msgstr "Inhalt"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "notice"
 msgstr "Notiz"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "history"
 msgstr "Geschichte"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "nature"
 msgstr "Natur"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "wildlife"
 msgstr "Wildtiere"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "plants"
 msgstr "Pflanzen"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1744
 msgid "Guidepost"
 msgstr "Wegweiser"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1759
 msgid "Information Terminal"
-msgstr ""
+msgstr "Informationsterminal"
 
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1760 build/trans_presets.java:1770
+#: build/trans_presets.java:1764 build/trans_presets.java:1774
 msgid "Closer description"
 msgstr "Nähere Beschreibung"
 
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1769
 msgid "Audioguide"
 msgstr "Audioguide"
 
 #. <space />
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1779
 msgid "Audioguide via mobile phone?"
 msgstr "Audioguide per Handy?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1780
 msgid "Phone number"
 msgstr "Telefonnummer"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1778
+#: build/trans_presets.java:1782
 msgid "Other Information Points"
 msgstr "Andere Informationspunkte"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1790
 msgid "Edit Shelter"
 msgstr "Schutzraum bearbeiten"
@@ -18189,25 +18628,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1789 build/trans_presets.java:1795
+#: build/trans_presets.java:1793 build/trans_presets.java:1799
 msgid "Fireplace"
 msgstr "Feuerstelle"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1791
+#: build/trans_presets.java:1795
 msgid "Picnic Site"
 msgstr "Picknickplatz"
 
 #. item
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1796
 msgid "Edit Picnic Site"
 msgstr "Picknickplatz bearbeiten"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1802
 msgid "Historic Places"
 msgstr "Historische Stätten"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1799
+#: build/trans_presets.java:1803
 msgid "Castle"
 msgstr "Burg / Schloß"
@@ -18216,19 +18655,19 @@
 #. <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:1802
+#: build/trans_presets.java:1806
 msgid "Edit Castle"
 msgstr "Burg / Schloß bearbeiten"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1810
 msgid "Ruins"
 msgstr "Ruinen"
 
 #. item
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1811
 msgid "Edit Ruins"
 msgstr "Ruinen bearbeiten"
 
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1816
 msgid "Archaeological Site"
 msgstr "Ausgrabungsstelle"
@@ -18237,9 +18676,9 @@
 #. <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:1815
+#: build/trans_presets.java:1819
 msgid "Edit Archaeological Site"
 msgstr "Ausgrabungsstelle bearbeiten"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1824
 msgid "Battlefield"
 msgstr "Schlachtfeld"
@@ -18247,5 +18686,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1826
 msgid "Edit Battlefield"
 msgstr "Schlachtfeld bearbeiten"
@@ -18253,15 +18692,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1831
 msgid "Monument"
 msgstr "Baudenkmal"
 
 #. item
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1832
 msgid "Edit Monument"
 msgstr "Baudenkmal bearbeiten"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1836
 msgid "Memorial"
 msgstr "Gedenkstätte"
@@ -18269,45 +18708,57 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1838
 msgid "Edit Memorial"
 msgstr "Gedenkstätte bearbeiten"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1842
 msgid "Wayside Cross"
 msgstr "Wegkreuz"
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1843
 msgid "Edit Wayside Cross"
 msgstr "Wegkreuz bearbeiten"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1847
 msgid "Wayside Shrine"
 msgstr "Bildstock"
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1848
 msgid "Edit Wayside Shrine"
 msgstr "Bildstock bearbeiten"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1852
+#, fuzzy
+msgid "Boundary Stone"
+msgstr "Grenzen"
+
+#. item
+#: build/trans_presets.java:1853
+#, fuzzy
+msgid "Edit Boundary Stone"
+msgstr "Buchhandlung bearbeiten"
+
+#. item "Historic Places/Boundary Stone" text "Name"
+#: build/trans_presets.java:1858
 msgid "Leisure"
 msgstr "Freizeit"
 
 #. group "Leisure"
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1859
 msgid "Water Park"
 msgstr "Schwimmbad"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1860
 msgid "Edit Water Park"
 msgstr "Schwimmbad bearbeiten"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1864
 msgid "Playground"
 msgstr "Spielplatz"
@@ -18315,31 +18766,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1866
 msgid "Edit Playground"
 msgstr "Spielplatz bearbeiten"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1870
 msgid "Fishing"
 msgstr "Angeln"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1871
 msgid "Edit Fishing"
 msgstr "Angelplatz bearbeiten"
 
 #. item "Leisure/Fishing" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1877 build/trans_presets.java:2669
+msgid "Sports"
+msgstr "Sport"
+
+#. group "Sports"
+#: build/trans_presets.java:1878
 msgid "Sport Facilities"
 msgstr "Sporteinrichtungen"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1879
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1880
 msgid "Edit Stadium"
 msgstr "Stadion bearbeiten"
@@ -18353,6 +18808,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1874 build/trans_presets.java:1883
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1902 build/trans_presets.java:1911
 msgid "select sport:"
 msgstr "Sportart wählen:"
@@ -18744,30 +19199,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884 build/trans_style.java:3892
-#: build/trans_style.java:3900 build/trans_style.java:3908
-#: build/trans_style.java:3916 build/trans_style.java:3924
-#: build/trans_style.java:3932
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_style.java:3572 build/trans_style.java:3580
+#: build/trans_style.java:3588 build/trans_style.java:3596
+#: build/trans_style.java:3604 build/trans_style.java:3612
+#: build/trans_style.java:3620 build/trans_style.java:3628
+#: build/trans_style.java:3636 build/trans_style.java:3644
+#: build/trans_style.java:3652 build/trans_style.java:3660
+#: build/trans_style.java:3668 build/trans_style.java:3676
+#: build/trans_style.java:3684 build/trans_style.java:3692
+#: build/trans_style.java:3700 build/trans_style.java:3708
+#: build/trans_style.java:3716 build/trans_style.java:3724
+#: build/trans_style.java:3732 build/trans_style.java:3740
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3764 build/trans_style.java:3772
+#: build/trans_style.java:3780 build/trans_style.java:3788
+#: build/trans_style.java:3796 build/trans_style.java:3804
+#: build/trans_style.java:3812 build/trans_style.java:3820
+#: build/trans_style.java:3828 build/trans_style.java:3836
+#: build/trans_style.java:3844 build/trans_style.java:3852
+#: build/trans_style.java:3860 build/trans_style.java:3868
+#: build/trans_style.java:3876 build/trans_style.java:3884
+#: build/trans_style.java:3892 build/trans_style.java:3900
+#: build/trans_style.java:3908 build/trans_style.java:3916
+#: build/trans_style.java:3924 build/trans_style.java:3932
+#: build/trans_style.java:3940
 msgid "sport"
 msgstr "Sport"
@@ -18777,225 +19232,225 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "multi"
 msgstr "Mehrfachnutzung"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "archery"
 msgstr "Bogenschießen"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "athletics"
 msgstr "Leichtathletik"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "australian_football"
 msgstr "Australian Football"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "baseball"
 msgstr "Baseball"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "basketball"
 msgstr "Basketball"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "boules"
 msgstr "Boule"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "bowls"
 msgstr "Bowls"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "canoe"
 msgstr "Kanu"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "climbing"
 msgstr "Klettern"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket"
 msgstr "Kricket"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket_nets"
 msgstr "Kricketnetze"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "croquet"
 msgstr "Krocket"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cycling"
 msgstr "Fahrradfahren"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "dog_racing"
 msgstr "Hunderennen"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "equestrian"
 msgstr "Reiten"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "football"
 msgstr "American Football"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "golf"
 msgstr "Golf"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "gymnastics"
 msgstr "Gymnastik"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "hockey"
 msgstr "Hockey"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "horse_racing"
 msgstr "Pferderennen"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "motor"
 msgstr "Motorsport"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "pelota"
 msgstr "Pelota"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "racquet"
 msgstr "Schlagball (Racquet)"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "rugby"
 msgstr "Rugby"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "shooting"
 msgstr "Schießen"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skateboard"
 msgstr "Skateboard"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skating"
 msgstr "Eislaufen"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skiing"
 msgstr "Skifahren"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "soccer"
 msgstr "Fußball"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "swimming"
 msgstr "Schwimmen"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "table_tennis"
 msgstr "Tischtennis"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "tennis"
 msgstr "Tennis"
 
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1888
 msgid "Sports Centre"
 msgstr "Sporthalle / Fitnesscenter"
 
 #. item
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1889
 msgid "Edit Sports Centre"
 msgstr "Sporthalle / Fitnesscenter bearbeiten"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1897
 msgid "Pitch"
 msgstr "Spielfeld"
 
 #. item
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1898
 msgid "Edit Pitch"
 msgstr "Spielfeld bearbeiten"
 
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1906
 msgid "Racetrack"
 msgstr "Rennbahn"
 
 #. item
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1907
 msgid "Edit Racetrack"
 msgstr "Rennbahn bearbeiten"
 
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1915
 msgid "Golf Course"
 msgstr "Golfanlage"
 
 #. item
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1916
 msgid "Edit Golf Course"
 msgstr "Golfanlage bearbeiten"
 
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1921
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1922
 msgid "Edit Miniature Golf"
 msgstr "Minigolfplatz bearbeiten"
 
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1928
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1929
 msgid "Multi"
 msgstr "Mehrfachnutzung"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1930
 msgid "Edit Multi"
 msgstr "Mehrfach genutzten Sportplatz bearbeiten"
@@ -19034,183 +19489,183 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "pitch"
 msgstr "Spielfeld"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "sports_centre"
 msgstr "Sporthalle / Fitnesscenter"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "stadium"
 msgstr "Stadion"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1935
 msgid "10pin"
 msgstr "Bowling"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1936
 msgid "Edit 10pin"
 msgstr "Bowlinghalle bearbeiten"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1941
 msgid "Athletics"
 msgstr "Leichtathletik"
 
 #. item
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1942
 msgid "Edit Athletics"
 msgstr "Leichtathletikfeld bearbeiten"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1947
 msgid "Archery"
 msgstr "Bogenschießen"
 
 #. item
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1948
 msgid "Edit Archery"
 msgstr "Bogenschießplatz bearbeiten"
 
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1953
 msgid "Climbing"
 msgstr "Klettern"
 
 #. item
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:1954
 msgid "Edit Climbing"
 msgstr "Kletterbereich bearbeiten"
 
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1959
 msgid "Canoeing"
 msgstr "Kanufahren"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1960
 msgid "Edit Canoeing"
 msgstr "Kanufahrtstrecke bearbeiten"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1966
 msgid "Edit Cycling"
 msgstr "Radsporthalle oder -kurs bearbeiten"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1971
 msgid "Dog Racing"
 msgstr "Hunderennen"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1972
 msgid "Edit Dog Racing"
 msgstr "Trainingsplatz für Hunde bearbeiten"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1977
 msgid "Equestrian"
 msgstr "Reitplatz"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1978
 msgid "Edit Equestrian"
 msgstr "Reitplatz bearbeiten"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1983
 msgid "Horse Racing"
 msgstr "Pferderennen"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1984
 msgid "Edit Horse Racing"
 msgstr "Pferderennplatz bearbeiten"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1989
 msgid "Gymnastics"
 msgstr "Gymnastik"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1990
 msgid "Edit Gymnastics"
 msgstr "Gymnastikbereich bearbeiten"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1995
 msgid "Motor Sports"
 msgstr "Motorsport"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1996
 msgid "Edit Motor Sports"
 msgstr "Motorsportplatz bearbeiten"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2001
 msgid "Skating"
 msgstr "Eislaufen"
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2002
 msgid "Edit Skating"
 msgstr "Eislaufbahn bearbeiten"
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2007
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2008
 msgid "Edit Skateboard"
 msgstr "Skateboardplatz bearbeiten"
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2013
 msgid "Swimming"
 msgstr "Schwimmen"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2014
 msgid "Edit Swimming"
 msgstr "Schwimmbad bearbeiten"
@@ -19218,56 +19673,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2021
 msgid "Edit Skiing"
 msgstr "Skipiste bearbeiten"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "Piste type"
 msgstr "Pistentyp"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "downhill"
 msgstr "Abfahrt"
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "nordic"
 msgstr "Langlauf"
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "snow_park"
 msgstr "Schneepark"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "Difficulty"
 msgstr "Schwierigkeit"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "novice"
 msgstr "Anfänger"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "easy"
 msgstr "einfach"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "intermediate"
 msgstr "mittelschwer"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "advanced"
 msgstr "fortgeschritten"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "expert"
 msgstr "Experte"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "freeride"
 msgstr "Freistil"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2028
 msgid "Shooting"
 msgstr "Schießen"
@@ -19275,178 +19730,183 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2030
 msgid "Edit Shooting"
 msgstr "Schießbahn bearbeiten"
 
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2036
 msgid "Sport (Ball)"
 msgstr "Ballsport"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2037
 msgid "Soccer"
 msgstr "Fußball"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2038
 msgid "Edit Soccer"
 msgstr "Fußballplatz bearbeiten"
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2043
 msgid "Football"
 msgstr "American Football"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2044
 msgid "Edit Football"
 msgstr "American Football-Platz bearbeiten"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2049
 msgid "Australian Football"
 msgstr "Australian Football"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2050
 msgid "Edit Australian Football"
 msgstr "Australian Foootball-Platz bearbeiten"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2055
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2056
 msgid "Edit Baseball"
 msgstr "Baseballplatz bearbeiten"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2061
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2062
 msgid "Edit Basketball"
 msgstr "Basketballplatz bearbeiten"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2067
 msgid "Golf"
 msgstr "Golfplatz"
 
 #. item
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2068
 msgid "Edit Golf"
 msgstr "Golfplatz bearbeiten"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2071
 msgid "golf_course"
 msgstr "Golfanlage"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2073
 msgid "Boule"
 msgstr "Boule"
 
 #. item
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2074
 msgid "Edit Boule"
 msgstr "Boule-Spielbereich bearbeiten"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2079
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2080
 msgid "Edit Bowls"
 msgstr "Bowls-Spielfeld bearbeiten"
 
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2085
 msgid "Cricket"
 msgstr "Kricket"
 
 #. item
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2086
 msgid "Edit Cricket"
 msgstr "Kricketspielfeld bearbeiten"
 
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2091
 msgid "Cricket Nets"
 msgstr "Kricketnetze"
 
 #. item
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2092
 msgid "Edit Cricket Nets"
 msgstr "Kricketnetze bearbeiten"
 
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2097
 msgid "Croquet"
 msgstr "Krocket"
 
 #. item
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2098
 msgid "Edit Croquet"
 msgstr "Krocketspielfeld bearbeiten"
 
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2103
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2104
 msgid "Edit Hockey"
 msgstr "Hockeyplatz bearbeiten"
 
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2109
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2110
 msgid "Edit Pelota"
 msgstr "Pelotaplatz bearbeiten"
 
-#: build/trans_presets.java:2105
+#: build/trans_presets.java:2115
 msgid "Racquet"
 msgstr "Schlagball (Racquet)"
 
 #. item
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2116
 msgid "Edit Racquet"
 msgstr "Schlagball (Racquet)-Platz bearbeiten"
 
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2121
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2122
 msgid "Edit Rugby"
 msgstr "Rugbyplatz bearbeiten"
 
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2127
 msgid "Table Tennis"
 msgstr "Tischtennis"
 
 #. item
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2128
 msgid "Edit Table Tennis"
 msgstr "Tischtennisplatz bearbeiten"
 
-#: build/trans_presets.java:2123
+#: build/trans_presets.java:2133
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2134
 msgid "Edit Tennis"
 msgstr "Tennisplatz bearbeiten"
 
-#. <separator/>
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2141
+#, fuzzy
+msgid "Man-Made"
+msgstr "Zivilisationsbauten"
+
+#. group "Man-Made"
+#: build/trans_presets.java:2142
 msgid "Buildings"
 msgstr "Gebäude"
 
 #. group "Buildings"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2143
 msgid "Building"
 msgstr "Gebäude"
@@ -19454,5 +19914,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Public Building"
 msgstr "Öffentliches Gebäude"
@@ -19460,10 +19920,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2148
 msgid "Edit Public Building"
 msgstr "Öffentliches Gebäuden bearbeiten"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2152
 msgid "Town hall"
 msgstr "Rathaus"
@@ -19471,10 +19931,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2154
 msgid "Edit Town hall"
 msgstr "Rathaus bearbeiten"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:2158
 msgid "Embassy"
 msgstr "Botschaft"
@@ -19482,10 +19942,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Edit Embassy"
 msgstr "Botschaft bearbeiten"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2164
 msgid "Courthouse"
 msgstr "Gericht"
@@ -19494,10 +19954,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:2156
+#: build/trans_presets.java:2167
 msgid "Edit Courthouse"
 msgstr "Gericht bearbeiten"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2171
 msgid "Prison"
 msgstr "Gefängnis"
@@ -19506,10 +19966,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:2163
+#: build/trans_presets.java:2174
 msgid "Edit Prison"
 msgstr "Gefängnis bearbeiten"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2178
 msgid "Police"
 msgstr "Polizei"
@@ -19519,10 +19979,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:2171
+#: build/trans_presets.java:2182
 msgid "Edit Police"
 msgstr "Polizei bearbeiten"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2186
 msgid "Fire Station"
 msgstr "Feuerwache"
@@ -19531,10 +19991,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:2178
+#: build/trans_presets.java:2189
 msgid "Edit Fire Station"
 msgstr "Feuerwache bearbeiten"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "Post Office"
 msgstr "Post"
@@ -19542,5 +20002,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Edit Post Office"
 msgstr "Post bearbeiten"
@@ -19548,15 +20008,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2200
 msgid "Kindergarten"
 msgstr "Kindergarten"
 
 #. item
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Kindergarten"
 msgstr "Kindergarten bearbeiten"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2205
 msgid "School"
 msgstr "Schule"
@@ -19564,10 +20024,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Edit School"
 msgstr "Schule bearbeiten"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2211
 msgid "University"
 msgstr "Universität"
@@ -19575,10 +20035,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit University"
 msgstr "Universität bearbeiten"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "College"
 msgstr "Hochschule"
@@ -19586,5 +20046,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2219
 msgid "Edit College"
 msgstr "College bearbeiten"
@@ -19592,5 +20052,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2224
 msgid "Cinema"
 msgstr "Kino"
@@ -19599,10 +20059,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:2216
+#: build/trans_presets.java:2227
 msgid "Edit Cinema"
 msgstr "Kino bearbeiten"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2231
 msgid "Library"
 msgstr "Bibliothek"
@@ -19611,9 +20071,9 @@
 #. <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:2223
+#: build/trans_presets.java:2234
 msgid "Edit Library"
 msgstr "Bibliothek bearbeiten"
 
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Arts Centre"
 msgstr "Kulturzentrum"
@@ -19621,10 +20081,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Arts Centre"
 msgstr "Kulturzentrum bearbeiten"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Theatre"
 msgstr "Theater"
@@ -19633,10 +20093,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:2237
+#: build/trans_presets.java:2248
 msgid "Edit Theatre"
 msgstr "Theater bearbeiten"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2252
 msgid "Place of Worship"
 msgstr "Kirche"
@@ -19646,5 +20106,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:2245
+#: build/trans_presets.java:2256
 msgid "Edit Place of Worship"
 msgstr "Kirche bearbeiten"
@@ -19653,6 +20113,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "Religion"
 msgstr "Religion"
@@ -19661,66 +20121,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "bahai"
 msgstr "bahaiistisch"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "buddhist"
 msgstr "buddhistisch"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "christian"
 msgstr "christlich"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "hindu"
 msgstr "hinduistisch"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jain"
 msgstr "jainistisch"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jewish"
 msgstr "jüdisch"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "muslim"
 msgstr "moslemisch"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "sikh"
 msgstr "sikhistisch"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "spiritualist"
 msgstr "spiritistisch"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "taoist"
 msgstr "taoistisch"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "unitarian"
 msgstr "unitarisch"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "zoroastrian"
 msgstr "zoroastrisch"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "Denomination"
 msgstr "Konfession"
@@ -19729,81 +20189,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "anglican"
 msgstr "anglikanisch"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "baptist"
 msgstr "baptistisch"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "catholic"
 msgstr "katholisch"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "evangelical"
 msgstr "evangelikal"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "jehovahs_witness"
 msgstr "Zeugen Jehovas"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "lutheran"
 msgstr "lutherisch"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "methodist"
 msgstr "methodistisch"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "mormon"
 msgstr "mormonisch"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "pentecostal"
 msgstr "Pfingstgemeinde"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "presbyterian"
 msgstr "presbyterianisch"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "protestant"
 msgstr "protestantisch"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "quaker"
 msgstr "Quäker"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "shia"
 msgstr "schiitisch"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "sunni"
 msgstr "sunnitisch"
 
 #. <separator/>
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2264
 msgid "Addresses"
 msgstr "Adressen"
@@ -19812,5 +20272,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:2256
+#: build/trans_presets.java:2267
 msgid "Edit Address Information"
 msgstr "Adressinformationen bearbeiten"
@@ -19818,5 +20278,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2269
 msgid "House number"
 msgstr "Hausnummer"
@@ -19824,20 +20284,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "House name"
 msgstr "Hausname"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "City name"
 msgstr "Ortsname"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2274
 msgid "Post code"
 msgstr "Postleitzahl"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2275
 msgid "Country code"
 msgstr "Länderkennung"
@@ -19845,5 +20305,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Address Interpolation"
 msgstr "Adressinterpolation"
@@ -19852,5 +20312,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:2270
+#: build/trans_presets.java:2281
 msgid "Edit Address Interpolation"
 msgstr "Adressinterpolation bearbeiten"
@@ -19858,67 +20318,67 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "Numbering scheme"
 msgstr "Nummernschema"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "odd"
 msgstr "ungerade"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "even"
 msgstr "gerade"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "alphabetic"
 msgstr "alphabetisch"
 
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2286
 msgid "Man Made"
 msgstr "Zivilisationsbauten"
 
 #. group "Man Made"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Works"
 msgstr "Fabrik"
 
 #. item
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2288
 msgid "Edit Works"
 msgstr "Fabrik bearbeiten"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2292
 msgid "Tower"
 msgstr "Turm"
 
 #. item
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2293
 msgid "Edit Tower"
 msgstr "Turm bearbeiten"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Water Tower"
 msgstr "Wasserturm"
 
 #. item
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2298
 msgid "Edit Water Tower"
 msgstr "Wasserturm bearbeiten"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Gasometer"
 msgstr "Gasometer"
 
 #. item
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2303
 msgid "Edit Gasometer"
 msgstr "Gasometer bearbeiten"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Lighthouse"
 msgstr "Leuchtturm"
@@ -19926,10 +20386,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2309
 msgid "Edit Lighthouse"
 msgstr "Leuchtturm bearbeiten"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Windmill"
 msgstr "Windmühle"
@@ -19937,10 +20397,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2315
 msgid "Edit Windmill"
 msgstr "Windmühle bearbeiten"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2319
 msgid "Pipeline"
 msgstr "Pipeline"
@@ -19948,10 +20408,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Edit Pipeline"
 msgstr "Pipeline bearbeiten"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2325
 msgid "Wastewater Plant"
 msgstr "Kläranlage"
@@ -19961,10 +20421,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:2318
+#: build/trans_presets.java:2329
 msgid "Edit Wastewater Plant"
 msgstr "Kläranlage bearbeiten"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2333
 msgid "Crane"
 msgstr "Stationärer Kran"
@@ -19972,10 +20432,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2335
 msgid "Edit Crane"
 msgstr "Stationären Kran bearbeiten"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Beacon"
 msgstr "Bake"
@@ -19983,10 +20443,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2341
 msgid "Edit Beacon"
 msgstr "Bake bearbeiten"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2345
 msgid "Survey Point"
 msgstr "Vermessungspunkt"
@@ -19994,10 +20454,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Edit Survey Point"
 msgstr "Vermessungspunkt bearbeiten"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2351
 msgid "Surveillance"
 msgstr "Überwachungskamera"
@@ -20005,5 +20465,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2353
 msgid "Edit Surveillance Camera"
 msgstr "Überwachungskamera bearbeiten"
@@ -20011,5 +20471,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Power Generator"
 msgstr "Stromgenerator"
@@ -20019,39 +20479,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:2351
+#: build/trans_presets.java:2362
 msgid "Edit Power Generator"
 msgstr "Stromgenerator bearbeiten"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "wind"
 msgstr "Wind"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "hydro"
 msgstr "Wasser"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "fossil"
 msgstr "Fossil"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "nuclear"
 msgstr "Nuklear"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "coal"
 msgstr "Kohle"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "photovoltaic"
 msgstr "Photovoltaik"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "gas"
 msgstr "Gas"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2367
 msgid "Power Station"
 msgstr "Umspannwerk"
@@ -20060,10 +20520,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:2359
+#: build/trans_presets.java:2370
 msgid "Edit Power Station"
 msgstr "Umspannwerk bearbeiten"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2374
 msgid "Power Sub Station"
 msgstr "Trafostation"
@@ -20072,5 +20532,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:2366
+#: build/trans_presets.java:2377
 msgid "Edit Power Sub Station"
 msgstr "Trafostation bearbeiten"
@@ -20078,10 +20538,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2369 build/trans_presets.java:2385
+#: build/trans_presets.java:2380 build/trans_presets.java:2396
 msgid "Line reference"
 msgstr "Liniennummer"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2382
 msgid "Power Tower"
 msgstr "Strommast"
@@ -20092,5 +20552,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:2376
+#: build/trans_presets.java:2387
 msgid "Edit Power Tower"
 msgstr "Strommast bearbeiten"
@@ -20098,5 +20558,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2390
 msgid "Power Line"
 msgstr "Stromleitung"
@@ -20105,40 +20565,40 @@
 #. <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:2382
+#: build/trans_presets.java:2393
 msgid "Edit Power Line"
 msgstr "Stromleitung bearbeiten"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Voltage"
 msgstr "Spannung"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2398
 msgid "Amount of Wires"
 msgstr "Leitungsanzahl"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Amenities"
 msgstr "Einrichtungen"
 
 #. group "Amenities"
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2402
 msgid "Toilets"
 msgstr "Toiletten"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2398 build/trans_presets.java:2514
+#: build/trans_presets.java:2409 build/trans_presets.java:2525
 msgid "Note"
 msgstr "Kommentar"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2411
 msgid "Post Box"
 msgstr "Briefkasten"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2416
 msgid "Telephone"
 msgstr "Telefon"
@@ -20147,5 +20607,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:2408
+#: build/trans_presets.java:2419
 msgid "Edit Telephone"
 msgstr "Telefon bearbeiten"
@@ -20153,5 +20613,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2411 build/trans_presets.java:2515
+#: build/trans_presets.java:2422 build/trans_presets.java:2526
 msgid "Coins"
 msgstr "Münzen"
@@ -20159,5 +20619,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2412 build/trans_presets.java:2516
+#: build/trans_presets.java:2423 build/trans_presets.java:2527
 msgid "Notes"
 msgstr "Scheine"
@@ -20165,5 +20625,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2413 build/trans_presets.java:2517
+#: build/trans_presets.java:2424 build/trans_presets.java:2528
 msgid "Electronic purses and Charge cards"
 msgstr "Geld- oder Prepaidkarten"
@@ -20171,5 +20631,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2414 build/trans_presets.java:2518
+#: build/trans_presets.java:2425 build/trans_presets.java:2529
 msgid "Debit cards"
 msgstr "Konto- oder EC-Karten"
@@ -20177,15 +20637,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2415 build/trans_presets.java:2519
+#: build/trans_presets.java:2426 build/trans_presets.java:2530
 msgid "Credit cards"
 msgstr "Kreditkarten"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2427
 msgid "Telephone cards"
 msgstr "Telefonkarten"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2429
 msgid "Recycling"
 msgstr "Recyclingstelle & -container"
@@ -20194,5 +20654,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:2421
+#: build/trans_presets.java:2432
 msgid "Edit Recycling station"
 msgstr "Recyclingstelle oder -container bearbeiten"
@@ -20200,35 +20660,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Batteries"
 msgstr "Batterien"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2435
 msgid "Cans"
 msgstr "Dosen"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Clothes"
 msgstr "Kleidung"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2437
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2438
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2439
 msgid "Scrap Metal"
 msgstr "Altmetall"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2441
 msgid "Bench"
 msgstr "Bank"
@@ -20237,40 +20697,33 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2433
-#, fuzzy
+#: build/trans_presets.java:2444
 msgid "Backrest"
-msgstr "Zurück"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr "Lehne"
+
+#: build/trans_presets.java:2445
 msgid "Material"
-msgstr "Gedenkstätte"
+msgstr "Material"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2434
-#, fuzzy
+#: build/trans_presets.java:2445
 msgid "stone"
-msgstr "Kein"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr "Stein"
+
+#: build/trans_presets.java:2445
 msgid "plastic"
-msgstr "Ort"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr "Kunststoff"
+
+#: build/trans_presets.java:2446
 msgid "Colour"
 msgstr "Farbe"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "black"
-msgstr "Zurück"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr "schwarz"
+
+#: build/trans_presets.java:2446
 msgid "brown"
-msgstr "runter"
+msgstr "braun"
 
 #. color historic
@@ -20339,39 +20792,35 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2435 build/trans_style.java:3055
-#: build/trans_style.java:3063 build/trans_style.java:3071
-#: build/trans_style.java:3079 build/trans_style.java:3127
-#: build/trans_style.java:3135 build/trans_style.java:3233
-#: build/trans_style.java:3241
+#: build/trans_presets.java:2446 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3135
+#: build/trans_style.java:3143 build/trans_style.java:3241
+#: build/trans_style.java:3249
 msgid "green"
 msgstr "Grün"
 
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "red"
-msgstr "Röhricht"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr "rot"
+
+#: build/trans_presets.java:2446
 msgid "blue"
-msgstr "Wert"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr "blau"
+
+#: build/trans_presets.java:2446
 msgid "white"
-msgstr "Örtlichkeit"
-
-#: build/trans_presets.java:2436
-#, fuzzy
+msgstr "weiß"
+
+#: build/trans_presets.java:2447
 msgid "Amount of Seats"
-msgstr "Leitungsanzahl"
+msgstr "Anzahl der Sitzplätze"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2449
 msgid "Hunting Stand"
 msgstr "Jagdanstand"
 
 #. item
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2450
 msgid "Edit Hunting Stand"
 msgstr "Jagdanstand bearbeiten"
@@ -20380,30 +20829,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2441 build/trans_presets.java:2902
+#: build/trans_presets.java:2452 build/trans_presets.java:2914
 msgid "Height"
 msgstr "Höhe"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "low"
 msgstr "niedrig"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "half"
 msgstr "halb"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "full"
 msgstr "voll"
 
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2454
 msgid "Hide"
 msgstr "Versteck"
 
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2455
 msgid "Lock"
 msgstr "Schloß"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Fountain"
 msgstr "Springbrunnen"
@@ -20412,10 +20861,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:2449
+#: build/trans_presets.java:2460
 msgid "Edit Fountain"
 msgstr "Springbrunnen bearbeiten"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2464
 msgid "Drinking Water"
 msgstr "Trinkwasser"
@@ -20424,10 +20873,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:2456
+#: build/trans_presets.java:2467
 msgid "Edit Drinking Water"
 msgstr "Trinkwasserabgabe bearbeiten"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2471
 msgid "Baby Hatch"
 msgstr "Babyklappe"
@@ -20435,33 +20884,33 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Baby Hatch"
 msgstr "Babyklappe bearbeiten"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2479
 msgid "Shops"
 msgstr "Geschäfte"
 
 #. group "Shops"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2480
 msgid "Supermarket"
 msgstr "Supermarkt"
 
 #. item
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2481
 msgid "Edit Supermarket"
 msgstr "Supermarkt bearbeiten"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2486
 msgid "Chemist"
 msgstr "Drogerie"
 
 #. item
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2487
 msgid "Edit Chemist"
 msgstr "Drogerie bearbeiten"
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2492
 msgid "Convenience Store"
 msgstr "Tante-Emma-Laden"
@@ -20469,9 +20918,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Edit Convenience Store"
 msgstr "Tante-Emma-Laden bearbeiten"
 
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2499
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -20479,27 +20928,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Kiosk"
 msgstr "Kiosk bearbeiten"
 
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Book Store"
 msgstr "Buchhandlung"
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2507
 msgid "Edit Book Store"
 msgstr "Buchhandlung bearbeiten"
 
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2512
 msgid "Travel Agency"
 msgstr "Reisebüro"
 
 #. item
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2513
 msgid "Edit Travel Agency"
 msgstr "Reisebüro bearbeiten"
 
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2518
 msgid "Vending machine"
 msgstr "Verkaufsautomat"
@@ -20507,5 +20956,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Edit Vending machine"
 msgstr "Automaten bearbeiten"
@@ -20513,88 +20962,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "Vending products"
 msgstr "Automatenprodukte"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_tickets"
 msgstr "Fahrscheine"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_plans"
 msgstr "Pläne des öffentlichen Nahverkehrs"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "parking_tickets"
 msgstr "Parkscheine"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "food"
 msgstr "Essen"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "drinks"
 msgstr "Getränke"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "sweets"
 msgstr "Süßigkeiten"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "cigarettes"
 msgstr "Zigaretten"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "photos"
 msgstr "Fotos"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "animal_food"
 msgstr "Tiernahrung"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "news_papers"
 msgstr "Zeitungen"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "toys"
 msgstr "Spielzeug"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "stamps"
 msgstr "Briefmarken"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "SIM-cards"
 msgstr "SIM-Karten"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "telephone_vouchers"
 msgstr "Telefonkarten"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "vouchers"
 msgstr "Karten/Belege"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "condoms"
 msgstr "Kondome"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "tampons"
 msgstr "Tampons"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "excrement_bags"
 msgstr "Hundekot-Tüten"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Account or loyalty cards"
 msgstr "Kundenkarten"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Butcher"
 msgstr "Fleischer"
@@ -20602,9 +21051,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2535
 msgid "Edit Butcher"
 msgstr "Fleischer bearbeiten"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2540
 msgid "Baker"
 msgstr "Bäcker"
@@ -20612,9 +21061,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2542
 msgid "Edit Baker"
 msgstr "Bäcker bearbeiten"
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2547
 msgid "Florist"
 msgstr "Blumenladen"
@@ -20622,18 +21071,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Florist"
 msgstr "Blumenladen bearbeiten"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2554
 msgid "Organic"
 msgstr "Bioladen"
 
 #. item
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Edit Organic Shop"
 msgstr "Bioladen bearbeiten"
 
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2560
 msgid "Alcohol"
 msgstr "Spirituosen"
@@ -20641,54 +21090,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2562
 msgid "Edit Alcohol Shop"
 msgstr "Spirituosengeschäft bearbeiten"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2567
 msgid "Beverages"
 msgstr "Getränke"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2568
 msgid "Edit Beverages Shop"
 msgstr "Getränkeladen bearbeiten"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2573
 msgid "Computer"
 msgstr "Computer"
 
 #. item
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2574
 msgid "Edit Computer Shop"
 msgstr "Computergeschäft bearbeiten"
 
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Electronics"
 msgstr "Elektronikgeschäft"
 
 #. item
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2580
 msgid "Edit Electronics Shop"
 msgstr "Elektronikgeschäft bearbeiten"
 
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2585
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2586
 msgid "Edit Hifi Shop"
 msgstr "Hifi-Geschäft bearbeiten"
 
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2591
 msgid "Furniture"
 msgstr "Mobiliar"
 
 #. item
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Edit Furniture Shop"
 msgstr "Möbelgeschäft bearbeiten"
 
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Garden Centre"
 msgstr "Gartenzentrum"
@@ -20696,9 +21145,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2599
 msgid "Edit Garden Centre"
 msgstr "Gartenzentrum bearbeiten"
 
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Hardware"
 msgstr "Haushaltswaren"
@@ -20706,9 +21155,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2606
 msgid "Edit Hardware Store"
 msgstr "Haushaltswaren bearbeiten"
 
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "Do-it-yourself-store"
 msgstr "Heimwerkerbedarf"
@@ -20716,54 +21165,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2613
 msgid "Edit Do-it-yourself-store"
 msgstr "Geschäft für Heimwerkerbedarf bearbeiten"
 
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2618
 msgid "Stationery"
 msgstr "Bürobedarf"
 
 #. item
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2619
 msgid "Edit Stationery Shop"
 msgstr "Bürobedarf bearbeiten"
 
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Hairdresser"
 msgstr "Friseur"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Hairdresser"
 msgstr "Friseur bearbeiten"
 
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Shoes"
 msgstr "Schuhe"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Shoe Shop"
 msgstr "Schuhladen bearbeiten"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2636
 msgid "Toys"
 msgstr "Spielzeug"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit Toy Shop"
 msgstr "Spielzeuggeschäft bearbeiten"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Video"
 msgstr "Videoverleih"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Video Shop"
 msgstr "Videogeschäft bearbeiten"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "Dry Cleaning"
 msgstr "Chemische Reinigung"
@@ -20771,9 +21220,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2650
 msgid "Edit Dry Cleaning"
 msgstr "Chemische Reinigung bearbeiten"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "Laundry"
 msgstr "Waschsalon"
@@ -20781,9 +21230,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2657
 msgid "Edit Laundry"
 msgstr "Waschsalon bearbeiten"
 
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2662
 msgid "Outdoor"
 msgstr "Camping (Outdoor)"
@@ -20791,32 +21240,28 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2664
 msgid "Edit Outdoor Shop"
 msgstr "Laden für Camping- (Outdoor-)bedarf bearbeiten"
 
-#: build/trans_presets.java:2658
-msgid "Sports"
-msgstr "Sport"
-
-#. item
-#: build/trans_presets.java:2659
+#. item
+#: build/trans_presets.java:2670
 msgid "Edit Sports Shop"
 msgstr "Sportgeschäft bearbeiten"
 
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Optician"
 msgstr "Optiker"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Optician"
 msgstr "Optiker bearbeiten"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2683
 msgid "Cash"
 msgstr "Geld"
 
 #. group "Cash"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2684
 msgid "Bank"
 msgstr "Bank"
@@ -20824,14 +21269,14 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2686
 msgid "Edit Bank"
 msgstr "Bank bearbeiten"
 
-#: build/trans_presets.java:2680 build/trans_presets.java:2689
+#: build/trans_presets.java:2691 build/trans_presets.java:2700
 msgid "Automated Teller Machine"
 msgstr "Geldautomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2693
 msgid "Money Exchange"
 msgstr "Wechselstube"
@@ -20839,5 +21284,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Edit Money Exchange"
 msgstr "Wechselstube bearbeiten"
@@ -20845,15 +21290,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2691
+#: build/trans_presets.java:2702
 msgid "Edit Automated Teller Machine"
 msgstr "Geldautomat bearbeiten"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2707
 msgid "Health"
 msgstr "Gesundheit"
 
 #. group "Health"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2708
 msgid "Doctors"
 msgstr "Arzt"
@@ -20861,18 +21306,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2710
 msgid "Edit Doctors"
 msgstr "Arzt bearbeiten"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2715
 msgid "Dentist"
 msgstr "Zahnarzt"
 
 #. item
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Edit Dentist"
 msgstr "Zahnarzt bearbeiten"
 
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2721
 msgid "Pharmacy"
 msgstr "Apotheke"
@@ -20880,5 +21325,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Edit Pharmacy"
 msgstr "Apotheke bearbeiten"
@@ -20886,9 +21331,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Dispensing"
 msgstr "Rezepteinlösung"
 
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2729
 msgid "Hospital"
 msgstr "Krankenhaus"
@@ -20896,10 +21341,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Edit Hospital"
 msgstr "Krankenhaus bearbeiten"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2735
 msgid "Emergency Access Point"
 msgstr "Notfallrettungspunkt"
@@ -20908,5 +21353,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:2727
+#: build/trans_presets.java:2738
 msgid "Edit Emergency Access Point"
 msgstr "Notfallrettungspunkt bearbeiten"
@@ -20915,20 +21360,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2741
 msgid "Point Number"
 msgstr "Punktnummer"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2742
 msgid "Point Name"
 msgstr "Punktname"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Internationale Nummer verwenden, z.B. +49-123-45678)"
@@ -20936,5 +21381,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2748
 msgid "Veterinary"
 msgstr "Tierarzt"
@@ -20943,55 +21388,60 @@
 #. <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:2740
+#: build/trans_presets.java:2751
 msgid "Edit Veterinary"
 msgstr "Tierarzt bearbeiten"
 
+#: build/trans_presets.java:2758
+#, fuzzy
+msgid "Geography"
+msgstr "WGS84 Geografisch"
+
 #. group "Places"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2760
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2761
 msgid "Edit Continent"
 msgstr "Kontinent bearbeiten"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2766
 msgid "Country"
 msgstr "Staat"
 
 #. item
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2767
 msgid "Edit Country"
 msgstr "Staat bearbeiten"
 
 #. item "Places/Country" text "Name"
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2772
 msgid "State"
 msgstr "Bundesland"
 
 #. item
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2773
 msgid "Edit State"
 msgstr "Bundesland bearbeiten"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2778
 msgid "Region"
 msgstr "Region"
 
 #. item
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2779
 msgid "Edit Region"
 msgstr "Region bearbeiten"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2784
 msgid "County"
 msgstr "Landkreis"
 
 #. item
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2785
 msgid "Edit County"
 msgstr "Landkreis bearbeiten"
@@ -20999,15 +21449,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2791
 msgid "City"
 msgstr "Großstadt"
 
 #. item
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2792
 msgid "Edit City"
 msgstr "Großstadt bearbeiten"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2797
 msgid "Town"
 msgstr "Stadt"
@@ -21015,10 +21465,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2799
 msgid "Edit Town"
 msgstr "Stadt bearbeiten"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2804
 msgid "Suburb"
 msgstr "Stadtteil"
@@ -21026,25 +21476,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2806
 msgid "Edit Suburb"
 msgstr "Stadtteil bearbeiten"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2811
 msgid "Village"
 msgstr "Dorf"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2812
 msgid "Edit Village"
 msgstr "Dorf bearbeiten"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2817
 msgid "Hamlet"
 msgstr "Weiler"
 
 #. item
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2818
 msgid "Edit Hamlet"
 msgstr "Weiler bearbeiten"
@@ -21052,5 +21502,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2824
 msgid "Locality"
 msgstr "Unbewohnter Ort"
@@ -21058,10 +21508,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2826
 msgid "Edit Locality"
 msgstr "Unbewohnten Ort bearbeiten"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2831
 msgid "Island"
 msgstr "Insel"
@@ -21069,10 +21519,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2833
 msgid "Edit Island"
 msgstr "Insel bearbeiten"
 
 #. item "Places/Island" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2838
 msgid "Islet"
 msgstr "Kleine Insel"
@@ -21080,5 +21530,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2840
 msgid "Edit Islet"
 msgstr "Kleine Insel bearbeiten"
@@ -21086,5 +21536,5 @@
 #. item "Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2846
 msgid "Cave Entrance"
 msgstr "Höhleneingang"
@@ -21092,10 +21542,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2848
 msgid "Edit Cave Entrance"
 msgstr "Höhleneingang bearbeiten"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2852
 msgid "Peak"
 msgstr "Bergspitze"
@@ -21103,10 +21553,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2854
 msgid "Edit Peak"
 msgstr "Bergspitze bearbeiten"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2859
 msgid "Glacier"
 msgstr "Gletscher"
@@ -21114,10 +21564,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2861
 msgid "Edit Glacier"
 msgstr "Gletscher bearbeiten"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2854
+#: build/trans_presets.java:2866
 msgid "Volcano"
 msgstr "Vulkan"
@@ -21125,70 +21575,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2868
 msgid "Edit Volcano"
 msgstr "Vulkan bearbeiten"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2874
 msgid "Boundaries"
 msgstr "Grenzen"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2875
 msgid "National"
 msgstr "Staat"
 
 #. item
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2876
 msgid "Edit National Boundary"
 msgstr "Staatsgrenze bearbeiten"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2881
 msgid "Administrative"
 msgstr "Innerstaatlich"
 
 #. item
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2882
 msgid "Edit Administrative Boundary"
 msgstr "Innerstaatliche Grenze bearbeiten"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:2887
 msgid "Civil"
 msgstr "Zivil"
 
 #. item
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2888
 msgid "Edit Civil Boundary"
 msgstr "Zivilrechtliche Grenze bearbeiten"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2893
 msgid "Political"
 msgstr "Politisch"
 
 #. item
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2894
 msgid "Edit Political Boundary"
 msgstr "Politische Grenze bearbeiten"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2899
 msgid "National park"
 msgstr "Nationalpark"
 
 #. item
-#: build/trans_presets.java:2888
+#: build/trans_presets.java:2900
 msgid "Edit National Park Boundary"
 msgstr "Nationalparkgrenze bearbeiten"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2906
 msgid "Land use"
 msgstr "Landnutzung"
 
 #. group "Land use"
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2907
 msgid "Tree"
 msgstr "Baum"
@@ -21197,15 +21647,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:2898
+#: build/trans_presets.java:2910
 msgid "Edit Tree"
 msgstr "Baum bearbeiten"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2915
 msgid "Botanical Name"
 msgstr "Botanischer Name"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2917
 msgid "Wood"
 msgstr "Naturwald"
@@ -21214,5 +21664,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:2908
+#: build/trans_presets.java:2920
 msgid "Edit Wood"
 msgstr "Naturwald bearbeiten"
@@ -21220,17 +21670,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "coniferous"
 msgstr "Nadelwald"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "deciduous"
 msgstr "Laubwald"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "mixed"
 msgstr "Mischwald"
 
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2925
 msgid "Forest"
 msgstr "Forst"
@@ -21239,14 +21689,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:2916
+#: build/trans_presets.java:2928
 msgid "Edit Forest Landuse"
 msgstr "Forst bearbeiten"
 
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2934
 msgid "Nature Reserve"
 msgstr "Naturdenkmal & Reservat"
 
 #. item
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2935
 msgid "Edit Nature Reserve"
 msgstr "Naturdenkmal oder Reservat bearbeiten"
@@ -21254,25 +21704,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2940
 msgid "Scree"
 msgstr "Geröll"
 
 #. item
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2941
 msgid "Edit Scree"
 msgstr "Geröll bearbeiten"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2945
 msgid "Scrub"
 msgstr "Buschland"
 
 #. item
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2946
 msgid "Edit Scrub"
 msgstr "Buschland bearbeiten"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2950
 msgid "Fell"
 msgstr "Gebirge"
@@ -21280,10 +21730,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2952
 msgid "Edit Fell"
 msgstr "Gebirge bearbeiten"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2956
 msgid "Heath"
 msgstr "Heide"
@@ -21291,5 +21741,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2958
 msgid "Edit Heath"
 msgstr "Heide bearbeiten"
@@ -21297,5 +21747,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2963
 msgid "Farmyard"
 msgstr "Bauernhof"
@@ -21304,45 +21754,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:2954
+#: build/trans_presets.java:2966
 msgid "Edit Farmyard Landuse"
 msgstr "Bauernhof bearbeiten"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2971
 msgid "Farmland"
 msgstr "Ackerland"
 
 #. item
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2972
 msgid "Edit Farmland Landuse"
 msgstr "Ackerland bearbeiten"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2977
 msgid "Meadow"
 msgstr "Wiese"
 
 #. item
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2978
 msgid "Edit Meadow Landuse"
 msgstr "Wiese bearbeiten"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2983
 msgid "Vineyard"
 msgstr "Weinberg"
 
 #. item
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2984
 msgid "Edit Vineyard Landuse"
 msgstr "Weinberg bearbeiten"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:2989
 msgid "Allotments"
 msgstr "Schrebergärten"
 
 #. item
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2990
 msgid "Edit Allotments Landuse"
 msgstr "Schrebergärten bearbeiten"
@@ -21350,25 +21800,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2996
 msgid "Garden"
 msgstr "Garten"
 
 #. item
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2997
 msgid "Edit Garden"
 msgstr "Garten bearbeiten"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3001
 msgid "Grass"
 msgstr "Gras"
 
 #. item
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3002
 msgid "Edit Grass Landuse"
 msgstr "Grasfläche bearbeiten"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3007
 msgid "Village Green"
 msgstr "Dorfanger"
@@ -21376,10 +21826,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3009
 msgid "Edit Village Green Landuse"
 msgstr "Dorfanger bearbeiten"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3014
 msgid "Common"
 msgstr "Öffentlicher Bereich"
@@ -21387,20 +21837,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3004
+#: build/trans_presets.java:3016
 msgid "Edit Common"
 msgstr "Öffentlichen Bereich bearbeiten"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3020
 msgid "Park"
 msgstr "Park"
 
 #. item
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3021
 msgid "Edit Park"
 msgstr "Park bearbeiten"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3025
 msgid "Recreation Ground"
 msgstr "Erholungsgebiet"
@@ -21408,5 +21858,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3027
 msgid "Edit Recreation Ground Landuse"
 msgstr "Erholungsgebiet bearbeiten"
@@ -21414,15 +21864,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3033
 msgid "Residential area"
 msgstr "Wohngebiet"
 
 #. item
-#: build/trans_presets.java:3022
+#: build/trans_presets.java:3034
 msgid "Edit Residential Landuse"
 msgstr "Wohngebiet bearbeiten"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3039
 msgid "Graveyard"
 msgstr "Kleiner Friedhof"
@@ -21430,9 +21880,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3029
+#: build/trans_presets.java:3041
 msgid "Edit Graveyard"
 msgstr "Kleinen Friedhof bearbeiten"
 
-#: build/trans_presets.java:3035
+#: build/trans_presets.java:3047
 msgid "Cemetery"
 msgstr "Friedhof"
@@ -21440,39 +21890,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3049
 msgid "Edit Cemetery Landuse"
 msgstr "Friedhof bearbeiten"
 
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3056
 msgid "Retail"
 msgstr "Einkaufsbereich"
 
 #. item
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3057
 msgid "Edit Retail Landuse"
 msgstr "Einkaufsbereich bearbeiten"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3062
 msgid "Commercial"
 msgstr "Gewerbegebiet"
 
 #. item
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3063
 msgid "Edit Commercial Landuse"
 msgstr "Gewerbegebiet bearbeiten"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3056
+#: build/trans_presets.java:3068
 msgid "Industrial"
 msgstr "Industrie"
 
 #. item
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3069
 msgid "Edit Industrial Landuse"
 msgstr "Industriegebiet bearbeiten"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3074
 msgid "Railway land"
 msgstr "Eisenbahngelände"
@@ -21480,15 +21930,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3076
 msgid "Edit Railway Landuse"
 msgstr "Eisenbahngelände bearbeiten"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3081
 msgid "Military"
 msgstr "Militärgebiet"
 
 #. item
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3082
 msgid "Edit Military Landuse"
 msgstr "Militärgebiet bearbeiten"
@@ -21496,55 +21946,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3088
 msgid "Construction area"
 msgstr "Baustellengebiet"
 
 #. item
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3089
 msgid "Edit Construction Landuse"
 msgstr "Baustelle bearbeiten"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3094
 msgid "Brownfield"
 msgstr "Baulücke"
 
 #. item
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3095
 msgid "Edit Brownfield Landuse"
 msgstr "Baulücke bearbeiten"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3100
 msgid "Greenfield"
 msgstr "Bauland"
 
 #. item
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3101
 msgid "Edit Greenfield Landuse"
 msgstr "Bauland bearbeiten"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3106
 msgid "Landfill"
 msgstr "Deponie"
 
 #. item
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3107
 msgid "Edit Landfill Landuse"
 msgstr "Deponie bearbeiten"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3112
 msgid "Quarry"
 msgstr "Steinbruch"
 
 #. item
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3113
 msgid "Edit Quarry Landuse"
 msgstr "Steinbruch bearbeiten"
 
 #. group "Relations"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3122
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -21554,5 +22004,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:3114
+#: build/trans_presets.java:3126
 msgid "Edit Multipolygon"
 msgstr "Ein Multipolygon bearbeiten"
@@ -21561,10 +22011,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3132
 msgid "outer segment"
 msgstr "Äußeres Segment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3133
 msgid "inner segment"
 msgstr "Inneres Segment"
@@ -21572,5 +22022,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3136
 msgid "Turn restriction"
 msgstr "Abbiegeeinschränkung"
@@ -21579,5 +22029,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3139
 msgid "Edit Turn Restriction"
 msgstr "Abbiegeeinschränkung bearbeiten"
@@ -21585,34 +22035,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "Restriction"
 msgstr "Einschränkung"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_left_turn"
 msgstr "Nicht links abbiegen"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_right_turn"
 msgstr "Nicht rechts abbiegen"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_straight_on"
 msgstr "Nicht geradeaus"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_u_turn"
 msgstr "Wendeverbot"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_right_turn"
 msgstr "Nur rechts abbiegen"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_left_turn"
 msgstr "Nur links abbiegen"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_straight_on"
 msgstr "Nur geradeaus"
@@ -21621,15 +22071,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3146
 msgid "from way"
 msgstr "Von Weg"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3147
 msgid "via node or way"
 msgstr "Über Knoten oder Weg"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3148
 msgid "to way"
 msgstr "Zu Weg"
@@ -21637,5 +22087,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3151
 msgid "Route"
 msgstr "Route"
@@ -21644,5 +22094,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3154
 msgid "Edit Route"
 msgstr "Route bearbeiten"
@@ -21650,5 +22100,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "Route type"
 msgstr "Routentyp"
@@ -21720,5 +22170,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3144 build/trans_style.java:233
+#: build/trans_presets.java:3156 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -21727,17 +22177,17 @@
 msgstr "Fahrrad"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "bus"
 msgstr "Bus"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "road"
 msgstr "Straße"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ferry"
 msgstr "Fähre"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ski"
 msgstr "Ski"
@@ -21790,5 +22240,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3144 build/trans_style.java:247
+#: build/trans_presets.java:3156 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -21797,13 +22247,13 @@
 msgstr "Fuß"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "hiking"
 msgstr "Wandern"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "tram"
 msgstr "Straßenbahn"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "detour"
 msgstr "Umleitung"
@@ -21817,10 +22267,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3144 build/trans_style.java:1206
+#: build/trans_presets.java:3156 build/trans_style.java:1206
 msgid "subway"
 msgstr "U-Bahn"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3159
 msgid "Symbol description"
 msgstr "Symbolbeschreibung"
@@ -21828,31 +22278,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3162
 msgid "Network"
 msgstr "Netzwerk"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "Route state"
 msgstr "Routenstatus"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "proposed"
 msgstr "geplant"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "alternate"
 msgstr "alternativ"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "temporary"
 msgstr "temporär"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "connection"
 msgstr "Verbindung"
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "Color (hex)"
 msgstr "Farbe (hex)"
@@ -21861,30 +22311,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3168
 msgid "route segment"
 msgstr "Routenabschnitt"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3169
 msgid "forward segment"
 msgstr "Vorwärts-Abschnitt"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3170
 msgid "backward segment"
 msgstr "Rückwärts-Abschnitt"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3171
 msgid "halt point"
 msgstr "Haltepunkt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3172
 msgid "forward halt point"
 msgstr "Vorwärts-Haltepunkt"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3173
 msgid "backward halt point"
 msgstr "Rückwärts-Haltepunkt"
@@ -22322,11 +22772,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3375 build/trans_style.java:3376
-#: build/trans_style.java:3946 build/trans_style.java:4254
-#: build/trans_style.java:4263 build/trans_style.java:4272
-#: build/trans_style.java:4281 build/trans_style.java:4290
-#: build/trans_style.java:4299 build/trans_style.java:4308
-#: build/trans_style.java:4309 build/trans_style.java:4318
-#: build/trans_style.java:4327
+#: build/trans_style.java:3383 build/trans_style.java:3384
+#: build/trans_style.java:3954 build/trans_style.java:4262
+#: build/trans_style.java:4271 build/trans_style.java:4280
+#: build/trans_style.java:4289 build/trans_style.java:4298
+#: build/trans_style.java:4307 build/trans_style.java:4316
+#: build/trans_style.java:4317 build/trans_style.java:4326
+#: build/trans_style.java:4335
 msgid "deprecated"
 msgstr "veraltet"
@@ -24350,5 +24800,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3294
+#: build/trans_style.java:3302
 msgid "light_water"
 msgstr "Wasser (hell)"
@@ -25030,8 +25480,17 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="boundary_stone"/>
+#. <icon annotate="true" src="historic/boundary_stone.png"/>
 #: build/trans_style.java:2990 build/trans_style.java:2998
 #: build/trans_style.java:3006 build/trans_style.java:3014
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
+#: build/trans_style.java:3054
 msgid "historic"
 msgstr "Historisch"
@@ -25045,5 +25504,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3095
 msgid "quarry"
 msgstr "Steinbruch"
@@ -25057,5 +25516,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "landfill"
 msgstr "Mülldeponie"
@@ -25077,5 +25536,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3103 build/trans_style.java:3111
+#: build/trans_style.java:3111 build/trans_style.java:3119
 msgid "basin"
 msgstr "Wasserbecken"
@@ -25089,5 +25548,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3127
 msgid "forest"
 msgstr "Forst"
@@ -25101,5 +25560,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3159
 msgid "farmyard"
 msgstr "Farmland"
@@ -25122,5 +25581,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3160 build/trans_style.java:3168
+#: build/trans_style.java:3168 build/trans_style.java:3176
 msgid "retail"
 msgstr "Einkaufsbereich"
@@ -25134,5 +25593,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3176
+#: build/trans_style.java:3184
 msgid "industrial"
 msgstr "Industriegebiet"
@@ -25146,5 +25605,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "brownfield"
 msgstr "Baulücke"
@@ -25158,5 +25617,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "greenfield"
 msgstr "Bauland"
@@ -25170,5 +25629,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "railland"
 msgstr "Eisenbahnland"
@@ -25225,7 +25684,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3217 build/trans_style.java:3252
-#: build/trans_style.java:3260 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3225 build/trans_style.java:3260
+#: build/trans_style.java:3268 build/trans_style.java:3276
+#: build/trans_style.java:3284 build/trans_style.java:3292
 msgid "military"
 msgstr "Militär"
@@ -25239,5 +25698,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3225
+#: build/trans_style.java:3233
 msgid "cemetery"
 msgstr "Friedhof"
@@ -25250,5 +25709,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3301
+#: build/trans_style.java:3309
 msgid "peak"
 msgstr "Berggipfel"
@@ -25263,5 +25722,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3310
+#: build/trans_style.java:3318
 msgid "glacier"
 msgstr "Gletscher"
@@ -25275,5 +25734,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "volcano"
 msgstr "Vulkan"
@@ -25328,8 +25787,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3326 build/trans_style.java:3327
-#: build/trans_style.java:3335 build/trans_style.java:3351
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440
+#: build/trans_style.java:3334 build/trans_style.java:3335
+#: build/trans_style.java:3343 build/trans_style.java:3359
+#: build/trans_style.java:3432 build/trans_style.java:3440
+#: build/trans_style.java:3448
 msgid "natural"
 msgstr "Natur"
@@ -25343,5 +25802,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3343
+#: build/trans_style.java:3351
 msgid "scrub"
 msgstr "Buschland"
@@ -25355,5 +25814,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3359
+#: build/trans_style.java:3367
 msgid "heath"
 msgstr "Heide"
@@ -25367,5 +25826,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3408
+#: build/trans_style.java:3416
 msgid "mud"
 msgstr "Schlick & Moor"
@@ -25379,5 +25838,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "beach"
 msgstr "Strand"
@@ -25455,8 +25914,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
-#: build/trans_style.java:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496 build/trans_style.java:3504
+#: build/trans_style.java:3512 build/trans_style.java:3520
 msgid "route"
 msgstr "Route"
@@ -25504,7 +25963,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3522 build/trans_style.java:3530
-#: build/trans_style.java:3538 build/trans_style.java:3546
-#: build/trans_style.java:3554
+#: build/trans_style.java:3530 build/trans_style.java:3538
+#: build/trans_style.java:3546 build/trans_style.java:3554
+#: build/trans_style.java:3562
 msgid "boundary"
 msgstr "Grenze"
@@ -25654,11 +26113,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090
+#: build/trans_style.java:4002 build/trans_style.java:4010
+#: build/trans_style.java:4018 build/trans_style.java:4026
+#: build/trans_style.java:4034 build/trans_style.java:4042
+#: build/trans_style.java:4050 build/trans_style.java:4058
+#: build/trans_style.java:4066 build/trans_style.java:4074
+#: build/trans_style.java:4082 build/trans_style.java:4090
+#: build/trans_style.java:4098
 msgid "place"
 msgstr "Ort"
@@ -25706,6 +26165,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4207 build/trans_style.java:4214
-#: build/trans_style.java:4221 build/trans_style.java:4228
+#: build/trans_style.java:4215 build/trans_style.java:4222
+#: build/trans_style.java:4229 build/trans_style.java:4236
 msgid "address"
 msgstr "Adresse"
@@ -26006,10 +26465,86 @@
 #: build/trans_wms.java:25
 msgid "Czech CUZK:KM"
-msgstr ""
+msgstr "Tschechien CUZK:KM"
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE&
 #: build/trans_wms.java:26
 msgid "Czech UHUL:ORTOFOTO"
-msgstr ""
+msgstr "Tschechien UHUL:ORTOFOTO"
+
+#~ msgid "Close current changeset"
+#~ msgstr "Aktuellen Änderungssatz schließen"
+
+#~ msgid "There is currently no changeset open."
+#~ msgstr "Es gibt momentan keinen offenen Änderungssatz."
+
+#~ msgid "paramete''{0}'' must not be null"
+#~ msgstr "Parameter \"{0}\" darf nucht Null sein."
+
+#~ msgid "unsupported value ''{0}'' or parameter ''{1}''"
+#~ msgstr "Nicht unterstützter Wert \"{0}\" oder Parameter \"{1}\"."
+
+#~ msgid "- running version is {0}"
+#~ msgstr "- aktive Version ist {0}"
+
+#~ msgid "not yet decided"
+#~ msgstr "Noch ohne Lösung"
+
+#~ msgid "Use a new changeset and close it"
+#~ msgstr "Neuen Änderungssatz erstellen und danach schließen"
+
+#~ msgid ""
+#~ "Select to upload the data using a new changeset and to leave the "
+#~ "changeset open after the upload"
+#~ msgstr ""
+#~ "Auswählen, um in einen neuen Änderungssatz hochzuladen und den "
+#~ "Änderungssatz für weiteres Hochladen geöffnet zu lassen"
+
+#~ msgid "Use the existing changeset {0} and close it after upload"
+#~ msgstr ""
+#~ "Vorhandenen Änderungssatz {0} verwenden und nach dem Hochladen schließen"
+
+#~ msgid ""
+#~ "Select to upload to the existing changeset {0} and to close the changeset "
+#~ "after this upload"
+#~ msgstr ""
+#~ "Auswählen, um in den vorhandenen Änderungssatz {0} hochzuladen und den "
+#~ "Änderungssatz dann zu schließen"
+
+#~ msgid "Use the existing changeset {0} and leave it open"
+#~ msgstr "Vorhandenen Änderungssatz {0} verwenden und geöffnet lassen"
+
+#~ msgid ""
+#~ "Select to upload to the existing changeset {0} and to leave the changeset "
+#~ "open for further uploads"
+#~ msgstr ""
+#~ "Auswählen, um in den vorhandenen Änderungssatz {0} hochzuladen und den "
+#~ "Änderungssatz für weiteres Hochladen geöffnet zu lassen"
+
+#~ msgid "Changeset {0} is unchanged. Skipping update."
+#~ msgstr "Änderungssatz {0} ist unverändert. Aktualisierung überspringen."
+
+#~ msgid ""
+#~ "Failed to update changeset. Either there is no current changeset or the "
+#~ "id of the current changeset is 0"
+#~ msgstr ""
+#~ "Aktualisierung des Änderungssatzes fehlgeschlagen. Entweder es existiert "
+#~ "kein vorhandener Änderungssatz oder die ID des aktuellen Änderungssatzes "
+#~ "ist 0."
+
+#~ msgid "INFO: entering compatibilty mode for JOSM with Main.ds"
+#~ msgstr "INFO: Gehe in den Kompatibilitätsmodus von JOSM mit Main.ds"
+
+#~ msgid ""
+#~ "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
+#~ msgstr ""
+#~ "INFO: Gehe in den Kompatibilitätsmodus von JOSM mit Main.getCurrentDataSet"
+#~ "()"
+
+#~ msgid ""
+#~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
+#~ "found."
+#~ msgstr ""
+#~ "Unerwartete Version von JOSM. Weder Main.ds noch Main.getCurrentDataSet() "
+#~ "gefunden."
 
 #~ msgid "All the ways were empty"
@@ -26019,6 +26554,47 @@
 #~ msgstr "Knotenpunkte mit unterschiedlicher Mitgliedschaft vereinen?"
 
-#~ msgid "Merge Anyway"
-#~ msgstr "Trotzdem vereinen"
+#~ msgid ""
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
+#~ msgstr ""
+#~ "Interner Fehler: Bitte melden Sie den Fehler: \"cannot check conditions "
+#~ "for no layer.\""
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr "Kein Dokument geöffnet, deshalb nichts zu speichern."
+
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "Ein <nd> Element in einem Nicht-Weg gefunden."
+
+#~ msgid "<nd> has zero ref"
+#~ msgstr "<nd> hat Null ref"
+
+#~ msgid "Please select ways with almost right angles to orthogonalize."
+#~ msgstr ""
+#~ "Bitte Wege mit nahezu rechten Winkeln zum rechtwinklig machen auswählen."
+
+#~ msgid "Copy Default"
+#~ msgstr "Standard kopieren"
+
+#~ msgid "map"
+#~ msgstr "Karte"
+
+#~ msgid "citymap"
+#~ msgstr "Stadtplan"
+
+#~ msgid "hikingmap"
+#~ msgstr "Wanderkarte"
+
+#~ msgid "bicyclemap"
+#~ msgstr "Fahrradkarte"
+
+#~ msgid "board"
+#~ msgstr "Infotafel"
+
+#~ msgid "Unknown version"
+#~ msgstr "Unbekannte Version"
+
+#~ msgid "Delete {1} {0}"
+#~ msgstr "{1} {0} löschen"
 
 #~ msgid ""
@@ -26029,24 +26605,52 @@
 #~ "wirklich vereint werden?"
 
-#~ msgid "No currently open changeset. Opening a new changeset..."
-#~ msgstr "Kein geöffnetes Changeset vorhanden. Öffne neues Changeset..."
-
-#~ msgid "Reusing existing changeset {0}"
-#~ msgstr "Changeset {0} wiederverwenden"
-
-#~ msgid "Unknown version"
-#~ msgstr "Unbekannte Version"
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "<member>-Schlüssel bei einer Nicht-Relation gefunden."
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "Falsch formatierte Knoten-ID"
+
+#~ msgid "Cannot open preferences directory: {0}"
+#~ msgstr "Kann Einstellungsverzeichnis nicht laden: {0}"
+
+#~ msgid "Authors: {0}"
+#~ msgstr "Autoren: {0}"
+
+#~ msgid "Public"
+#~ msgstr "Öffentlich"
+
+#~ msgid "Selected makes your trace public in openstreetmap.org"
+#~ msgstr ""
+#~ "Wird dies gewählt, werden Ihre Spuren bei openstreetmap.org öffentlich"
+
+#~ msgid "Select Tableau d'Assemblage"
+#~ msgstr "Montagetabelle wählen"
+
+#~ msgid "Hint: Some changes came from uploading new data to the server."
+#~ msgstr ""
+#~ "Hinweis: Einige Änderungen sind durch das Hochladen der Daten entstanden."
+
+#~ msgid "Merge Anyway"
+#~ msgstr "Trotzdem vereinen"
+
+#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
+#~ msgstr ""
+#~ "EXPERIMENTELLE FUNKTION. Speichern Sie Ihre Arbeit und kontrollieren Sie "
+#~ "vorm Hochladen alles."
+
+#~ msgid "Continue anyway"
+#~ msgstr "Trotzdem fortfahren"
+
+#~ msgid "Edit Information Office"
+#~ msgstr "Informationsbüro bearbeiten"
+
+#~ msgid "Map Type"
+#~ msgstr "Kartentyp"
+
+#~ msgid "Board Type"
+#~ msgstr "Tafeltyp"
 
 #~ msgid "Version number missing from OSM data"
 #~ msgstr "Fehlende Versionsnummer in OSM-Daten"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "Ein <nd> Element in einem Nicht-Weg gefunden."
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> hat Null ref"
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "<member>-Schlüssel bei einer Nicht-Relation gefunden."
 
 #~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
@@ -26055,82 +26659,4 @@
 #~ "Relation {1}"
 
-#~ msgid "Ill-formed node id"
-#~ msgstr "Falsch formatierte Knoten-ID"
-
-#~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
-#~ msgstr ""
-#~ "Interner Fehler: Bitte melden Sie den Fehler: \"cannot check conditions "
-#~ "for no layer.\""
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Kein Dokument geöffnet, deshalb nichts zu speichern."
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr ""
-#~ "Bitte Wege mit nahezu rechten Winkeln zum rechtwinklig machen auswählen."
-
-#~ msgid "Copy Default"
-#~ msgstr "Standard kopieren"
-
-#~ msgid "map"
-#~ msgstr "Karte"
-
-#~ msgid "citymap"
-#~ msgstr "Stadtplan"
-
-#~ msgid "hikingmap"
-#~ msgstr "Wanderkarte"
-
-#~ msgid "bicyclemap"
-#~ msgstr "Fahrradkarte"
-
-#~ msgid "board"
-#~ msgstr "Infotafel"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "{1} {0} löschen"
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "Kann Einstellungsverzeichnis nicht laden: {0}"
-
-#~ msgid "Authors: {0}"
-#~ msgstr "Autoren: {0}"
-
-#~ msgid "Public"
-#~ msgstr "Öffentlich"
-
-#~ msgid "Selected makes your trace public in openstreetmap.org"
-#~ msgstr ""
-#~ "Wird dies gewählt, werden Ihre Spuren bei openstreetmap.org öffentlich"
-
-#~ msgid "Select Tableau d'Assemblage"
-#~ msgstr "Montagetabelle wählen"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr ""
-#~ "Hinweis: Einige Änderungen sind durch das Hochladen der Daten entstanden."
-
-#~ msgid "Delete Layer"
-#~ msgstr "Ebene löschen"
-
-#~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
-#~ msgstr ""
-#~ "EXPERIMENTELLE FUNKTION. Speichern Sie Ihre Arbeit und kontrollieren Sie "
-#~ "vorm Hochladen alles."
-
-#~ msgid "Continue anyway"
-#~ msgstr "Trotzdem fortfahren"
-
-#~ msgid "Edit Information Office"
-#~ msgstr "Informationsbüro bearbeiten"
-
-#~ msgid "Map Type"
-#~ msgstr "Kartentyp"
-
-#~ msgid "Board Type"
-#~ msgstr "Tafeltyp"
-
 #~ msgid "Adjust the position of the WMS layer (raster images only)"
 #~ msgstr "Position des WMS-Layers justieren (nur Rasterbilder)"
@@ -26152,7 +26678,4 @@
 #~ "<html>Das Laden der Historie vom Server ist fehlgeschlagen. Details:<br>"
 #~ "{0}</html>"
-
-#~ msgid "Change {0} {1}"
-#~ msgstr "{0} {1} ändern"
 
 #~ msgid "Remove relation member {0} {1}"
@@ -26236,4 +26759,7 @@
 #~ "Vordergrund gebracht werden. Fehlermeldung ist: {0}"
 
-#~ msgid "Set Lambert coordinate"
-#~ msgstr "Lambertkoordinaten eingeben"
+#~ msgid "No currently open changeset. Opening a new changeset..."
+#~ msgstr "Kein geöffnetes Changeset vorhanden. Öffne neues Changeset..."
+
+#~ msgid "Reusing existing changeset {0}"
+#~ msgstr "Changeset {0} wiederverwenden"
Index: applications/editors/josm/i18n/po/el.po
===================================================================
--- applications/editors/josm/i18n/po/el.po	(revision 17655)
+++ applications/editors/josm/i18n/po/el.po	(revision 17697)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-12 18:11+0200\n"
-"PO-Revision-Date: 2009-07-09 11:26+0000\n"
-"Last-Translator: alichani <alichani@yahoo.co.uk>\n"
+"POT-Creation-Date: 2009-09-19 13:00+0200\n"
+"PO-Revision-Date: 2009-09-15 07:45+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-09-12 16:05+0000\n"
+"X-Launchpad-Export-Date: 2009-09-19 10:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -35,5 +35,5 @@
 #, java-format
 msgid "The projection {0} could not be activated. Using Mercator"
-msgstr ""
+msgstr "Η προβολή {0} δεν μπορούσε να ενεργοποιηθεί. Χρησιμοποιώ το Mercator"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:298
@@ -42,10 +42,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:543
 #: ../core/src/org/openstreetmap/josm/Main.java:551
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -70,5 +70,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -86,6 +86,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:358
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
@@ -101,6 +101,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
@@ -124,10 +124,10 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
 msgid "Save and Exit"
 msgstr "Αποθήκευση και Έξοδος"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
 msgid "Discard and Exit"
 msgstr "Απόρριψη και Έξοδος"
@@ -138,4 +138,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
@@ -143,27 +144,28 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:296
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:258
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:613
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
@@ -171,5 +173,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -189,6 +191,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
@@ -205,17 +207,17 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:654
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1528
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -226,6 +228,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
@@ -278,9 +280,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:607
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:609
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -337,8 +339,8 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:152
 msgid "License"
-msgstr ""
+msgstr "Άδεια χρήσης"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
 msgid "Plugins"
@@ -388,7 +390,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
-msgstr ""
+msgstr "Συγχώνευση"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:89
@@ -474,5 +476,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -485,4 +487,5 @@
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -518,6 +521,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
@@ -526,6 +529,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:346
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
@@ -635,8 +638,50 @@
 msgstr "Καμοία διένεξη για να γίνει ζουμ"
 
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#, fuzzy
+msgid "Close open changesets"
+msgstr "Κλείσιμο πακέτου αλλαγών"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#, fuzzy
+msgid "Closes open changesets"
+msgstr "Κλείσιμο πακέτου αλλαγών"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
+#: ../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:114
+#, java-format
+msgid "File: {0}"
+msgstr "Αρχείο: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
+#, fuzzy
+msgid "There are no open changesets"
+msgstr "Ο διακομιστής δεν υποστηρίζει πακέτα αλλαγών"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
+#, fuzzy
+msgid "No open changesets"
+msgstr "Κλείσιμο πακέτου αλλαγών"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
+#, fuzzy
+msgid "Downloading open changesets ..."
+msgstr "Κλείσιμο πακέτου αλλαγών"
+
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
 msgid "Combine Way"
-msgstr ""
+msgstr "Σύνδεση Δρόμου"
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
@@ -681,5 +726,5 @@
 #, java-format
 msgid "Combine {0} ways"
-msgstr ""
+msgstr "Ένωσε {0} δρόμους"
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:228
@@ -724,10 +769,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:123
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
@@ -771,31 +817,30 @@
 "Κατανομή των επιλεγμένων κόμβων σε ίσες αποστάσεις κατά μήκος μιας γραμμής."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
 msgid "Download from OSM..."
 msgstr "Λήψη από το OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
 msgid "Download map data from the OSM server."
 msgstr "Λήψη δεδομένων χάρτη από τον διακομιστή του OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
-#, java-format
-msgid "File: {0}"
-msgstr "Αρχείο: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
 msgid "Download"
 msgstr "Λήψη"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "Εντάξει"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
 msgid "Please select at least one task to download"
 msgstr "Παρακαλώ επιλέξτε τουλάχιστον μία εργασία για λήψη"
@@ -816,5 +861,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1527
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307
@@ -834,6 +879,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:376
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1415
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
 msgid "Duplicate"
 msgstr "Αντιγραφή"
@@ -905,10 +950,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
@@ -993,25 +1039,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 msgid "Merge Nodes"
 msgstr "Συγχώνευση Κόμβων"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
 msgid "Merge nodes into the oldest one."
 msgstr "Συγχώνευση κόμβων στον παλαιότερο."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
 msgid "Please select at least two nodes to merge."
 msgstr "Παρακαλώ επιλέξτε τουλάχιστον δύο κόμβους για συγχώνευση."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:394
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
@@ -1027,8 +1074,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -1054,6 +1101,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
@@ -1062,9 +1113,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283
 #, java-format
 msgid "Merge {0} nodes"
@@ -1136,5 +1187,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "New"
 msgstr "Νέα"
@@ -1408,14 +1459,15 @@
 msgstr "Βοήθεια: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
 msgid "Status Report"
 msgstr "Αναφορά Κατάστασης"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 msgid "Copy to clipboard and close"
 msgstr "Αντιγραφή στο πρόχειρο και κλείσιμο"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
@@ -1494,25 +1546,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24
-msgid "Close current changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-msgid "Close the current changeset ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41
-msgid "There is currently no changeset open."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42
-msgid "No open changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60
-msgid "Closing changeset"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
@@ -1676,14 +1707,14 @@
 msgstr "Κενή επιλογή"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Αποστολή προς OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 msgid "Upload all changes to the OSM server."
 msgstr "Αποστολή όλων των αλλαγών στον δακομιστή του OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
 #, java-format
 msgid ""
@@ -1692,23 +1723,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
 msgid "Nothing to upload. Get some data first."
 msgstr "Τίποτα για αποστολή. Κάντε λήψη δεδομένων πρώτα."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 msgid "No changes to upload."
 msgstr "Δεν υπάρχουν αλλαγές προς αποστολή"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Συγχρονισμός μόνο {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
 msgid "Synchronize entire dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
 #, java-format
 msgid ""
@@ -1722,17 +1753,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
 msgid "Conflict detected"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr "μη αναμενόμενη επιστρεφόμενη τιμή. Λήφθηκε {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:267
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
 #, java-format
 msgid ""
@@ -1743,5 +1774,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
+msgid ""
+"<html>Uploading <strong>failed</strong> because you've been "
+"using<br>changeset {0} which was already closed at {1}.<br>Please upload "
+"again with a new or an existing open changeset."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+#, fuzzy
+msgid "Changeset closed"
+msgstr "Αλλαγή τιμών;"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
@@ -1750,23 +1793,23 @@
 "αναμενόμενο πρότυπο \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
 msgid "Upload to OSM API failed"
 msgstr "Η αποστολή στο OSM API απέτυχε"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1983,14 +2026,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:930
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:932
 msgid "Create new node."
 msgstr "Δημιοθργία νέου κόμβου."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
 msgid "Select node under cursor."
 msgstr "Επιλογή κόμβου στο σημείο του κέρσορα."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939
 #, java-format
 msgid "Insert new node into way."
@@ -1999,14 +2042,14 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
 msgid "Start new way from last node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951
 msgid "Continue way from last node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:972
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:974
 msgid "Finish drawing."
 msgstr "Τέλος σχεδιασμού."
@@ -2127,62 +2170,72 @@
 "+πάνω, κάτω, αριστερά, δεξιά ή με το δεξί πλήκτρο του ποντικιού"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Αναζήτηση..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Αναζήτηση αντικειμένων."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
 msgid "Can't search because there is no loaded data."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
+#, fuzzy
+msgid "Please enter a filter string."
+msgstr "Παρακαλώ εισάγετε κείμενο αναζήτησης."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
 msgid "Please enter a search string."
 msgstr "Παρακαλώ εισάγετε κείμενο αναζήτησης."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
 msgid "replace selection"
 msgstr "αντικατάσταση επιλογής"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72
 msgid "add to selection"
 msgstr "προσθήκη στην επιλογή"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73
 msgid "remove from selection"
 msgstr "αφαίρεση από την επιλογή"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
+#, fuzzy
+msgid "find in selection"
+msgstr "προσθήκη στην επιλογή"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81
 msgid "case sensitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82
 msgid "regular expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
 msgstr ""
 "<b>Baker Street</b> - 'Baker' και 'Street' σε οποιοδήποτε κλειδί ή όνομα."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
 msgstr ""
 "<b>\"Baker Street\"</b> - 'Baker Street' σε οποιοδήποτε κλειδί ή όνομα."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
 msgstr "<b>name:Bak</b> - 'Bak' οπουδήποτε στο όνομα."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid ""
 "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
@@ -2190,109 +2243,126 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
 msgstr "<b>-name:Bak</b> - χωρίς 'Bak' στο όνομα."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - κλειδί=foot ορισμένο με οποιαδήποτε τιμή."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
 msgid "<u>Special targets:</u>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - όλα τα αντικείμενα που αλλάχθηκαν από τον χρήστη"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 msgid "<b>nodes:</b>... - object with given number of nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - όλα τα αλλαγμένα αντικείμενα"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - όλα τα επιλεγμένα αντικείμενα"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - όλα τα ημιτελή αντικείμενα"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - όλα τα αντικείμενα χωρίς ετικέτες"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
+msgid "Filter"
+msgstr "Φίλτρο"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Αναζήτηση"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
+msgid "Submit filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "Start Search"
 msgstr "Έναρξη αναζήτησης"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Δεν βρέθηκε αποτέλεσμα για ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Τίποτα δεν προστέθηκε στην επιλογή ψάχνοντας για \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Τίποτα δεν αφαιρέθηκε από την επιλογή ψάχνοντας για \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#, fuzzy, java-format
+msgid "Nothing find in selection by searching for ''{0}''"
+msgstr "Τίποτα δεν προστέθηκε στην επιλογή ψάχνοντας για \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262
 #, java-format
 msgid "Found {0} matches"
 msgstr "Βρέθηκαν {0} αποτελέσματα"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283
 msgid "RX"
 msgstr "RX"
@@ -2474,5 +2544,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
 msgid "Double conflict"
 msgstr ""
@@ -2715,4 +2785,5 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:134
 msgid "Old value"
 msgstr "Παλιά τιμή"
@@ -2876,27 +2947,59 @@
 
 #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
 msgid "E"
 msgstr "Α"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:59
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:203
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
 msgid "Changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:323
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:325
-#, java-format
-msgid "paramete''{0}'' must not be null"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331
-#, fuzzy, java-format
-msgid "unsupported value ''{0}'' or parameter ''{1}''"
-msgstr "Χρήση προεπιλογής \"{0}\" από ομάδα \"{1}\""
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "H"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "Text"
+msgstr "κείμενο"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "C"
+msgstr "CS"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "I"
+msgstr "CI"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "M"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#, fuzzy
+msgid "R"
+msgstr "RX"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+msgid "A"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+msgid "D"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+msgid "F"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
@@ -2910,29 +3013,29 @@
 msgstr "Προειδοποίηση: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
+#, java-format
 msgid "expected id >= 0. Got {0}"
-msgstr "μη αναμενόμενη επιστρεφόμενη τιμή. Λήφθηκε {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:257
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
 msgid "a primitive with id=0 can't be invisible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:293
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
+#, java-format
 msgid "id > 0 expected. Got {0}"
-msgstr "μη αναμενόμενη επιστρεφόμενη τιμή. Λήφθηκε {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
 msgid "version > 0 expected. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
 msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
 msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
@@ -2999,9 +3102,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:247
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:249
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:478
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:482
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
@@ -3010,118 +3113,118 @@
 #. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
 #. TODO Remove useless nullcheck when RelationMember.member is encalupsed
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:851
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855
 msgid "Empty member in relation."
 msgstr "Άδειο μέλος στη σχέση."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:853
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Διαγράφηκε το μέλος ''{0}'' της σχέσης."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:864
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Άγνωστος ρόλος \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Άγνωστος τύπος μέλους για το \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"from\" way found."
 msgstr "Οδός \"από\" δεν βρέθηκε."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652
 msgid "No \"via\" node or way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:885
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:943
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1032
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1044
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Εσωτερικός δρόμος \"{0}\" είναι από έξω."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1097
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1123
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1327
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331
 msgid "untagged"
 msgstr "Χωρίς ετικέτα"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1328
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332
 msgid "text"
 msgstr "κείμενο"
@@ -3142,5 +3245,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
@@ -3161,5 +3264,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
@@ -3213,5 +3316,5 @@
 msgstr "Ζώνη Labert (Γαλλία)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
 msgid "Lambert Zone (Estonia)"
 msgstr "Ζώνη Lambert (Εσθονία)"
@@ -3253,9 +3356,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:38
 msgid "Do not show again"
 msgstr "Να μην εμφανιστεί ξανά"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
 #, java-format
@@ -3263,31 +3366,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:91
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:116
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154
 msgid "incomplete"
 msgstr "μη ολοκληρωμένη"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
 msgid "highway"
 msgstr "Οδός ταχείας κυκλοφορίας"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
-#: build/trans_presets.java:3144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: build/trans_presets.java:3156
 msgid "railway"
 msgstr "σιδηρόδρομος"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
 msgid "waterway"
 msgstr "υδατόρρευμα"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "landuse"
 msgstr "χρήση γής"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:474
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
@@ -3297,5 +3400,5 @@
 msgstr[1] "{0} κόμβοι"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
 #, java-format
 msgid "{0} member"
@@ -3340,10 +3443,5 @@
 msgstr "Το μήνυμα της ημέρας δεν είναι διαθέσιμο"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67
-#, java-format
-msgid "- running version is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:95
 msgid "Downloading \"Message of the day\""
 msgstr "Λήψη \"Μηνύματος Ημέρας\""
@@ -3411,10 +3509,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:162
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
 msgid "Username"
 msgstr "Όνομα χρήστη"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
 msgid "Password"
 msgstr "Κωδικός"
@@ -3539,5 +3637,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226
 msgid "Presets"
 msgstr "Προεπιλογές"
@@ -3611,38 +3709,49 @@
 msgstr "κλίμακα"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Το γεωγραφικό μήκος στο σημείο του ποντικιού."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The name of the object at the mouse pointer."
 msgstr "Το όνομα του αντικειμένου στο σημείο του ποντικιού."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Το γεωγραφικό πλάτος στο σημείο του ποντικιού."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The angle between the previous and the current way segment."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The (compass) heading of the line segment being drawn."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The length of the new way segment being drawn."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199
+msgid ""
+"Middle click again to cycle through.<br>Hold CTRL to select directly from "
+"this list with the mouse.<hr>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290
 msgid "(no object)"
 msgstr "(κανένα αντικείμενο)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:301
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418
+#, fuzzy
+msgid "User:"
+msgstr "Χρήστης"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
 msgid "layer not in list."
 msgstr "το επίπεδο δεν είναι στη λίστα."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:488
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3712,7 +3821,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:224
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Tags"
 msgstr "Ετικέτες"
@@ -3727,5 +3836,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
@@ -3908,4 +4017,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
 msgid "Up"
 msgstr ""
@@ -3916,4 +4026,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Down"
 msgstr "Κάτω"
@@ -3926,5 +4037,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
@@ -4348,23 +4459,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:236
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239
 msgid "No conflicts to resolve"
-msgstr "Καμοία διένεξη για να γίνει ζουμ"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:295
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254
 msgid "Cancel conflict resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:310
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269
 msgid "Apply resolved conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Apply"
 msgstr ""
@@ -4376,5 +4486,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "all"
 msgstr "όλα"
@@ -4418,7 +4528,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
-msgid "not yet decided"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:213
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
@@ -4445,7 +4552,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
@@ -4455,7 +4562,7 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:152
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
@@ -4465,20 +4572,20 @@
 msgstr[1] "{0} σχέσεις"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "Paste ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "From ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:372
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "To ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:428
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
 #, java-format
 msgid "{0} tag"
@@ -4494,13 +4601,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
-#, fuzzy
 msgid "Remove this relation member from the relation"
-msgstr "Αφαίρεση του μέλους στην τρέχουσα σειρά του πίνακα από αυτήν την σχέση"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-#, fuzzy
 msgid "Replace"
-msgstr "Τζάκι"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
@@ -4511,11 +4616,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
-#, fuzzy
 msgid "Undecided"
-msgstr "<ακαθόριστο>"
+msgstr ""
 
 #. --- role editing
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:56
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510
 msgid "Role:"
 msgstr ""
@@ -4531,7 +4635,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70
-#, fuzzy
 msgid "Value:"
-msgstr "Τιμή"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86
@@ -4544,12 +4647,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51
-#, fuzzy
 msgid "Orig. Way"
-msgstr "Μονόδρομος"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
-#, fuzzy
 msgid "Decision"
-msgstr "Αναθεώρηση"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -4565,6 +4666,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
@@ -4655,170 +4757,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-msgid "History"
-msgstr "Ιστορικό"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-msgid "Display the history of all selected items."
-msgstr "Εμφάνιση του ιστορικού όλων των επιλεγμένων αντικειμένων."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
-#, java-format
-msgid "index out of bounds Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr "Κόμβος {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
-msgid "History item"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
-msgid "Show"
-msgstr "Προβολή"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
-msgid "Dialog not created yet. Invoke createInstance() first"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
-msgid "Layers"
-msgstr "Επίπεδα"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-msgid "Open a list of all loaded layers."
-msgstr "Άνοιγμα λίστας όλων τον φορτωμένων απιπέδων."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:297
-msgid "Delete the selected layer."
-msgstr "Διαγραφή του επιλεγμένου επιπέδου."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:367
-msgid "Show/Hide"
-msgstr "Εμφάνιση/Απόκρυψη"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:378
-msgid "Toggle visible state of the selected layer."
-msgstr "Εναλλαγή κατάστασης ορατότητας του επιλεγμένου επιπέδου."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:420
-msgid "Activate the selected layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:475
-msgid "Merge this layer into another layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:581
-msgid "Move the selected layer one row up."
-msgstr "Μετακίνηση του επιλεγμένου επιπέδου μία γραμμή πάνω."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:600
-msgid "Move the selected layer one row down."
-msgstr "Μετακίνηση του επιλεγμένου επιπέδου μία γραμμή κάτω."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
-msgid "Information about layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
-#, java-format
-msgid "This will change up to {0} object."
-msgid_plural "This will change up to {0} objects."
-msgstr[0] "Αυτό θα αλλάξει εώς {0} αντικείμενο."
-msgstr[1] "Αυτό θα αλλάξει εώς {0} αντικείμενα."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
-msgid "An empty value deletes the key."
-msgstr "Κενή τιμή διαγράφει το κλειδί."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
-msgid "<different>"
-msgstr "<διαφορετικά>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
-msgid "Change values?"
-msgstr "Αλλαγή τιμών;"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
-#, java-format
-msgid "Change properties of up to {0} object"
-msgid_plural "Change properties of up to {0} objects"
-msgstr[0] "Αλλαγή ιδιοτήτων εώς {0} αντικειμένου"
-msgstr[1] "Αλλαγή ιδιοτήτων εώς {0} αντικειμένων"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
-msgid "Please select a key"
-msgstr "Παρακαλώ επιλέξτε κλειδί"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
-msgid "Please select a value"
-msgstr "Παρακαλώ επιλέξτε μια τιμή"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
-msgid "Please select the objects you want to change properties for."
-msgstr ""
-"Παρακαλώ επιλέξτε τα αντικείμενα των οποίων τις ιδιότητες θέλετε να αλλάξετε."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
-msgid "Properties/Memberships"
-msgstr "Ιδιότητες/Υπαγωγές"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-msgid "Properties for selected objects."
-msgstr "Ιδιότητες επιλεγμένων αντικειμένων."
-
-#. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-msgid "Member Of"
-msgstr "Μέλος του"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
-msgid "Add Properties"
-msgstr "Προσθήκη Ιδιοτήτων"
-
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+msgid "Filter objects and hide/disable them."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
@@ -4832,4 +4777,213 @@
 msgstr "Προσθήκη"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#, fuzzy
+msgid "Add filter."
+msgstr "Προσθήκη επιλεγμένων"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
+#, fuzzy
+msgid "Edit filter."
+msgstr "Επεξεργασία Αποβάθρας"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#, fuzzy
+msgid "Delete filter."
+msgstr "Διαγραφή Επιπέδου"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
+#, fuzzy
+msgid "Move filter up."
+msgstr "Μετακίνηση πάνω"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
+#, fuzzy
+msgid "Move filter down."
+msgstr "Μετακίνηση Κάτω"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128
+msgid "Enable filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
+#, fuzzy
+msgid "Hide elements"
+msgstr "Μεμονομένα στοιχεία"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
+msgid "Apply also for children"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
+msgid "Inverse filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
+#, fuzzy
+msgid "Filter mode"
+msgstr "Φίλτρο"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
+msgid "History"
+msgstr "Ιστορικό"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+msgid "Display the history of all selected items."
+msgstr "Εμφάνιση του ιστορικού όλων των επιλεγμένων αντικειμένων."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr "Κόμβος {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
+msgid "History item"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
+msgid "Reload all currently selected objects and refresh the list."
+msgstr ""
+
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
+msgid "Show"
+msgstr "Προβολή"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
+msgid "Display the history of the selected primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84
+msgid "Dialog not created yet. Invoke createInstance() first"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
+msgid "Layers"
+msgstr "Επίπεδα"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+msgid "Open a list of all loaded layers."
+msgstr "Άνοιγμα λίστας όλων τον φορτωμένων απιπέδων."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294
+msgid "Delete the selected layer."
+msgstr "Διαγραφή του επιλεγμένου επιπέδου."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364
+msgid "Show/Hide"
+msgstr "Εμφάνιση/Απόκρυψη"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375
+msgid "Toggle visible state of the selected layer."
+msgstr "Εναλλαγή κατάστασης ορατότητας του επιλεγμένου επιπέδου."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgid "Activate"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417
+msgid "Activate the selected layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472
+msgid "Merge this layer into another layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578
+msgid "Move the selected layer one row up."
+msgstr "Μετακίνηση του επιλεγμένου επιπέδου μία γραμμή πάνω."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597
+msgid "Move the selected layer one row down."
+msgstr "Μετακίνηση του επιλεγμένου επιπέδου μία γραμμή κάτω."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+msgid "Information about layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+#, java-format
+msgid "This will change up to {0} object."
+msgid_plural "This will change up to {0} objects."
+msgstr[0] "Αυτό θα αλλάξει εώς {0} αντικείμενο."
+msgstr[1] "Αυτό θα αλλάξει εώς {0} αντικείμενα."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+msgid "An empty value deletes the key."
+msgstr "Κενή τιμή διαγράφει το κλειδί."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+msgid "<different>"
+msgstr "<διαφορετικά>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+msgid "Change values?"
+msgstr "Αλλαγή τιμών;"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#, java-format
+msgid "Change properties of up to {0} object"
+msgid_plural "Change properties of up to {0} objects"
+msgstr[0] "Αλλαγή ιδιοτήτων εώς {0} αντικειμένου"
+msgstr[1] "Αλλαγή ιδιοτήτων εώς {0} αντικειμένων"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+msgid "Please select a key"
+msgstr "Παρακαλώ επιλέξτε κλειδί"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+msgid "Please select a value"
+msgstr "Παρακαλώ επιλέξτε μια τιμή"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
+msgid "Please select the objects you want to change properties for."
+msgstr ""
+"Παρακαλώ επιλέξτε τα αντικείμενα των οποίων τις ιδιότητες θέλετε να αλλάξετε."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
+msgid "Properties/Memberships"
+msgstr "Ιδιότητες/Υπαγωγές"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+msgid "Properties for selected objects."
+msgstr "Ιδιότητες επιλεγμένων αντικειμένων."
+
+#. setting up the membership table
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+msgid "Member Of"
+msgstr "Μέλος του"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
+msgid "Add Properties"
+msgstr "Προσθήκη Ιδιοτήτων"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574
 msgid "Add a new key/value pair to all objects"
@@ -4871,10 +5025,9 @@
 
 #. item "Land use/Quarry" text "Name"
-#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
-#: build/trans_presets.java:3109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168
+#: build/trans_presets.java:3121
 msgid "Relations"
 msgstr "Σχέσεις"
@@ -4884,23 +5037,23 @@
 msgstr "Άνοιγμα λίστας όλων τον σχέσεων."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166
 #, java-format
 msgid "Relations: {0}"
 msgstr "Σχέσεις: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276
 msgid "Open an editor for the selected relation"
 msgstr "Άνοιγμα επεξεργαστή για την επιλεγμένη σχέση"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
 msgid "Delete the selected relation"
 msgstr "Διαγραφή της επιλεγμένης σχέσης"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349
 msgid "Create a new relation"
 msgstr "Σημιουργία νέας σχέσης"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:373
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1412
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
@@ -4933,5 +5086,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4943,9 +5096,9 @@
 msgstr "Επιλογή: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441
 msgid "Undock the panel"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -4954,5 +5107,5 @@
 "αριστερή εργαλειοθήκη."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:457
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr ""
@@ -5014,5 +5167,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5036,5 +5189,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1502
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1370
 msgid "Download relation members"
 msgstr ""
@@ -5064,5 +5217,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -5070,18 +5223,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
 msgid "Tags and Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:167
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5090,14 +5243,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613
 #, java-format
 msgid ""
@@ -5107,9 +5260,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid ""
@@ -5119,15 +5272,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5135,5 +5288,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5141,20 +5294,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849
 #, java-format
 msgid ""
@@ -5163,57 +5316,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:961
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909
 msgid "Move the currently selected members up"
 msgstr "Μετακίνηση των επιλεγμένων μελών πάνω"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:979
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:912
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928
 msgid "Move the currently selected members down"
 msgstr "Μετακίνηση των επιλεγμένων μελών κάτω"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:998
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:931
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5222,9 +5375,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1058
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
 #, java-format
 msgid ""
@@ -5233,56 +5386,41 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090
+msgid "Apply the current updates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123
+msgid "Apply the updates and close the dialog"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
-msgid "Apply the current updates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
-msgid "Apply the updates and close the dialog"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "Εντάξει"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
-msgid "Delete the currently selected tags"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
 msgid "Download all incomplete ways and nodes in relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 msgid "Download Members"
 msgstr "Λήψη μελών"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1208
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1211
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1356
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 #, java-format
 msgid ""
@@ -5292,13 +5430,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1229
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1367
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
 msgid "Confirm empty role"
 msgstr ""
@@ -5385,37 +5523,37 @@
 msgstr "Σελιδοδείκτες"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:82
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
 msgid "Please enter the desired coordinates first."
 msgstr "ΠΑρακλώ εισάγετε τις επιθυμητές συντεταγένες πρώτα."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
 msgid "Please enter a name for the location."
 msgstr "ΠΑρακαλώ εισάγετε ένα όνομα για την τοποθεσία."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:107
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
 msgid "Select a bookmark first."
 msgstr "Επιλέξτε ένα σελιδοδείκτη πρώτα."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
 msgid "min lat"
 msgstr "ελαχ. γ. πλάτος"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
 msgid "min lon"
 msgstr "ελαχ. γ. μήκος"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid "max lat"
 msgstr "μεγ. γ. πλάτος"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
 msgid "max lon"
 msgstr "μεγ. γ. μήκος"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5425,22 +5563,22 @@
 "για να κατεβάσετε μια περιοχή)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
 msgid "Bounding Box"
 msgstr ""
 
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
 msgid "Data Sources and Types"
 msgstr "Πηγές και Τύποι δεδομένων"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
 msgid "Download as new layer"
 msgstr "Λήψη σαν νέο επίπεδο"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
 msgid "Download Area"
 msgstr "Λήψη Περιοχής"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
 msgid "Download area too large; will probably be rejected by server"
 msgstr ""
@@ -5448,5 +5586,5 @@
 "διακομιστή"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
 msgid "Download area ok, size probably acceptable to server"
 msgstr ""
@@ -5472,7 +5610,7 @@
 msgstr ""
 
-#. <separator/>
+#. group "Geography"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2759
 msgid "Places"
 msgstr "Τοποθεσίες"
@@ -5519,21 +5657,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "type"
 msgstr "τύπος"
@@ -6013,4 +6151,6 @@
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
 #. <key key="historic" value="wayside_shrine" />
+#. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
+#. <key key="historic" value="boundary_stone" />
 #. item "Leisure/Water Park" label "Edit Water Park"
 #. <key key="leisure" value="water_park" />
@@ -6382,153 +6522,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/trans_presets.java:66 build/trans_presets.java:102
-#: build/trans_presets.java:142 build/trans_presets.java:179
-#: build/trans_presets.java:199 build/trans_presets.java:217
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:272 build/trans_presets.java:305
-#: build/trans_presets.java:351 build/trans_presets.java:371
-#: build/trans_presets.java:386 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:463 build/trans_presets.java:482
-#: build/trans_presets.java:502 build/trans_presets.java:522
-#: build/trans_presets.java:543 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627 build/trans_presets.java:658
-#: build/trans_presets.java:679 build/trans_presets.java:692
-#: build/trans_presets.java:705 build/trans_presets.java:718
-#: build/trans_presets.java:731 build/trans_presets.java:744
-#: build/trans_presets.java:755 build/trans_presets.java:764
-#: build/trans_presets.java:811 build/trans_presets.java:832
-#: build/trans_presets.java:841 build/trans_presets.java:901
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1067 build/trans_presets.java:1075
-#: build/trans_presets.java:1085 build/trans_presets.java:1093
-#: build/trans_presets.java:1098 build/trans_presets.java:1105
-#: build/trans_presets.java:1112 build/trans_presets.java:1117
-#: build/trans_presets.java:1125 build/trans_presets.java:1134
-#: build/trans_presets.java:1140 build/trans_presets.java:1146
-#: build/trans_presets.java:1151 build/trans_presets.java:1157
-#: build/trans_presets.java:1163 build/trans_presets.java:1172
-#: build/trans_presets.java:1181 build/trans_presets.java:1188
-#: build/trans_presets.java:1196 build/trans_presets.java:1209
-#: build/trans_presets.java:1215 build/trans_presets.java:1224
-#: build/trans_presets.java:1230 build/trans_presets.java:1236
-#: build/trans_presets.java:1244 build/trans_presets.java:1299
-#: build/trans_presets.java:1346 build/trans_presets.java:1352
-#: build/trans_presets.java:1358 build/trans_presets.java:1364
-#: build/trans_presets.java:1370 build/trans_presets.java:1381
-#: build/trans_presets.java:1390 build/trans_presets.java:1405
-#: build/trans_presets.java:1412 build/trans_presets.java:1418
-#: build/trans_presets.java:1426 build/trans_presets.java:1433
-#: build/trans_presets.java:1442 build/trans_presets.java:1450
-#: build/trans_presets.java:1457 build/trans_presets.java:1468
-#: build/trans_presets.java:1478 build/trans_presets.java:1488
-#: build/trans_presets.java:1508 build/trans_presets.java:1520
-#: build/trans_presets.java:1531 build/trans_presets.java:1548
-#: build/trans_presets.java:1555 build/trans_presets.java:1570
-#: build/trans_presets.java:1577 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1594
-#: build/trans_presets.java:1599 build/trans_presets.java:1605
-#: build/trans_presets.java:1611 build/trans_presets.java:1619
-#: build/trans_presets.java:1627 build/trans_presets.java:1635
-#: build/trans_presets.java:1642 build/trans_presets.java:1648
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1670 build/trans_presets.java:1677
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1712 build/trans_presets.java:1719
-#: build/trans_presets.java:1736 build/trans_presets.java:1744
-#: build/trans_presets.java:1759 build/trans_presets.java:1769
-#: build/trans_presets.java:1781 build/trans_presets.java:1788
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:1809 build/trans_presets.java:1817
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1841
-#: build/trans_presets.java:1846 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1864
-#: build/trans_presets.java:1872 build/trans_presets.java:1881
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1908 build/trans_presets.java:1914
-#: build/trans_presets.java:1922 build/trans_presets.java:1928
-#: build/trans_presets.java:1934 build/trans_presets.java:1940
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2013
-#: build/trans_presets.java:2022 build/trans_presets.java:2030
-#: build/trans_presets.java:2036 build/trans_presets.java:2042
-#: build/trans_presets.java:2048 build/trans_presets.java:2054
-#: build/trans_presets.java:2060 build/trans_presets.java:2066
-#: build/trans_presets.java:2072 build/trans_presets.java:2078
-#: build/trans_presets.java:2084 build/trans_presets.java:2090
-#: build/trans_presets.java:2096 build/trans_presets.java:2102
-#: build/trans_presets.java:2108 build/trans_presets.java:2114
-#: build/trans_presets.java:2120 build/trans_presets.java:2126
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2158
-#: build/trans_presets.java:2165 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2186
-#: build/trans_presets.java:2192 build/trans_presets.java:2198
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2218 build/trans_presets.java:2225
-#: build/trans_presets.java:2232 build/trans_presets.java:2239
-#: build/trans_presets.java:2247 build/trans_presets.java:2279
-#: build/trans_presets.java:2284 build/trans_presets.java:2289
-#: build/trans_presets.java:2294 build/trans_presets.java:2300
-#: build/trans_presets.java:2306 build/trans_presets.java:2312
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2354
-#: build/trans_presets.java:2451 build/trans_presets.java:2458
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2485 build/trans_presets.java:2492
-#: build/trans_presets.java:2498 build/trans_presets.java:2504
-#: build/trans_presets.java:2526 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2553 build/trans_presets.java:2559
-#: build/trans_presets.java:2565 build/trans_presets.java:2571
-#: build/trans_presets.java:2577 build/trans_presets.java:2583
-#: build/trans_presets.java:2590 build/trans_presets.java:2597
-#: build/trans_presets.java:2604 build/trans_presets.java:2610
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2661
-#: build/trans_presets.java:2667 build/trans_presets.java:2677
-#: build/trans_presets.java:2686 build/trans_presets.java:2701
-#: build/trans_presets.java:2707 build/trans_presets.java:2715
-#: build/trans_presets.java:2722 build/trans_presets.java:2742
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2783
-#: build/trans_presets.java:2790 build/trans_presets.java:2797
-#: build/trans_presets.java:2803 build/trans_presets.java:2809
-#: build/trans_presets.java:2817 build/trans_presets.java:2824
-#: build/trans_presets.java:2831 build/trans_presets.java:2838
-#: build/trans_presets.java:2844 build/trans_presets.java:2851
-#: build/trans_presets.java:2858 build/trans_presets.java:2867
-#: build/trans_presets.java:2873 build/trans_presets.java:2879
-#: build/trans_presets.java:2885 build/trans_presets.java:2891
-#: build/trans_presets.java:2900 build/trans_presets.java:2910
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2948
-#: build/trans_presets.java:2957 build/trans_presets.java:2963
-#: build/trans_presets.java:2969 build/trans_presets.java:2975
-#: build/trans_presets.java:2981 build/trans_presets.java:2987
-#: build/trans_presets.java:2993 build/trans_presets.java:3000
-#: build/trans_presets.java:3006 build/trans_presets.java:3011
-#: build/trans_presets.java:3018 build/trans_presets.java:3025
-#: build/trans_presets.java:3031 build/trans_presets.java:3040
-#: build/trans_presets.java:3048 build/trans_presets.java:3054
-#: build/trans_presets.java:3060 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3080
-#: build/trans_presets.java:3086 build/trans_presets.java:3092
-#: build/trans_presets.java:3098 build/trans_presets.java:3104
-#: build/trans_presets.java:3117 build/trans_presets.java:3131
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:67 build/trans_presets.java:103
+#: build/trans_presets.java:143 build/trans_presets.java:180
+#: build/trans_presets.java:200 build/trans_presets.java:218
+#: build/trans_presets.java:235 build/trans_presets.java:253
+#: build/trans_presets.java:273 build/trans_presets.java:306
+#: build/trans_presets.java:352 build/trans_presets.java:372
+#: build/trans_presets.java:387 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:503 build/trans_presets.java:523
+#: build/trans_presets.java:544 build/trans_presets.java:565
+#: build/trans_presets.java:586 build/trans_presets.java:607
+#: build/trans_presets.java:628 build/trans_presets.java:659
+#: build/trans_presets.java:680 build/trans_presets.java:693
+#: build/trans_presets.java:706 build/trans_presets.java:719
+#: build/trans_presets.java:732 build/trans_presets.java:745
+#: build/trans_presets.java:756 build/trans_presets.java:765
+#: build/trans_presets.java:812 build/trans_presets.java:833
+#: build/trans_presets.java:842 build/trans_presets.java:902
+#: build/trans_presets.java:1053 build/trans_presets.java:1061
+#: build/trans_presets.java:1069 build/trans_presets.java:1077
+#: build/trans_presets.java:1087 build/trans_presets.java:1095
+#: build/trans_presets.java:1100 build/trans_presets.java:1107
+#: build/trans_presets.java:1114 build/trans_presets.java:1119
+#: build/trans_presets.java:1127 build/trans_presets.java:1136
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1153 build/trans_presets.java:1159
+#: build/trans_presets.java:1165 build/trans_presets.java:1174
+#: build/trans_presets.java:1183 build/trans_presets.java:1190
+#: build/trans_presets.java:1198 build/trans_presets.java:1211
+#: build/trans_presets.java:1217 build/trans_presets.java:1226
+#: build/trans_presets.java:1232 build/trans_presets.java:1238
+#: build/trans_presets.java:1246 build/trans_presets.java:1302
+#: build/trans_presets.java:1349 build/trans_presets.java:1355
+#: build/trans_presets.java:1361 build/trans_presets.java:1367
+#: build/trans_presets.java:1373 build/trans_presets.java:1384
+#: build/trans_presets.java:1393 build/trans_presets.java:1408
+#: build/trans_presets.java:1415 build/trans_presets.java:1421
+#: build/trans_presets.java:1429 build/trans_presets.java:1436
+#: build/trans_presets.java:1445 build/trans_presets.java:1453
+#: build/trans_presets.java:1460 build/trans_presets.java:1471
+#: build/trans_presets.java:1481 build/trans_presets.java:1491
+#: build/trans_presets.java:1511 build/trans_presets.java:1523
+#: build/trans_presets.java:1534 build/trans_presets.java:1551
+#: build/trans_presets.java:1558 build/trans_presets.java:1574
+#: build/trans_presets.java:1581 build/trans_presets.java:1586
+#: build/trans_presets.java:1592 build/trans_presets.java:1598
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1646 build/trans_presets.java:1652
+#: build/trans_presets.java:1659 build/trans_presets.java:1666
+#: build/trans_presets.java:1674 build/trans_presets.java:1681
+#: build/trans_presets.java:1689 build/trans_presets.java:1696
+#: build/trans_presets.java:1702 build/trans_presets.java:1709
+#: build/trans_presets.java:1716 build/trans_presets.java:1723
+#: build/trans_presets.java:1740 build/trans_presets.java:1748
+#: build/trans_presets.java:1763 build/trans_presets.java:1773
+#: build/trans_presets.java:1785 build/trans_presets.java:1792
+#: build/trans_presets.java:1798 build/trans_presets.java:1808
+#: build/trans_presets.java:1813 build/trans_presets.java:1821
+#: build/trans_presets.java:1828 build/trans_presets.java:1834
+#: build/trans_presets.java:1840 build/trans_presets.java:1845
+#: build/trans_presets.java:1850 build/trans_presets.java:1855
+#: build/trans_presets.java:1862 build/trans_presets.java:1868
+#: build/trans_presets.java:1873 build/trans_presets.java:1882
+#: build/trans_presets.java:1891 build/trans_presets.java:1900
+#: build/trans_presets.java:1909 build/trans_presets.java:1918
+#: build/trans_presets.java:1924 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 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:2023 build/trans_presets.java:2032
+#: build/trans_presets.java:2040 build/trans_presets.java:2046
+#: build/trans_presets.java:2052 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 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:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2150
+#: build/trans_presets.java:2156 build/trans_presets.java:2162
+#: build/trans_presets.java:2169 build/trans_presets.java:2176
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2197 build/trans_presets.java:2203
+#: build/trans_presets.java:2209 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2229
+#: build/trans_presets.java:2236 build/trans_presets.java:2243
+#: build/trans_presets.java:2250 build/trans_presets.java:2258
+#: build/trans_presets.java:2290 build/trans_presets.java:2295
+#: build/trans_presets.java:2300 build/trans_presets.java:2305
+#: build/trans_presets.java:2311 build/trans_presets.java:2317
+#: build/trans_presets.java:2323 build/trans_presets.java:2331
+#: build/trans_presets.java:2337 build/trans_presets.java:2343
+#: build/trans_presets.java:2349 build/trans_presets.java:2355
+#: build/trans_presets.java:2365 build/trans_presets.java:2462
+#: build/trans_presets.java:2469 build/trans_presets.java:2483
+#: build/trans_presets.java:2489 build/trans_presets.java:2496
+#: build/trans_presets.java:2503 build/trans_presets.java:2509
+#: build/trans_presets.java:2515 build/trans_presets.java:2537
+#: build/trans_presets.java:2544 build/trans_presets.java:2551
+#: build/trans_presets.java:2557 build/trans_presets.java:2564
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2594 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2615
+#: build/trans_presets.java:2621 build/trans_presets.java:2627
+#: build/trans_presets.java:2633 build/trans_presets.java:2639
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2672 build/trans_presets.java:2678
+#: build/trans_presets.java:2688 build/trans_presets.java:2697
+#: build/trans_presets.java:2712 build/trans_presets.java:2718
+#: build/trans_presets.java:2726 build/trans_presets.java:2733
+#: build/trans_presets.java:2753 build/trans_presets.java:2764
+#: build/trans_presets.java:2770 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2788
+#: build/trans_presets.java:2795 build/trans_presets.java:2802
+#: build/trans_presets.java:2809 build/trans_presets.java:2815
+#: build/trans_presets.java:2821 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2912
+#: build/trans_presets.java:2922 build/trans_presets.java:2931
+#: build/trans_presets.java:2937 build/trans_presets.java:2943
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 build/trans_presets.java:2981
+#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:2999 build/trans_presets.java:3005
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3023 build/trans_presets.java:3030
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3066 build/trans_presets.java:3072
+#: build/trans_presets.java:3079 build/trans_presets.java:3085
+#: build/trans_presets.java:3092 build/trans_presets.java:3098
+#: build/trans_presets.java:3104 build/trans_presets.java:3110
+#: build/trans_presets.java:3116 build/trans_presets.java:3129
+#: build/trans_presets.java:3143 build/trans_presets.java:3157
 msgid "Name"
 msgstr "Όνομα"
@@ -6563,4 +6704,58 @@
 msgstr "Έκδοση"
 
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
+#, fuzzy
+msgid "Changeset id:"
+msgstr "Αλλαγή σχέσης"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
+#, fuzzy
+msgid "Created at:"
+msgstr "Δημιουργία περιοχών"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
+#, fuzzy
+msgid "Changeset comment:"
+msgstr "Οριστικοποίηση σχολίου"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
+msgid "No open changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48
+#, fuzzy
+msgid "<html>Please select the changesets you want to close</html>"
+msgstr "Παρακαλώ επιλέξτε ποιές αλλαγές ιδιοτήτων θέλετε να εφαρμόσετε."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
+#, fuzzy
+msgid "Open changesets"
+msgstr "Κλείσιμο πακέτου αλλαγών"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101
+#, fuzzy
+msgid "Close changesets"
+msgstr "Κλείσιμο πακέτου αλλαγών"
+
+#. putValue(SMALL_ICON, ImageProvider.get("cancel"));
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
+#, fuzzy
+msgid "Close the selected open changesets"
+msgstr "Διαγραφή επιλεγμένων αντικειμένων."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126
+#, fuzzy
+msgid "Cancel closeing of changesets"
+msgstr "Κλείσιμο πακέτου αλλαγών"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37
+msgid "Closing changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77
+#, fuzzy, java-format
+msgid "Closing changeset {0}"
+msgstr "Κλείσιμο πακέτου αλλαγών"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
 msgid "Launch a file chooser to select a file"
@@ -6588,5 +6783,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be uploaded"
+msgid "Layer ''{0}'' has no modifications to be uploaded."
 msgstr ""
 
@@ -6594,5 +6789,5 @@
 #, java-format
 msgid ""
-"Layer ''{0}'' has modifications which should be saved to its assoicated file "
+"Layer ''{0}'' has modifications which should be saved to its associated file "
 "''{1}''."
 msgstr ""
@@ -6600,5 +6795,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be saved"
+msgid "Layer ''{0}'' has no modifications to be saved."
 msgstr ""
 
@@ -6632,17 +6827,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113
 msgid "Unsaved changes - Save/Upload before exiting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194
 #, java-format
 msgid ""
@@ -6655,10 +6850,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205
 msgid "Unsaved data and conflicts"
-msgstr "Επίλυση συγκρούσεων"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212
 #, java-format
 msgid ""
@@ -6672,9 +6866,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223
 msgid "Unsaved data and missing associated file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230
 #, java-format
 msgid ""
@@ -6689,42 +6883,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243
 msgid "Unsaved data non-writable files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
 msgid "Close this dialog and resume editing in JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322
+msgid "Discard and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
-msgid "Discard and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354
+msgid "Save and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
-msgid "Save and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
 msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402
 #, java-format
 msgid "Preparing layer ''{0}'' for upload ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
@@ -6732,5 +6926,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491
 msgid "Incomplete upload and/or save"
 msgstr ""
@@ -6770,21 +6964,21 @@
 #. item "Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:200
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:278
-#: build/trans_presets.java:311 build/trans_presets.java:357
-#: build/trans_presets.java:372 build/trans_presets.java:387
-#: build/trans_presets.java:409 build/trans_presets.java:429
-#: build/trans_presets.java:450 build/trans_presets.java:470
-#: build/trans_presets.java:489 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:549
-#: build/trans_presets.java:570 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:633
-#: build/trans_presets.java:664 build/trans_presets.java:1060
-#: build/trans_presets.java:1068 build/trans_presets.java:1076
-#: build/trans_presets.java:1086 build/trans_presets.java:1305
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:242
+#: build/trans_presets.java:260 build/trans_presets.java:279
+#: build/trans_presets.java:312 build/trans_presets.java:358
+#: build/trans_presets.java:373 build/trans_presets.java:388
+#: build/trans_presets.java:410 build/trans_presets.java:430
+#: build/trans_presets.java:451 build/trans_presets.java:471
+#: build/trans_presets.java:490 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:665 build/trans_presets.java:1062
+#: build/trans_presets.java:1070 build/trans_presets.java:1078
+#: build/trans_presets.java:1088 build/trans_presets.java:1308
 msgid "Layer"
 msgstr "Επίπεδο"
@@ -6803,67 +6997,32 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:200
 msgid "Upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-msgid "Use a new changeset and close it"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
-msgid ""
-"Select to upload the data using a new changeset and to close the changeset "
-"after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
-msgid "Use a new changeset and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
-msgid ""
-"Select to upload the data using a new changeset and to leave the changeset "
-"open after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
-msgid "Upload to a new or to an existing changeset?"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
-msgid "upload all changes in one request"
+msgid "Settings"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
-msgid ""
-"Enable to upload all changes in one request, disable to use one request per "
-"changed primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "Παρέχετε ένα σύντομο σχόλιο για τις αλλαγές που αποστέλλετε:"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:216
-msgid "Settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908
 msgid "Tags of new changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:221
 msgid "Objects to add:"
 msgstr "Αντικείμενα που θα προστεθούν:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:227
 msgid "Objects to modify:"
 msgstr "Αντικείμενα που θα αλλαχτούν"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:233
 msgid "Objects to delete:"
 msgstr "Αντικείμενα που θα διαγραφούν:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
 #, java-format
 msgid "{0} object to add:"
@@ -6872,5 +7031,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:277
 #, java-format
 msgid "{0} object to modifiy:"
@@ -6879,5 +7038,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:286
 #, java-format
 msgid "{0} object to delete:"
@@ -6886,53 +7045,86 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422
-#, java-format
-msgid "Use the existing changeset {0} and close it after upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:423
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to close the changeset "
-"after this upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426
-#, java-format
-msgid "Use the existing changeset {0} and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:427
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to leave the changeset "
-"open for further uploads"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
-#, java-format
-msgid "Tags of changeset {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:470
 msgid "Upload Changes"
 msgstr "Αποστολή Αλλαγών"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472
+msgid "Upload the changed primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
+msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:479
+msgid "Illegal upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
+msgid "Cancel the upload and resume editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606
 #, fuzzy
-msgid "Upload the changed primitives"
-msgstr "Να αποσταλούν αυτές οι αλλαγές;"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592
+msgid "Upload all changes in one request"
+msgstr "Αποστολή όλων των αλλαγών στον δακομιστή του OSM."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607
+msgid ""
+"Enable to upload all changes in one request, disable to use one request per "
+"changed primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:617
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "Παρέχετε ένα σύντομο σχόλιο για τις αλλαγές που αποστέλλετε:"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672
+msgid "Open a new changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
+msgid "Open a new changeset and use it in the next upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
 #, fuzzy
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "ΠΑρακαλώ εισάγετε ένα όνομα για την τοποθεσία."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:593
-msgid "Illegal upload comment"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
-msgid "Cancel the upload and resume editing"
+msgid "Use an open changeset"
+msgstr "Μη αποθηκευμένες αλλαγές"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
+msgid "Upload data to an already opened changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
+#, fuzzy
+msgid "Close changeset after upload"
+msgstr "Δεν υπάρχουν αλλαγές προς αποστολή"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
+msgid "Select to close the changeset after the next upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922
+#, java-format
+msgid "Tags of changeset {0}"
+msgstr ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
+#, fuzzy
+msgid "Load the list of your open changesets from the server"
+msgstr "Αποστολή των τρεχουσών προτιμήσεων στον διακομιστή"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
+#, fuzzy
+msgid "Close the currently selected open changeset"
+msgstr "Μετακίνηση των επιλεγμένων μελών πάνω"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
+#, java-format
+msgid "changeset id > 0 expected. Got {1}"
 msgstr ""
 
@@ -7011,5 +7203,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
@@ -7047,5 +7239,5 @@
 msgstr "Η ώρα ποθ εισήχθει δεν μπόρεσε να ερμηνευθεί."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
@@ -7053,30 +7245,30 @@
 msgstr "σημείο gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
 msgid "Customize line drawing"
 msgstr "Προσαρμογή του σχεδιασμού γραμμών"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
 msgid "Use global settings."
 msgstr "Χρηση καθολικών ρυθμίσεων."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Draw lines between points for this layer."
 msgstr "Σχεδίαση γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Do not draw lines between points for this layer."
 msgstr "ΠΑράλειψη σχεδίασης γραμμών ανάμεσα στα σημεία για αυτό το επίπεδο."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 msgid "Select line drawing options"
 msgstr "Επιλογή προτιμήσεων για τον σχεδιασμό γραμμών"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7084,5 +7276,5 @@
 msgstr "Προσαρμογή Χρώματος"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7091,5 +7283,5 @@
 msgstr "Προκαθορισμένο"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7098,38 +7290,75 @@
 msgstr "Επιλέξτε ένα χρώμα"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
 msgid "Markers From Named Points"
 msgstr "Σημάδια από Ονομασμένα Σημεία"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
 msgid "Import Audio"
 msgstr "Εισαγωγή Ήχου"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
 msgid "Wave Audio files (*.wav)"
 msgstr "Αρχεία Κυματομορφής (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Σημάδια ήχου από {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
 msgid "Import images"
 msgstr "Εισαγωγή εικόνων"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#, java-format
+msgid "Name: {0}"
+msgstr "Όνομα: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#, java-format
+msgid "Description: {0}"
+msgstr "Περιγραφή: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#, fuzzy, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
 msgstr[0] "{0} τροχιά, "
 msgstr[1] "{0} τροχιές, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
+#: build/trans_presets.java:3160
+msgid "Description"
+msgstr "Περιγραφή"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#, fuzzy
+msgid "Timespan"
+msgstr "Διάρκεια: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#, fuzzy
+msgid "Length"
+msgstr "Μήκος: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
+msgid "URL"
+msgstr "URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+msgid "Length: "
+msgstr "Μήκος: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
 #, java-format
 msgid "{0} route, "
@@ -7138,5 +7367,5 @@
 msgstr[1] "{0} διαδρομές, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 #, java-format
 msgid "{0} waypoint"
@@ -7145,29 +7374,10 @@
 msgstr[1] "{0} σημεία αναφοράς"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
-#, java-format
-msgid "Name: {0}"
-msgstr "Όνομα: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
-#, java-format
-msgid "Description: {0}"
-msgstr "Περιγραφή: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
-msgid "Timespan: "
-msgstr "Διάρκεια: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
-msgid "Length: "
-msgstr "Μήκος: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Μετατροπή σε επίπεδο δεδομένων"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7177,10 +7387,10 @@
 "βλαβερή.<br>Αν θέλετε να αποστείλετε ίχνη, κοιτάξτε εδώ:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -7191,29 +7401,29 @@
 msgstr "Μετατράπηκε από: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
 msgid "Download from OSM along this track"
 msgstr "Λήψη από OSM κατά μηκός αυτού του ίχνους"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
 msgid "Download everything within:"
 msgstr "Λήψη όλων εντός:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
 #, java-format
 msgid "{0} meters"
 msgstr "{0} μέτρα"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 msgid "Maximum area per request:"
 msgstr "Μέγιστη περιοχή ανά αίτημα:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} τετρ. χλμ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
 #, java-format
 msgid ""
@@ -7224,14 +7434,14 @@
 "συνεχίσετε;</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
 msgid "Download data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 "Δεν υπάρχει διαθέσιμο ίχνος GPX  στο επίπεδο για την συσχέτιση με τον ήχο."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7239,5 +7449,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7288,30 +7498,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
-#, fuzzy
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
 "<br>If you want to upload traces, look here:</html>"
 msgstr ""
-"<html>Η αποστολή μη επεξεργασμένων δεδομένων GPS ως δεδομένα χάρτη θερείτε "
-"βλαβερή.<br>Αν θέλετε να αποστείλετε ίχνη, κοιτάξτε εδώ:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "track"
 msgid_plural "tracks"
@@ -7446,4 +7653,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
@@ -7674,13 +7882,18 @@
 msgstr "Σχεδιασμός μεγάλων σημείων GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+msgid "Draw a circle form HDOP value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Ταχύτητα (κόκκινο = αργό, πράσινο = γρήγορο)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -7688,6 +7901,6 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1374
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:1377
 msgid "Car"
 msgstr "Αυτοκίνητο"
@@ -7708,14 +7921,14 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:324 build/trans_presets.java:650
-#: build/trans_presets.java:857 build/trans_presets.java:876
-#: build/trans_presets.java:890 build/trans_presets.java:912
-#: build/trans_presets.java:949 build/trans_presets.java:962
-#: build/trans_presets.java:974 build/trans_presets.java:986
-#: build/trans_presets.java:998 build/trans_presets.java:1010
-#: build/trans_presets.java:1020 build/trans_presets.java:1029
-#: build/trans_presets.java:1038 build/trans_presets.java:1437
-#: build/trans_presets.java:1510
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:325 build/trans_presets.java:651
+#: build/trans_presets.java:858 build/trans_presets.java:877
+#: build/trans_presets.java:891 build/trans_presets.java:913
+#: build/trans_presets.java:950 build/trans_presets.java:963
+#: build/trans_presets.java:975 build/trans_presets.java:987
+#: build/trans_presets.java:999 build/trans_presets.java:1011
+#: build/trans_presets.java:1021 build/trans_presets.java:1030
+#: build/trans_presets.java:1039 build/trans_presets.java:1440
+#: build/trans_presets.java:1513
 msgid "Bicycle"
 msgstr "Ποδήλατο"
@@ -7748,62 +7961,62 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:325 build/trans_presets.java:649
-#: build/trans_presets.java:856 build/trans_presets.java:875
-#: build/trans_presets.java:889 build/trans_presets.java:911
-#: build/trans_presets.java:948 build/trans_presets.java:961
-#: build/trans_presets.java:973 build/trans_presets.java:985
-#: build/trans_presets.java:997 build/trans_presets.java:1009
-#: build/trans_presets.java:1019 build/trans_presets.java:1028
-#: build/trans_presets.java:1037
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:326 build/trans_presets.java:650
+#: build/trans_presets.java:857 build/trans_presets.java:876
+#: build/trans_presets.java:890 build/trans_presets.java:912
+#: build/trans_presets.java:949 build/trans_presets.java:962
+#: build/trans_presets.java:974 build/trans_presets.java:986
+#: build/trans_presets.java:998 build/trans_presets.java:1010
+#: build/trans_presets.java:1020 build/trans_presets.java:1029
+#: build/trans_presets.java:1038
 msgid "Foot"
 msgstr "Πεζοί"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Σχεδιασμός Βελών Κατεύθυνσης"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Γρήγορος σχεδιασμός (δείχνει άσχημος)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
-msgid "Only interesting direction hints (e.g. with oneway tag)."
-msgstr ""
-
-#. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+msgid "Only interesting direction hints (e.g. with oneway tag)."
+msgstr ""
+
+#. only on the head of a way
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Only on the head of a way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Σχεδιασμός αριθμών σειράς τμημάτων"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Σχεδιασμός ορίων δεδομένων που έχουν ληφθεί"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Σχεδιασμός εικονικών κόμβων σε κατάσταση επιλογής"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Σχεδιασμός ανενεργών επιπέδων με άλλο χρώμα"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Εξομάλυνση γραφικών χάρτη (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:82
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -7811,9 +8024,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
 msgid "Maximum length for local files (meters)"
 msgstr "Μέγιστο μήκος για τοπικά αρχεία (μέτρα)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
@@ -7822,25 +8035,25 @@
 "σχεδιασμό όλων των γραμμών."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length (meters)"
 msgstr "Μέγιστο μήκος (μέτρα)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:129
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Σχεδιασμός βελών κατεύθυνσης για γραμμές που συνδέουν σημεία GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:135
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:141
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -7848,13 +8061,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:144
 msgid "Minimum distance (pixels)"
 msgstr "Ελάχιστη απόσταση (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Draw larger dots for the GPS points."
 msgstr "Σχεδιασμός μεγαλύτερων κουκίδων για τα σημεία GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -7862,9 +8075,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Colors points and track segments by velocity."
 msgstr "Χρωματισμός σημείων και τμημάτων ιχνών ανάλογα με την ταχύτητα."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -7872,27 +8085,27 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid "Track and Point Coloring"
 msgstr "Χρωματισμός Ιχνών και Σημείων"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202
 msgid "GPS Points"
 msgstr "Σημεία GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:237
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -7900,19 +8113,19 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Σχεδιασμός των ορίων των δεδομένων που λήφθηκαν από τον διακομιστή."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257
 msgid "Draw the inactive data layers in a different color."
 msgstr "Σχεδιασμός των ανενερών επιπέδων με διαφορετικό χρώμα."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "OSM Data"
 msgstr "Δεδομένα OSM"
@@ -7992,45 +8205,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Configure available plugins."
 msgstr "Ρύθμιση διαθέσιμων πρόσθετων."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50
+#. buttons at the bottom
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
 msgid "Download List"
 msgstr "Λήψη λίστας"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:100
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 msgid "Update"
 msgstr "Ενημέρωση"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Configure Sites..."
 msgstr "Ρύθμιση τοποθεσιών..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:125
 msgid "Add JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:126
 msgid "Enter URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:162
 msgid "Please select an entry."
 msgstr "Παρακαλώ επιλέξτε μια επιλογή"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:147
 msgid "Edit JOSM Plugin description URL."
 msgstr "Επεξεργασία URL περιγραφής  πρόσθετου του JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:148
 msgid "JOSM Plugin description URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:175
 msgid "Configure Plugin Sites"
 msgstr "Ρύθμιση τοποθεσιών πρόσθετων"
@@ -8362,6 +8576,6 @@
 msgstr "<πολλαπλές>"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:369
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341
 #, java-format
 msgid "Remove old keys from up to {0} object"
@@ -8370,9 +8584,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135
 msgid "Add a new tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160
 msgid "Delete the selection in the tag table"
 msgstr ""
@@ -8407,7 +8621,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:68
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:75
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -8451,4 +8665,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24
+#, fuzzy, java-format
+msgid "Preset group ''{0}'' of group ''{1}''"
+msgstr "Χρήση προεπιλογής \"{0}\" από ομάδα \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
 #, java-format
 msgid "Preset group ''{0}''"
@@ -8469,4 +8688,10 @@
 msgstr "Μεταφόρτωση σημείων {0} ως {1}..."
 
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, java-format
+msgid "parameter ''{0}'' > 0 expected. Got {1}"
+msgstr ""
+
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8575,5 +8800,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
 msgid "Parse error: invalid document structure for gpx document"
 msgstr ""
@@ -8693,10 +8918,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -8704,75 +8930,79 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315
 msgid "Creating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
 #, java-format
 msgid "Successfully opened changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#, java-format
+msgid "id of changeset > 0 required. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
-#, java-format
-msgid "Changeset {0} is unchanged. Skipping update."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
 #, java-format
 msgid "Updating changeset {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
-msgid ""
-"Failed to update changeset. Either there is no current changeset or the id "
-"of the current changeset is 0"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
 msgid "Closing changeset..."
 msgstr "Κλείσιμο πακέτου αλλαγών"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
-#, java-format
-msgid "Closing changeset {0}..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
-#, java-format
-msgid "Leaving changeset {0} open..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
 msgid "No changeset present for diff upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414
 msgid "Preparing..."
 msgstr "Προετοιμασία..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419
 msgid "Uploading..."
 msgstr "Αποστολή..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438
 msgid "Waiting 10 seconds ... "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449
 msgid "OK - trying again."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:485
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517
 #, java-format
 msgid "Starting retry {0} of {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
+msgid "current changeset is null. Can't upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
+#, java-format
+msgid "id of current changeset > required. Current id is {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
+#, java-format
+msgid "Open changeset expected. Got closed changeset with id {0}"
 msgstr ""
 
@@ -8798,33 +9028,92 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
+#, java-format
+msgid "missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:128
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:134
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
+#, java-format
+msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
+#, java-format
+msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
+#, java-format
+msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#, java-format
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#, java-format
+msgid "Unsupported version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:176
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Aborting."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#, java-format
+msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
+#, fuzzy
+msgid "Parsing list of changesets..."
+msgstr "Κλείσιμο πακέτου αλλαγών"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
 msgid "Incorrect password or username."
 msgstr "Λανθασμένος κωδικός ή όνομα χρήστη"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:168
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Προειδοποίηση: Ο κωδικός μεταδίδεται χωρίς κρυπτογράφηση"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Save user and password (unencrypted)"
 msgstr "Αποθήκευση χρήστη και κωδικού (χωρίς κρυπτογράφηση)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
 msgid "Enter Password"
 msgstr "Εισάγετε κωδικό"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 msgid "Login"
 msgstr "Είσοδος"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:242
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Η βασική URL για τον διακομιστή OSM (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -8833,17 +9122,17 @@
 "κωδικός."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
 msgid "Base Server URL"
 msgstr "Η βασική URL για τον διακομιστή"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
 msgid "OSM username (e-mail)"
 msgstr "Όνομα χρήστη OSM (e-mail)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
 msgid "OSM password"
 msgstr "Κωδικός OSM"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -8852,5 +9141,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:51
+#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #, java-format
 msgid "(at line {0}, column {1})"
@@ -8940,20 +9229,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124
-#, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
-#, fuzzy, java-format
-msgid "Missing mandatory attribute ''{0}''"
-msgstr "Ανύπαρκτο απαιτούμενο χαρακτηριστικό \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
-#, fuzzy, java-format
-msgid "Unsupported version: {0}"
-msgstr "Άγνωστη έκδοση: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:155
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -8962,38 +9236,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
 msgid "found XML element <nd> element not as direct child of element <way>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
 msgid "Found XML element <member> not as direct child of element <relation>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
 #, java-format
 msgid ""
@@ -9001,24 +9275,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
 msgid "Incomplete <member> specification with ref=0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
-#, java-format
-msgid "Warning: Undefined element ''{0}'' found in input stream. Skipping."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
-#, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Skipping."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
 msgid "Illegal object with id=0"
 msgstr "Άγνωστο αντικείμενο με id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #, java-format
 msgid ""
@@ -9026,5 +9295,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:303
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
 #, java-format
 msgid ""
@@ -9033,5 +9302,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
 #, java-format
 msgid ""
@@ -9040,5 +9309,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
@@ -9048,25 +9317,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:316
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#, java-format
 msgid "Unknown or unsupported API version. Got {0}"
-msgstr "Άγνωστη έκδοση: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with id {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#, java-format
 msgid "Missing required attribute ''{0}''."
-msgstr "Ανύπαρκτο απαιτούμενο χαρακτηριστικό \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
 #, java-format
 msgid ""
@@ -9074,5 +9343,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
 #, java-format
 msgid ""
@@ -9081,5 +9350,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
 #, java-format
 msgid ""
@@ -9087,5 +9356,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
 #, java-format
 msgid ""
@@ -9094,17 +9363,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
 msgid "Prepare OSM data..."
 msgstr "Προετοιμασία δεδομένων OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 msgid "Parsing OSM data..."
-msgstr "Προετοιμασία δεδομένων OSM..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
 msgid "Preparing data set..."
-msgstr "Προετοιμασία δεδομένων..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
@@ -9125,4 +9392,24 @@
 msgid "Downloading referring relations ..."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51
+#, fuzzy
+msgid "Reading changesets..."
+msgstr "Κλείσιμο πακέτου αλλαγών"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
+#, fuzzy
+msgid "Downloading changesets ..."
+msgstr "Κλείσιμο πακέτου αλλαγών"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85
+#, fuzzy, java-format
+msgid "Reading changeset {0} ..."
+msgstr "Ανάγνωση {0}..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91
+#, fuzzy, java-format
+msgid "Downloading changeset {0} ..."
+msgstr "Λήψη πρόσθετου {0}..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
@@ -9139,10 +9426,14 @@
 msgstr "Επικοινωνία με τον Διακομιστή..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
 msgid "Failed to open connection to API {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
+msgid "Error: failed to add authentication credentials to the connection."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -9151,33 +9442,52 @@
 "Internet."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+msgid "XML tag <user> is missing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
+#, fuzzy, java-format
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgstr "Χρήση προεπιλογής \"{0}\" από ομάδα \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
+#, java-format
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
 msgid "Starting to upload with one request per primitive ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
 msgid "Starting to upload in one request ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:171
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135
 msgid "Uploading data ..."
-msgstr "Αποστολή..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:178
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
 msgid ""
 "WARNING: no API version defined for data to upload. Falling back to version "
@@ -9185,5 +9495,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147
 #, java-format
 msgid ""
@@ -9193,10 +9503,10 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
 msgid "Update Plugins"
 msgstr "Ενημέρωση πρόσθετων"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 msgid "Download Plugins"
 msgstr "Λήψη Πρόσθετων"
@@ -9360,5 +9670,5 @@
 msgstr "Περισσότερες λεπτομέρειες"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -9367,18 +9677,18 @@
 msgstr[1] "Έγινε λήψη πληροφοριών πρόσθετων από {0} τοποθεσίες"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
 msgid "No plugin information found."
 msgstr "Δεν βρέθηκαν πληροφορίες πρόσθετων."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:93
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
 msgid "All installed plugins are up to date."
 msgstr "Όλα τα εγκατεστημένα πρόσθετα είναι ενημεωμένα."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
 #, java-format
 msgid ""
@@ -9391,9 +9701,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
 msgid "Download missing plugins"
 msgstr "Λήψη πρόσθετων που λείπουν"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
 #, java-format
 msgid ""
@@ -9408,43 +9718,43 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
 msgid "unknown"
 msgstr "άγνωστο"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Έκδοση {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 msgid "Plugin bundled with JOSM"
 msgstr "Πρόσθετα που έρχονται με το JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:357
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -9762,10 +10072,4 @@
 msgid "(What does that mean?)"
 msgstr ""
-
-#. item "Relations/Route" text "Symbol description"
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3148
-msgid "Description"
-msgstr "Περιγραφή"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
@@ -10525,6 +10829,7 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
-msgid "Set "
-msgstr ""
+#, fuzzy, java-format
+msgid "Set {0} Lambert coordinates"
+msgstr "Διατήρηση των συντεταγμένων τους"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -11145,6 +11450,6 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 #: build/trans_style.java:990 build/trans_style.java:1007
-#: build/trans_style.java:1023 build/trans_style.java:3392
-#: build/trans_style.java:3400
+#: build/trans_style.java:1023 build/trans_style.java:3400
+#: build/trans_style.java:3408
 msgid "water"
 msgstr "νερό"
@@ -11439,4 +11744,57 @@
 msgstr "Μετρήσεις"
 
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Michigan Left"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Adds no left turn for sets of 4 or 5 ways."
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45
+#, fuzzy
+msgid "Please select 4 or 5 ways to assign no left turns."
+msgstr ""
+"Παρακαλώ επιλέξτε έναν ή περισσότερους κλειστούς δρόμους από τουλάχιστον "
+"τέσσερις κόμβους."
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61
+#, fuzzy, java-format
+msgid "{0} extrem nodes."
+msgstr "{0} κόμβος"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69
+#, java-format
+msgid "Via node {0}, {1}"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75
+#, fuzzy, java-format
+msgid "{0} via nodes."
+msgstr "{0} κόμβος"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78
+msgid "Unable to find via nodes. Please check your selection"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98
+#, fuzzy, java-format
+msgid "MIddle way: {0}"
+msgstr "Κατάσταση: {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121
+msgid "Create Michigan left turn restriction"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129
+#, fuzzy, java-format
+msgid "Processing {0}"
+msgstr "Έκδοση {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142
+#, fuzzy, java-format
+msgid "Relation: from {0} to {1} via {2}"
+msgstr "Έκδοση {0} δημιουργήθηκε στις {1} από {2}"
+
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
 msgid "OpenLayers"
@@ -11588,7 +11946,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
-#, fuzzy
 msgid "create new objects"
-msgstr "Δημιοθργία νέου κόμβου."
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
@@ -11908,5 +12265,5 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:158
 msgid "JOSM Tag Editor Plugin"
 msgstr ""
@@ -11916,5 +12273,5 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:370
 #, java-format
 msgid "Updating properties of up to {0} object"
@@ -11923,18 +12280,4 @@
 msgstr[1] ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44
-msgid "INFO: entering compatibilty mode for JOSM with Main.ds"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47
-msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49
-msgid ""
-"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-"found."
-msgstr ""
-
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
 msgid "Group"
@@ -11944,9 +12287,4 @@
 msgid "Item"
 msgstr "Αντικείμενο"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-msgid "Filter"
-msgstr "Φίλτρο"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63
@@ -12032,5 +12370,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2272
 msgid "Street name"
 msgstr "Όνομα οδού"
@@ -12192,8 +12530,4 @@
 msgid "Zoom (in metres)"
 msgstr "Ζουμ (σε μέτρα)"
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
-msgid "URL"
-msgstr "URL"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -12398,7 +12732,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501
-#, fuzzy
 msgid "Updating map ..."
-msgstr "Αποστολή..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69
@@ -12884,7 +13217,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
-#: build/trans_style.java:4179
+#: build/trans_style.java:4159 build/trans_style.java:4166
+#: build/trans_style.java:4173 build/trans_style.java:4180
+#: build/trans_style.java:4187
 msgid "building"
 msgstr "κτίριο"
@@ -12898,5 +13231,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4186
+#: build/trans_style.java:4194
 msgid "area"
 msgstr ""
@@ -13023,10 +13356,10 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:148
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:155
 msgid "Reached a junction"
 msgstr ""
@@ -13321,12 +13654,10 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
-#, fuzzy
 msgid "% of east:"
-msgstr "% γεωγ. πλάτους:"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
-#, fuzzy
 msgid "% of north:"
-msgstr "% γεωγ. πλάτους:"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -13473,6 +13804,11 @@
 msgstr ""
 
+#. Plugin michigan_left
+#: build/trans_plugins.java:35
+msgid "Adds no left turn for sets of 4 or 5 ways"
+msgstr ""
+
 #. Plugin nearclick
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid ""
 "Simulates a click when you do a small and short drag. This is usefull for "
@@ -13482,15 +13818,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Εισάγει προβλήματα από OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13498,5 +13834,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13504,5 +13840,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13511,15 +13847,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Let other applications send commands to JOSM."
 msgstr "Επιτρέπει άλλες εφαρμογές να στέλνουν εντολές στο JOSM."
 
 #. Plugin routes
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13528,10 +13864,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Provides routing capabilities."
 msgstr "Παρέχει δυνατότητες δρομολόγησης."
 
 #. Plugin slippymap
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13540,15 +13876,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -13558,10 +13894,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin usertools
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -13570,5 +13906,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -13577,5 +13913,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -13584,5 +13920,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -13591,10 +13927,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -13650,4 +13986,10 @@
 #. <annotations>
 #: build/trans_presets.java:57
+#, fuzzy
+msgid "Highways"
+msgstr "Οδός ταχείας κυκλοφορίας"
+
+#. group "Highways"
+#: build/trans_presets.java:58
 msgid "Streets"
 msgstr "Οδοί"
@@ -13658,5 +14000,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:58 build/trans_surveyor.java:72
+#: build/trans_presets.java:59 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Αυτοκινητόδρομος"
@@ -13665,5 +14007,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:61
+#: build/trans_presets.java:62
 msgid "Edit Motorway"
 msgstr "Επεξεργασία Αυτοκινητοδρόμου"
@@ -13690,8 +14032,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:120 build/trans_presets.java:140
-#: build/trans_presets.java:177 build/trans_presets.java:197
-#: build/trans_presets.java:1557 build/trans_presets.java:3146
+#: build/trans_presets.java:65 build/trans_presets.java:101
+#: build/trans_presets.java:121 build/trans_presets.java:141
+#: build/trans_presets.java:178 build/trans_presets.java:198
+#: build/trans_presets.java:1560 build/trans_presets.java:3158
 msgid "Reference"
 msgstr ""
@@ -13705,8 +14047,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:358
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:359
 msgid "Lanes"
 msgstr "Λωρίδες κυκλοφορίας"
@@ -13723,15 +14065,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:224 build/trans_presets.java:280
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:373 build/trans_presets.java:388
-#: build/trans_presets.java:412 build/trans_presets.java:431
-#: build/trans_presets.java:452 build/trans_presets.java:472
-#: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1307
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:225 build/trans_presets.java:281
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:374 build/trans_presets.java:389
+#: build/trans_presets.java:413 build/trans_presets.java:432
+#: build/trans_presets.java:453 build/trans_presets.java:473
+#: build/trans_presets.java:511 build/trans_presets.java:667
+#: build/trans_presets.java:1310
 msgid "Max. speed (km/h)"
 msgstr "Μεγ. Ταχύτητα (χαω)"
@@ -13768,16 +14110,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:293 build/trans_presets.java:306
-#: build/trans_presets.java:320 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:464
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:659 build/trans_presets.java:1300
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:294 build/trans_presets.java:307
+#: build/trans_presets.java:321 build/trans_presets.java:353
+#: build/trans_presets.java:405 build/trans_presets.java:425
+#: build/trans_presets.java:445 build/trans_presets.java:465
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:660 build/trans_presets.java:1303
 msgid "Oneway"
 msgstr "Μονόδρομος"
@@ -13819,19 +14161,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:353
-#: build/trans_presets.java:362 build/trans_presets.java:405
-#: build/trans_presets.java:425 build/trans_presets.java:445
-#: build/trans_presets.java:465 build/trans_presets.java:485
-#: build/trans_presets.java:504 build/trans_presets.java:523
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:586 build/trans_presets.java:607
-#: build/trans_presets.java:628 build/trans_presets.java:660
-#: build/trans_presets.java:1301 build/trans_surveyor.java:12
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:354
+#: build/trans_presets.java:363 build/trans_presets.java:406
+#: build/trans_presets.java:426 build/trans_presets.java:446
+#: build/trans_presets.java:466 build/trans_presets.java:486
+#: build/trans_presets.java:505 build/trans_presets.java:524
+#: build/trans_presets.java:545 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629 build/trans_presets.java:661
+#: build/trans_presets.java:1304 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Γέφυρα"
@@ -13867,19 +14209,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:354
-#: build/trans_presets.java:378 build/trans_presets.java:406
-#: build/trans_presets.java:426 build/trans_presets.java:446
-#: build/trans_presets.java:466 build/trans_presets.java:486
-#: build/trans_presets.java:505 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629 build/trans_presets.java:661
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:355
+#: build/trans_presets.java:379 build/trans_presets.java:407
+#: build/trans_presets.java:427 build/trans_presets.java:447
+#: build/trans_presets.java:467 build/trans_presets.java:487
+#: build/trans_presets.java:506 build/trans_presets.java:525
+#: build/trans_presets.java:546 build/trans_presets.java:567
+#: build/trans_presets.java:588 build/trans_presets.java:609
+#: build/trans_presets.java:630 build/trans_presets.java:662
+#: build/trans_presets.java:1305
 msgid "Tunnel"
 msgstr "Σήραγγα"
@@ -13913,18 +14255,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:73 build/trans_presets.java:90
-#: build/trans_presets.java:110 build/trans_presets.java:129
-#: build/trans_presets.java:150 build/trans_presets.java:166
-#: build/trans_presets.java:186 build/trans_presets.java:205
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:355
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:467
-#: build/trans_presets.java:487 build/trans_presets.java:506
-#: build/trans_presets.java:525 build/trans_presets.java:546
-#: build/trans_presets.java:567 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:630
-#: build/trans_presets.java:662 build/trans_presets.java:1303
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:356
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:468
+#: build/trans_presets.java:488 build/trans_presets.java:507
+#: build/trans_presets.java:526 build/trans_presets.java:547
+#: build/trans_presets.java:568 build/trans_presets.java:589
+#: build/trans_presets.java:610 build/trans_presets.java:631
+#: build/trans_presets.java:663 build/trans_presets.java:1306
 msgid "Cutting"
 msgstr ""
@@ -13958,18 +14300,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:74 build/trans_presets.java:91
-#: build/trans_presets.java:111 build/trans_presets.java:130
-#: build/trans_presets.java:151 build/trans_presets.java:167
-#: build/trans_presets.java:187 build/trans_presets.java:206
-#: build/trans_presets.java:222 build/trans_presets.java:240
-#: build/trans_presets.java:258 build/trans_presets.java:277
-#: build/trans_presets.java:310 build/trans_presets.java:356
-#: build/trans_presets.java:408 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:468
-#: build/trans_presets.java:488 build/trans_presets.java:507
-#: build/trans_presets.java:526 build/trans_presets.java:547
-#: build/trans_presets.java:568 build/trans_presets.java:589
-#: build/trans_presets.java:610 build/trans_presets.java:631
-#: build/trans_presets.java:663 build/trans_presets.java:1304
+#: build/trans_presets.java:75 build/trans_presets.java:92
+#: build/trans_presets.java:112 build/trans_presets.java:131
+#: build/trans_presets.java:152 build/trans_presets.java:168
+#: build/trans_presets.java:188 build/trans_presets.java:207
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:357
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:469
+#: build/trans_presets.java:489 build/trans_presets.java:508
+#: build/trans_presets.java:527 build/trans_presets.java:548
+#: build/trans_presets.java:569 build/trans_presets.java:590
+#: build/trans_presets.java:611 build/trans_presets.java:632
+#: build/trans_presets.java:664 build/trans_presets.java:1307
 msgid "Embankment"
 msgstr ""
@@ -13977,5 +14319,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Motorway Link"
 msgstr ""
@@ -13984,5 +14326,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:80
+#: build/trans_presets.java:81
 msgid "Edit Motorway Link"
 msgstr ""
@@ -13990,5 +14332,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:94
+#: build/trans_presets.java:95
 msgid "Trunk"
 msgstr ""
@@ -13997,5 +14339,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:97
+#: build/trans_presets.java:98
 msgid "Edit Trunk"
 msgstr ""
@@ -14005,6 +14347,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
 msgid "Motorroad"
 msgstr ""
@@ -14012,5 +14354,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:114
+#: build/trans_presets.java:115
 msgid "Trunk Link"
 msgstr ""
@@ -14019,5 +14361,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:117
+#: build/trans_presets.java:118
 msgid "Edit Trunk Link"
 msgstr ""
@@ -14030,5 +14372,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:134 build/trans_surveyor.java:76
+#: build/trans_presets.java:135 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Πρωτεύων"
@@ -14037,5 +14379,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:137
+#: build/trans_presets.java:138
 msgid "Edit Primary Road"
 msgstr ""
@@ -14043,10 +14385,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:154
+#: build/trans_presets.java:155
 msgid "Primary Link"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:155
+#: build/trans_presets.java:156
 msgid "Edit Primary Link"
 msgstr ""
@@ -14058,5 +14400,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:170 build/trans_surveyor.java:80
+#: build/trans_presets.java:171 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Δευτερεύων"
@@ -14066,5 +14408,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:174
+#: build/trans_presets.java:175
 msgid "Edit Secondary Road"
 msgstr ""
@@ -14072,5 +14414,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:190
+#: build/trans_presets.java:191
 msgid "Tertiary"
 msgstr ""
@@ -14080,5 +14422,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:194
+#: build/trans_presets.java:195
 msgid "Edit Tertiary Road"
 msgstr ""
@@ -14090,5 +14432,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:209 build/trans_surveyor.java:84
+#: build/trans_presets.java:210 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Μη κατηγοριοποιημένος"
@@ -14098,5 +14440,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:213
+#: build/trans_presets.java:214
 msgid "Edit Unclassified Road"
 msgstr ""
@@ -14123,19 +14465,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:225 build/trans_presets.java:243
-#: build/trans_presets.java:261 build/trans_presets.java:281
-#: build/trans_presets.java:314 build/trans_presets.java:359
-#: build/trans_presets.java:375 build/trans_presets.java:389
-#: build/trans_presets.java:413 build/trans_presets.java:432
-#: build/trans_presets.java:453 build/trans_presets.java:473
-#: build/trans_presets.java:491 build/trans_presets.java:511
-#: build/trans_presets.java:532 build/trans_presets.java:553
-#: build/trans_presets.java:574 build/trans_presets.java:595
-#: build/trans_presets.java:616 build/trans_presets.java:637
-#: build/trans_presets.java:667 build/trans_presets.java:680
-#: build/trans_presets.java:693 build/trans_presets.java:706
-#: build/trans_presets.java:719 build/trans_presets.java:732
-#: build/trans_presets.java:745 build/trans_presets.java:1308
-#: build/trans_presets.java:1498 build/trans_presets.java:1540
+#: build/trans_presets.java:226 build/trans_presets.java:244
+#: build/trans_presets.java:262 build/trans_presets.java:282
+#: build/trans_presets.java:315 build/trans_presets.java:360
+#: build/trans_presets.java:376 build/trans_presets.java:390
+#: build/trans_presets.java:414 build/trans_presets.java:433
+#: build/trans_presets.java:454 build/trans_presets.java:474
+#: build/trans_presets.java:492 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:554
+#: build/trans_presets.java:575 build/trans_presets.java:596
+#: build/trans_presets.java:617 build/trans_presets.java:638
+#: build/trans_presets.java:668 build/trans_presets.java:681
+#: build/trans_presets.java:694 build/trans_presets.java:707
+#: build/trans_presets.java:720 build/trans_presets.java:733
+#: build/trans_presets.java:746 build/trans_presets.java:1311
+#: build/trans_presets.java:1501 build/trans_presets.java:1543
 msgid "Width (meters)"
 msgstr "Πλάτος (μέτρα)"
@@ -14147,5 +14489,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:228 build/trans_surveyor.java:88
+#: build/trans_presets.java:229 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Οικιστική"
@@ -14154,5 +14496,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:231
+#: build/trans_presets.java:232
 msgid "Edit Residential Street"
 msgstr "Επεξεργασία οικιστικής οδού"
@@ -14177,14 +14519,14 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:611
-#: build/trans_presets.java:632 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "Surface"
 msgstr "Επιφάνεια"
@@ -14205,53 +14547,53 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paved"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "unpaved"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
 msgid "metal"
 msgstr ""
@@ -14265,22 +14607,22 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
-#: build/trans_style.java:3367
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
+#: build/trans_style.java:3375
 msgid "wood"
 msgstr "άλσος"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paving_stones"
 msgstr ""
@@ -14288,77 +14630,77 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "cobblestone"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "gravel"
 msgstr "χαλίκι"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "grass"
 msgstr "χόρτο"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "sand"
 msgstr "άμμος"
@@ -14366,13 +14708,13 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "ground"
 msgstr ""
@@ -14380,5 +14722,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:246
+#: build/trans_presets.java:247
 msgid "Living Street"
 msgstr ""
@@ -14387,5 +14729,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:249
+#: build/trans_presets.java:250
 msgid "Edit Living Street"
 msgstr ""
@@ -14393,5 +14735,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:264
+#: build/trans_presets.java:265
 msgid "Service"
 msgstr ""
@@ -14400,5 +14742,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:267
+#: build/trans_presets.java:268
 msgid "Edit Serviceway"
 msgstr ""
@@ -14408,18 +14750,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "parking_aisle"
 msgstr ""
@@ -14427,5 +14769,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:284
+#: build/trans_presets.java:285
 msgid "Parking Aisle"
 msgstr ""
@@ -14435,5 +14777,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:288
+#: build/trans_presets.java:289
 msgid "Edit Parking Aisle"
 msgstr ""
@@ -14441,5 +14783,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:298
+#: build/trans_presets.java:299
 msgid "Road (Unknown Type)"
 msgstr ""
@@ -14448,5 +14790,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Edit Road of unknown type"
 msgstr ""
@@ -14455,20 +14797,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:318
+#: build/trans_presets.java:319
 msgid "Road Restrictions"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:319
+#: build/trans_presets.java:320
 msgid "Edit Road Restrictions"
 msgstr ""
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:321
+#: build/trans_presets.java:322
 msgid "Toll"
 msgstr "Διόδια"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:322
+#: build/trans_presets.java:323
 msgid "No exit (cul-de-sac)"
 msgstr "Αδιέξοδο"
@@ -14481,8 +14823,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:323 build/trans_presets.java:529
-#: build/trans_presets.java:550 build/trans_presets.java:571
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:634
+#: build/trans_presets.java:324 build/trans_presets.java:530
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:593 build/trans_presets.java:614
+#: build/trans_presets.java:635
 msgid "Access"
 msgstr "Πρόσβαση"
@@ -14536,29 +14878,29 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1397
-#: build/trans_presets.java:1398 build/trans_presets.java:1399
-#: build/trans_presets.java:1763 build/trans_presets.java:1773
-#: build/trans_presets.java:2397 build/trans_presets.java:2433
-#: build/trans_presets.java:2442 build/trans_presets.java:2443
-#: build/trans_presets.java:2444 build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:1396
+#: build/trans_presets.java:1397 build/trans_presets.java:1400
+#: build/trans_presets.java:1401 build/trans_presets.java:1402
+#: build/trans_presets.java:1767 build/trans_presets.java:1777
+#: build/trans_presets.java:2408 build/trans_presets.java:2444
+#: build/trans_presets.java:2453 build/trans_presets.java:2454
+#: build/trans_presets.java:2455 build/trans_presets.java:2725
 msgid "yes"
 msgstr "ναι"
@@ -14571,40 +14913,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:212
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:212
 msgid "private"
 msgstr "ιδιωτικό"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655
 msgid "designated"
 msgstr ""
@@ -14617,19 +14959,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:219
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:219
 msgid "destination"
 msgstr "προορισμός"
@@ -14652,71 +14994,71 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:205
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:205
 msgid "permissive"
 msgstr ""
 
-#: build/trans_presets.java:323 build/trans_presets.java:327
-#: build/trans_presets.java:330 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636
+#: build/trans_presets.java:324 build/trans_presets.java:328
+#: build/trans_presets.java:331 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637
 msgid "agricultural"
 msgstr "αγροτικό"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
-#: build/trans_presets.java:2433 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1396 build/trans_presets.java:1397
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
+#: build/trans_presets.java:2444 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
+#: build/trans_presets.java:2725
 msgid "no"
 msgstr "όχι"
 
-#: build/trans_presets.java:326
+#: build/trans_presets.java:327
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:327
+#: build/trans_presets.java:328
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -14731,10 +15073,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:328 build/trans_presets.java:651
-#: build/trans_presets.java:858 build/trans_presets.java:891
-#: build/trans_presets.java:913 build/trans_presets.java:950
-#: build/trans_presets.java:963 build/trans_presets.java:975
-#: build/trans_presets.java:987 build/trans_presets.java:999
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:329 build/trans_presets.java:652
+#: build/trans_presets.java:859 build/trans_presets.java:892
+#: build/trans_presets.java:914 build/trans_presets.java:951
+#: build/trans_presets.java:964 build/trans_presets.java:976
+#: build/trans_presets.java:988 build/trans_presets.java:1000
+#: build/trans_presets.java:1040
 msgid "Horse"
 msgstr "Άλογο"
@@ -14750,13 +15092,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:329 build/trans_presets.java:530
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:635 build/trans_presets.java:859
-#: build/trans_presets.java:877 build/trans_presets.java:892
-#: build/trans_presets.java:914 build/trans_presets.java:951
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:330 build/trans_presets.java:531
+#: build/trans_presets.java:552 build/trans_presets.java:573
+#: build/trans_presets.java:594 build/trans_presets.java:615
+#: build/trans_presets.java:636 build/trans_presets.java:860
+#: build/trans_presets.java:878 build/trans_presets.java:893
+#: build/trans_presets.java:915 build/trans_presets.java:952
+#: build/trans_presets.java:965 build/trans_presets.java:977
+#: build/trans_presets.java:989 build/trans_presets.java:1001
+#: build/trans_presets.java:1041
 msgid "Motorcycle"
 msgstr "Μοτοσυκλέτα"
@@ -14771,30 +15113,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:330 build/trans_presets.java:531
-#: build/trans_presets.java:552 build/trans_presets.java:573
-#: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:636 build/trans_presets.java:654
-#: build/trans_presets.java:878 build/trans_presets.java:893
-#: build/trans_presets.java:915 build/trans_presets.java:952
-#: build/trans_presets.java:965 build/trans_presets.java:977
-#: build/trans_presets.java:989 build/trans_presets.java:1001
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:331 build/trans_presets.java:532
+#: build/trans_presets.java:553 build/trans_presets.java:574
+#: build/trans_presets.java:595 build/trans_presets.java:616
+#: build/trans_presets.java:637 build/trans_presets.java:655
+#: build/trans_presets.java:879 build/trans_presets.java:894
+#: build/trans_presets.java:916 build/trans_presets.java:953
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1042
 msgid "Motorcar"
 msgstr "Αυτοκίνητο"
 
-#: build/trans_presets.java:331
+#: build/trans_presets.java:332
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
-#: build/trans_presets.java:332
+#: build/trans_presets.java:333
 msgid "Motorboat"
 msgstr ""
 
-#: build/trans_presets.java:333
+#: build/trans_presets.java:334
 msgid "Boat"
 msgstr "Καράβι"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:336
 msgid "Min. speed (km/h)"
 msgstr "Ελαχ. ταχύτητα (χαω)"
@@ -14802,25 +15144,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:336 build/trans_presets.java:374
+#: build/trans_presets.java:337 build/trans_presets.java:375
 msgid "Max. weight (tonnes)"
 msgstr "Μεγ. βάρος (τόνοι)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:337
+#: build/trans_presets.java:338
 msgid "Max. Height (meters)"
 msgstr "Μέγιστο Ύψος (μέτρα)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Max. Width (meters)"
 msgstr "Μέγιστο Πλάτος (μέτρα)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:339
+#: build/trans_presets.java:340
 msgid "Max. Length (meters)"
 msgstr "Μέγιστο Μήκος (μέτρα)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:341
+#: build/trans_presets.java:342
 msgid "Roundabout"
 msgstr "Κυκλικός κόμβος"
@@ -14831,5 +15173,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:346
+#: build/trans_presets.java:347
 msgid "Edit Junction"
 msgstr ""
@@ -14851,9 +15193,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:349 build/trans_presets.java:648
-#: build/trans_presets.java:788 build/trans_presets.java:1135
-#: build/trans_presets.java:1392 build/trans_presets.java:2353
-#: build/trans_presets.java:2901 build/trans_presets.java:2911
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:350 build/trans_presets.java:649
+#: build/trans_presets.java:789 build/trans_presets.java:1137
+#: build/trans_presets.java:1395 build/trans_presets.java:2364
+#: build/trans_presets.java:2913 build/trans_presets.java:2923
+#: build/trans_presets.java:2932
 msgid "Type"
 msgstr "Τύπος"
@@ -14873,10 +15215,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:547
+#: build/trans_presets.java:350 build/trans_style.java:547
 #: build/trans_style.java:555
 msgid "motorway"
 msgstr "Αυτοκινητόδρομος"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "motorway_link"
 msgstr ""
@@ -14898,10 +15240,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:563
+#: build/trans_presets.java:350 build/trans_style.java:563
 #: build/trans_style.java:571
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "trunk_link"
 msgstr ""
@@ -14923,10 +15265,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:579
+#: build/trans_presets.java:350 build/trans_style.java:579
 #: build/trans_style.java:587
 msgid "primary"
 msgstr "πρωτεύων"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "primary_link"
 msgstr ""
@@ -14948,5 +15290,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:595
+#: build/trans_presets.java:350 build/trans_style.java:595
 #: build/trans_style.java:603
 msgid "secondary"
@@ -14961,9 +15303,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:349 build/trans_style.java:611
+#: build/trans_presets.java:350 build/trans_style.java:611
 msgid "tertiary"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "unclassified"
 msgstr "αταξινόμητος"
@@ -14977,9 +15319,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:349 build/trans_style.java:3143
+#: build/trans_presets.java:350 build/trans_style.java:3151
 msgid "residential"
 msgstr "Οικιστική"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "living_street"
 msgstr ""
@@ -15009,10 +15351,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:349 build/trans_style.java:667
-#: build/trans_style.java:4244
+#: build/trans_presets.java:350 build/trans_style.java:667
+#: build/trans_style.java:4252
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "bus_guideway"
 msgstr ""
@@ -15042,6 +15384,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:349 build/trans_style.java:877
-#: build/trans_style.java:3208 build/trans_style.java:3209
+#: build/trans_presets.java:350 build/trans_style.java:877
+#: build/trans_style.java:3216 build/trans_style.java:3217
 msgid "construction"
 msgstr ""
@@ -15052,10 +15394,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Edit Bridge"
 msgstr "Επεξεργασία Γέφυρας"
 
 #. item
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "Edit Tunnel"
 msgstr "Σήραγγα"
@@ -15063,19 +15405,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:393
+#: build/trans_presets.java:394
 msgid "Ways"
 msgstr ""
 
 #. group "Ways"
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Construction"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:395
+#: build/trans_presets.java:396
 msgid "Edit Highway Under Construction"
 msgstr "Επεξεργασία οδού ταχείας κυκλοφορίας υπό κατασκευή"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "Junction"
 msgstr "Κόμβος"
@@ -15091,5 +15433,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:411 build/trans_style.java:895
+#: build/trans_presets.java:412 build/trans_style.java:895
 msgid "roundabout"
 msgstr "κυκλικός κόμβος"
@@ -15098,5 +15440,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:417
+#: build/trans_presets.java:418
 msgid "Bridleway"
 msgstr ""
@@ -15104,5 +15446,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:419
+#: build/trans_presets.java:420
 msgid "Edit Bridleway"
 msgstr ""
@@ -15110,5 +15452,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:435
+#: build/trans_presets.java:436
 msgid "Cycleway"
 msgstr "Ποδηλατόδρομος"
@@ -15118,10 +15460,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:439
+#: build/trans_presets.java:440
 msgid "Edit Cycleway"
 msgstr "Επεξεργασία ποδηλατόδρομου"
 
 #. item "Ways/Cycleway" check "Embankment"
-#: build/trans_presets.java:449
+#: build/trans_presets.java:450
 msgid "Pedestrians"
 msgstr ""
@@ -15129,5 +15471,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Footway"
 msgstr ""
@@ -15136,10 +15478,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Footway"
 msgstr ""
 
 #. item "Ways/Footway" check "Embankment"
-#: build/trans_presets.java:469
+#: build/trans_presets.java:470
 msgid "Bikes"
 msgstr ""
@@ -15147,5 +15489,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:476
+#: build/trans_presets.java:477
 msgid "Pedestrian"
 msgstr "Πεζόδρομος"
@@ -15154,5 +15496,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Edit Pedestrian Street"
 msgstr "Επεξεργασία Πεοζόδρομου"
@@ -15160,5 +15502,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:494
+#: build/trans_presets.java:495
 msgid "Steps"
 msgstr "Σκαλοπάτια"
@@ -15168,5 +15510,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:498
+#: build/trans_presets.java:499
 msgid "Edit Flight of Steps"
 msgstr "Επεξεργασία σκαλοπατιών"
@@ -15175,5 +15517,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:515
+#: build/trans_presets.java:516
 msgid "Track"
 msgstr ""
@@ -15182,5 +15524,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:518
+#: build/trans_presets.java:519
 msgid "Edit Track"
 msgstr ""
@@ -15188,5 +15530,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:535
+#: build/trans_presets.java:536
 msgid "Track Grade 1"
 msgstr ""
@@ -15195,5 +15537,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:538
+#: build/trans_presets.java:539
 msgid "Edit Track of grade 1"
 msgstr ""
@@ -15201,5 +15543,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:556
+#: build/trans_presets.java:557
 msgid "Track Grade 2"
 msgstr ""
@@ -15208,5 +15550,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:559
+#: build/trans_presets.java:560
 msgid "Edit Track of grade 2"
 msgstr ""
@@ -15214,5 +15556,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:577
+#: build/trans_presets.java:578
 msgid "Track Grade 3"
 msgstr ""
@@ -15221,5 +15563,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:580
+#: build/trans_presets.java:581
 msgid "Edit Track of grade 3"
 msgstr ""
@@ -15227,5 +15569,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:598
+#: build/trans_presets.java:599
 msgid "Track Grade 4"
 msgstr ""
@@ -15234,5 +15576,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:601
+#: build/trans_presets.java:602
 msgid "Edit Track of grade 4"
 msgstr ""
@@ -15240,5 +15582,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:619
+#: build/trans_presets.java:620
 msgid "Track Grade 5"
 msgstr ""
@@ -15247,5 +15589,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:622
+#: build/trans_presets.java:623
 msgid "Edit Track of grade 5"
 msgstr ""
@@ -15254,5 +15596,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:641
+#: build/trans_presets.java:642
 msgid "Path"
 msgstr "Μονοπάτι"
@@ -15261,13 +15603,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:644
+#: build/trans_presets.java:645
 msgid "Edit Path"
 msgstr "Επεξεργασία μονοπατιού"
 
-#: build/trans_presets.java:652
+#: build/trans_presets.java:653
 msgid "Ski"
 msgstr "Σκι"
 
-#: build/trans_presets.java:653
+#: build/trans_presets.java:654
 msgid "Snowmobile"
 msgstr "Snowmobile"
@@ -15277,6 +15619,6 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:670 build/trans_presets.java:1725
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:671 build/trans_presets.java:1729
+#: build/trans_presets.java:1752
 msgid "Hiking"
 msgstr "Πεζοπορία"
@@ -15286,5 +15628,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:674
+#: build/trans_presets.java:675
 msgid "Edit Hiking"
 msgstr "Επεξεργασία Πεζοπορίας"
@@ -15292,5 +15634,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:683
+#: build/trans_presets.java:684
 msgid "Mountain Hiking"
 msgstr "Ορειβασία"
@@ -15300,5 +15642,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:687
+#: build/trans_presets.java:688
 msgid "Edit Mountain Hiking"
 msgstr "Επεξεργασία Ορειβασίας"
@@ -15306,5 +15648,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:696
+#: build/trans_presets.java:697
 msgid "Demanding Mountain Hiking"
 msgstr "Απαιτητική Ορειβασία"
@@ -15314,5 +15656,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:700
+#: build/trans_presets.java:701
 msgid "Edit Demanding Mountain Hiking"
 msgstr "Επεξεργασία απαιτητικής ορειβασίας"
@@ -15320,5 +15662,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:709
+#: build/trans_presets.java:710
 msgid "Alpine Hiking"
 msgstr ""
@@ -15328,5 +15670,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:713
+#: build/trans_presets.java:714
 msgid "Edit Alpine Hiking"
 msgstr ""
@@ -15334,5 +15676,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:723
 msgid "Demanding Alpine Hiking"
 msgstr ""
@@ -15342,5 +15684,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:726
+#: build/trans_presets.java:727
 msgid "Edit Demanding Alpine Hiking"
 msgstr ""
@@ -15348,5 +15690,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:735
+#: build/trans_presets.java:736
 msgid "Difficult Alpine Hiking"
 msgstr ""
@@ -15356,5 +15698,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:739
+#: build/trans_presets.java:740
 msgid "Edit Difficult Alpine Hiking"
 msgstr ""
@@ -15362,10 +15704,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:749
+#: build/trans_presets.java:750
 msgid "Waypoints"
 msgstr "Σημεία αναφοράς"
 
 #. group "Waypoints"
-#: build/trans_presets.java:750
+#: build/trans_presets.java:751
 msgid "Motorway Junction"
 msgstr "Κόμβος Αυτοκινητοδρόμου"
@@ -15373,15 +15715,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:752
+#: build/trans_presets.java:753
 msgid "Edit Motorway Junction"
 msgstr "Επεξεργασία Κόμβου Αυτοκινητοδρόμου"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:757
 msgid "Number"
 msgstr "Αριθμός"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:759
 msgid "Services"
 msgstr "Υπηρεσίες"
@@ -15389,5 +15731,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:761
 msgid "Edit Service Station"
 msgstr ""
@@ -15425,15 +15767,15 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:765 build/trans_presets.java:902
-#: build/trans_presets.java:1382 build/trans_presets.java:1406
-#: build/trans_presets.java:1413 build/trans_presets.java:1419
-#: build/trans_presets.java:1427 build/trans_presets.java:1434
-#: build/trans_presets.java:1761 build/trans_presets.java:1771
-#: build/trans_presets.java:2361 build/trans_presets.java:2368
-#: build/trans_presets.java:2384 build/trans_presets.java:2395
-#: build/trans_presets.java:2403 build/trans_presets.java:2410
-#: build/trans_presets.java:2464 build/trans_presets.java:2512
-#: build/trans_presets.java:2678 build/trans_presets.java:2693
-#: build/trans_presets.java:2732 build/trans_presets.java:3151
+#: build/trans_presets.java:766 build/trans_presets.java:903
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
+#: build/trans_presets.java:1416 build/trans_presets.java:1422
+#: build/trans_presets.java:1430 build/trans_presets.java:1437
+#: build/trans_presets.java:1765 build/trans_presets.java:1775
+#: build/trans_presets.java:2372 build/trans_presets.java:2379
+#: build/trans_presets.java:2395 build/trans_presets.java:2406
+#: build/trans_presets.java:2414 build/trans_presets.java:2421
+#: build/trans_presets.java:2475 build/trans_presets.java:2523
+#: build/trans_presets.java:2689 build/trans_presets.java:2704
+#: build/trans_presets.java:2743 build/trans_presets.java:3163
 msgid "Operator"
 msgstr "Λειτουργός"
@@ -15442,5 +15784,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:769
+#: build/trans_presets.java:770
 msgid "Traffic Signal"
 msgstr "Σηματοδότης"
@@ -15450,5 +15792,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:774
 msgid "Pedestrian crossing type"
 msgstr "Τύπος διάβασης πεζών"
@@ -15457,27 +15799,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "traffic_signals"
 msgstr "σηματοδότες"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "island"
 msgstr "νησίδα"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:774 build/trans_presets.java:790
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:775 build/trans_presets.java:791
+#: build/trans_presets.java:1334
 msgid "Cross on horseback"
 msgstr ""
@@ -15485,6 +15827,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:775 build/trans_presets.java:789
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:776 build/trans_presets.java:790
+#: build/trans_presets.java:1335
 msgid "Cross by bicycle"
 msgstr ""
@@ -15493,11 +15835,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:776 build/trans_presets.java:791
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:1336
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:778
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -15505,30 +15847,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:780
+#: build/trans_presets.java:781
 msgid "Stop"
 msgstr "Stop"
@@ -15536,5 +15878,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:783
+#: build/trans_presets.java:784
 msgid "Pedestrian Crossing"
 msgstr "Διάβαση Πεζών"
@@ -15543,14 +15885,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:786
+#: build/trans_presets.java:787
 msgid "Edit Crossing"
 msgstr "Επεξεργασία Διάβασης Πεζών"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:793
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:795
 msgid "Mini-roundabout"
 msgstr "Μικρός Κυκλικός Κόμβος"
@@ -15561,14 +15903,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "Direction"
 msgstr "Κατεύθυνση"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "clockwise"
 msgstr "δεξιόστροφα"
 
-#: build/trans_presets.java:801
+#: build/trans_presets.java:802
 msgid "Turning Circle"
 msgstr ""
@@ -15578,20 +15920,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:806
+#: build/trans_presets.java:807
 msgid "City Limit"
 msgstr "Όρια πόλης"
 
 #. item
-#: build/trans_presets.java:807
+#: build/trans_presets.java:808
 msgid "Edit City Limit Sign"
 msgstr "Επεξεργασία πινακίδας ορίων πόλης"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:812
+#: build/trans_presets.java:813
 msgid "Second Name"
 msgstr "Δεύτερο Όνομα"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:814
+#: build/trans_presets.java:815
 msgid "Speed Camera"
 msgstr "Κάμερα ελέγχου ταχύτητας"
@@ -15599,5 +15941,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:817
+#: build/trans_presets.java:818
 msgid "Emergency Phone"
 msgstr "Τηλέφωνο εκτάκτου ανάγκης"
@@ -15605,5 +15947,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:820
+#: build/trans_presets.java:821
 msgid "Incline"
 msgstr ""
@@ -15611,5 +15953,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:823
+#: build/trans_presets.java:824
 msgid "Incline Steep"
 msgstr ""
@@ -15618,10 +15960,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:827
+#: build/trans_presets.java:828
 msgid "Ford"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:828
+#: build/trans_presets.java:829
 msgid "Edit Ford"
 msgstr ""
@@ -15629,5 +15971,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:835
+#: build/trans_presets.java:836
 msgid "Mountain Pass"
 msgstr ""
@@ -15635,5 +15977,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:837
+#: build/trans_presets.java:838
 msgid "Edit Mountain Pass"
 msgstr ""
@@ -15645,7 +15987,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:842 build/trans_presets.java:1600
-#: build/trans_presets.java:1745 build/trans_presets.java:2845
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:843 build/trans_presets.java:1604
+#: build/trans_presets.java:1749 build/trans_presets.java:2857
+#: build/trans_presets.java:2864 build/trans_presets.java:2871
 msgid "Elevation"
 msgstr "Υψόμετρο"
@@ -15653,5 +15995,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:846
+#: build/trans_presets.java:847
 msgid "Barriers"
 msgstr "Εμπόδια"
@@ -15659,5 +16001,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:849
+#: build/trans_presets.java:850
 msgid "Bollard"
 msgstr ""
@@ -15665,5 +16007,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:852
 msgid "Edit Bollard"
 msgstr ""
@@ -15708,16 +16050,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:854 build/trans_presets.java:873
-#: build/trans_presets.java:887 build/trans_presets.java:909
-#: build/trans_presets.java:946 build/trans_presets.java:959
-#: build/trans_presets.java:971 build/trans_presets.java:983
-#: build/trans_presets.java:995 build/trans_presets.java:1007
-#: build/trans_presets.java:1017 build/trans_presets.java:1026
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:855 build/trans_presets.java:874
+#: build/trans_presets.java:888 build/trans_presets.java:910
+#: build/trans_presets.java:947 build/trans_presets.java:960
+#: build/trans_presets.java:972 build/trans_presets.java:984
+#: build/trans_presets.java:996 build/trans_presets.java:1008
+#: build/trans_presets.java:1018 build/trans_presets.java:1027
+#: build/trans_presets.java:1036
 msgid "Allowed traffic:"
 msgstr "Επιτρεπόμενα οχήματα:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:861
+#: build/trans_presets.java:862
 msgid "Cycle Barrier"
 msgstr ""
@@ -15726,5 +16068,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:865
+#: build/trans_presets.java:866
 msgid "Block"
 msgstr ""
@@ -15732,5 +16074,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:868
+#: build/trans_presets.java:869
 msgid "Cattle Grid"
 msgstr ""
@@ -15738,10 +16080,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:870
+#: build/trans_presets.java:871
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:880
+#: build/trans_presets.java:881
 msgid "Bus Trap"
 msgstr ""
@@ -15749,15 +16091,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:883
+#: build/trans_presets.java:884
 msgid "Spikes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:884
+#: build/trans_presets.java:885
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:896
 msgid "Toll Booth"
 msgstr "Σταθμός Διοδίων"
@@ -15765,5 +16107,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:897
+#: build/trans_presets.java:898
 msgid "Edit Toll Booth"
 msgstr "Επεξεργασία Σταθμού Διοδίων"
@@ -15771,10 +16113,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:905
+#: build/trans_presets.java:906
 msgid "Border Control"
 msgstr "Συνοριακός Σταθμός"
 
 #. item
-#: build/trans_presets.java:906
+#: build/trans_presets.java:907
 msgid "Edit Border Control"
 msgstr "Επεξεργασία Συνοριακού Σταθμού"
@@ -15784,5 +16126,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:920
+#: build/trans_presets.java:921
 msgid "Hedge"
 msgstr "Φράκτης θάμνων"
@@ -15791,5 +16133,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:925
 msgid "Fence"
 msgstr "Φράκτης"
@@ -15798,5 +16140,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:929
 msgid "Wall"
 msgstr "Τοίχος"
@@ -15804,5 +16146,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:931
+#: build/trans_presets.java:932
 msgid "City Wall"
 msgstr ""
@@ -15811,5 +16153,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:935
+#: build/trans_presets.java:936
 msgid "Retaining Wall"
 msgstr ""
@@ -15821,15 +16163,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:942
+#: build/trans_presets.java:943
 msgid "Entrance"
 msgstr "Είσοδος"
 
 #. item
-#: build/trans_presets.java:943
+#: build/trans_presets.java:944
 msgid "Edit Entrance"
 msgstr "Επεξεργασία Εισόδου"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:954
+#: build/trans_presets.java:955
 msgid "Gate"
 msgstr "Πύλη"
@@ -15837,50 +16179,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:956
+#: build/trans_presets.java:957
 msgid "Edit Gate"
 msgstr "Επεξεργασία Πύλης"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:967
+#: build/trans_presets.java:968
 msgid "Lift Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:968
+#: build/trans_presets.java:969
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:979
+#: build/trans_presets.java:980
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:980
+#: build/trans_presets.java:981
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:991
+#: build/trans_presets.java:992
 msgid "Bump Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:992
+#: build/trans_presets.java:993
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:1003
+#: build/trans_presets.java:1004
 msgid "Kissing Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1004
+#: build/trans_presets.java:1005
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1013
 msgid "Stile"
 msgstr ""
@@ -15888,25 +16230,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1014
+#: build/trans_presets.java:1015
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1023
 msgid "Turnstile"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1024
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1032
 msgid "Sally Port"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1033
 msgid "Edit Sally Port"
 msgstr ""
@@ -15914,13 +16256,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #.
-#. <separator/>
+#. group "Water"
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1046 build/trans_presets.java:1089
+#: build/trans_presets.java:1047 build/trans_presets.java:1048
+#: build/trans_presets.java:1091
 msgid "Water"
 msgstr "Νερό"
 
 #. group "Water"
-#: build/trans_presets.java:1047
+#: build/trans_presets.java:1049
 msgid "Spring"
 msgstr "Πηγή"
@@ -15928,5 +16271,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1049
+#: build/trans_presets.java:1051
 msgid "Edit Spring"
 msgstr "Επεξεργασία πηγής"
@@ -15934,5 +16277,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1056
 msgid "Drain"
 msgstr ""
@@ -15940,10 +16283,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1058
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1064
 msgid "Stream"
 msgstr "Υδατόρρευμα"
@@ -15951,10 +16294,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1066
 msgid "Edit Stream"
 msgstr "Επεξεργασία Υδατορρεύματος"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1072
 msgid "Canal"
 msgstr "Κανάλι"
@@ -15962,10 +16305,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1074
 msgid "Edit Canal"
 msgstr "Επεξεργασία Καναλιού"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1080
 msgid "River"
 msgstr "Ποταμός"
@@ -15975,5 +16318,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1084
 msgid "Edit River"
 msgstr "Επεξεργασία ποταμού"
@@ -15981,15 +16324,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1093
 msgid "Edit Water"
 msgstr "Επεξεργασία νερού"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1097
 msgid "Land"
 msgstr "Ξηρά"
 
 #. item
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1098
 msgid "Edit Land"
 msgstr "Επεξεργασία νερού"
@@ -15997,15 +16340,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1103
 msgid "Basin"
 msgstr "Λεκάνη"
 
 #. item
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1104
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1109
 msgid "Reservoir"
 msgstr "Ταμιευτήρας"
@@ -16013,15 +16356,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1109
+#: build/trans_presets.java:1111
 msgid "Edit Reservoir Landuse"
 msgstr "Επεξεργασία Ταμιευτήρα"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1116
 msgid "Covered Reservoir"
 msgstr "Καλυμένος Ταμιευτήρας"
 
 #. item
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1117
 msgid "Edit Covered Reservoir"
 msgstr "Επεξεργασία Καλυμένου Ταμιευτήρα"
@@ -16029,5 +16372,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1120
+#: build/trans_presets.java:1122
 msgid "Riverbank"
 msgstr "Όχθη ποταμού"
@@ -16036,10 +16379,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1125
 msgid "Edit Riverbank"
 msgstr "Επεξεργασία όχθης ποταμού"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1127
+#: build/trans_presets.java:1129
 msgid "Wetland"
 msgstr ""
@@ -16050,14 +16393,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1134
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "swamp"
 msgstr "Βάλτος"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "bog"
 msgstr ""
@@ -16071,35 +16414,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1135 build/trans_style.java:3384
+#: build/trans_presets.java:1137 build/trans_style.java:3392
 msgid "marsh"
 msgstr "έλος"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1139
 msgid "Mud"
 msgstr "Λάσπη"
 
 #. item
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1140
 msgid "Edit Mud"
 msgstr ""
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1144
 msgid "Beach"
 msgstr "Παραλία"
@@ -16107,20 +16450,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1144
+#: build/trans_presets.java:1146
 msgid "Edit Beach"
 msgstr "Επεξεργασία παραλίας"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1150
 msgid "Bay"
 msgstr "Όρμος"
 
 #. item
-#: build/trans_presets.java:1149
+#: build/trans_presets.java:1151
 msgid "Edit Bay"
 msgstr "Επεξεργασία όρμου"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1155
 msgid "Cliff"
 msgstr "Λόφος"
@@ -16128,10 +16471,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1157
 msgid "Edit Cliff"
 msgstr "Επεξεργασία λόφου"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1159
+#: build/trans_presets.java:1161
 msgid "Coastline"
 msgstr "Ακτογραμμή"
@@ -16139,5 +16482,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1163
 msgid "Edit Coastline"
 msgstr "Επεξεργασία Ακτογραμμής"
@@ -16145,5 +16488,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1168
 msgid "Ferry Route"
 msgstr ""
@@ -16151,5 +16494,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1170
 msgid "Edit Ferry"
 msgstr ""
@@ -16158,5 +16501,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1176
+#: build/trans_presets.java:1178
 msgid "Boatyard"
 msgstr ""
@@ -16164,10 +16507,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:1180
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1185
 msgid "Dock"
 msgstr ""
@@ -16175,5 +16518,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1187
 msgid "Edit Dock"
 msgstr ""
@@ -16181,5 +16524,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1193
 msgid "Dam"
 msgstr "Φράγμα"
@@ -16187,15 +16530,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1195
 msgid "Edit Dam"
 msgstr "Επεξεργασία Φweirράγματος"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1199
+#: build/trans_presets.java:1201
 msgid "Waterway Point"
 msgstr ""
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1202
 msgid "Lock Gate"
 msgstr ""
@@ -16204,5 +16547,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1206
 msgid "Weir"
 msgstr "Φράγμα εκτροπής"
@@ -16210,20 +16553,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1208
 msgid "Edit Weir"
 msgstr "Επεξεργασία φράγματος εκτροπής"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1213
 msgid "Waterfall"
 msgstr "Καταρράκτης"
 
 #. item
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1214
 msgid "Edit Waterfall"
 msgstr "Επεξεργασία Καταράκτη"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1219
 msgid "Turning Point"
 msgstr ""
@@ -16232,15 +16575,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1221
+#: build/trans_presets.java:1223
 msgid "Marina"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1224
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1228
 msgid "Pier"
 msgstr "Αποβάθρα"
@@ -16248,10 +16591,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1230
 msgid "Edit Pier"
 msgstr "Επεξεργασία Αποβάθρας"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1234
 msgid "Ferry Terminal"
 msgstr ""
@@ -16259,10 +16602,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1236
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1240
 msgid "Slipway"
 msgstr ""
@@ -16272,16 +16615,21 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1244
 msgid "Edit Slipway"
 msgstr ""
 
 #. item "Waterway Point/Slipway" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1250
+#, fuzzy
+msgid "Transport"
+msgstr "Μέσα Μαζικής Μεταφοράς"
+
+#. group "Transport"
+#: build/trans_presets.java:1251
 msgid "Railway"
 msgstr "Σιδηρόδρομος"
 
 #. group "Railway"
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1252
 msgid "Rail"
 msgstr "Σιδηροτροχιά"
@@ -16289,5 +16637,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:1254
 msgid "Edit Rail"
 msgstr "Επεξεργασία σιδηροτροχιάς"
@@ -16317,8 +16665,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "Optional Types"
 msgstr ""
@@ -16332,35 +16680,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1259
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1257
+#: build/trans_presets.java:1260
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1265
 msgid "Monorail"
 msgstr ""
@@ -16368,45 +16716,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1267
 msgid "Edit Monorail"
 msgstr ""
 
-#: build/trans_presets.java:1269
+#: build/trans_presets.java:1272
 msgid "Preserved"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1273
 msgid "Edit Preserved Railway"
 msgstr ""
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1278
 msgid "Light Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1279
 msgid "Edit Light Rail"
 msgstr ""
 
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1284
 msgid "Subway"
 msgstr "Υπόγειος Σιδηρόδρομος"
 
 #. item
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1285
 msgid "Edit Subway"
 msgstr "Επεξεργασία υπογείου σιδηροδρόμου"
 
-#: build/trans_presets.java:1287
+#: build/trans_presets.java:1290
 msgid "Tram"
 msgstr "Τραμ"
 
 #. item
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1291
 msgid "Edit Tram"
 msgstr "Επεξεργασία Τραμ"
 
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1296
 msgid "Bus Guideway"
 msgstr ""
@@ -16414,5 +16762,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1295
+#: build/trans_presets.java:1298
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -16421,14 +16769,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1315
 msgid "Disused Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1313
+#: build/trans_presets.java:1316
 msgid "Edit Disused Railway"
 msgstr ""
 
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1321
 msgid "Abandoned Rail"
 msgstr ""
@@ -16437,5 +16785,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1325
 msgid "Level Crossing"
 msgstr "Ισόπεδη διάβαση"
@@ -16444,5 +16792,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1329
 msgid "Crossing"
 msgstr "Φυλασόμενη Διάβαση"
@@ -16452,5 +16800,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1333
 msgid "Crossing type"
 msgstr "Είδος Διάβασης"
@@ -16458,5 +16806,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1339
 msgid "Turntable"
 msgstr "Περιστρεφόμενη πλατφόρμα"
@@ -16465,10 +16813,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1344
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1345
 msgid "Chair Lift"
 msgstr ""
@@ -16476,10 +16824,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1347
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1351
 msgid "Drag Lift"
 msgstr ""
@@ -16487,10 +16835,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1353
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1357
 msgid "Cable Car"
 msgstr ""
@@ -16498,10 +16846,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1359
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1360
+#: build/trans_presets.java:1363
 msgid "Gondola"
 msgstr ""
@@ -16509,5 +16857,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1365
 msgid "Edit Gondola"
 msgstr ""
@@ -16515,5 +16863,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1366 build/trans_presets.java:1461
+#: build/trans_presets.java:1369 build/trans_presets.java:1464
 msgid "Station"
 msgstr "Σταθμός"
@@ -16524,10 +16872,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1368 build/trans_presets.java:1464
+#: build/trans_presets.java:1371 build/trans_presets.java:1467
 msgid "Edit Station"
 msgstr "Επεξεργασία Σταθμού"
 
 #. group "Car"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1378
 msgid "Fuel"
 msgstr "Καύσιμα"
@@ -16537,5 +16885,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1382
 msgid "Edit Fuel"
 msgstr "Επεξεργασία καυσίμων"
@@ -16593,32 +16941,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1671 build/trans_presets.java:1678
-#: build/trans_presets.java:1686 build/trans_presets.java:1699
-#: build/trans_presets.java:1713 build/trans_presets.java:1810
-#: build/trans_presets.java:1818 build/trans_presets.java:1909
-#: build/trans_presets.java:1915 build/trans_presets.java:2226
-#: build/trans_presets.java:2250 build/trans_presets.java:2465
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1703
+#: build/trans_presets.java:1717 build/trans_presets.java:1814
+#: build/trans_presets.java:1822 build/trans_presets.java:1919
+#: build/trans_presets.java:1925 build/trans_presets.java:2237
+#: build/trans_presets.java:2261 build/trans_presets.java:2476
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Opening Hours"
 msgstr "Ώρες Λειτουργείας"
@@ -16677,91 +17025,91 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -16776,5 +17124,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1385 build/trans_presets.java:1438
+#: build/trans_presets.java:1388 build/trans_presets.java:1441
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -16784,5 +17132,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1391
 msgid "Edit Parking"
 msgstr "Επεξεργασία Χώρου Στάθμευσης"
@@ -16793,24 +17141,24 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1391 build/trans_presets.java:1762
-#: build/trans_presets.java:1772 build/trans_presets.java:2396
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:1394 build/trans_presets.java:1766
+#: build/trans_presets.java:1776 build/trans_presets.java:2407
+#: build/trans_presets.java:2524
 msgid "Reference number"
 msgstr "Αριθμός Αναφοράς"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "multi-storey"
 msgstr "πολυόροφο"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "surface"
 msgstr "επιφάνεια"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "underground"
 msgstr "υπόγειο"
 
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1396
 msgid "Park and Ride"
 msgstr ""
@@ -16819,38 +17167,38 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1394 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
+#: build/trans_presets.java:1397 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
 msgid "Fee"
 msgstr "Κόστος"
 
 #. <space />
-#: build/trans_presets.java:1396
+#: build/trans_presets.java:1399
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1400
 msgid "Spaces for Disabled"
 msgstr "Θέσεις αναπήρων"
 
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1401
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1402
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1403
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1405
 msgid "Wash"
 msgstr "Πλυντήριο"
 
 #. item
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1406
 msgid "Edit Car Wash"
 msgstr "Επεξεργασία πλυντηρίου"
@@ -16858,5 +17206,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1408 build/trans_presets.java:1452
+#: build/trans_presets.java:1411 build/trans_presets.java:1455
 msgid "Shop"
 msgstr "Κατάστημα"
@@ -16864,15 +17212,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1413
 msgid "Edit Car Shop"
 msgstr "Επεξεργασία Καταστήματος"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1418
 msgid "Repair"
 msgstr "Συνεργείο Αυτοκινήτων"
 
 #. item
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1419
 msgid "Edit Car Repair"
 msgstr "Επεξεργασία Συνεργείου Αυτοκινήτων"
@@ -16880,5 +17228,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1421 build/trans_presets.java:1445
+#: build/trans_presets.java:1424 build/trans_presets.java:1448
 msgid "Rental"
 msgstr "Ενοικίαση"
@@ -16887,10 +17235,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1427
 msgid "Edit Car Rental"
 msgstr "Επεξεργασία Ενοικίασης"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1432
 msgid "Sharing"
 msgstr "Κοινή χρήση"
@@ -16898,5 +17246,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1434
 msgid "Edit Car Sharing"
 msgstr "Επεξεργασία κοινής χρήσης αυτοκινήτου"
@@ -16904,10 +17252,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Parking"
 msgstr "Επεξεργασία χώρου στάθμευσης ποδηλάτων"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1446
 msgid "Capacity"
 msgstr "Χωρητικότητα"
@@ -16916,5 +17264,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1448
+#: build/trans_presets.java:1451
 msgid "Edit Bicycle Rental"
 msgstr "Επεξεργασία Ενοικίασης ποδηλάτων"
@@ -16923,15 +17271,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1458
 msgid "Edit Bicycle Shop"
 msgstr "Επεξεργασία Καταστήματος Ποδηλάτων"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1463
 msgid "Public Transport"
 msgstr "Μέσα Μαζικής Μεταφοράς"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:1472
 msgid "UIC-Reference"
 msgstr ""
@@ -16939,5 +17287,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1475
 msgid "Railway Halt"
 msgstr ""
@@ -16945,5 +17293,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1477
 msgid "Edit Halt"
 msgstr ""
@@ -16951,5 +17299,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1484
 msgid "Tram Stop"
 msgstr "Στάση Τραμ"
@@ -16958,5 +17306,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1484
+#: build/trans_presets.java:1487
 msgid "Edit Tram Stop"
 msgstr "Επεξεργασία Στάσης Τραμ"
@@ -16964,5 +17312,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1494
 msgid "Railway Platform"
 msgstr ""
@@ -16971,5 +17319,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1497
 msgid "Edit Railway Platform"
 msgstr ""
@@ -16981,5 +17329,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1497 build/trans_presets.java:1539
+#: build/trans_presets.java:1500 build/trans_presets.java:1542
 msgid "Reference (track number)"
 msgstr ""
@@ -16987,10 +17335,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1499 build/trans_presets.java:1541
+#: build/trans_presets.java:1502 build/trans_presets.java:1544
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1504
 msgid "Subway Entrance"
 msgstr "Είσοδος υπογείου σιδηρόδρομου"
@@ -16999,10 +17347,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1507
 msgid "Edit Subway Entrance"
 msgstr "Επεξεργασία εισόδου υπογείου σιδηρόδρομου"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1512
 msgid "Wheelchair"
 msgstr "Αναπηρικό καρότσι"
@@ -17011,5 +17359,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1517
 msgid "Bus Station"
 msgstr "Σταθμός Λεωφορείων"
@@ -17018,5 +17366,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1520
 msgid "Edit Bus Station"
 msgstr "Επεξεργασία Σταθμού Λεωφορείων"
@@ -17024,5 +17372,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1526
 msgid "Bus Stop"
 msgstr "Στάση Λεωφορείου"
@@ -17032,5 +17380,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1530
 msgid "Edit Bus Stop"
 msgstr "Επεξεργασία Στάσης Λεωφορείου"
@@ -17039,6 +17387,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1532 build/trans_presets.java:1785
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:1535 build/trans_presets.java:1789
+#: build/trans_presets.java:2453
 msgid "Shelter"
 msgstr "Καταφύγιο"
@@ -17046,10 +17394,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1538
 msgid "Bus Platform"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1539
 msgid "Edit Bus Platform"
 msgstr ""
@@ -17057,5 +17405,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1547
 msgid "Taxi"
 msgstr "Ταξί"
@@ -17063,5 +17411,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1549
 msgid "Edit Taxi station"
 msgstr "Επεξεργασία σταθμού ταξί"
@@ -17069,5 +17417,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1554
 msgid "Airport"
 msgstr "Αεροδρόμιο"
@@ -17075,15 +17423,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1556
 msgid "Edit Airport"
 msgstr "Επεξεργασία Αεροδρομίου"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1561
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1559
+#: build/trans_presets.java:1562
 msgid "ICAO"
 msgstr "ICAO"
@@ -17091,6 +17439,11 @@
 #. item "Public Transport/Airport" text "ICAO"
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1567
+#, fuzzy
+msgid "Travel"
+msgstr "χαλίκι"
+
+#. group "Travel"
+#: build/trans_presets.java:1568
 msgid "Accomodation"
 msgstr "Διαμονή"
@@ -17102,5 +17455,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1565 build/trans_surveyor.java:43
+#: build/trans_presets.java:1569 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Ξενοδοχείο"
@@ -17109,15 +17462,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:1568
+#: build/trans_presets.java:1572
 msgid "Edit Hotel"
 msgstr "Επεξεργασία Ξενοδοχείου"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1575
 msgid "Stars"
 msgstr "Αστέρια"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1577
 msgid "Motel"
 msgstr ""
@@ -17125,20 +17478,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1579
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1583
 msgid "Guest House"
 msgstr "Ξενώνας"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1584
 msgid "Edit Guest House"
 msgstr "Επεξεργασία Ξενώνα"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1588
 msgid "Chalet"
 msgstr "Σαλέ"
@@ -17146,10 +17499,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1590
 msgid "Edit Chalet"
 msgstr "Επεξεργασία Σαλέ"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1594
 msgid "Hostel"
 msgstr ""
@@ -17157,30 +17510,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1592
+#: build/trans_presets.java:1596
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1600
 msgid "Alpine Hut"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1601
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1606
 msgid "Caravan Site"
 msgstr "Χώρος Τροχόσπιτων"
 
 #. item
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1607
 msgid "Edit Caravan Site"
 msgstr "Επεξεργασία Χώρου Τροχόσπιτων"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1611
 msgid "Camping Site"
 msgstr "Χώρος Κάμπινγκ"
@@ -17188,10 +17541,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1613
 msgid "Edit Camping Site"
 msgstr "Επεξεργασία Χώρου Κάμπινγκ"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1618
 msgid "Food+Drinks"
 msgstr "Φαγητό+Ποτά"
@@ -17202,5 +17555,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1615 build/trans_surveyor.java:47
+#: build/trans_presets.java:1619 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Εστιατόριο"
@@ -17208,5 +17561,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1621
 msgid "Edit Restaurant"
 msgstr "Επεξεργασία Εστιατορίου"
@@ -17214,5 +17567,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "Cuisine"
 msgstr "Κουζίνα"
@@ -17220,61 +17573,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "italian"
 msgstr "ιταλική"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "chinese"
 msgstr "κινέζικη"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "greek"
 msgstr "ελληνική"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "german"
 msgstr "γερμανική"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "indian"
 msgstr "ινδική"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "regional"
 msgstr "τοπική"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "turkish"
 msgstr "τουρκική"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "asian"
 msgstr "ασιατική"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "thai"
 msgstr "ταϊλανδέζικη"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "mexican"
 msgstr "μεξικάνικη"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "japanese"
 msgstr "ιαπωνική"
 
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1627
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -17282,9 +17635,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1629
 msgid "Edit Fast Food Restaurant"
 msgstr "Επεξεργασία Εστιατορίου Fast Food"
 
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1635
 msgid "Cafe"
 msgstr "Καφέ"
@@ -17292,9 +17645,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1633
+#: build/trans_presets.java:1637
 msgid "Edit Cafe"
 msgstr "Επεξεργασία Καφέ"
 
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1642
 msgid "Pub"
 msgstr "Pub"
@@ -17302,18 +17655,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1644
 msgid "Edit Pub"
 msgstr "Επεξεργασία Pub"
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1649
 msgid "Biergarten"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1646
+#: build/trans_presets.java:1650
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1655
 msgid "Bar"
 msgstr "Μπαρ"
@@ -17321,9 +17674,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1657
 msgid "Edit Bar"
 msgstr "Επεξεργασία Μπαρ"
 
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1662
 msgid "Nightclub"
 msgstr "Νυχτερινό Κέντρο"
@@ -17331,24 +17684,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1664
 msgid "Edit Nightclub"
 msgstr "Νυχτερινό Κέντρο"
 
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1670
 msgid "Tourism"
 msgstr "Τουρισμός"
 
 #. group "Tourism"
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1671
 msgid "Attraction"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1672
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1677
 msgid "Museum"
 msgstr "Μουσείο"
@@ -17356,9 +17709,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1679
 msgid "Edit Museum"
 msgstr "Επεξεργασία Μουσείου"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1684
 msgid "Zoo"
 msgstr "Ζωολογικός Κήπος"
@@ -17367,9 +17720,9 @@
 #. <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:1683
+#: build/trans_presets.java:1687
 msgid "Edit Zoo"
 msgstr "Επεξεργασία Ζωολογικού Κήπου"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1692
 msgid "Viewpoint"
 msgstr ""
@@ -17377,24 +17730,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1694
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1697
 msgid "Look-Out Tower"
 msgstr "Πύργος Παρατήρησης"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1699
 msgid "Theme Park"
 msgstr "Θεματικό Πάρκο"
 
 #. item
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1700
 msgid "Edit Theme Park"
 msgstr "Επεξεργασία Θεματικού Πάρκου"
 
-#: build/trans_presets.java:1701
+#: build/trans_presets.java:1705
 msgid "Artwork"
 msgstr ""
@@ -17402,5 +17755,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1707
 msgid "Edit Artwork"
 msgstr ""
@@ -17408,19 +17761,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1712
 msgid "Information Office"
 msgstr "Γραφείο Πληροφοριών"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1719
 msgid "Map"
 msgstr "Χάρτης"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "topo"
 msgstr ""
@@ -17458,5 +17811,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1720 build/trans_style.java:619
+#: build/trans_presets.java:1724 build/trans_style.java:619
 #: build/trans_style.java:635 build/trans_style.java:651
 #: build/trans_style.java:659
@@ -17464,28 +17817,28 @@
 msgstr "οδός"
 
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1722 build/trans_presets.java:1738
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1726 build/trans_presets.java:1742
+#: build/trans_presets.java:1786
 msgid "Closer Description"
 msgstr ""
@@ -17495,5 +17848,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1724 build/trans_presets.java:1747
+#: build/trans_presets.java:1728 build/trans_presets.java:1751
 msgid "Routes shown for:"
 msgstr ""
@@ -17501,6 +17854,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1726 build/trans_presets.java:1749
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1965
 msgid "Cycling"
 msgstr "Ποδηλασία"
@@ -17508,5 +17861,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1727 build/trans_presets.java:1750
+#: build/trans_presets.java:1731 build/trans_presets.java:1754
 msgid "Mountainbiking"
 msgstr ""
@@ -17514,6 +17867,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1728 build/trans_presets.java:1751
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:1732 build/trans_presets.java:1755
+#: build/trans_presets.java:2019
 msgid "Skiing"
 msgstr ""
@@ -17521,5 +17874,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1729 build/trans_presets.java:1752
+#: build/trans_presets.java:1733 build/trans_presets.java:1756
 msgid "Riding"
 msgstr ""
@@ -17527,46 +17880,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1734 build/trans_presets.java:1757
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1736
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "history"
 msgstr "ιστορία"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1744
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1759
 msgid "Information Terminal"
 msgstr ""
@@ -17574,29 +17927,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1760 build/trans_presets.java:1770
+#: build/trans_presets.java:1764 build/trans_presets.java:1774
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1769
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1779
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1780
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1778
+#: build/trans_presets.java:1782
 msgid "Other Information Points"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1790
 msgid "Edit Shelter"
 msgstr ""
@@ -17604,25 +17957,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1789 build/trans_presets.java:1795
+#: build/trans_presets.java:1793 build/trans_presets.java:1799
 msgid "Fireplace"
 msgstr "Τζάκι"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1791
+#: build/trans_presets.java:1795
 msgid "Picnic Site"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1796
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1802
 msgid "Historic Places"
 msgstr "Ιστορικά Σημεία"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1799
+#: build/trans_presets.java:1803
 msgid "Castle"
 msgstr "Κάστρο"
@@ -17631,19 +17984,19 @@
 #. <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:1802
+#: build/trans_presets.java:1806
 msgid "Edit Castle"
 msgstr "Επεξεργασία Κάστρου"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1810
 msgid "Ruins"
 msgstr "Ερείπια"
 
 #. item
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1811
 msgid "Edit Ruins"
 msgstr "Επεξεργασία Ερειπίων"
 
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1816
 msgid "Archaeological Site"
 msgstr "Αρχαιολογικός Χώρος"
@@ -17652,9 +18005,9 @@
 #. <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:1815
+#: build/trans_presets.java:1819
 msgid "Edit Archaeological Site"
 msgstr "Επεξεργασία Αρχαιολογικού Χώρου"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1824
 msgid "Battlefield"
 msgstr "Πεδίο Μάχης"
@@ -17662,5 +18015,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1826
 msgid "Edit Battlefield"
 msgstr "Επεξεργασία Πεδίου Μάχης"
@@ -17668,15 +18021,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1831
 msgid "Monument"
 msgstr "Μνημείο"
 
 #. item
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1832
 msgid "Edit Monument"
 msgstr "Επεξεργασία Μνημείου"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1836
 msgid "Memorial"
 msgstr "Ηρώο"
@@ -17684,45 +18037,57 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1838
 msgid "Edit Memorial"
 msgstr "Επεξεργασία Ηρώου"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1842
 msgid "Wayside Cross"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1843
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1847
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1848
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1852
+#, fuzzy
+msgid "Boundary Stone"
+msgstr "Όρια"
+
+#. item
+#: build/trans_presets.java:1853
+#, fuzzy
+msgid "Edit Boundary Stone"
+msgstr "Επεξεργασία Στάσης Λεωφορείου"
+
+#. item "Historic Places/Boundary Stone" text "Name"
+#: build/trans_presets.java:1858
 msgid "Leisure"
 msgstr "Αναψυχή"
 
 #. group "Leisure"
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1859
 msgid "Water Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1860
 msgid "Edit Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1864
 msgid "Playground"
 msgstr "Παιδική Χαρά"
@@ -17730,31 +18095,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1866
 msgid "Edit Playground"
 msgstr "Επεξεργασία Παιδικής Χαράς"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1870
 msgid "Fishing"
 msgstr "Ψάρεμα"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1871
 msgid "Edit Fishing"
 msgstr "Επεξεργασία Ψαρέματος"
 
 #. item "Leisure/Fishing" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1877 build/trans_presets.java:2669
+msgid "Sports"
+msgstr "Αθλητικά"
+
+#. group "Sports"
+#: build/trans_presets.java:1878
 msgid "Sport Facilities"
 msgstr "Χώροι Άθλησης"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1879
 msgid "Stadium"
 msgstr "Στάδιο"
 
 #. item
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1880
 msgid "Edit Stadium"
 msgstr "Επεξεργασία Σταδίου"
@@ -17768,6 +18137,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1874 build/trans_presets.java:1883
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1902 build/trans_presets.java:1911
 msgid "select sport:"
 msgstr "επιλέξτε άθλημα:"
@@ -18159,30 +18528,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884 build/trans_style.java:3892
-#: build/trans_style.java:3900 build/trans_style.java:3908
-#: build/trans_style.java:3916 build/trans_style.java:3924
-#: build/trans_style.java:3932
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_style.java:3572 build/trans_style.java:3580
+#: build/trans_style.java:3588 build/trans_style.java:3596
+#: build/trans_style.java:3604 build/trans_style.java:3612
+#: build/trans_style.java:3620 build/trans_style.java:3628
+#: build/trans_style.java:3636 build/trans_style.java:3644
+#: build/trans_style.java:3652 build/trans_style.java:3660
+#: build/trans_style.java:3668 build/trans_style.java:3676
+#: build/trans_style.java:3684 build/trans_style.java:3692
+#: build/trans_style.java:3700 build/trans_style.java:3708
+#: build/trans_style.java:3716 build/trans_style.java:3724
+#: build/trans_style.java:3732 build/trans_style.java:3740
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3764 build/trans_style.java:3772
+#: build/trans_style.java:3780 build/trans_style.java:3788
+#: build/trans_style.java:3796 build/trans_style.java:3804
+#: build/trans_style.java:3812 build/trans_style.java:3820
+#: build/trans_style.java:3828 build/trans_style.java:3836
+#: build/trans_style.java:3844 build/trans_style.java:3852
+#: build/trans_style.java:3860 build/trans_style.java:3868
+#: build/trans_style.java:3876 build/trans_style.java:3884
+#: build/trans_style.java:3892 build/trans_style.java:3900
+#: build/trans_style.java:3908 build/trans_style.java:3916
+#: build/trans_style.java:3924 build/trans_style.java:3932
+#: build/trans_style.java:3940
 msgid "sport"
 msgstr "άθληση"
@@ -18192,225 +18561,225 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "archery"
 msgstr "τοξοβολία"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "basketball"
 msgstr "Καλαθοσφαίρηση"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "canoe"
 msgstr "Κανόε"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "climbing"
 msgstr "αναρρήχηση"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cycling"
 msgstr "ποδηλασία"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "dog_racing"
 msgstr "κυνοδρομίες"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "football"
 msgstr "ποδόσφαιρο"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "shooting"
 msgstr "σκοποβολή"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skiing"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "soccer"
 msgstr "ποδόσφαιρο"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "swimming"
 msgstr "κολύμβηση"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "table_tennis"
 msgstr "επιτραπέζια αντισφαίρηση"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "tennis"
 msgstr "αντισφαίρηση"
 
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1888
 msgid "Sports Centre"
 msgstr "Αθλητικό Κέντρο"
 
 #. item
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1889
 msgid "Edit Sports Centre"
 msgstr "Επεξεργασία Αθλητικού Κέντρου"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1897
 msgid "Pitch"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1898
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1906
 msgid "Racetrack"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1907
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1915
 msgid "Golf Course"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1916
 msgid "Edit Golf Course"
 msgstr ""
 
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1921
 msgid "Miniature Golf"
 msgstr "Μίνι Golf"
 
 #. item
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1922
 msgid "Edit Miniature Golf"
 msgstr "Επεξεργασία Μίνι Golf"
 
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1928
 msgid "Sport"
 msgstr "Άθλημα"
 
 #. group "Sport"
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1929
 msgid "Multi"
 msgstr "Πολλαπλά"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1930
 msgid "Edit Multi"
 msgstr ""
@@ -18449,183 +18818,183 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "sports_centre"
 msgstr "αθλητικό κέντρο"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "stadium"
 msgstr "στάδιο"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1935
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1936
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1941
 msgid "Athletics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1942
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1947
 msgid "Archery"
 msgstr "Τοξοβολία"
 
 #. item
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1948
 msgid "Edit Archery"
 msgstr "Επεξεργασία τοξοβολίας"
 
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1953
 msgid "Climbing"
 msgstr "Αναρρήχηση"
 
 #. item
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:1954
 msgid "Edit Climbing"
 msgstr "Επεξεργασία Αναρρήχησης"
 
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1959
 msgid "Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1960
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1966
 msgid "Edit Cycling"
 msgstr "Επεξεργασία Ποδηλασίας"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1971
 msgid "Dog Racing"
 msgstr "Κυνοδρομίες"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1972
 msgid "Edit Dog Racing"
 msgstr "Επεξεργασία Κυνοδρομιών"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1977
 msgid "Equestrian"
 msgstr "Ιππικό"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1978
 msgid "Edit Equestrian"
 msgstr "Επεξεργασία Ιππικού"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1983
 msgid "Horse Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1984
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1989
 msgid "Gymnastics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1990
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1995
 msgid "Motor Sports"
 msgstr "Μηχανοκίνητα Αθλήματα"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1996
 msgid "Edit Motor Sports"
 msgstr "Επεξεργασία Μηχανοικίνητων  Αθλημάτων"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2001
 msgid "Skating"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2002
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2007
 msgid "Skateboard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2008
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2013
 msgid "Swimming"
 msgstr "Κολύμβηση"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2014
 msgid "Edit Swimming"
 msgstr "Επεξεργασία Κολύμβησης"
@@ -18633,56 +19002,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2021
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "Difficulty"
 msgstr "Δυσκολία"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "novice"
 msgstr "αρχαρίων"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "easy"
 msgstr "εύκολη"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2028
 msgid "Shooting"
 msgstr "Σκοποβολή"
@@ -18690,178 +19059,182 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2030
 msgid "Edit Shooting"
 msgstr "Επεξεργασία Σκοποβολής"
 
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2036
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2037
 msgid "Soccer"
 msgstr "Ποδόσφαιρο"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2038
 msgid "Edit Soccer"
 msgstr "Επεξεργασία Ποδοσφαίρου"
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2043
 msgid "Football"
 msgstr "Ποδόσφαιρο"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2044
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2049
 msgid "Australian Football"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2050
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2055
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2056
 msgid "Edit Baseball"
 msgstr "Επεξεργασία Baseball"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2061
 msgid "Basketball"
 msgstr "Καλαθοσφαίρηση"
 
 #. item
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2062
 msgid "Edit Basketball"
 msgstr "Επεξεργασία Καλαθοσφαίρησης"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2067
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2068
 msgid "Edit Golf"
 msgstr "Επεξεργασία Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2071
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2073
 msgid "Boule"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2074
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2079
 msgid "Bowls"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2080
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2085
 msgid "Cricket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2086
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2091
 msgid "Cricket Nets"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2092
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2097
 msgid "Croquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2098
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2103
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2104
 msgid "Edit Hockey"
 msgstr "Επεξεργασία Hockey"
 
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2109
 msgid "Pelota"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2110
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2105
+#: build/trans_presets.java:2115
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2116
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2121
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2122
 msgid "Edit Rugby"
 msgstr "Επεξεργασία Rugby"
 
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2127
 msgid "Table Tennis"
 msgstr "Επιτραπέζια Αντισφαίριση"
 
 #. item
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2128
 msgid "Edit Table Tennis"
 msgstr "Επεξεργασία Επιτραπέζιας Αντισφαίρισης"
 
-#: build/trans_presets.java:2123
+#: build/trans_presets.java:2133
 msgid "Tennis"
 msgstr "Αντισφαίριση"
 
 #. item
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2134
 msgid "Edit Tennis"
 msgstr "Επεξεργασία Αντισφαίρισης"
 
-#. <separator/>
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2141
+msgid "Man-Made"
+msgstr ""
+
+#. group "Man-Made"
+#: build/trans_presets.java:2142
 msgid "Buildings"
 msgstr "Κτήρια"
 
 #. group "Buildings"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2143
 msgid "Building"
 msgstr "Κτήριο"
@@ -18869,5 +19242,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Public Building"
 msgstr "Δημόσιο Κτήριο"
@@ -18875,10 +19248,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2148
 msgid "Edit Public Building"
 msgstr "Επεξεργασία Δημοσίου Κτηρίου"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2152
 msgid "Town hall"
 msgstr "Δημαρχείο"
@@ -18886,10 +19259,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2154
 msgid "Edit Town hall"
 msgstr "Επεξεργασία Δημαρχείου"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:2158
 msgid "Embassy"
 msgstr "Πρεσβεία"
@@ -18897,10 +19270,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Edit Embassy"
 msgstr "Επεξεργασία Πρεσβείας"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2164
 msgid "Courthouse"
 msgstr "Δικαστήρια"
@@ -18909,10 +19282,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:2156
+#: build/trans_presets.java:2167
 msgid "Edit Courthouse"
 msgstr "Επεξεργασία Δικαστηρίων"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2171
 msgid "Prison"
 msgstr "Φυλακή"
@@ -18921,10 +19294,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:2163
+#: build/trans_presets.java:2174
 msgid "Edit Prison"
 msgstr "Επεξεργασία Φυλακής"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2178
 msgid "Police"
 msgstr "Αστυνομία"
@@ -18934,10 +19307,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:2171
+#: build/trans_presets.java:2182
 msgid "Edit Police"
 msgstr "Επεξεργασία Αστυνομίας"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2186
 msgid "Fire Station"
 msgstr "Πυροσβεστείο"
@@ -18946,10 +19319,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:2178
+#: build/trans_presets.java:2189
 msgid "Edit Fire Station"
 msgstr "Επεξεργασία Πυροσβεστείου"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "Post Office"
 msgstr "Ταχυδρομείο"
@@ -18957,5 +19330,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Edit Post Office"
 msgstr "Επεξεργασία Ταχυδρομείου"
@@ -18963,15 +19336,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2200
 msgid "Kindergarten"
 msgstr "Νηπιαγωγίο"
 
 #. item
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Kindergarten"
 msgstr "Επεξεργασία Νηπιαγωγίου"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2205
 msgid "School"
 msgstr "Σχολείο"
@@ -18979,10 +19352,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Edit School"
 msgstr "Επεξεργασία Σχολείου"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2211
 msgid "University"
 msgstr "Πανεπιστήμιο"
@@ -18990,10 +19363,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit University"
 msgstr "Επεξεργασία Πανεπιστημίου"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "College"
 msgstr "Κολέγιο"
@@ -19001,5 +19374,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2219
 msgid "Edit College"
 msgstr "Επεξεργασία Κολεγίου"
@@ -19007,5 +19380,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2224
 msgid "Cinema"
 msgstr "Κινηματογράφος"
@@ -19014,10 +19387,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:2216
+#: build/trans_presets.java:2227
 msgid "Edit Cinema"
 msgstr "Επεξεργασία Κινηματογράφου"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2231
 msgid "Library"
 msgstr "Βιβλιοθήκη"
@@ -19026,9 +19399,9 @@
 #. <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:2223
+#: build/trans_presets.java:2234
 msgid "Edit Library"
 msgstr "Επεξεργασία Βιβλιοθήκης"
 
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Arts Centre"
 msgstr "Κέντρο Τεχνών"
@@ -19036,10 +19409,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Arts Centre"
 msgstr "Επεξεργασία Κέντρου Τεχνών"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Theatre"
 msgstr "Θέατρο"
@@ -19048,10 +19421,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:2237
+#: build/trans_presets.java:2248
 msgid "Edit Theatre"
 msgstr "Επεξεργασία Θεάτρου"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2252
 msgid "Place of Worship"
 msgstr "Τόπος Λατρείας"
@@ -19061,5 +19434,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:2245
+#: build/trans_presets.java:2256
 msgid "Edit Place of Worship"
 msgstr "Επεξεργασία Τόπου Λατρείας"
@@ -19068,6 +19441,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "Religion"
 msgstr "Θρησκεία"
@@ -19076,66 +19449,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "buddhist"
 msgstr "βουδισμός"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "christian"
 msgstr "χριστιανισμός"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "hindu"
 msgstr "ινδουϊσμός"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jewish"
 msgstr "ιουδαϊσμός"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "muslim"
 msgstr "μουσουλμανισμός"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "taoist"
 msgstr "ταοϊσμός"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "Denomination"
 msgstr "Δόγμα"
@@ -19144,81 +19517,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "anglican"
 msgstr "αγγλικανικό"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "baptist"
 msgstr "βαπτιστικό"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "catholic"
 msgstr "καθολικό"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "evangelical"
 msgstr "ευαγγελικό"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "jehovahs_witness"
 msgstr "μαρτύρων του Ιεχοβά"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "lutheran"
 msgstr "λουθερανικό"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "orthodox"
 msgstr "ορθόδοξο"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "pentecostal"
 msgstr "πεντηκωστής"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "protestant"
 msgstr "προτεσταντικό"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2264
 msgid "Addresses"
 msgstr "Διευθύνσεις"
@@ -19227,5 +19600,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:2256
+#: build/trans_presets.java:2267
 msgid "Edit Address Information"
 msgstr "Επεξεργασία διεύθυνσης"
@@ -19233,5 +19606,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2269
 msgid "House number"
 msgstr "Αριθμός σπιτιού"
@@ -19239,20 +19612,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "House name"
 msgstr "Όνομα Σπιτιού"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "City name"
 msgstr "Όνομα πόλης"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2274
 msgid "Post code"
 msgstr "Ταχυδρομικός Κώδικας"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2275
 msgid "Country code"
 msgstr "Κωδικός χώρας"
@@ -19260,5 +19633,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Address Interpolation"
 msgstr "Παρεμβολή Διευθύνσεων"
@@ -19267,5 +19640,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:2270
+#: build/trans_presets.java:2281
 msgid "Edit Address Interpolation"
 msgstr "Επεξεργασία Παρεμβολής Διευθύνσεων"
@@ -19273,67 +19646,67 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "Numbering scheme"
 msgstr "Τρόπος Αρίθμησης"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "odd"
 msgstr "Μονά"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "even"
 msgstr "Ζυγά"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2286
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Works"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2288
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2292
 msgid "Tower"
 msgstr "Πύργος"
 
 #. item
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2293
 msgid "Edit Tower"
 msgstr "Επεξεργασία Πύργου"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Water Tower"
 msgstr "Υδραγωγείο"
 
 #. item
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2298
 msgid "Edit Water Tower"
 msgstr "Επεξεργασία Υδραγωγείου"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Gasometer"
 msgstr "Μετρητής Αερίου"
 
 #. item
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2303
 msgid "Edit Gasometer"
 msgstr "Επεξεργασία Μετρητή Αερίου"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Lighthouse"
 msgstr "Φάρος"
@@ -19341,10 +19714,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2309
 msgid "Edit Lighthouse"
 msgstr "Επεξεργασία Φάρου"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Windmill"
 msgstr "Ανεμόμυλος"
@@ -19352,10 +19725,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2315
 msgid "Edit Windmill"
 msgstr "Επεξεργασία Ανεμόμυλου"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2319
 msgid "Pipeline"
 msgstr "Αγωγός"
@@ -19363,10 +19736,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Edit Pipeline"
 msgstr "Επεξεργασία Αγωγού"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2325
 msgid "Wastewater Plant"
 msgstr "Βιολογικός Καθαρισμός"
@@ -19376,10 +19749,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:2318
+#: build/trans_presets.java:2329
 msgid "Edit Wastewater Plant"
 msgstr "Επεξεργασία Βιολογικού Καθαρισμού"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2333
 msgid "Crane"
 msgstr "Γερανός"
@@ -19387,10 +19760,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2335
 msgid "Edit Crane"
 msgstr "Επεξεργασία Γερανού"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Beacon"
 msgstr "Φάρος"
@@ -19398,10 +19771,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2341
 msgid "Edit Beacon"
 msgstr "Επεξεργασία Φάρου"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2345
 msgid "Survey Point"
 msgstr ""
@@ -19409,10 +19782,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2351
 msgid "Surveillance"
 msgstr "Παρακολούθηση"
@@ -19420,5 +19793,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2353
 msgid "Edit Surveillance Camera"
 msgstr "Επεξεργασία Κάμερας Παρακολούθησης"
@@ -19426,5 +19799,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Power Generator"
 msgstr "Γεννήτρια Ρεύματος"
@@ -19434,39 +19807,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:2351
+#: build/trans_presets.java:2362
 msgid "Edit Power Generator"
 msgstr "Επεξεργασία Γεννήτριας Ρεύματος"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "wind"
 msgstr "Αέρας"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "hydro"
 msgstr "Νερό"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "nuclear"
 msgstr "Πυρηνικό"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "coal"
 msgstr "Λιγνίτης"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "photovoltaic"
 msgstr "Φωτοβολταϊκό"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "gas"
 msgstr "Αέριο"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2367
 msgid "Power Station"
 msgstr "Σταθμός Παραγωγής Ρεύματος"
@@ -19475,10 +19848,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:2359
+#: build/trans_presets.java:2370
 msgid "Edit Power Station"
 msgstr "Επεξεργασία Σταθμού Παραγωγής Ρεύματος"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2374
 msgid "Power Sub Station"
 msgstr "Υποσταθμός Ρεύματος"
@@ -19487,5 +19860,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:2366
+#: build/trans_presets.java:2377
 msgid "Edit Power Sub Station"
 msgstr "Επεξεργασία Υποσταθμού Ρεύματος"
@@ -19493,10 +19866,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2369 build/trans_presets.java:2385
+#: build/trans_presets.java:2380 build/trans_presets.java:2396
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2382
 msgid "Power Tower"
 msgstr "Πυλώνας Ρεύματος"
@@ -19507,5 +19880,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:2376
+#: build/trans_presets.java:2387
 msgid "Edit Power Tower"
 msgstr "Επεξεργασία Πυλώνα Ρεύματος"
@@ -19513,5 +19886,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2390
 msgid "Power Line"
 msgstr "Αγωγός Μεταφοράς Ρεύματος"
@@ -19520,40 +19893,40 @@
 #. <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:2382
+#: build/trans_presets.java:2393
 msgid "Edit Power Line"
 msgstr "Επεξεργασία Αγωγού Μεταφοράς Ρεύματος"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Voltage"
 msgstr "Τάση ρεύματος"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2398
 msgid "Amount of Wires"
 msgstr "Ποσότητα Αγωγών"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2402
 msgid "Toilets"
 msgstr "Τουαλέτες"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2398 build/trans_presets.java:2514
+#: build/trans_presets.java:2409 build/trans_presets.java:2525
 msgid "Note"
 msgstr "Σημείωση"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2411
 msgid "Post Box"
 msgstr "Γραμματοκιβώτιο"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2416
 msgid "Telephone"
 msgstr "Τηλέφωνο"
@@ -19562,5 +19935,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:2408
+#: build/trans_presets.java:2419
 msgid "Edit Telephone"
 msgstr "Επεξεργασία Τηλεφώνου"
@@ -19568,5 +19941,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2411 build/trans_presets.java:2515
+#: build/trans_presets.java:2422 build/trans_presets.java:2526
 msgid "Coins"
 msgstr "Κέρματα"
@@ -19574,5 +19947,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2412 build/trans_presets.java:2516
+#: build/trans_presets.java:2423 build/trans_presets.java:2527
 msgid "Notes"
 msgstr "Χαρτονομίσματα"
@@ -19580,5 +19953,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2413 build/trans_presets.java:2517
+#: build/trans_presets.java:2424 build/trans_presets.java:2528
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -19586,5 +19959,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2414 build/trans_presets.java:2518
+#: build/trans_presets.java:2425 build/trans_presets.java:2529
 msgid "Debit cards"
 msgstr "Χρεωστικές Κάρτεσ"
@@ -19592,15 +19965,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2415 build/trans_presets.java:2519
+#: build/trans_presets.java:2426 build/trans_presets.java:2530
 msgid "Credit cards"
 msgstr "Πιστωτικές Κάρτες"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2427
 msgid "Telephone cards"
 msgstr "Τηλεκάρτες"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2429
 msgid "Recycling"
 msgstr "Ανακύκλωση"
@@ -19609,5 +19982,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:2421
+#: build/trans_presets.java:2432
 msgid "Edit Recycling station"
 msgstr "Επεξεργασία σταθμού Ανακύκλωσης"
@@ -19615,35 +19988,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Batteries"
 msgstr "Μπαταρίες"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2435
 msgid "Cans"
 msgstr "Τενεκεδάκια"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Clothes"
 msgstr "Ρούχα"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2437
 msgid "Glass"
 msgstr "Γυαλί"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2438
 msgid "Paper"
 msgstr "Χαρτί"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2439
 msgid "Scrap Metal"
 msgstr "Μέταλλα"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2441
 msgid "Bench"
 msgstr "Παγκάκι"
@@ -19652,40 +20025,33 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2433
-#, fuzzy
+#: build/trans_presets.java:2444
 msgid "Backrest"
-msgstr "Πίσω"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "Material"
-msgstr "Ηρώο"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2434
-#, fuzzy
+#: build/trans_presets.java:2445
 msgid "stone"
-msgstr "καμοία"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "plastic"
-msgstr "Βασικό"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "Colour"
-msgstr "Χρώμα"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "black"
-msgstr "Πίσω"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "brown"
-msgstr "κάτω"
+msgstr ""
 
 #. color historic
@@ -19754,39 +20120,35 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2435 build/trans_style.java:3055
-#: build/trans_style.java:3063 build/trans_style.java:3071
-#: build/trans_style.java:3079 build/trans_style.java:3127
-#: build/trans_style.java:3135 build/trans_style.java:3233
-#: build/trans_style.java:3241
+#: build/trans_presets.java:2446 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3135
+#: build/trans_style.java:3143 build/trans_style.java:3241
+#: build/trans_style.java:3249
 msgid "green"
 msgstr ""
 
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "red"
-msgstr "τέλος"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "blue"
-msgstr "Τιμή"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "white"
-msgstr "νερό"
-
-#: build/trans_presets.java:2436
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2447
 msgid "Amount of Seats"
-msgstr "Ποσότητα Αγωγών"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2449
 msgid "Hunting Stand"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2450
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -19795,30 +20157,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2441 build/trans_presets.java:2902
+#: build/trans_presets.java:2452 build/trans_presets.java:2914
 msgid "Height"
 msgstr "Ύψος"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "low"
 msgstr "χαμηλό"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "half"
 msgstr "μισό"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "full"
 msgstr "πλήρες"
 
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2454
 msgid "Hide"
 msgstr "Κρυψώνα"
 
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2455
 msgid "Lock"
 msgstr "Κλειδαριά"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Fountain"
 msgstr "Συντριβάνι"
@@ -19827,10 +20189,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:2449
+#: build/trans_presets.java:2460
 msgid "Edit Fountain"
 msgstr "Επεξεργασία Συντριβανίου"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2464
 msgid "Drinking Water"
 msgstr "Πόσιμο Νερό"
@@ -19839,10 +20201,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:2456
+#: build/trans_presets.java:2467
 msgid "Edit Drinking Water"
 msgstr "Επεξεργασία πόσιμου νερού"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2471
 msgid "Baby Hatch"
 msgstr "Βρεφοδόχος"
@@ -19850,33 +20212,33 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Baby Hatch"
 msgstr "Επεξεργασία Βρεφοδόχου"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2479
 msgid "Shops"
 msgstr "Καταστήματα"
 
 #. group "Shops"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2480
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2481
 msgid "Edit Supermarket"
 msgstr "Επεξεργασία Supermarket"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2486
 msgid "Chemist"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2487
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2492
 msgid "Convenience Store"
 msgstr ""
@@ -19884,9 +20246,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2499
 msgid "Kiosk"
 msgstr "Περίπτερο"
@@ -19894,27 +20256,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Kiosk"
 msgstr "Επεξεργασία Περιπτέρου"
 
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Book Store"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2507
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2512
 msgid "Travel Agency"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2513
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2518
 msgid "Vending machine"
 msgstr "Μηχάνημα Πώλησης"
@@ -19922,5 +20284,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Edit Vending machine"
 msgstr "Επεξεργασία Μηχανήματος Πώλησης"
@@ -19928,88 +20290,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "Vending products"
 msgstr "Πωλούμενα Προϊόντα"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_tickets"
 msgstr "εισητήρια Μέσων Μαζικής Μεταφοράς"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_plans"
 msgstr "χάρτες Μέσων Μαζικής Μεταφοράς"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "parking_tickets"
 msgstr "εισιτήρια Στάθμευσης"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "food"
 msgstr "φαγητό"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "drinks"
 msgstr "ποτά"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "sweets"
 msgstr "γλυκά"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "cigarettes"
 msgstr "τσιγάρα"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "photos"
 msgstr "φωτογραφίες"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "animal_food"
 msgstr "τροφές ζώων"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "news_papers"
 msgstr "εφημερίδες"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "toys"
 msgstr "Παιχνίδια"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "stamps"
 msgstr "Γραμματόσημα"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "SIM-cards"
 msgstr "Κάρτες SIM"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "vouchers"
 msgstr "κουπόνια"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "condoms"
 msgstr "Προφυλακτικά"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Butcher"
 msgstr "Κρεοπωλείο"
@@ -20017,9 +20379,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2535
 msgid "Edit Butcher"
 msgstr "Επεξεργασία Κρεοπωλείου"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2540
 msgid "Baker"
 msgstr "Φούρνος"
@@ -20027,9 +20389,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2542
 msgid "Edit Baker"
 msgstr "Επεξεργασία Φούρνου"
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2547
 msgid "Florist"
 msgstr "Ανθοπωλείο"
@@ -20037,18 +20399,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Florist"
 msgstr "Επεξεργασία Ανθοπωλείου"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2554
 msgid "Organic"
 msgstr "Βιολογικά"
 
 #. item
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Edit Organic Shop"
 msgstr "Επεξεργασία Καταστήματος Βιολογικών"
 
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2560
 msgid "Alcohol"
 msgstr ""
@@ -20056,54 +20418,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2562
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2567
 msgid "Beverages"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2568
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2573
 msgid "Computer"
 msgstr "Υπολογιστές"
 
 #. item
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2574
 msgid "Edit Computer Shop"
 msgstr "Επεξεργασία Καταστήματος Υπολογιστών"
 
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Electronics"
 msgstr "Ηλεκτρονικά"
 
 #. item
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2580
 msgid "Edit Electronics Shop"
 msgstr "Επεξεργασία Καταστήματος Ηλεκτρονικών"
 
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2585
 msgid "Hifi"
 msgstr "Ηχοσυστήματα"
 
 #. item
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2586
 msgid "Edit Hifi Shop"
 msgstr "Επεξεργασία Καταστήματος Ηχοσυστημάτων"
 
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2591
 msgid "Furniture"
 msgstr "Έπιπλα"
 
 #. item
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Edit Furniture Shop"
 msgstr "Επεξεργασία Καταστήματος Επίπλων"
 
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Garden Centre"
 msgstr "Είδη Κήπου"
@@ -20111,9 +20473,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2599
 msgid "Edit Garden Centre"
 msgstr "Επεξεργασία Καταστήματος Ειδών Κήπου"
 
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Hardware"
 msgstr "Σιδηρικά"
@@ -20121,9 +20483,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2606
 msgid "Edit Hardware Store"
 msgstr "Επεξεργασία Καταστήματος Σιδηρικών"
 
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -20131,54 +20493,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2613
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2618
 msgid "Stationery"
 msgstr "Χαρτικά"
 
 #. item
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2619
 msgid "Edit Stationery Shop"
 msgstr "Επεξεργασία Χαρτοπωλείου"
 
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Hairdresser"
 msgstr "Κομμωτήριο"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Hairdresser"
 msgstr "Επεξεργασία Κομμωτηρίου"
 
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Shoes"
 msgstr "Υποδήματα"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Shoe Shop"
 msgstr "Επεξεργασία Υποδηματοπωλείου"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2636
 msgid "Toys"
 msgstr "Παιχνίδια"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit Toy Shop"
 msgstr "Επεξεργασία Καταστήματος Παιχνιδιών"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "Dry Cleaning"
 msgstr "Στπγνοκαθαριστήριο"
@@ -20186,9 +20548,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2650
 msgid "Edit Dry Cleaning"
 msgstr "Επεξεργασία Στεγνοκαθαριστηρίου"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "Laundry"
 msgstr "Πλυντήριο"
@@ -20196,9 +20558,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2657
 msgid "Edit Laundry"
 msgstr "Επεξεργασία πλυντηρίου"
 
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2662
 msgid "Outdoor"
 msgstr ""
@@ -20206,32 +20568,28 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2664
 msgid "Edit Outdoor Shop"
 msgstr ""
 
-#: build/trans_presets.java:2658
-msgid "Sports"
-msgstr "Αθλητικά"
-
-#. item
-#: build/trans_presets.java:2659
+#. item
+#: build/trans_presets.java:2670
 msgid "Edit Sports Shop"
 msgstr "Επεξεργασία Καταστήματος Αθλητικών"
 
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Optician"
 msgstr ""
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2683
 msgid "Cash"
 msgstr "Μετρητά"
 
 #. group "Cash"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2684
 msgid "Bank"
 msgstr "Τράπεζα"
@@ -20239,14 +20597,14 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2686
 msgid "Edit Bank"
 msgstr "Επεξεργασία Τράπεζας"
 
-#: build/trans_presets.java:2680 build/trans_presets.java:2689
+#: build/trans_presets.java:2691 build/trans_presets.java:2700
 msgid "Automated Teller Machine"
 msgstr "ΑΤΜ"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2693
 msgid "Money Exchange"
 msgstr "Συναλλακτήριο"
@@ -20254,5 +20612,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Edit Money Exchange"
 msgstr "Επεξεργασία Συναλλακτηρίου"
@@ -20260,15 +20618,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2691
+#: build/trans_presets.java:2702
 msgid "Edit Automated Teller Machine"
 msgstr "Επεξεργασία ΑΤΜ"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2707
 msgid "Health"
 msgstr "Υγεία"
 
 #. group "Health"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2708
 msgid "Doctors"
 msgstr "Ιατροί"
@@ -20276,18 +20634,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2710
 msgid "Edit Doctors"
 msgstr "Επεξεργασία Ιατρών"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2715
 msgid "Dentist"
 msgstr "Οδοντίατρος"
 
 #. item
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Edit Dentist"
 msgstr "Επεξεργασία Οδοντιάτρου"
 
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2721
 msgid "Pharmacy"
 msgstr "Φαρμακείο"
@@ -20295,5 +20653,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Edit Pharmacy"
 msgstr "Επεξεργασία Φαρμακείου"
@@ -20301,9 +20659,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2729
 msgid "Hospital"
 msgstr "Νοσοκομείο"
@@ -20311,10 +20669,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Edit Hospital"
 msgstr "Επεξεργασία Νοσοκομειου"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2735
 msgid "Emergency Access Point"
 msgstr ""
@@ -20323,5 +20681,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:2727
+#: build/trans_presets.java:2738
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -20330,20 +20688,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2741
 msgid "Point Number"
 msgstr "Αριθμός Σημείου"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2742
 msgid "Point Name"
 msgstr "Όνομα Σημείου"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Phone Number"
 msgstr "Αριθμός Τηλεφώνου"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Χρησιμοποιήστε διεθνή κωδικό, όπως +12-345-67890)"
@@ -20351,5 +20709,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2748
 msgid "Veterinary"
 msgstr "Κτηνιατρίο"
@@ -20358,55 +20716,59 @@
 #. <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:2740
+#: build/trans_presets.java:2751
 msgid "Edit Veterinary"
 msgstr "Επεξεργασία Κτηνιατρίου"
 
+#: build/trans_presets.java:2758
+msgid "Geography"
+msgstr ""
+
 #. group "Places"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2760
 msgid "Continent"
 msgstr "Ήπειρος"
 
 #. item
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2761
 msgid "Edit Continent"
 msgstr "Επεξεργασία Ηπείρου"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2766
 msgid "Country"
 msgstr "Χώρα"
 
 #. item
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2767
 msgid "Edit Country"
 msgstr "Επεξεργασία Χώρας"
 
 #. item "Places/Country" text "Name"
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2772
 msgid "State"
 msgstr "Πολιτεία"
 
 #. item
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2773
 msgid "Edit State"
 msgstr "Επεξεργασία Πολιτείας"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2778
 msgid "Region"
 msgstr "Περιοχή"
 
 #. item
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2779
 msgid "Edit Region"
 msgstr "Επεξεργασία Περιοχής"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2784
 msgid "County"
 msgstr "Περιφέρεια"
 
 #. item
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2785
 msgid "Edit County"
 msgstr "Επεξεργασία Περιφέρειας"
@@ -20414,15 +20776,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2791
 msgid "City"
 msgstr "Πόλη"
 
 #. item
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2792
 msgid "Edit City"
 msgstr "Επεξεργασία Πόλης"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2797
 msgid "Town"
 msgstr "Κωμόπολη"
@@ -20430,10 +20792,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2799
 msgid "Edit Town"
 msgstr "Επεξεργασία Κωμόπολης"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2804
 msgid "Suburb"
 msgstr "Προάστιο"
@@ -20441,25 +20803,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2806
 msgid "Edit Suburb"
 msgstr "Επεξεργασία Προαστίου"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2811
 msgid "Village"
 msgstr "Χωριό"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2812
 msgid "Edit Village"
 msgstr "Επεξεργασία Χωριού"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2817
 msgid "Hamlet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2818
 msgid "Edit Hamlet"
 msgstr ""
@@ -20467,5 +20829,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2824
 msgid "Locality"
 msgstr ""
@@ -20473,10 +20835,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2826
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2831
 msgid "Island"
 msgstr "Νησί"
@@ -20484,10 +20846,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2833
 msgid "Edit Island"
 msgstr "Επεξεργασία Νησιού"
 
 #. item "Places/Island" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2838
 msgid "Islet"
 msgstr ""
@@ -20495,5 +20857,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2840
 msgid "Edit Islet"
 msgstr ""
@@ -20501,5 +20863,5 @@
 #. item "Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2846
 msgid "Cave Entrance"
 msgstr "Είσοδος σπηλαίου"
@@ -20507,10 +20869,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2848
 msgid "Edit Cave Entrance"
 msgstr "Επεξεργασία εισόδου σπηλαίου"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2852
 msgid "Peak"
 msgstr "Κορυφή"
@@ -20518,10 +20880,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2854
 msgid "Edit Peak"
 msgstr "Επεξεργασία κορυφής"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2859
 msgid "Glacier"
 msgstr "Παγετώνας"
@@ -20529,10 +20891,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2861
 msgid "Edit Glacier"
 msgstr "Επεξεργασία παγετώνα"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2854
+#: build/trans_presets.java:2866
 msgid "Volcano"
 msgstr "Ηφαίστειο"
@@ -20540,70 +20902,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2868
 msgid "Edit Volcano"
 msgstr "Επεξεργασία ηφαιστείου"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2874
 msgid "Boundaries"
 msgstr "Όρια"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2875
 msgid "National"
 msgstr "Εθνικό"
 
 #. item
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2876
 msgid "Edit National Boundary"
 msgstr "Επεξεργασία Εθνικού Συνόρου"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2881
 msgid "Administrative"
 msgstr "Διοικητικό"
 
 #. item
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2882
 msgid "Edit Administrative Boundary"
 msgstr "Επεξεργασία Διοικητικού Ορίου"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:2887
 msgid "Civil"
 msgstr "Πολιτικό"
 
 #. item
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2888
 msgid "Edit Civil Boundary"
 msgstr "Επεξεργασία Πολιτικού Ορίου"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2893
 msgid "Political"
 msgstr "Πολιτικό"
 
 #. item
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2894
 msgid "Edit Political Boundary"
 msgstr "Επεξεργασία Πολιτικού Ορίου"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2899
 msgid "National park"
 msgstr "Εθνικό πάρκο"
 
 #. item
-#: build/trans_presets.java:2888
+#: build/trans_presets.java:2900
 msgid "Edit National Park Boundary"
 msgstr "Επεξεργασία Ορίου Εθνικού Δρυμού"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2906
 msgid "Land use"
 msgstr "Χρήση γής"
 
 #. group "Land use"
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2907
 msgid "Tree"
 msgstr "Δένδρο"
@@ -20612,15 +20974,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:2898
+#: build/trans_presets.java:2910
 msgid "Edit Tree"
 msgstr "Επεξεργασία δένδρου"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2915
 msgid "Botanical Name"
 msgstr "Βοτανικό όνομα"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2917
 msgid "Wood"
 msgstr "Άλσος"
@@ -20629,5 +20991,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:2908
+#: build/trans_presets.java:2920
 msgid "Edit Wood"
 msgstr "Επεξεργασία άλσους"
@@ -20635,17 +20997,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "coniferous"
 msgstr "Κωνοφόρο"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "deciduous"
 msgstr "φυλλοβόλα"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "mixed"
 msgstr "Μικτό"
 
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2925
 msgid "Forest"
 msgstr "Δάσος"
@@ -20654,14 +21016,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:2916
+#: build/trans_presets.java:2928
 msgid "Edit Forest Landuse"
 msgstr "Επεξεργασία Δάσους"
 
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2934
 msgid "Nature Reserve"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2935
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -20669,25 +21031,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2940
 msgid "Scree"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2941
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2945
 msgid "Scrub"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2946
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2950
 msgid "Fell"
 msgstr ""
@@ -20695,10 +21057,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2952
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2956
 msgid "Heath"
 msgstr ""
@@ -20706,5 +21068,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2958
 msgid "Edit Heath"
 msgstr ""
@@ -20712,5 +21074,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2963
 msgid "Farmyard"
 msgstr ""
@@ -20719,45 +21081,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:2954
+#: build/trans_presets.java:2966
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2971
 msgid "Farmland"
 msgstr "Χωράφι"
 
 #. item
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2972
 msgid "Edit Farmland Landuse"
 msgstr "Επεξεργασία Χωραφιού"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2977
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2978
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2983
 msgid "Vineyard"
 msgstr "Αμπελώνας"
 
 #. item
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2984
 msgid "Edit Vineyard Landuse"
 msgstr "Επεξεργασία Αμπελώνα"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:2989
 msgid "Allotments"
 msgstr "Κλήροι"
 
 #. item
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2990
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -20765,25 +21127,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2996
 msgid "Garden"
 msgstr "Κήπος"
 
 #. item
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2997
 msgid "Edit Garden"
 msgstr "Επεξεργασία Κήπου"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3001
 msgid "Grass"
 msgstr "Γρασίδι"
 
 #. item
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3002
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3007
 msgid "Village Green"
 msgstr ""
@@ -20791,10 +21153,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3009
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3014
 msgid "Common"
 msgstr ""
@@ -20802,20 +21164,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3004
+#: build/trans_presets.java:3016
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3020
 msgid "Park"
 msgstr "Πάρκο"
 
 #. item
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3021
 msgid "Edit Park"
 msgstr "Επεξεργασία Πάρκου"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3025
 msgid "Recreation Ground"
 msgstr "Χώρος αναψυχής"
@@ -20823,5 +21185,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3027
 msgid "Edit Recreation Ground Landuse"
 msgstr "Επεξεργασία χώρου αναψυχής"
@@ -20829,15 +21191,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3033
 msgid "Residential area"
 msgstr "Οικιστική περιοχή"
 
 #. item
-#: build/trans_presets.java:3022
+#: build/trans_presets.java:3034
 msgid "Edit Residential Landuse"
 msgstr "Επεξεργασία οικιστικής περιοχής"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3039
 msgid "Graveyard"
 msgstr "Νεκροταφείο"
@@ -20845,9 +21207,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3029
+#: build/trans_presets.java:3041
 msgid "Edit Graveyard"
 msgstr "Επεξεργασία Νεκροταφείου"
 
-#: build/trans_presets.java:3035
+#: build/trans_presets.java:3047
 msgid "Cemetery"
 msgstr "Κοιμητήριο"
@@ -20855,39 +21217,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3049
 msgid "Edit Cemetery Landuse"
 msgstr "Επεξεργασία χρήσης γης κοιμητηρίου"
 
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3056
 msgid "Retail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3057
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3062
 msgid "Commercial"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3063
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3056
+#: build/trans_presets.java:3068
 msgid "Industrial"
 msgstr "Βιομηχανική"
 
 #. item
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3069
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3074
 msgid "Railway land"
 msgstr ""
@@ -20895,15 +21257,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3076
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3081
 msgid "Military"
 msgstr "Στρατιωτικά"
 
 #. item
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3082
 msgid "Edit Military Landuse"
 msgstr ""
@@ -20911,55 +21273,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3088
 msgid "Construction area"
 msgstr "Εγοτάξιο"
 
 #. item
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3089
 msgid "Edit Construction Landuse"
 msgstr "Επεξεργασία εργοταξίου"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3094
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3095
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3100
 msgid "Greenfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3101
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3106
 msgid "Landfill"
 msgstr "ΧΥΤΑ"
 
 #. item
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3107
 msgid "Edit Landfill Landuse"
 msgstr "Επεξεργασία Χρήσης γης ΧΥΤΑ"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3112
 msgid "Quarry"
 msgstr "Λατομείο"
 
 #. item
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3113
 msgid "Edit Quarry Landuse"
 msgstr "Επεξεργασία Λατομείου"
 
 #. group "Relations"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3122
 msgid "Multipolygon"
 msgstr ""
@@ -20969,5 +21331,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:3114
+#: build/trans_presets.java:3126
 msgid "Edit Multipolygon"
 msgstr ""
@@ -20976,10 +21338,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3132
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3133
 msgid "inner segment"
 msgstr ""
@@ -20987,5 +21349,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3136
 msgid "Turn restriction"
 msgstr "Περιορισμός στροφής"
@@ -20994,5 +21356,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3139
 msgid "Edit Turn Restriction"
 msgstr "Επεξεργασία περιορισμού στροφής"
@@ -21000,34 +21362,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "Restriction"
 msgstr "Περιορισμός"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_left_turn"
 msgstr "όχι_αριστερή_στροφή"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_right_turn"
 msgstr "όχι_δεξιά_στροφή"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_straight_on"
 msgstr "όχι_ευθεία"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_u_turn"
 msgstr "όχι_αναστροφή"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_right_turn"
 msgstr "μόνο_δεξιά_στροφή"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_left_turn"
 msgstr "μόνο_αριστερή_στροφή"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_straight_on"
 msgstr "μόνο_ευθεία"
@@ -21036,15 +21398,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3146
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3147
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3148
 msgid "to way"
 msgstr ""
@@ -21052,5 +21414,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3151
 msgid "Route"
 msgstr "Διαδρομή"
@@ -21059,5 +21421,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3154
 msgid "Edit Route"
 msgstr "Επεξεργασία Διαδρομής"
@@ -21065,5 +21427,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "Route type"
 msgstr "Τύπος Διαδρομής"
@@ -21135,5 +21497,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3144 build/trans_style.java:233
+#: build/trans_presets.java:3156 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -21142,17 +21504,17 @@
 msgstr "ποδήλατο"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "bus"
 msgstr "λεωφορείο"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "road"
 msgstr "δρόμος"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ski"
 msgstr "σκι"
@@ -21205,5 +21567,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3144 build/trans_style.java:247
+#: build/trans_presets.java:3156 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -21212,13 +21574,13 @@
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "hiking"
 msgstr "πεζοπορία"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "tram"
 msgstr "τραμ"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "detour"
 msgstr "παράκαμψη"
@@ -21232,10 +21594,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3144 build/trans_style.java:1206
+#: build/trans_presets.java:3156 build/trans_style.java:1206
 msgid "subway"
 msgstr "υπόγειος"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3159
 msgid "Symbol description"
 msgstr "Περιγραφή συμβόλου"
@@ -21243,31 +21605,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3162
 msgid "Network"
 msgstr "Δίκτυο"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "proposed"
 msgstr "προτεινόμενο"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "alternate"
 msgstr "εναλλακτικό"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "temporary"
 msgstr "προσωρινό"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "connection"
 msgstr "σύνδεση"
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "Color (hex)"
 msgstr "Χρώμα (δεκαεξαδικό)"
@@ -21276,30 +21638,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3168
 msgid "route segment"
 msgstr "τμήμα διαδρομής"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3169
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3170
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3171
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3172
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3173
 msgid "backward halt point"
 msgstr ""
@@ -21737,11 +22099,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3375 build/trans_style.java:3376
-#: build/trans_style.java:3946 build/trans_style.java:4254
-#: build/trans_style.java:4263 build/trans_style.java:4272
-#: build/trans_style.java:4281 build/trans_style.java:4290
-#: build/trans_style.java:4299 build/trans_style.java:4308
-#: build/trans_style.java:4309 build/trans_style.java:4318
-#: build/trans_style.java:4327
+#: build/trans_style.java:3383 build/trans_style.java:3384
+#: build/trans_style.java:3954 build/trans_style.java:4262
+#: build/trans_style.java:4271 build/trans_style.java:4280
+#: build/trans_style.java:4289 build/trans_style.java:4298
+#: build/trans_style.java:4307 build/trans_style.java:4316
+#: build/trans_style.java:4317 build/trans_style.java:4326
+#: build/trans_style.java:4335
 msgid "deprecated"
 msgstr ""
@@ -23765,5 +24127,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3294
+#: build/trans_style.java:3302
 msgid "light_water"
 msgstr ""
@@ -24445,8 +24807,17 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="boundary_stone"/>
+#. <icon annotate="true" src="historic/boundary_stone.png"/>
 #: build/trans_style.java:2990 build/trans_style.java:2998
 #: build/trans_style.java:3006 build/trans_style.java:3014
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
+#: build/trans_style.java:3054
 msgid "historic"
 msgstr "ιστορικό"
@@ -24460,5 +24831,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3095
 msgid "quarry"
 msgstr "λατομείο"
@@ -24472,5 +24843,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "landfill"
 msgstr "Χ.Υ.Τ.Α."
@@ -24492,5 +24863,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3103 build/trans_style.java:3111
+#: build/trans_style.java:3111 build/trans_style.java:3119
 msgid "basin"
 msgstr "λεκάνη"
@@ -24504,5 +24875,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3127
 msgid "forest"
 msgstr "δάσος"
@@ -24516,5 +24887,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3159
 msgid "farmyard"
 msgstr ""
@@ -24537,5 +24908,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3160 build/trans_style.java:3168
+#: build/trans_style.java:3168 build/trans_style.java:3176
 msgid "retail"
 msgstr ""
@@ -24549,5 +24920,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3176
+#: build/trans_style.java:3184
 msgid "industrial"
 msgstr "βιομηχανική"
@@ -24561,5 +24932,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "brownfield"
 msgstr ""
@@ -24573,5 +24944,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "greenfield"
 msgstr ""
@@ -24585,5 +24956,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "railland"
 msgstr ""
@@ -24640,7 +25011,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3217 build/trans_style.java:3252
-#: build/trans_style.java:3260 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3225 build/trans_style.java:3260
+#: build/trans_style.java:3268 build/trans_style.java:3276
+#: build/trans_style.java:3284 build/trans_style.java:3292
 msgid "military"
 msgstr "στρατιωτική"
@@ -24654,5 +25025,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3225
+#: build/trans_style.java:3233
 msgid "cemetery"
 msgstr "κοιμητήριο"
@@ -24665,5 +25036,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3301
+#: build/trans_style.java:3309
 msgid "peak"
 msgstr "κορυφή"
@@ -24678,5 +25049,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3310
+#: build/trans_style.java:3318
 msgid "glacier"
 msgstr "παγετώνας"
@@ -24690,5 +25061,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "volcano"
 msgstr "ηφαίστειο"
@@ -24743,8 +25114,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3326 build/trans_style.java:3327
-#: build/trans_style.java:3335 build/trans_style.java:3351
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440
+#: build/trans_style.java:3334 build/trans_style.java:3335
+#: build/trans_style.java:3343 build/trans_style.java:3359
+#: build/trans_style.java:3432 build/trans_style.java:3440
+#: build/trans_style.java:3448
 msgid "natural"
 msgstr ""
@@ -24758,5 +25129,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3343
+#: build/trans_style.java:3351
 msgid "scrub"
 msgstr ""
@@ -24770,5 +25141,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3359
+#: build/trans_style.java:3367
 msgid "heath"
 msgstr ""
@@ -24782,5 +25153,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3408
+#: build/trans_style.java:3416
 msgid "mud"
 msgstr "λάσπη"
@@ -24794,5 +25165,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "beach"
 msgstr "παραλία"
@@ -24870,8 +25241,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
-#: build/trans_style.java:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496 build/trans_style.java:3504
+#: build/trans_style.java:3512 build/trans_style.java:3520
 msgid "route"
 msgstr "διαδρομή"
@@ -24919,7 +25290,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3522 build/trans_style.java:3530
-#: build/trans_style.java:3538 build/trans_style.java:3546
-#: build/trans_style.java:3554
+#: build/trans_style.java:3530 build/trans_style.java:3538
+#: build/trans_style.java:3546 build/trans_style.java:3554
+#: build/trans_style.java:3562
 msgid "boundary"
 msgstr "όριο"
@@ -25069,11 +25440,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090
+#: build/trans_style.java:4002 build/trans_style.java:4010
+#: build/trans_style.java:4018 build/trans_style.java:4026
+#: build/trans_style.java:4034 build/trans_style.java:4042
+#: build/trans_style.java:4050 build/trans_style.java:4058
+#: build/trans_style.java:4066 build/trans_style.java:4074
+#: build/trans_style.java:4082 build/trans_style.java:4090
+#: build/trans_style.java:4098
 msgid "place"
 msgstr ""
@@ -25121,6 +25492,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4207 build/trans_style.java:4214
-#: build/trans_style.java:4221 build/trans_style.java:4228
+#: build/trans_style.java:4215 build/trans_style.java:4222
+#: build/trans_style.java:4229 build/trans_style.java:4236
 msgid "address"
 msgstr "διεύθυνση"
@@ -25428,32 +25799,4 @@
 msgstr ""
 
-#~ msgid "All the ways were empty"
-#~ msgstr "Όλοι οι δρόμοι ήταν άδειοι"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Συγχώνευση κόμβων  με διαφορετικές συμμετοχές;"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Επιβεβαίωση συγχώνευσης"
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr ""
-#~ "Οι επιλεγμένοι κόμβοι είναι μέλη σε διαφορετικές σχέσεις. Επιθυμείτε να "
-#~ "τους συγχωνεύσετε;"
-
-#~ msgid "Unknown version"
-#~ msgstr "Άγνωστη έκδοση"
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> έχει μηδενική αναφορά"
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Βρέθηκε <member> στοιχείο εκτός σχέσης."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Κακοσχηματισμένο id κόμβου"
-
 #~ msgid ""
 #~ "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -25463,6 +25806,9 @@
 #~ "οποία πήρατε το JOSM για το πρόβλημα."
 
-#~ msgid "Server does not support changesets"
-#~ msgstr "Ο διακομιστής δεν υποστηρίζει πακέτα αλλαγών"
+#~ msgid "Unknown version"
+#~ msgstr "Άγνωστη έκδοση"
+
+#~ msgid "<nd> has zero ref"
+#~ msgstr "<nd> έχει μηδενική αναφορά"
 
 #~ msgid "Plugin requires JOSM update: {0}."
@@ -25538,4 +25884,14 @@
 #~ "Παρακαλώ αναφέρετε το σαν σφάλμα."
 
+#~ msgid ""
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
+#~ msgstr ""
+#~ "Οι επιλεγμένοι κόμβοι είναι μέλη σε διαφορετικές σχέσεις. Επιθυμείτε να "
+#~ "τους συγχωνεύσετε;"
+
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "Συγχώνευση κόμβων  με διαφορετικές συμμετοχές;"
+
 #~ msgid "Some of the nodes are (almost) in the line"
 #~ msgstr "Μερικοι από τους κόμβους είναι (σχεδόν) σε ευθεία"
@@ -25558,7 +25914,4 @@
 #~ msgid "Add all currently selected objects as members"
 #~ msgstr "Προσθήκη επιλεγμένων αντικειμένων ως μέλη"
-
-#~ msgid "Add Selected"
-#~ msgstr "Προσθήκη επιλεγμένων"
 
 #~ msgid "Cannot connect to server."
@@ -25613,6 +25966,9 @@
 #~ msgstr "Κατεχόμενο από"
 
-#~ msgid "Commit comment"
-#~ msgstr "Οριστικοποίηση σχολίου"
+#~ msgid "Ill-formed node id"
+#~ msgstr "Κακοσχηματισμένο id κόμβου"
+
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "Βρέθηκε <member> στοιχείο εκτός σχέσης."
 
 #~ msgid "false"
@@ -25689,4 +26045,10 @@
 #~ msgstr "Προσθέστε είτε το site-josm.xml ή τις Σελίδες Βίκι."
 
+#~ msgid "All the ways were empty"
+#~ msgstr "Όλοι οι δρόμοι ήταν άδειοι"
+
+#~ msgid "Merge Anyway"
+#~ msgstr "Επιβεβαίωση συγχώνευσης"
+
 #~ msgid "The following errors occured during mass download:"
 #~ msgstr "Τα παρακάτω σφάλματα συνέβησαν κατά την μαζική λήψη:"
@@ -25725,7 +26087,4 @@
 #~ msgstr "Μετακίνηση Πάνω"
 
-#~ msgid "Delete Layer"
-#~ msgstr "Διαγραφή Επιπέδου"
-
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Επεξεργαστής Σχέσεων: {0}"
Index: applications/editors/josm/i18n/po/en_GB.po
===================================================================
--- applications/editors/josm/i18n/po/en_GB.po	(revision 17655)
+++ applications/editors/josm/i18n/po/en_GB.po	(revision 17697)
@@ -10,7 +10,7 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-12 18:11+0200\n"
-"PO-Revision-Date: 2009-09-10 08:18+0000\n"
-"Last-Translator: pl71 <Unknown>\n"
+"POT-Creation-Date: 2009-09-19 13:00+0200\n"
+"PO-Revision-Date: 2009-09-15 02:06+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-09-12 16:06+0000\n"
+"X-Launchpad-Export-Date: 2009-09-19 10:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -44,10 +44,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:543
 #: ../core/src/org/openstreetmap/josm/Main.java:551
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -72,5 +72,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -88,6 +88,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:358
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
@@ -103,6 +103,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
@@ -126,10 +126,10 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
 msgid "Save and Exit"
 msgstr "Save and Exit"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
 msgid "Discard and Exit"
 msgstr "Discard and Exit"
@@ -140,4 +140,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
@@ -145,27 +146,28 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:296
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:258
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:613
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
@@ -173,5 +175,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -191,6 +193,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
@@ -207,17 +209,17 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:654
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1528
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -228,6 +230,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
@@ -280,9 +282,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:607
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:609
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -342,5 +344,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
 msgid "Plugins"
@@ -392,5 +394,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Merge"
@@ -480,5 +482,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -491,4 +493,5 @@
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -524,6 +527,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
@@ -532,6 +535,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:346
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
@@ -645,4 +648,46 @@
 msgstr "No conflicts to zoom to"
 
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#, fuzzy
+msgid "Close open changesets"
+msgstr "Closing changeset..."
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#, fuzzy
+msgid "Closes open changesets"
+msgstr "Closing changeset..."
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
+#: ../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:114
+#, java-format
+msgid "File: {0}"
+msgstr "File: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
+#, fuzzy
+msgid "There are no open changesets"
+msgstr "Server does not support changesets"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
+#, fuzzy
+msgid "No open changesets"
+msgstr "changesets"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
+#, fuzzy
+msgid "Downloading open changesets ..."
+msgstr "Closing changeset..."
+
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
@@ -742,10 +787,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:123
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
@@ -788,31 +834,30 @@
 msgstr "Distribute the selected nodes to equal distances along a line."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
 msgid "Download from OSM..."
 msgstr "Download from OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
 msgid "Download map data from the OSM server."
 msgstr "Download map data from the OSM server."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
-#, java-format
-msgid "File: {0}"
-msgstr "File: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
 msgid "Download"
 msgstr "Download"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
 msgid "Please select at least one task to download"
 msgstr "Please select at least one task to download"
@@ -833,5 +878,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1527
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307
@@ -851,6 +896,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:376
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1415
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
 msgid "Duplicate"
 msgstr "Duplicate"
@@ -922,10 +967,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
@@ -1011,25 +1057,26 @@
 msgstr "Merge the current layer into another layer"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 msgid "Merge Nodes"
 msgstr "Merge Nodes"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
 msgid "Merge nodes into the oldest one."
 msgstr "Merge nodes into the oldest one."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
 msgid "Please select at least two nodes to merge."
 msgstr "Please select at least two nodes to merge."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:394
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
@@ -1045,8 +1092,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -1072,6 +1119,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
@@ -1080,9 +1131,9 @@
 msgstr "parameter ''{0}'' must not be null"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr "Cannot merge nodes: Would have to delete a way that is still used."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283
 #, java-format
 msgid "Merge {0} nodes"
@@ -1154,5 +1205,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "New"
 msgstr "New"
@@ -1430,14 +1481,15 @@
 msgstr "Help: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
 msgid "Status Report"
 msgstr "Status Report"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 msgid "Copy to clipboard and close"
 msgstr "Copy to clipboard and close"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
@@ -1522,25 +1574,4 @@
 msgstr "Split way {0} into {1} parts"
 
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24
-msgid "Close current changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-msgid "Close the current changeset ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41
-msgid "There is currently no changeset open."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42
-msgid "No open changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60
-msgid "Closing changeset"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
@@ -1706,41 +1737,39 @@
 msgstr "Selection empty"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Upload to OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 msgid "Upload all changes to the OSM server."
 msgstr "Upload all changes to the OSM server."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#, java-format
 msgid ""
 "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
 "resolve them first.</html>"
 msgstr ""
-"<html>There are no layers the source layer<br>''{0}''<br>could be merged to."
-"</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
 msgid "Nothing to upload. Get some data first."
 msgstr "Nothing to upload. Get some data first."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 msgid "No changes to upload."
 msgstr "No changes to upload."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Synchronize {0} {1} only"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
 msgid "Synchronize entire dataset"
 msgstr "Synchronize entire dataset"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
 #, java-format
 msgid ""
@@ -1761,17 +1790,17 @@
 "<strong>{6}</strong> to abort and continue editing.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
 msgid "Conflict detected"
 msgstr "Conflict detected"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr "unexpected return value. Got {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:267
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
 #, java-format
 msgid ""
@@ -1786,28 +1815,40 @@
 "<strong>{1}</strong> to abort and continue editing.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
+msgid ""
+"<html>Uploading <strong>failed</strong> because you've been "
+"using<br>changeset {0} which was already closed at {1}.<br>Please upload "
+"again with a new or an existing open changeset."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+#, fuzzy
+msgid "Changeset closed"
+msgstr "changesets"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr "Error header \"{0}\" does not match expected pattern \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
 msgid "Upload to OSM API failed"
 msgstr "Upload to OSM API failed"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
 msgid "Updating primitive"
 msgstr "Updating primitive"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -2032,14 +2073,14 @@
 msgstr "Add node into way and connect"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:930
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:932
 msgid "Create new node."
 msgstr "Create new node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
 msgid "Select node under cursor."
 msgstr "Select node under cursor."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939
 #, java-format
 msgid "Insert new node into way."
@@ -2048,14 +2089,14 @@
 msgstr[1] "Insert new node into {0} ways."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
 msgid "Start new way from last node."
 msgstr "Start new way from last node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951
 msgid "Continue way from last node."
 msgstr "Continue way from last node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:972
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:974
 msgid "Finish drawing."
 msgstr "Finish drawing."
@@ -2175,60 +2216,70 @@
 "move zoom with right button"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Search..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Search for objects."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
 msgid "Can't search because there is no loaded data."
 msgstr "Can't search because there is no loaded data."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
+#, fuzzy
+msgid "Please enter a filter string."
+msgstr "Please enter a search string."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
 msgid "Please enter a search string."
 msgstr "Please enter a search string."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
 msgid "replace selection"
 msgstr "replace selection"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72
 msgid "add to selection"
 msgstr "add to selection"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73
 msgid "remove from selection"
 msgstr "remove from selection"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
+#, fuzzy
+msgid "find in selection"
+msgstr "add to selection"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81
 msgid "case sensitive"
 msgstr "case sensitive"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82
 msgid "regular expression"
 msgstr "regular expression"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
 msgstr "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
 msgstr "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
 msgstr "<b>name:Bak</b> - 'Bak' anywhere in the name."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
 msgstr "<b>type=route</b> - key 'type' with value exactly 'route'."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid ""
 "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
@@ -2238,17 +2289,17 @@
 "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
 msgstr "<b>-name:Bak</b> - not 'Bak' in the name."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - key=foot set to any value."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
 msgid "<u>Special targets:</u>"
 msgstr "<u>Special targets:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
@@ -2256,33 +2307,33 @@
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - all objects changed by user"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 msgid "<b>nodes:</b>... - object with given number of nodes"
 msgstr "<b>nodes:</b>... - object with given number of nodes"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - all changed objects"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - all selected objects"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - all incomplete objects"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - all untagged objects"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2290,5 +2341,5 @@
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2296,54 +2347,71 @@
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Use <b>|</b> or <b>OR</b> to combine with logical or"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Use <b>(</b> and <b>)</b> to group expressions"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
+msgid "Filter"
+msgstr "Filter"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Search"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
+msgid "Submit filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "Start Search"
 msgstr "Start Search"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "No match found for ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Nothing added to selection by searching for ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Nothing removed from selection by searching for ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#, fuzzy, java-format
+msgid "Nothing find in selection by searching for ''{0}''"
+msgstr "Nothing added to selection by searching for ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262
 #, java-format
 msgid "Found {0} matches"
 msgstr "Found {0} matches"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283
 msgid "RX"
 msgstr "RX"
@@ -2532,5 +2600,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
 msgid "Double conflict"
 msgstr "Double conflict"
@@ -2780,4 +2848,5 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:134
 msgid "Old value"
 msgstr "Old value"
@@ -2943,27 +3012,59 @@
 
 #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
 msgid "E"
 msgstr "E"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:59
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:203
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
 msgid "Changeset {0}"
 msgstr "Changeset {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:323
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
 msgstr "parameter {0} > 0 required. Got {1}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:325
-#, fuzzy, java-format
-msgid "paramete''{0}'' must not be null"
-msgstr "parameter ''{0}'' must not be null"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331
-#, fuzzy, java-format
-msgid "unsupported value ''{0}'' or parameter ''{1}''"
-msgstr "No useful role ''{0}'' for Way ''{1}''."
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "H"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "Text"
+msgstr "text"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "C"
+msgstr "CS"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "I"
+msgstr "CI"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "M"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#, fuzzy
+msgid "R"
+msgstr "RX"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+msgid "A"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+msgid "D"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+msgid "F"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
@@ -2977,29 +3078,29 @@
 msgstr "Warning: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
+#, java-format
 msgid "expected id >= 0. Got {0}"
-msgstr "unexpected column index. Got {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:257
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
 msgid "a primitive with id=0 can't be invisible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:293
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
+#, java-format
 msgid "id > 0 expected. Got {0}"
-msgstr "child.id >0 expected. Got {1}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
+#, java-format
 msgid "version > 0 expected. Got {0}"
-msgstr "child.id >0 expected. Got {1}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
 msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
 msgstr "parameter ''{0}'' is not a valid type name, got ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
 msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
@@ -3066,9 +3167,9 @@
 msgstr "parameter {0} not in range 0..{1}, got {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:247
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:249
 msgid "Area style way is not closed."
 msgstr "Area style way is not closed."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:478
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:482
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
@@ -3077,118 +3178,118 @@
 #. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
 #. TODO Remove useless nullcheck when RelationMember.member is encalupsed
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:851
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855
 msgid "Empty member in relation."
 msgstr "Empty member in relation."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:853
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Deleted member ''{0}'' in relation."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:864
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Way ''{0}'' with less than two points."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "More than one \"from\" way found."
 msgstr "More than one \"from\" way found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "More than one \"to\" way found."
 msgstr "More than one \"to\" way found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "More than one \"via\" found."
 msgstr "More than one \"via\" found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Unknown role ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Unknown member type for ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"from\" way found."
 msgstr "No \"from\" way found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"to\" way found."
 msgstr "No \"to\" way found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652
 msgid "No \"via\" node or way found."
 msgstr "No \"via\" node or way found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "The \"from\" way doesn't start or end at a \"via\" node."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "The \"to\" way doesn't start or end at a \"via\" node."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "The \"from\" way doesn't start or end at the \"via\" way."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "The \"to\" way doesn't start or end at the \"via\" way."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Style for restriction {0} not found."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "No useful role ''{0}'' for Way ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:885
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Non-Way ''{0}'' in multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:943
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "No outer way for multipolygon ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1032
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Intersection between ways ''{0}'' and ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1044
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Inner way ''{0}'' is outside."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1097
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Style for inner way ''{0}'' equals multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1123
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Style for outer way ''{0}'' mismatches."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1327
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331
 msgid "untagged"
 msgstr "untagged"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1328
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332
 msgid "text"
 msgstr "text"
@@ -3212,5 +3313,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
@@ -3231,5 +3332,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
@@ -3283,5 +3384,5 @@
 msgstr "Lambert Zone (France)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambert Zone (Estonia)"
@@ -3323,9 +3424,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:38
 msgid "Do not show again"
 msgstr "Do not show again"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
 #, java-format
@@ -3333,31 +3434,31 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:91
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:116
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154
 msgid "incomplete"
 msgstr "incomplete"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
 msgid "highway"
 msgstr "highway"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
-#: build/trans_presets.java:3144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: build/trans_presets.java:3156
 msgid "railway"
 msgstr "railway"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
 msgid "waterway"
 msgstr "waterway"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "landuse"
 msgstr "landuse"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:474
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
@@ -3367,5 +3468,5 @@
 msgstr[1] "{0} nodes"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
 #, java-format
 msgid "{0} member"
@@ -3395,7 +3496,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
-#, fuzzy
 msgid "Bad Request"
-msgstr "Edit Racquet"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144
@@ -3411,10 +3511,5 @@
 msgstr "Message of the day not available"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67
-#, java-format
-msgid "- running version is {0}"
-msgstr "- running version is {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:95
 msgid "Downloading \"Message of the day\""
 msgstr "Downloading \"Message of the day\""
@@ -3486,10 +3581,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:162
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
 msgid "Username"
 msgstr "Username"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
 msgid "Password"
 msgstr "Password"
@@ -3612,5 +3707,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226
 msgid "Presets"
 msgstr "Presets"
@@ -3684,38 +3779,49 @@
 msgstr "scale"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
 msgid "The geographic longitude at the mouse pointer."
 msgstr "The geographic longitude at the mouse pointer."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The name of the object at the mouse pointer."
 msgstr "The name of the object at the mouse pointer."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The geographic latitude at the mouse pointer."
 msgstr "The geographic latitude at the mouse pointer."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The angle between the previous and the current way segment."
 msgstr "The angle between the previous and the current way segment."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "The (compass) heading of the line segment being drawn."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The length of the new way segment being drawn."
 msgstr "The length of the new way segment being drawn."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199
+msgid ""
+"Middle click again to cycle through.<br>Hold CTRL to select directly from "
+"this list with the mouse.<hr>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290
 msgid "(no object)"
 msgstr "(no object)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:301
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418
+#, fuzzy
+msgid "User:"
+msgstr "User"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
 msgid "layer not in list."
 msgstr "layer not in list."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:488
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3786,7 +3892,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:224
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Tags"
 msgstr "Tags"
@@ -3801,5 +3907,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
@@ -3994,4 +4100,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
 msgid "Up"
 msgstr "Up"
@@ -4002,4 +4109,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Down"
 msgstr "Down"
@@ -4012,5 +4120,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
@@ -4449,23 +4557,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:236
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239
 msgid "No conflicts to resolve"
-msgstr "No pending tag conflicts to be resolved"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:295
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254
 msgid "Cancel conflict resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:310
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269
 msgid "Apply resolved conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Apply"
 msgstr "Apply"
@@ -4477,5 +4584,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "all"
 msgstr "all"
@@ -4519,7 +4626,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
-msgid "not yet decided"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:213
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
@@ -4546,7 +4650,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
@@ -4556,7 +4660,7 @@
 msgstr[1] "{0} ways"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:152
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
@@ -4566,20 +4670,20 @@
 msgstr[1] "{0} relations"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "Paste ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "From ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:372
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "To ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:428
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
 #, java-format
 msgid "{0} tag"
@@ -4595,13 +4699,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
-#, fuzzy
 msgid "Remove this relation member from the relation"
-msgstr "Remove the currently selected members from this relation"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-#, fuzzy
 msgid "Replace"
-msgstr "place"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
@@ -4612,11 +4714,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
-#, fuzzy
 msgid "Undecided"
-msgstr "Undecide"
+msgstr ""
 
 #. --- role editing
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:56
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510
 msgid "Role:"
 msgstr "Role:"
@@ -4632,7 +4733,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70
-#, fuzzy
 msgid "Value:"
-msgstr "Value"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86
@@ -4645,12 +4745,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51
-#, fuzzy
 msgid "Orig. Way"
-msgstr "One Way"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
-#, fuzzy
 msgid "Decision"
-msgstr "Revision"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -4666,6 +4764,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
@@ -4760,169 +4859,13 @@
 msgstr "Resolve conflicts for ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-msgid "History"
-msgstr "History"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-msgid "Display the history of all selected items."
-msgstr "Display the history of all selected items."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
-#, java-format
-msgid "index out of bounds Got {0}"
-msgstr "index out of bounds Got {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr "Node {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
-msgid "History item"
-msgstr "History item"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Reload all currently selected objects and refresh the list."
-
-#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
-msgid "Show"
-msgstr "Show"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
-msgstr "Display the history of the selected primitive"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
-msgid "Dialog not created yet. Invoke createInstance() first"
-msgstr "Dialog not created yet. Invoke createInstance() first"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
-msgid "Layers"
-msgstr "Layers"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-msgid "Open a list of all loaded layers."
-msgstr "Open a list of all loaded layers."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:297
-msgid "Delete the selected layer."
-msgstr "Delete the selected layer."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:367
-msgid "Show/Hide"
-msgstr "Show/Hide"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:378
-msgid "Toggle visible state of the selected layer."
-msgstr "Toggle visible state of the selected layer."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414
-msgid "Activate"
-msgstr "Activate"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:420
-msgid "Activate the selected layer"
-msgstr "Activate the selected layer"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:475
-msgid "Merge this layer into another layer"
-msgstr "Merge this layer into another layer"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:581
-msgid "Move the selected layer one row up."
-msgstr "Move the selected layer one row up."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:600
-msgid "Move the selected layer one row down."
-msgstr "Move the selected layer one row down."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
-msgid "Information about layer"
-msgstr "Information about layer"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
-#, java-format
-msgid "This will change up to {0} object."
-msgid_plural "This will change up to {0} objects."
-msgstr[0] "This will change up to {0} object."
-msgstr[1] "This will change up to {0} objects."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
-msgid "An empty value deletes the key."
-msgstr "An empty value deletes the key."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
-msgid "<different>"
-msgstr "<different>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
-msgid "Change values?"
-msgstr "Change values?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
-#, java-format
-msgid "Change properties of up to {0} object"
-msgid_plural "Change properties of up to {0} objects"
-msgstr[0] "Change properties of up to {0} object"
-msgstr[1] "Change properties of up to {0} objects"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
-msgid "Please select a key"
-msgstr "Please select a key"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
-msgid "Please select a value"
-msgstr "Please select a value"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
-msgid "Please select the objects you want to change properties for."
-msgstr "Please select the objects you want to change properties for."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
-msgid "Properties/Memberships"
-msgstr "Properties/Memberships"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-msgid "Properties for selected objects."
-msgstr "Properties for selected objects."
-
-#. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-msgid "Member Of"
-msgstr "Member Of"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
-msgid "Add Properties"
-msgstr "Add Properties"
-
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+msgid "Filter objects and hide/disable them."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
@@ -4936,4 +4879,212 @@
 msgstr "Add"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#, fuzzy
+msgid "Add filter."
+msgstr "Add Selected"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
+#, fuzzy
+msgid "Edit filter."
+msgstr "Edit Pier"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#, fuzzy
+msgid "Delete filter."
+msgstr "Delete mine"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
+#, fuzzy
+msgid "Move filter up."
+msgstr "Move up"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
+#, fuzzy
+msgid "Move filter down."
+msgstr "Move down"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128
+msgid "Enable filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
+#, fuzzy
+msgid "Hide elements"
+msgstr "Single elements"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
+msgid "Apply also for children"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
+msgid "Inverse filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
+#, fuzzy
+msgid "Filter mode"
+msgstr "Filter"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
+msgid "History"
+msgstr "History"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+msgid "Display the history of all selected items."
+msgstr "Display the history of all selected items."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr "index out of bounds Got {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr "Node {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
+msgid "History item"
+msgstr "History item"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
+msgid "Reload all currently selected objects and refresh the list."
+msgstr "Reload all currently selected objects and refresh the list."
+
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
+msgid "Show"
+msgstr "Show"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
+msgid "Display the history of the selected primitive"
+msgstr "Display the history of the selected primitive"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84
+msgid "Dialog not created yet. Invoke createInstance() first"
+msgstr "Dialog not created yet. Invoke createInstance() first"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
+msgid "Layers"
+msgstr "Layers"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+msgid "Open a list of all loaded layers."
+msgstr "Open a list of all loaded layers."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294
+msgid "Delete the selected layer."
+msgstr "Delete the selected layer."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364
+msgid "Show/Hide"
+msgstr "Show/Hide"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375
+msgid "Toggle visible state of the selected layer."
+msgstr "Toggle visible state of the selected layer."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgid "Activate"
+msgstr "Activate"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417
+msgid "Activate the selected layer"
+msgstr "Activate the selected layer"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472
+msgid "Merge this layer into another layer"
+msgstr "Merge this layer into another layer"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578
+msgid "Move the selected layer one row up."
+msgstr "Move the selected layer one row up."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597
+msgid "Move the selected layer one row down."
+msgstr "Move the selected layer one row down."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+msgid "Information about layer"
+msgstr "Information about layer"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+#, java-format
+msgid "This will change up to {0} object."
+msgid_plural "This will change up to {0} objects."
+msgstr[0] "This will change up to {0} object."
+msgstr[1] "This will change up to {0} objects."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+msgid "An empty value deletes the key."
+msgstr "An empty value deletes the key."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+msgid "<different>"
+msgstr "<different>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+msgid "Change values?"
+msgstr "Change values?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#, java-format
+msgid "Change properties of up to {0} object"
+msgid_plural "Change properties of up to {0} objects"
+msgstr[0] "Change properties of up to {0} object"
+msgstr[1] "Change properties of up to {0} objects"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+msgid "Please select a key"
+msgstr "Please select a key"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+msgid "Please select a value"
+msgstr "Please select a value"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
+msgid "Please select the objects you want to change properties for."
+msgstr "Please select the objects you want to change properties for."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
+msgid "Properties/Memberships"
+msgstr "Properties/Memberships"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+msgid "Properties for selected objects."
+msgstr "Properties for selected objects."
+
+#. setting up the membership table
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+msgid "Member Of"
+msgstr "Member Of"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
+msgid "Add Properties"
+msgstr "Add Properties"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574
 msgid "Add a new key/value pair to all objects"
@@ -4975,10 +5126,9 @@
 
 #. item "Land use/Quarry" text "Name"
-#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
-#: build/trans_presets.java:3109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168
+#: build/trans_presets.java:3121
 msgid "Relations"
 msgstr "Relations"
@@ -4988,23 +5138,23 @@
 msgstr "Open a list of all relations."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relations: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276
 msgid "Open an editor for the selected relation"
 msgstr "Open an editor for the selected relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
 msgid "Delete the selected relation"
 msgstr "Delete the selected relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349
 msgid "Create a new relation"
 msgstr "Create a new relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:373
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1412
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "Create a copy of this relation and open it in another editor window"
@@ -5037,5 +5187,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5047,9 +5197,9 @@
 msgstr "Selection: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441
 msgid "Undock the panel"
 msgstr "Undock the panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5057,5 +5207,5 @@
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:457
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Click to minimise/maximise the panel content"
@@ -5116,5 +5266,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr "Edit the relation the currently selected relation member refers to"
@@ -5138,5 +5288,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1502
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1370
 msgid "Download relation members"
 msgstr "Download relation members"
@@ -5168,5 +5318,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -5174,18 +5324,18 @@
 msgstr "Warning: ignoring exception because task is cancelled. Exception: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
 msgid "Tags and Members"
 msgstr "Tags and Members"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:167
 msgid "Parent Relations"
 msgstr "Parent Relations"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
 msgid "Child Relations"
 msgstr "Child Relations"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5197,14 +5347,14 @@
 "<br>How do you want to proceed with circular dependencies?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
 msgid "Remove them, clean up relation"
 msgstr "Remove them, clean up relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
 msgid "Ignore them, leave relation as is"
 msgstr "Ignore them, leave relation as is"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613
 #, java-format
 msgid ""
@@ -5217,9 +5367,9 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
 msgid "Multiple members referring to same primitive"
 msgstr "Multiple members referring to same primitive"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid ""
@@ -5232,5 +5382,5 @@
 "''{0}''.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
@@ -5238,5 +5388,5 @@
 "Add all primitives selected in the current dataset before the first member"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
@@ -5244,5 +5394,5 @@
 "Add all primitives selected in the current dataset after the last member"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5252,5 +5402,5 @@
 "member"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5260,15 +5410,15 @@
 "member"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
 msgid "Remove all members referring to one of the selected primitives"
 msgstr "Remove all members referring to one of the selected primitives"
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
 msgid "Relation Editor: Remove Selected"
 msgstr "Relation Editor: Remove Selected"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851
 msgid ""
 "Select relation members which refer to primitives in the current selection"
@@ -5276,5 +5426,5 @@
 "Select relation members which refer to primitives in the current selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849
 #, java-format
 msgid ""
@@ -5285,57 +5435,57 @@
 "selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873
 msgid "Select primitives for selected relation members"
 msgstr "Select primitives for selected relation members"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:961
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
 msgid "Sort the relation members"
 msgstr "Sort the relation members"
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897
 msgid "Relation Editor: Sort"
 msgstr "Relation Editor: Sort"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909
 msgid "Move the currently selected members up"
 msgstr "Move the currently selected members up"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:979
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:912
 msgid "Relation Editor: Move Up"
 msgstr "Relation Editor: Move Up"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928
 msgid "Move the currently selected members down"
 msgstr "Move the currently selected members down"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:998
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:931
 msgid "Relation Editor: Move Down"
 msgstr "Relation Editor: Move Down"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947
 msgid "Remove the currently selected members from this relation"
 msgstr "Remove the currently selected members from this relation"
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
 msgid "Relation Editor: Remove"
 msgstr "Relation Editor: Remove"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
 msgid "Delete the currently edited relation"
 msgstr "Delete the currently edited relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Yes, create a conflict and close"
 msgstr "Yes, create a conflict and close"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050
 msgid "No, continue editing"
 msgstr "No, continue editing"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5347,9 +5497,9 @@
 "conflict and close the editor?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1058
 msgid "Conflict in data"
 msgstr "Conflict in data"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
 #, java-format
 msgid ""
@@ -5360,56 +5510,41 @@
 "<br>Please resolve this conflict first, then try again.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090
 msgid "Apply the current updates"
 msgstr "Apply the current updates"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123
 msgid "Apply the updates and close the dialog"
 msgstr "Apply the updates and close the dialog"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Cancel the updates and close the dialog"
 msgstr "Cancel the updates and close the dialog"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 msgid "Add an empty tag"
 msgstr "Add an empty tag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
-msgid "Delete the currently selected tags"
-msgstr "Delete the currently selected tags"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Download all incomplete ways and nodes in relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 msgid "Download Members"
 msgstr "Download Members"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Relation Editor: Download Members"
 msgstr "Relation Editor: Download Members"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1208
 msgid "Sets a role for the selected members"
 msgstr "Sets a role for the selected members"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1211
 msgid "Apply Role"
 msgstr "Apply Role"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1356
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 #, java-format
 msgid ""
@@ -5422,13 +5557,13 @@
 "new role?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228
 msgid "Yes, apply it"
 msgstr "Yes, apply it"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1229
 msgid "No, don't apply"
 msgstr "No, don't apply"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1367
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
 msgid "Confirm empty role"
 msgstr "Confirm empty role"
@@ -5464,7 +5599,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
-#, fuzzy, java-format
+#, java-format
 msgid "child.getId() >0 expected. Got {1}"
-msgstr "child.id >0 expected. Got {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
@@ -5516,37 +5651,37 @@
 msgstr "Bookmarks"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:82
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
 msgid "Please enter the desired coordinates first."
 msgstr "Please enter the desired coordinates first."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
 msgid "Please enter a name for the location."
 msgstr "Please enter a name for the location."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
 msgid "Name of location"
 msgstr "Name of location"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:107
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
 msgid "Select a bookmark first."
 msgstr "Select a bookmark first."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
 msgid "min lat"
 msgstr "min lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
 msgid "min lon"
 msgstr "min lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid "max lat"
 msgstr "max lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
 msgid "max lon"
 msgstr "max lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5556,26 +5691,26 @@
 "area)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
 msgid "Bounding Box"
 msgstr "Bounding Box"
 
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
 msgid "Data Sources and Types"
 msgstr "Data Sources and Types"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
 msgid "Download as new layer"
 msgstr "Download as new layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
 msgid "Download Area"
 msgstr "Download Area"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
 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:219
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
 msgid "Download area ok, size probably acceptable to server"
 msgstr "Download area ok, size probably acceptable to server"
@@ -5600,7 +5735,7 @@
 msgstr "Enter a place name to search for:"
 
-#. <separator/>
+#. group "Geography"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2759
 msgid "Places"
 msgstr "Places"
@@ -5647,21 +5782,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "type"
 msgstr "type"
@@ -5678,5 +5813,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-#, fuzzy
 msgid ""
 "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
@@ -5684,7 +5818,4 @@
 "Hold left mousebutton and draw a frame."
 msgstr ""
-"<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
-"Hold right mousebutton and move mouse or use cursor keys. <b>Select:</b> "
-"Click."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
@@ -6146,4 +6277,6 @@
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
 #. <key key="historic" value="wayside_shrine" />
+#. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
+#. <key key="historic" value="boundary_stone" />
 #. item "Leisure/Water Park" label "Edit Water Park"
 #. <key key="leisure" value="water_park" />
@@ -6515,153 +6648,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/trans_presets.java:66 build/trans_presets.java:102
-#: build/trans_presets.java:142 build/trans_presets.java:179
-#: build/trans_presets.java:199 build/trans_presets.java:217
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:272 build/trans_presets.java:305
-#: build/trans_presets.java:351 build/trans_presets.java:371
-#: build/trans_presets.java:386 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:463 build/trans_presets.java:482
-#: build/trans_presets.java:502 build/trans_presets.java:522
-#: build/trans_presets.java:543 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627 build/trans_presets.java:658
-#: build/trans_presets.java:679 build/trans_presets.java:692
-#: build/trans_presets.java:705 build/trans_presets.java:718
-#: build/trans_presets.java:731 build/trans_presets.java:744
-#: build/trans_presets.java:755 build/trans_presets.java:764
-#: build/trans_presets.java:811 build/trans_presets.java:832
-#: build/trans_presets.java:841 build/trans_presets.java:901
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1067 build/trans_presets.java:1075
-#: build/trans_presets.java:1085 build/trans_presets.java:1093
-#: build/trans_presets.java:1098 build/trans_presets.java:1105
-#: build/trans_presets.java:1112 build/trans_presets.java:1117
-#: build/trans_presets.java:1125 build/trans_presets.java:1134
-#: build/trans_presets.java:1140 build/trans_presets.java:1146
-#: build/trans_presets.java:1151 build/trans_presets.java:1157
-#: build/trans_presets.java:1163 build/trans_presets.java:1172
-#: build/trans_presets.java:1181 build/trans_presets.java:1188
-#: build/trans_presets.java:1196 build/trans_presets.java:1209
-#: build/trans_presets.java:1215 build/trans_presets.java:1224
-#: build/trans_presets.java:1230 build/trans_presets.java:1236
-#: build/trans_presets.java:1244 build/trans_presets.java:1299
-#: build/trans_presets.java:1346 build/trans_presets.java:1352
-#: build/trans_presets.java:1358 build/trans_presets.java:1364
-#: build/trans_presets.java:1370 build/trans_presets.java:1381
-#: build/trans_presets.java:1390 build/trans_presets.java:1405
-#: build/trans_presets.java:1412 build/trans_presets.java:1418
-#: build/trans_presets.java:1426 build/trans_presets.java:1433
-#: build/trans_presets.java:1442 build/trans_presets.java:1450
-#: build/trans_presets.java:1457 build/trans_presets.java:1468
-#: build/trans_presets.java:1478 build/trans_presets.java:1488
-#: build/trans_presets.java:1508 build/trans_presets.java:1520
-#: build/trans_presets.java:1531 build/trans_presets.java:1548
-#: build/trans_presets.java:1555 build/trans_presets.java:1570
-#: build/trans_presets.java:1577 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1594
-#: build/trans_presets.java:1599 build/trans_presets.java:1605
-#: build/trans_presets.java:1611 build/trans_presets.java:1619
-#: build/trans_presets.java:1627 build/trans_presets.java:1635
-#: build/trans_presets.java:1642 build/trans_presets.java:1648
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1670 build/trans_presets.java:1677
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1712 build/trans_presets.java:1719
-#: build/trans_presets.java:1736 build/trans_presets.java:1744
-#: build/trans_presets.java:1759 build/trans_presets.java:1769
-#: build/trans_presets.java:1781 build/trans_presets.java:1788
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:1809 build/trans_presets.java:1817
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1841
-#: build/trans_presets.java:1846 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1864
-#: build/trans_presets.java:1872 build/trans_presets.java:1881
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1908 build/trans_presets.java:1914
-#: build/trans_presets.java:1922 build/trans_presets.java:1928
-#: build/trans_presets.java:1934 build/trans_presets.java:1940
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2013
-#: build/trans_presets.java:2022 build/trans_presets.java:2030
-#: build/trans_presets.java:2036 build/trans_presets.java:2042
-#: build/trans_presets.java:2048 build/trans_presets.java:2054
-#: build/trans_presets.java:2060 build/trans_presets.java:2066
-#: build/trans_presets.java:2072 build/trans_presets.java:2078
-#: build/trans_presets.java:2084 build/trans_presets.java:2090
-#: build/trans_presets.java:2096 build/trans_presets.java:2102
-#: build/trans_presets.java:2108 build/trans_presets.java:2114
-#: build/trans_presets.java:2120 build/trans_presets.java:2126
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2158
-#: build/trans_presets.java:2165 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2186
-#: build/trans_presets.java:2192 build/trans_presets.java:2198
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2218 build/trans_presets.java:2225
-#: build/trans_presets.java:2232 build/trans_presets.java:2239
-#: build/trans_presets.java:2247 build/trans_presets.java:2279
-#: build/trans_presets.java:2284 build/trans_presets.java:2289
-#: build/trans_presets.java:2294 build/trans_presets.java:2300
-#: build/trans_presets.java:2306 build/trans_presets.java:2312
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2354
-#: build/trans_presets.java:2451 build/trans_presets.java:2458
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2485 build/trans_presets.java:2492
-#: build/trans_presets.java:2498 build/trans_presets.java:2504
-#: build/trans_presets.java:2526 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2553 build/trans_presets.java:2559
-#: build/trans_presets.java:2565 build/trans_presets.java:2571
-#: build/trans_presets.java:2577 build/trans_presets.java:2583
-#: build/trans_presets.java:2590 build/trans_presets.java:2597
-#: build/trans_presets.java:2604 build/trans_presets.java:2610
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2661
-#: build/trans_presets.java:2667 build/trans_presets.java:2677
-#: build/trans_presets.java:2686 build/trans_presets.java:2701
-#: build/trans_presets.java:2707 build/trans_presets.java:2715
-#: build/trans_presets.java:2722 build/trans_presets.java:2742
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2783
-#: build/trans_presets.java:2790 build/trans_presets.java:2797
-#: build/trans_presets.java:2803 build/trans_presets.java:2809
-#: build/trans_presets.java:2817 build/trans_presets.java:2824
-#: build/trans_presets.java:2831 build/trans_presets.java:2838
-#: build/trans_presets.java:2844 build/trans_presets.java:2851
-#: build/trans_presets.java:2858 build/trans_presets.java:2867
-#: build/trans_presets.java:2873 build/trans_presets.java:2879
-#: build/trans_presets.java:2885 build/trans_presets.java:2891
-#: build/trans_presets.java:2900 build/trans_presets.java:2910
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2948
-#: build/trans_presets.java:2957 build/trans_presets.java:2963
-#: build/trans_presets.java:2969 build/trans_presets.java:2975
-#: build/trans_presets.java:2981 build/trans_presets.java:2987
-#: build/trans_presets.java:2993 build/trans_presets.java:3000
-#: build/trans_presets.java:3006 build/trans_presets.java:3011
-#: build/trans_presets.java:3018 build/trans_presets.java:3025
-#: build/trans_presets.java:3031 build/trans_presets.java:3040
-#: build/trans_presets.java:3048 build/trans_presets.java:3054
-#: build/trans_presets.java:3060 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3080
-#: build/trans_presets.java:3086 build/trans_presets.java:3092
-#: build/trans_presets.java:3098 build/trans_presets.java:3104
-#: build/trans_presets.java:3117 build/trans_presets.java:3131
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:67 build/trans_presets.java:103
+#: build/trans_presets.java:143 build/trans_presets.java:180
+#: build/trans_presets.java:200 build/trans_presets.java:218
+#: build/trans_presets.java:235 build/trans_presets.java:253
+#: build/trans_presets.java:273 build/trans_presets.java:306
+#: build/trans_presets.java:352 build/trans_presets.java:372
+#: build/trans_presets.java:387 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:503 build/trans_presets.java:523
+#: build/trans_presets.java:544 build/trans_presets.java:565
+#: build/trans_presets.java:586 build/trans_presets.java:607
+#: build/trans_presets.java:628 build/trans_presets.java:659
+#: build/trans_presets.java:680 build/trans_presets.java:693
+#: build/trans_presets.java:706 build/trans_presets.java:719
+#: build/trans_presets.java:732 build/trans_presets.java:745
+#: build/trans_presets.java:756 build/trans_presets.java:765
+#: build/trans_presets.java:812 build/trans_presets.java:833
+#: build/trans_presets.java:842 build/trans_presets.java:902
+#: build/trans_presets.java:1053 build/trans_presets.java:1061
+#: build/trans_presets.java:1069 build/trans_presets.java:1077
+#: build/trans_presets.java:1087 build/trans_presets.java:1095
+#: build/trans_presets.java:1100 build/trans_presets.java:1107
+#: build/trans_presets.java:1114 build/trans_presets.java:1119
+#: build/trans_presets.java:1127 build/trans_presets.java:1136
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1153 build/trans_presets.java:1159
+#: build/trans_presets.java:1165 build/trans_presets.java:1174
+#: build/trans_presets.java:1183 build/trans_presets.java:1190
+#: build/trans_presets.java:1198 build/trans_presets.java:1211
+#: build/trans_presets.java:1217 build/trans_presets.java:1226
+#: build/trans_presets.java:1232 build/trans_presets.java:1238
+#: build/trans_presets.java:1246 build/trans_presets.java:1302
+#: build/trans_presets.java:1349 build/trans_presets.java:1355
+#: build/trans_presets.java:1361 build/trans_presets.java:1367
+#: build/trans_presets.java:1373 build/trans_presets.java:1384
+#: build/trans_presets.java:1393 build/trans_presets.java:1408
+#: build/trans_presets.java:1415 build/trans_presets.java:1421
+#: build/trans_presets.java:1429 build/trans_presets.java:1436
+#: build/trans_presets.java:1445 build/trans_presets.java:1453
+#: build/trans_presets.java:1460 build/trans_presets.java:1471
+#: build/trans_presets.java:1481 build/trans_presets.java:1491
+#: build/trans_presets.java:1511 build/trans_presets.java:1523
+#: build/trans_presets.java:1534 build/trans_presets.java:1551
+#: build/trans_presets.java:1558 build/trans_presets.java:1574
+#: build/trans_presets.java:1581 build/trans_presets.java:1586
+#: build/trans_presets.java:1592 build/trans_presets.java:1598
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1646 build/trans_presets.java:1652
+#: build/trans_presets.java:1659 build/trans_presets.java:1666
+#: build/trans_presets.java:1674 build/trans_presets.java:1681
+#: build/trans_presets.java:1689 build/trans_presets.java:1696
+#: build/trans_presets.java:1702 build/trans_presets.java:1709
+#: build/trans_presets.java:1716 build/trans_presets.java:1723
+#: build/trans_presets.java:1740 build/trans_presets.java:1748
+#: build/trans_presets.java:1763 build/trans_presets.java:1773
+#: build/trans_presets.java:1785 build/trans_presets.java:1792
+#: build/trans_presets.java:1798 build/trans_presets.java:1808
+#: build/trans_presets.java:1813 build/trans_presets.java:1821
+#: build/trans_presets.java:1828 build/trans_presets.java:1834
+#: build/trans_presets.java:1840 build/trans_presets.java:1845
+#: build/trans_presets.java:1850 build/trans_presets.java:1855
+#: build/trans_presets.java:1862 build/trans_presets.java:1868
+#: build/trans_presets.java:1873 build/trans_presets.java:1882
+#: build/trans_presets.java:1891 build/trans_presets.java:1900
+#: build/trans_presets.java:1909 build/trans_presets.java:1918
+#: build/trans_presets.java:1924 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 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:2023 build/trans_presets.java:2032
+#: build/trans_presets.java:2040 build/trans_presets.java:2046
+#: build/trans_presets.java:2052 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 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:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2150
+#: build/trans_presets.java:2156 build/trans_presets.java:2162
+#: build/trans_presets.java:2169 build/trans_presets.java:2176
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2197 build/trans_presets.java:2203
+#: build/trans_presets.java:2209 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2229
+#: build/trans_presets.java:2236 build/trans_presets.java:2243
+#: build/trans_presets.java:2250 build/trans_presets.java:2258
+#: build/trans_presets.java:2290 build/trans_presets.java:2295
+#: build/trans_presets.java:2300 build/trans_presets.java:2305
+#: build/trans_presets.java:2311 build/trans_presets.java:2317
+#: build/trans_presets.java:2323 build/trans_presets.java:2331
+#: build/trans_presets.java:2337 build/trans_presets.java:2343
+#: build/trans_presets.java:2349 build/trans_presets.java:2355
+#: build/trans_presets.java:2365 build/trans_presets.java:2462
+#: build/trans_presets.java:2469 build/trans_presets.java:2483
+#: build/trans_presets.java:2489 build/trans_presets.java:2496
+#: build/trans_presets.java:2503 build/trans_presets.java:2509
+#: build/trans_presets.java:2515 build/trans_presets.java:2537
+#: build/trans_presets.java:2544 build/trans_presets.java:2551
+#: build/trans_presets.java:2557 build/trans_presets.java:2564
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2594 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2615
+#: build/trans_presets.java:2621 build/trans_presets.java:2627
+#: build/trans_presets.java:2633 build/trans_presets.java:2639
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2672 build/trans_presets.java:2678
+#: build/trans_presets.java:2688 build/trans_presets.java:2697
+#: build/trans_presets.java:2712 build/trans_presets.java:2718
+#: build/trans_presets.java:2726 build/trans_presets.java:2733
+#: build/trans_presets.java:2753 build/trans_presets.java:2764
+#: build/trans_presets.java:2770 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2788
+#: build/trans_presets.java:2795 build/trans_presets.java:2802
+#: build/trans_presets.java:2809 build/trans_presets.java:2815
+#: build/trans_presets.java:2821 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2912
+#: build/trans_presets.java:2922 build/trans_presets.java:2931
+#: build/trans_presets.java:2937 build/trans_presets.java:2943
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 build/trans_presets.java:2981
+#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:2999 build/trans_presets.java:3005
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3023 build/trans_presets.java:3030
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3066 build/trans_presets.java:3072
+#: build/trans_presets.java:3079 build/trans_presets.java:3085
+#: build/trans_presets.java:3092 build/trans_presets.java:3098
+#: build/trans_presets.java:3104 build/trans_presets.java:3110
+#: build/trans_presets.java:3116 build/trans_presets.java:3129
+#: build/trans_presets.java:3143 build/trans_presets.java:3157
 msgid "Name"
 msgstr "Name"
@@ -6695,4 +6829,58 @@
 msgid "Version"
 msgstr "Version"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
+#, fuzzy
+msgid "Changeset id:"
+msgstr "Changeset {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
+#, fuzzy
+msgid "Created at:"
+msgstr "Create areas"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
+#, fuzzy
+msgid "Changeset comment:"
+msgstr "Changeset {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
+msgid "No open changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48
+#, fuzzy
+msgid "<html>Please select the changesets you want to close</html>"
+msgstr "Please select which property changes you want to apply."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
+#, fuzzy
+msgid "Open changesets"
+msgstr "changesets"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101
+#, fuzzy
+msgid "Close changesets"
+msgstr "Closing changeset..."
+
+#. putValue(SMALL_ICON, ImageProvider.get("cancel"));
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
+#, fuzzy
+msgid "Close the selected open changesets"
+msgstr "Delete selected objects."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126
+#, fuzzy
+msgid "Cancel closeing of changesets"
+msgstr "Closing changeset..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37
+msgid "Closing changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77
+#, fuzzy, java-format
+msgid "Closing changeset {0}"
+msgstr "Closing changeset..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
@@ -6721,5 +6909,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be uploaded"
+msgid "Layer ''{0}'' has no modifications to be uploaded."
 msgstr ""
 
@@ -6727,5 +6915,5 @@
 #, java-format
 msgid ""
-"Layer ''{0}'' has modifications which should be saved to its assoicated file "
+"Layer ''{0}'' has modifications which should be saved to its associated file "
 "''{1}''."
 msgstr ""
@@ -6733,5 +6921,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be saved"
+msgid "Layer ''{0}'' has no modifications to be saved."
 msgstr ""
 
@@ -6765,17 +6953,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113
 msgid "Unsaved changes - Save/Upload before exiting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194
 #, java-format
 msgid ""
@@ -6788,10 +6976,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205
 msgid "Unsaved data and conflicts"
-msgstr "Resolve conflicts"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212
 #, java-format
 msgid ""
@@ -6805,9 +6992,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223
 msgid "Unsaved data and missing associated file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230
 #, java-format
 msgid ""
@@ -6822,43 +7009,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243
 msgid "Unsaved data non-writable files"
-msgstr "Use default tag ignore file."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
 msgid "Close this dialog and resume editing in JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322
+msgid "Discard and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
-msgid "Discard and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354
+msgid "Save and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
-msgid "Save and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
 msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402
 #, java-format
 msgid "Preparing layer ''{0}'' for upload ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
@@ -6866,5 +7052,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491
 msgid "Incomplete upload and/or save"
 msgstr ""
@@ -6904,21 +7090,21 @@
 #. item "Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:200
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:278
-#: build/trans_presets.java:311 build/trans_presets.java:357
-#: build/trans_presets.java:372 build/trans_presets.java:387
-#: build/trans_presets.java:409 build/trans_presets.java:429
-#: build/trans_presets.java:450 build/trans_presets.java:470
-#: build/trans_presets.java:489 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:549
-#: build/trans_presets.java:570 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:633
-#: build/trans_presets.java:664 build/trans_presets.java:1060
-#: build/trans_presets.java:1068 build/trans_presets.java:1076
-#: build/trans_presets.java:1086 build/trans_presets.java:1305
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:242
+#: build/trans_presets.java:260 build/trans_presets.java:279
+#: build/trans_presets.java:312 build/trans_presets.java:358
+#: build/trans_presets.java:373 build/trans_presets.java:388
+#: build/trans_presets.java:410 build/trans_presets.java:430
+#: build/trans_presets.java:451 build/trans_presets.java:471
+#: build/trans_presets.java:490 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:665 build/trans_presets.java:1062
+#: build/trans_presets.java:1070 build/trans_presets.java:1078
+#: build/trans_presets.java:1088 build/trans_presets.java:1308
 msgid "Layer"
 msgstr "Layer"
@@ -6937,69 +7123,32 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:200
 msgid "Upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-msgid "Use a new changeset and close it"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
-msgid ""
-"Select to upload the data using a new changeset and to close the changeset "
-"after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
-msgid "Use a new changeset and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
-msgid ""
-"Select to upload the data using a new changeset and to leave the changeset "
-"open after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
-msgid "Upload to a new or to an existing changeset?"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
-msgid "upload all changes in one request"
-msgstr "upload all changes in one request"
+msgid "Settings"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
-msgid ""
-"Enable to upload all changes in one request, disable to use one request per "
-"changed primitive"
-msgstr ""
-"Enable to upload all changes in one request, disable to use one request per "
-"changed primitive"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171
-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/gui/io/UploadDialog.java:216
-msgid "Settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908
 msgid "Tags of new changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:221
 msgid "Objects to add:"
 msgstr "Objects to add:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:227
 msgid "Objects to modify:"
 msgstr "Objects to modify:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:233
 msgid "Objects to delete:"
 msgstr "Objects to delete:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
 #, java-format
 msgid "{0} object to add:"
@@ -7008,5 +7157,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:277
 #, java-format
 msgid "{0} object to modifiy:"
@@ -7015,5 +7164,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:286
 #, java-format
 msgid "{0} object to delete:"
@@ -7022,55 +7171,90 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422
-#, java-format
-msgid "Use the existing changeset {0} and close it after upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:423
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to close the changeset "
-"after this upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426
-#, java-format
-msgid "Use the existing changeset {0} and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:427
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to leave the changeset "
-"open for further uploads"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
-#, java-format
-msgid "Tags of changeset {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:470
 msgid "Upload Changes"
 msgstr "Upload Changes"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472
+msgid "Upload the changed primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
+msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:479
+msgid "Illegal upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
+msgid "Cancel the upload and resume editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606
 #, fuzzy
-msgid "Upload the changed primitives"
-msgstr "Upload these changes?"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592
+msgid "Upload all changes in one request"
+msgstr "upload all changes in one request"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607
+msgid ""
+"Enable to upload all changes in one request, disable to use one request per "
+"changed primitive"
+msgstr ""
+"Enable to upload all changes in one request, disable to use one request per "
+"changed primitive"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:617
+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/gui/io/UploadDialog.java:672
 #, fuzzy
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "Please enter a name for the location."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:593
-msgid "Illegal upload comment"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
+msgid "Open a new changeset"
+msgstr "changesets"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
+msgid "Open a new changeset and use it in the next upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
 #, fuzzy
-msgid "Cancel the upload and resume editing"
-msgstr "Cancel the updates and close the dialog"
+msgid "Use an open changeset"
+msgstr "Unsaved Changes"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
+msgid "Upload data to an already opened changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
+#, fuzzy
+msgid "Close changeset after upload"
+msgstr "No changes to upload."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
+msgid "Select to close the changeset after the next upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922
+#, java-format
+msgid "Tags of changeset {0}"
+msgstr ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
+#, fuzzy
+msgid "Load the list of your open changesets from the server"
+msgstr "Upload the current preferences to the server"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
+#, fuzzy
+msgid "Close the currently selected open changeset"
+msgstr "Delete the currently selected tags"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
+#, fuzzy, java-format
+msgid "changeset id > 0 expected. Got {1}"
+msgstr "parameter ''{0}'' > 0 expected, got ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63
@@ -7148,5 +7332,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
@@ -7184,5 +7368,5 @@
 msgstr "Time entered could not be parsed."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
@@ -7190,30 +7374,30 @@
 msgstr "gps point"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
 msgid "Customize line drawing"
 msgstr "Customise line drawing"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
 msgid "Use global settings."
 msgstr "Use global settings."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Draw lines between points for this layer."
 msgstr "Draw lines between points for this layer."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Do not draw lines between points for this layer."
 msgstr "Do not draw lines between points for this layer."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 msgid "Select line drawing options"
 msgstr "Select line drawing options"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7221,5 +7405,5 @@
 msgstr "Customise Colour"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7228,5 +7412,5 @@
 msgstr "Default"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7235,38 +7419,75 @@
 msgstr "Choose a colour"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
 msgid "Markers From Named Points"
 msgstr "Markers From Named Points"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Named Trackpoints from {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
 msgid "Import Audio"
 msgstr "Import Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave Audio files (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Audio markers from {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
 msgid "Import images"
 msgstr "Import images"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#, java-format
+msgid "Name: {0}"
+msgstr "Name: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#, java-format
+msgid "Description: {0}"
+msgstr "Description: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#, fuzzy, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
 msgstr[0] "{0} track, "
 msgstr[1] "{0} tracks, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
+#: build/trans_presets.java:3160
+msgid "Description"
+msgstr "Description"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#, fuzzy
+msgid "Timespan"
+msgstr "Timespan: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#, fuzzy
+msgid "Length"
+msgstr "Length: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
+msgid "URL"
+msgstr "URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+msgid "Length: "
+msgstr "Length: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
 #, java-format
 msgid "{0} route, "
@@ -7275,5 +7496,5 @@
 msgstr[1] "{0} routes, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 #, java-format
 msgid "{0} waypoint"
@@ -7282,29 +7503,10 @@
 msgstr[1] "{0} waypoints"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
-#, java-format
-msgid "Name: {0}"
-msgstr "Name: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
-#, java-format
-msgid "Description: {0}"
-msgstr "Description: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
-msgid "Timespan: "
-msgstr "Timespan: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
-msgid "Length: "
-msgstr "Length: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Convert to data layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7314,10 +7516,10 @@
 "<br>If you want to upload traces, look here:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -7328,29 +7530,29 @@
 msgstr "Converted from: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
 msgid "Download from OSM along this track"
 msgstr "Download from OSM along this track"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
 msgid "Download everything within:"
 msgstr "Download everything within:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metres"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 msgid "Maximum area per request:"
 msgstr "Maximum area per request:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} sq km"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
 #, java-format
 msgid ""
@@ -7361,13 +7563,13 @@
 "wish<br>to continue?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
 msgid "Download data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
 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:1143
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7377,5 +7579,5 @@
 "the end were omitted or moved to the start."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7428,30 +7630,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
-#, fuzzy
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
 "<br>If you want to upload traces, look here:</html>"
 msgstr ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "track"
 msgid_plural "tracks"
@@ -7589,4 +7788,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
@@ -7827,13 +8027,18 @@
 msgstr "Draw large GPS points."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+msgid "Draw a circle form HDOP value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Velocity (red = slow, green = fast)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Dilution of Position (red = high, green = low, if available)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Single Colour (can be customised for named layers)"
@@ -7841,6 +8046,6 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1374
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:1377
 msgid "Car"
 msgstr "Car"
@@ -7861,14 +8066,14 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:324 build/trans_presets.java:650
-#: build/trans_presets.java:857 build/trans_presets.java:876
-#: build/trans_presets.java:890 build/trans_presets.java:912
-#: build/trans_presets.java:949 build/trans_presets.java:962
-#: build/trans_presets.java:974 build/trans_presets.java:986
-#: build/trans_presets.java:998 build/trans_presets.java:1010
-#: build/trans_presets.java:1020 build/trans_presets.java:1029
-#: build/trans_presets.java:1038 build/trans_presets.java:1437
-#: build/trans_presets.java:1510
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:325 build/trans_presets.java:651
+#: build/trans_presets.java:858 build/trans_presets.java:877
+#: build/trans_presets.java:891 build/trans_presets.java:913
+#: build/trans_presets.java:950 build/trans_presets.java:963
+#: build/trans_presets.java:975 build/trans_presets.java:987
+#: build/trans_presets.java:999 build/trans_presets.java:1011
+#: build/trans_presets.java:1021 build/trans_presets.java:1030
+#: build/trans_presets.java:1039 build/trans_presets.java:1440
+#: build/trans_presets.java:1513
 msgid "Bicycle"
 msgstr "Bicycle"
@@ -7901,62 +8106,62 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:325 build/trans_presets.java:649
-#: build/trans_presets.java:856 build/trans_presets.java:875
-#: build/trans_presets.java:889 build/trans_presets.java:911
-#: build/trans_presets.java:948 build/trans_presets.java:961
-#: build/trans_presets.java:973 build/trans_presets.java:985
-#: build/trans_presets.java:997 build/trans_presets.java:1009
-#: build/trans_presets.java:1019 build/trans_presets.java:1028
-#: build/trans_presets.java:1037
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:326 build/trans_presets.java:650
+#: build/trans_presets.java:857 build/trans_presets.java:876
+#: build/trans_presets.java:890 build/trans_presets.java:912
+#: build/trans_presets.java:949 build/trans_presets.java:962
+#: build/trans_presets.java:974 build/trans_presets.java:986
+#: build/trans_presets.java:998 build/trans_presets.java:1010
+#: build/trans_presets.java:1020 build/trans_presets.java:1029
+#: build/trans_presets.java:1038
 msgid "Foot"
 msgstr "Foot"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Draw Direction Arrows"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Fast drawing (looks uglier)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Only interesting direction hints (e.g. with oneway tag)."
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Only on the head of a way."
 msgstr "Only on the head of a way."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Draw segment order numbers"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Draw boundaries of downloaded data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Draw virtual nodes in select mode"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Draw inactive layers in other colour"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Smooth map graphics (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:82
 msgid "Draw lines between raw GPS points"
 msgstr "Draw lines between raw GPS points"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -7966,9 +8171,9 @@
 "draw all lines."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
 msgid "Maximum length for local files (meters)"
 msgstr "Maximum length for local files (meters)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
@@ -7976,10 +8181,10 @@
 "Maximum length (in metres) to draw lines. Set to '-1' to draw all lines."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length (meters)"
 msgstr "Maximum length (metres)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -7987,10 +8192,10 @@
 "Force drawing of lines if the imported data contain no line information."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:129
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Draw direction arrows for lines, connecting GPS points."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:135
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -7998,5 +8203,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:141
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -8006,13 +8211,13 @@
 "one."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:144
 msgid "Minimum distance (pixels)"
 msgstr "Minimum distance (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Draw larger dots for the GPS points."
 msgstr "Draw larger dots for the GPS points."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -8022,9 +8227,9 @@
 "in Layer Manager."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Colors points and track segments by velocity."
 msgstr "Colours points and track segments by velocity."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -8034,46 +8239,46 @@
 "capture device needs to logs that information."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Allows to tune the track coloring for different average speeds."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid "Track and Point Coloring"
 msgstr "Track and Point Colouring"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202
 msgid "GPS Points"
 msgstr "GPS Points"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "Draw direction hints for way segments."
 msgstr "Draw direction hints for way segments."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:237
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Draw the order numbers of all segments within their way."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Apply antialiasing to the map view resulting in a smoother appearance."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Draw the boundaries of data loaded from the server."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Draw virtual nodes in select mode for easy way modification."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257
 msgid "Draw the inactive data layers in a different color."
 msgstr "Draw the inactive data layers in a different colour."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "OSM Data"
 msgstr "OSM Data"
@@ -8152,45 +8357,46 @@
 msgstr "Used style"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Configure available plugins."
 msgstr "Configure available plugins."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50
+#. buttons at the bottom
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
 msgid "Download List"
 msgstr "Download List"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:100
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 msgid "Update"
 msgstr "Update"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Configure Sites..."
 msgstr "Configure Sites..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:125
 msgid "Add JOSM Plugin description URL."
 msgstr "Add JOSM Plugin description URL."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:126
 msgid "Enter URL"
 msgstr "Enter URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:162
 msgid "Please select an entry."
 msgstr "Please select an entry."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:147
 msgid "Edit JOSM Plugin description URL."
 msgstr "Edit JOSM Plugin description URL."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:148
 msgid "JOSM Plugin description URL"
 msgstr "JOSM Plugin description URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:175
 msgid "Configure Plugin Sites"
 msgstr "Configure Plugin Sites"
@@ -8545,6 +8751,6 @@
 msgstr "<multiple>"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:369
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341
 #, java-format
 msgid "Remove old keys from up to {0} object"
@@ -8553,9 +8759,9 @@
 msgstr[1] "Remove old keys from up to {0} objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135
 msgid "Add a new tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160
 msgid "Delete the selection in the tag table"
 msgstr ""
@@ -8590,7 +8796,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:68
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:75
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -8634,4 +8840,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24
+#, fuzzy, java-format
+msgid "Preset group ''{0}'' of group ''{1}''"
+msgstr "Use preset ''{0}'' of group ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
 #, java-format
 msgid "Preset group ''{0}''"
@@ -8652,4 +8863,10 @@
 msgstr "Downloading points {0} to {1}..."
 
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, fuzzy, java-format
+msgid "parameter ''{0}'' > 0 expected. Got {1}"
+msgstr "parameter ''{0}'' > 0 expected, got ''{1}''"
+
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8758,5 +8975,5 @@
 msgstr "Parsing file \"{0}\" failed"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "Parse error: invalid document structure for gpx document"
@@ -8880,10 +9097,11 @@
 msgstr "Communications with {0} established using protocol version {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
 msgstr "unexpected format of id replied by the server, got ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -8892,76 +9110,80 @@
 "unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315
 msgid "Creating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
 #, java-format
 msgid "Successfully opened changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#, fuzzy, java-format
+msgid "id of changeset > 0 required. Got {0}"
+msgstr "id parameter ''{0}'' > 0 required. Got {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
-#, java-format
-msgid "Changeset {0} is unchanged. Skipping update."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
 #, java-format
 msgid "Updating changeset {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
-msgid ""
-"Failed to update changeset. Either there is no current changeset or the id "
-"of the current changeset is 0"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
 msgid "Closing changeset..."
 msgstr "Closing changeset..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
-#, java-format
-msgid "Closing changeset {0}..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
-#, java-format
-msgid "Leaving changeset {0} open..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
 msgid "No changeset present for diff upload"
 msgstr "No changeset present for diff upload"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414
 msgid "Preparing..."
 msgstr "Preparing..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419
 msgid "Uploading..."
 msgstr "Uploading..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438
 msgid "Waiting 10 seconds ... "
 msgstr "Waiting 10 seconds ... "
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449
 msgid "OK - trying again."
 msgstr "OK - trying again."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:485
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr "Starting retry {0} of {1}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
+msgid "current changeset is null. Can't upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
+#, java-format
+msgid "id of current changeset > required. Current id is {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
+#, java-format
+msgid "Open changeset expected. Got closed changeset with id {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
@@ -8986,33 +9208,92 @@
 msgstr "Invalid bz2 file."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
+#, fuzzy, java-format
+msgid "missing mandatory attribute ''{0}''"
+msgstr "mandatory attribute ''{0}'' missing"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:128
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:134
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
+#, fuzzy, java-format
+msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgstr "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
+#, fuzzy, java-format
+msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgstr "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
+#, fuzzy, java-format
+msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgstr "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#, java-format
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#, java-format
+msgid "Unsupported version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:176
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Aborting."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#, java-format
+msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
+#, fuzzy
+msgid "Parsing list of changesets..."
+msgstr "Closing changeset..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
 msgid "Incorrect password or username."
 msgstr "Incorrect password or username."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:168
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Warning: The password is transferred unencrypted."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Save user and password (unencrypted)"
 msgstr "Save user and password (unencrypted)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
 msgid "Enter Password"
 msgstr "Enter Password"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 msgid "Login"
 msgstr "Login"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:242
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
 msgid "The base URL for the OSM server (REST API)"
 msgstr "The base URL for the OSM server (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
 msgid "Login name (e-mail) to the OSM account."
 msgstr "Login name (e-mail) to the OSM account."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -9020,17 +9301,17 @@
 "Login password to the OSM account. Leave blank to not store any password."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
 msgid "Base Server URL"
 msgstr "Base Server URL"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
 msgid "OSM username (e-mail)"
 msgstr "OSM username (e-mail)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
 msgid "OSM password"
 msgstr "OSM password"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -9042,5 +9323,5 @@
 "URL.<br><b>Do not use a valuable Password.</b></html>"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:51
+#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #, java-format
 msgid "(at line {0}, column {1})"
@@ -9138,20 +9419,5 @@
 msgstr "Error during parse."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124
-#, fuzzy, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr "mandatory attribute ''{0}'' missing"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
-#, fuzzy, java-format
-msgid "Missing mandatory attribute ''{0}''"
-msgstr "mandatory attribute ''{0}'' missing"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
-#, fuzzy, java-format
-msgid "Unsupported version: {0}"
-msgstr "Unknown version: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:155
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -9160,70 +9426,64 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
 msgid "found XML element <nd> element not as direct child of element <way>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
-msgstr "mandatory attribute ''{0}'' missing"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
-msgstr "Illegal value for attribute \"ref\" on member in relation {0}, got {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
 msgid "Found XML element <member> not as direct child of element <relation>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}"
-msgstr "Missing attribute \"ref\" on member in relation {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
-msgstr "Illegal value for attribute \"ref\" on member in relation {0}, got {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}"
-msgstr "Missing attribute \"type\" on member {0} in relation {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#, java-format
 msgid ""
 "Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}."
-msgstr "Illegal value for attribute \"ref\" on member in relation {0}, got {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Incomplete <member> specification with ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
-#, java-format
-msgid "Warning: Undefined element ''{0}'' found in input stream. Skipping."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
-#, fuzzy, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
-msgstr "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Skipping."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
 msgid "Illegal object with id=0"
 msgstr "Illegal object with id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#, java-format
 msgid ""
 "Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
 msgstr ""
-"Illegal value for attribute \"version\" on OSM primitive with id {0}, got {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:303
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
 #, java-format
 msgid ""
@@ -9232,5 +9492,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
 #, java-format
 msgid ""
@@ -9239,5 +9499,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
@@ -9247,25 +9507,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:316
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#, java-format
 msgid "Unknown or unsupported API version. Got {0}"
-msgstr "Unknown version: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#, java-format
 msgid "Missing attribute ''version'' on OSM primitive with id {0}"
-msgstr "Missing attribute \"version\" on OSM primitive with id {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#, java-format
 msgid "Missing required attribute ''{0}''."
-msgstr "Missing required attribute \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
-msgstr "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
 #, java-format
 msgid ""
@@ -9273,5 +9533,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
 #, java-format
 msgid ""
@@ -9282,30 +9542,28 @@
 "missing in the loaded data and is therefore incomplete too"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
+#, java-format
 msgid ""
 "Unknown relation member type ''{0}'' in relation with external id ''{1}''"
-msgstr "Unknown relation member type {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#, java-format
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
 "id ''{1}''"
-msgstr "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
 msgid "Prepare OSM data..."
 msgstr "Prepare OSM data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 msgid "Parsing OSM data..."
-msgstr "Parsing OSM history data ..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
 msgid "Preparing data set..."
-msgstr "Preparing data..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
@@ -9327,4 +9585,24 @@
 msgstr "Downloading referring relations ..."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51
+#, fuzzy
+msgid "Reading changesets..."
+msgstr "Closing changeset..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
+#, fuzzy
+msgid "Downloading changesets ..."
+msgstr "Closing changeset..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85
+#, fuzzy, java-format
+msgid "Reading changeset {0} ..."
+msgstr "Reading {0}..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91
+#, fuzzy, java-format
+msgid "Downloading changeset {0} ..."
+msgstr "Downloading Plugin {0}..."
+
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
@@ -9340,10 +9618,14 @@
 msgstr "Contacting Server..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
 msgid "Failed to open connection to API {0}"
 msgstr "Failed to open connection to API {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
+msgid "Error: failed to add authentication credentials to the connection."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -9351,33 +9633,52 @@
 "Couldn't connect to the osm server. Please check your internet connection."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+msgid "XML tag <user> is missing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
+#, fuzzy, java-format
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgstr "Use preset ''{0}'' of group ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
+#, fuzzy, java-format
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgstr "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
 msgid "Starting to upload with one request per primitive ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
 msgid "Starting to upload in one request ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:171
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135
 msgid "Uploading data ..."
-msgstr "Uploading..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:178
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
 msgid ""
 "WARNING: no API version defined for data to upload. Falling back to version "
@@ -9385,5 +9686,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147
 #, java-format
 msgid ""
@@ -9393,10 +9694,10 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
 msgid "Update Plugins"
 msgstr "Update Plugins"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 msgid "Download Plugins"
 msgstr "Download Plugins"
@@ -9556,5 +9857,5 @@
 msgstr "More details"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -9563,18 +9864,18 @@
 msgstr[1] "Downloaded plugin information from {0} sites"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
 msgid "No plugin information found."
 msgstr "No plugin information found."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr "Plug-in named {0} is not available. Update skipped."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:93
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
 msgid "All installed plugins are up to date."
 msgstr "All installed plugins are up to date."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
 #, java-format
 msgid ""
@@ -9587,9 +9888,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
 msgid "Download missing plugins"
 msgstr "Download missing plugins"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
 #, java-format
 msgid ""
@@ -9604,43 +9905,43 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
 msgid "unknown"
 msgstr "unknown"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Version {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 msgid "Plugin bundled with JOSM"
 msgstr "Plugin bundled with JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:357
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -9769,5 +10070,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:165
-#, fuzzy
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -9775,6 +10075,4 @@
 "community."
 msgstr ""
-"The maximum bbox size is 0.25, and your request was too large. Either "
-"request a smaller area, or use planet.osm."
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:168
@@ -9980,10 +10278,4 @@
 msgid "(What does that mean?)"
 msgstr ""
-
-#. item "Relations/Route" text "Symbol description"
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3148
-msgid "Description"
-msgstr "Description"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
@@ -10766,6 +11058,7 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
-msgid "Set "
-msgstr ""
+#, fuzzy, java-format
+msgid "Set {0} Lambert coordinates"
+msgstr "Keep their coordiates"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -11395,6 +11688,6 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 #: build/trans_style.java:990 build/trans_style.java:1007
-#: build/trans_style.java:1023 build/trans_style.java:3392
-#: build/trans_style.java:3400
+#: build/trans_style.java:1023 build/trans_style.java:3400
+#: build/trans_style.java:3408
 msgid "water"
 msgstr "water"
@@ -11686,4 +11979,55 @@
 msgstr "Measurements"
 
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Michigan Left"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Adds no left turn for sets of 4 or 5 ways."
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45
+#, fuzzy
+msgid "Please select 4 or 5 ways to assign no left turns."
+msgstr "Please select one or more closed ways of at least four nodes."
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61
+#, fuzzy, java-format
+msgid "{0} extrem nodes."
+msgstr "{0} node"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69
+#, fuzzy, java-format
+msgid "Via node {0}, {1}"
+msgstr "Change {0} {1}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75
+#, fuzzy, java-format
+msgid "{0} via nodes."
+msgstr "{0} node"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78
+msgid "Unable to find via nodes. Please check your selection"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98
+#, fuzzy, java-format
+msgid "MIddle way: {0}"
+msgstr "Mode: {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121
+msgid "Create Michigan left turn restriction"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129
+#, fuzzy, java-format
+msgid "Processing {0}"
+msgstr "Version {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142
+#, fuzzy, java-format
+msgid "Relation: from {0} to {1} via {2}"
+msgstr "Version {0} created on {1} by {2}"
+
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
 msgid "OpenLayers"
@@ -11840,7 +12184,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
-#, fuzzy
 msgid "create new objects"
-msgstr "Create new node."
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
@@ -11904,7 +12247,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
-#, fuzzy
 msgid "Remote Control has been asked to create a new node."
-msgstr "Remote Control has been asked to load data from the API."
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
@@ -12164,5 +12506,5 @@
 msgstr "Launches the tag editor dialogue"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:158
 msgid "JOSM Tag Editor Plugin"
 msgstr "JOSM Tag Editor Plugin"
@@ -12172,5 +12514,5 @@
 msgstr "Highlight"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:370
 #, java-format
 msgid "Updating properties of up to {0} object"
@@ -12179,21 +12521,4 @@
 msgstr[1] "Updating properties of up to {0} objects"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44
-msgid "INFO: entering compatibilty mode for JOSM with Main.ds"
-msgstr "INFO: entering compatibilty mode for JOSM with Main.ds"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47
-msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
-msgstr ""
-"INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49
-msgid ""
-"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-"found."
-msgstr ""
-"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-"found."
-
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
 msgid "Group"
@@ -12203,9 +12528,4 @@
 msgid "Item"
 msgstr "Item"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-msgid "Filter"
-msgstr "Filter"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63
@@ -12292,5 +12612,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2272
 msgid "Street name"
 msgstr "Street name"
@@ -12457,8 +12777,4 @@
 msgid "Zoom (in metres)"
 msgstr "Zoom (in metres)"
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
-msgid "URL"
-msgstr "URL"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -12658,7 +12974,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:460
-#, fuzzy
 msgid "Fixing errors ..."
-msgstr "Waiting 10 seconds ... "
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:484
@@ -12668,7 +12983,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501
-#, fuzzy
 msgid "Updating map ..."
-msgstr "Updating data"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69
@@ -13160,7 +13474,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
-#: build/trans_style.java:4179
+#: build/trans_style.java:4159 build/trans_style.java:4166
+#: build/trans_style.java:4173 build/trans_style.java:4180
+#: build/trans_style.java:4187
 msgid "building"
 msgstr "building"
@@ -13174,5 +13488,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4186
+#: build/trans_style.java:4194
 msgid "area"
 msgstr "area"
@@ -13301,10 +13615,10 @@
 msgstr "Select a starting node on the end of a way"
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:148
 msgid "Reached the end of the line"
 msgstr "Reached the end of the line"
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:155
 msgid "Reached a junction"
 msgstr "Reached a junction"
@@ -13627,12 +13941,10 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
-#, fuzzy
 msgid "% of east:"
-msgstr "% of lat:"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
-#, fuzzy
 msgid "% of north:"
-msgstr "% of lat:"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -13800,6 +14112,11 @@
 "paths (which also can be imported from a gps layer)."
 
+#. Plugin michigan_left
+#: build/trans_plugins.java:35
+msgid "Adds no left turn for sets of 4 or 5 ways"
+msgstr ""
+
 #. Plugin nearclick
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid ""
 "Simulates a click when you do a small and short drag. This is usefull for "
@@ -13812,15 +14129,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid "Displays an OpenLayers background image"
 msgstr "Displays an OpenLayers background image"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Imports issues from OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13829,5 +14146,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13836,5 +14153,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13845,15 +14162,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "The great JGoodies Plastic Look and Feel."
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Let other applications send commands to JOSM."
 msgstr "Let other applications send commands to JOSM."
 
 #. Plugin routes
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13864,10 +14181,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Provides routing capabilities."
 msgstr "Provides routing capabilities."
 
 #. Plugin slippymap
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13878,15 +14195,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Allow adding markers/nodes on current gps positions."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Provides a dialog for editing tags in a tabular grid."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -13899,10 +14216,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Make terraced houses out of single blocks."
 msgstr "Make terraced houses out of single blocks."
 
 #. Plugin usertools
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -13913,5 +14230,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -13922,5 +14239,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -13931,5 +14248,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -13940,10 +14257,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Easy downloading along a long set of interconnected ways"
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -14000,4 +14317,10 @@
 #. <annotations>
 #: build/trans_presets.java:57
+#, fuzzy
+msgid "Highways"
+msgstr "highway"
+
+#. group "Highways"
+#: build/trans_presets.java:58
 msgid "Streets"
 msgstr "Streets"
@@ -14008,5 +14331,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:58 build/trans_surveyor.java:72
+#: build/trans_presets.java:59 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Motorway"
@@ -14015,5 +14338,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:61
+#: build/trans_presets.java:62
 msgid "Edit Motorway"
 msgstr "Edit Motorway"
@@ -14040,8 +14363,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:120 build/trans_presets.java:140
-#: build/trans_presets.java:177 build/trans_presets.java:197
-#: build/trans_presets.java:1557 build/trans_presets.java:3146
+#: build/trans_presets.java:65 build/trans_presets.java:101
+#: build/trans_presets.java:121 build/trans_presets.java:141
+#: build/trans_presets.java:178 build/trans_presets.java:198
+#: build/trans_presets.java:1560 build/trans_presets.java:3158
 msgid "Reference"
 msgstr "Reference"
@@ -14055,8 +14378,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:358
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:359
 msgid "Lanes"
 msgstr "Lanes"
@@ -14073,15 +14396,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:224 build/trans_presets.java:280
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:373 build/trans_presets.java:388
-#: build/trans_presets.java:412 build/trans_presets.java:431
-#: build/trans_presets.java:452 build/trans_presets.java:472
-#: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1307
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:225 build/trans_presets.java:281
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:374 build/trans_presets.java:389
+#: build/trans_presets.java:413 build/trans_presets.java:432
+#: build/trans_presets.java:453 build/trans_presets.java:473
+#: build/trans_presets.java:511 build/trans_presets.java:667
+#: build/trans_presets.java:1310
 msgid "Max. speed (km/h)"
 msgstr "Max. speed (km/h)"
@@ -14118,16 +14441,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:293 build/trans_presets.java:306
-#: build/trans_presets.java:320 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:464
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:659 build/trans_presets.java:1300
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:294 build/trans_presets.java:307
+#: build/trans_presets.java:321 build/trans_presets.java:353
+#: build/trans_presets.java:405 build/trans_presets.java:425
+#: build/trans_presets.java:445 build/trans_presets.java:465
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:660 build/trans_presets.java:1303
 msgid "Oneway"
 msgstr "Oneway"
@@ -14169,19 +14492,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:353
-#: build/trans_presets.java:362 build/trans_presets.java:405
-#: build/trans_presets.java:425 build/trans_presets.java:445
-#: build/trans_presets.java:465 build/trans_presets.java:485
-#: build/trans_presets.java:504 build/trans_presets.java:523
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:586 build/trans_presets.java:607
-#: build/trans_presets.java:628 build/trans_presets.java:660
-#: build/trans_presets.java:1301 build/trans_surveyor.java:12
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:354
+#: build/trans_presets.java:363 build/trans_presets.java:406
+#: build/trans_presets.java:426 build/trans_presets.java:446
+#: build/trans_presets.java:466 build/trans_presets.java:486
+#: build/trans_presets.java:505 build/trans_presets.java:524
+#: build/trans_presets.java:545 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629 build/trans_presets.java:661
+#: build/trans_presets.java:1304 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Bridge"
@@ -14217,19 +14540,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:354
-#: build/trans_presets.java:378 build/trans_presets.java:406
-#: build/trans_presets.java:426 build/trans_presets.java:446
-#: build/trans_presets.java:466 build/trans_presets.java:486
-#: build/trans_presets.java:505 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629 build/trans_presets.java:661
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:355
+#: build/trans_presets.java:379 build/trans_presets.java:407
+#: build/trans_presets.java:427 build/trans_presets.java:447
+#: build/trans_presets.java:467 build/trans_presets.java:487
+#: build/trans_presets.java:506 build/trans_presets.java:525
+#: build/trans_presets.java:546 build/trans_presets.java:567
+#: build/trans_presets.java:588 build/trans_presets.java:609
+#: build/trans_presets.java:630 build/trans_presets.java:662
+#: build/trans_presets.java:1305
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -14263,18 +14586,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:73 build/trans_presets.java:90
-#: build/trans_presets.java:110 build/trans_presets.java:129
-#: build/trans_presets.java:150 build/trans_presets.java:166
-#: build/trans_presets.java:186 build/trans_presets.java:205
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:355
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:467
-#: build/trans_presets.java:487 build/trans_presets.java:506
-#: build/trans_presets.java:525 build/trans_presets.java:546
-#: build/trans_presets.java:567 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:630
-#: build/trans_presets.java:662 build/trans_presets.java:1303
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:356
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:468
+#: build/trans_presets.java:488 build/trans_presets.java:507
+#: build/trans_presets.java:526 build/trans_presets.java:547
+#: build/trans_presets.java:568 build/trans_presets.java:589
+#: build/trans_presets.java:610 build/trans_presets.java:631
+#: build/trans_presets.java:663 build/trans_presets.java:1306
 msgid "Cutting"
 msgstr "Cutting"
@@ -14308,18 +14631,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:74 build/trans_presets.java:91
-#: build/trans_presets.java:111 build/trans_presets.java:130
-#: build/trans_presets.java:151 build/trans_presets.java:167
-#: build/trans_presets.java:187 build/trans_presets.java:206
-#: build/trans_presets.java:222 build/trans_presets.java:240
-#: build/trans_presets.java:258 build/trans_presets.java:277
-#: build/trans_presets.java:310 build/trans_presets.java:356
-#: build/trans_presets.java:408 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:468
-#: build/trans_presets.java:488 build/trans_presets.java:507
-#: build/trans_presets.java:526 build/trans_presets.java:547
-#: build/trans_presets.java:568 build/trans_presets.java:589
-#: build/trans_presets.java:610 build/trans_presets.java:631
-#: build/trans_presets.java:663 build/trans_presets.java:1304
+#: build/trans_presets.java:75 build/trans_presets.java:92
+#: build/trans_presets.java:112 build/trans_presets.java:131
+#: build/trans_presets.java:152 build/trans_presets.java:168
+#: build/trans_presets.java:188 build/trans_presets.java:207
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:357
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:469
+#: build/trans_presets.java:489 build/trans_presets.java:508
+#: build/trans_presets.java:527 build/trans_presets.java:548
+#: build/trans_presets.java:569 build/trans_presets.java:590
+#: build/trans_presets.java:611 build/trans_presets.java:632
+#: build/trans_presets.java:664 build/trans_presets.java:1307
 msgid "Embankment"
 msgstr "Embankment"
@@ -14327,5 +14650,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Motorway Link"
 msgstr "Motorway Link"
@@ -14334,5 +14657,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:80
+#: build/trans_presets.java:81
 msgid "Edit Motorway Link"
 msgstr "Edit Motorway Link"
@@ -14340,5 +14663,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:94
+#: build/trans_presets.java:95
 msgid "Trunk"
 msgstr "Trunk"
@@ -14347,5 +14670,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:97
+#: build/trans_presets.java:98
 msgid "Edit Trunk"
 msgstr "Edit Trunk"
@@ -14355,6 +14678,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
 msgid "Motorroad"
 msgstr "Motorroad"
@@ -14362,5 +14685,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:114
+#: build/trans_presets.java:115
 msgid "Trunk Link"
 msgstr "Trunk Link"
@@ -14369,5 +14692,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:117
+#: build/trans_presets.java:118
 msgid "Edit Trunk Link"
 msgstr "Edit Trunk Link"
@@ -14380,5 +14703,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:134 build/trans_surveyor.java:76
+#: build/trans_presets.java:135 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Primary"
@@ -14387,5 +14710,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:137
+#: build/trans_presets.java:138
 msgid "Edit Primary Road"
 msgstr "Edit Primary Road"
@@ -14393,10 +14716,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:154
+#: build/trans_presets.java:155
 msgid "Primary Link"
 msgstr "Primary Link"
 
 #. item
-#: build/trans_presets.java:155
+#: build/trans_presets.java:156
 msgid "Edit Primary Link"
 msgstr "Edit Primary Link"
@@ -14408,5 +14731,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:170 build/trans_surveyor.java:80
+#: build/trans_presets.java:171 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Secondary"
@@ -14416,5 +14739,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:174
+#: build/trans_presets.java:175
 msgid "Edit Secondary Road"
 msgstr "Edit Secondary Road"
@@ -14422,5 +14745,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:190
+#: build/trans_presets.java:191
 msgid "Tertiary"
 msgstr "Tertiary"
@@ -14430,5 +14753,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:194
+#: build/trans_presets.java:195
 msgid "Edit Tertiary Road"
 msgstr "Edit Tertiary Road"
@@ -14440,5 +14763,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:209 build/trans_surveyor.java:84
+#: build/trans_presets.java:210 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Unclassified"
@@ -14448,5 +14771,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:213
+#: build/trans_presets.java:214
 msgid "Edit Unclassified Road"
 msgstr "Edit Unclassified Road"
@@ -14473,19 +14796,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:225 build/trans_presets.java:243
-#: build/trans_presets.java:261 build/trans_presets.java:281
-#: build/trans_presets.java:314 build/trans_presets.java:359
-#: build/trans_presets.java:375 build/trans_presets.java:389
-#: build/trans_presets.java:413 build/trans_presets.java:432
-#: build/trans_presets.java:453 build/trans_presets.java:473
-#: build/trans_presets.java:491 build/trans_presets.java:511
-#: build/trans_presets.java:532 build/trans_presets.java:553
-#: build/trans_presets.java:574 build/trans_presets.java:595
-#: build/trans_presets.java:616 build/trans_presets.java:637
-#: build/trans_presets.java:667 build/trans_presets.java:680
-#: build/trans_presets.java:693 build/trans_presets.java:706
-#: build/trans_presets.java:719 build/trans_presets.java:732
-#: build/trans_presets.java:745 build/trans_presets.java:1308
-#: build/trans_presets.java:1498 build/trans_presets.java:1540
+#: build/trans_presets.java:226 build/trans_presets.java:244
+#: build/trans_presets.java:262 build/trans_presets.java:282
+#: build/trans_presets.java:315 build/trans_presets.java:360
+#: build/trans_presets.java:376 build/trans_presets.java:390
+#: build/trans_presets.java:414 build/trans_presets.java:433
+#: build/trans_presets.java:454 build/trans_presets.java:474
+#: build/trans_presets.java:492 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:554
+#: build/trans_presets.java:575 build/trans_presets.java:596
+#: build/trans_presets.java:617 build/trans_presets.java:638
+#: build/trans_presets.java:668 build/trans_presets.java:681
+#: build/trans_presets.java:694 build/trans_presets.java:707
+#: build/trans_presets.java:720 build/trans_presets.java:733
+#: build/trans_presets.java:746 build/trans_presets.java:1311
+#: build/trans_presets.java:1501 build/trans_presets.java:1543
 msgid "Width (meters)"
 msgstr "Width (metres)"
@@ -14497,5 +14820,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:228 build/trans_surveyor.java:88
+#: build/trans_presets.java:229 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Residential"
@@ -14504,5 +14827,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:231
+#: build/trans_presets.java:232
 msgid "Edit Residential Street"
 msgstr "Edit Residential Street"
@@ -14527,14 +14850,14 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:611
-#: build/trans_presets.java:632 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "Surface"
 msgstr "Surface"
@@ -14555,53 +14878,53 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paved"
 msgstr "paved"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "unpaved"
 msgstr "unpaved"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "concrete"
 msgstr "concrete"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
 msgid "metal"
 msgstr ""
@@ -14615,22 +14938,22 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
-#: build/trans_style.java:3367
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
+#: build/trans_style.java:3375
 msgid "wood"
 msgstr "wood"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paving_stones"
 msgstr ""
@@ -14638,77 +14961,77 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "cobblestone"
 msgstr "cobblestone"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "gravel"
 msgstr "gravel"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "grass"
 msgstr "grass"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "sand"
 msgstr "sand"
@@ -14716,13 +15039,13 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "ground"
 msgstr "ground"
@@ -14730,5 +15053,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:246
+#: build/trans_presets.java:247
 msgid "Living Street"
 msgstr "Living Street"
@@ -14737,5 +15060,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:249
+#: build/trans_presets.java:250
 msgid "Edit Living Street"
 msgstr "Edit Living Street"
@@ -14743,5 +15066,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:264
+#: build/trans_presets.java:265
 msgid "Service"
 msgstr "Service"
@@ -14750,5 +15073,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:267
+#: build/trans_presets.java:268
 msgid "Edit Serviceway"
 msgstr "Edit Serviceway"
@@ -14758,18 +15081,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "Serviceway type"
 msgstr "Serviceway type"
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "alley"
 msgstr "alley"
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "driveway"
 msgstr "driveway"
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "parking_aisle"
 msgstr "parking_aisle"
@@ -14777,5 +15100,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:284
+#: build/trans_presets.java:285
 msgid "Parking Aisle"
 msgstr "Parking Aisle"
@@ -14785,5 +15108,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:288
+#: build/trans_presets.java:289
 msgid "Edit Parking Aisle"
 msgstr "Edit Parking Aisle"
@@ -14791,5 +15114,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:298
+#: build/trans_presets.java:299
 msgid "Road (Unknown Type)"
 msgstr "Road (Unknown Type)"
@@ -14798,5 +15121,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Edit Road of unknown type"
 msgstr "Edit Road of unknown type"
@@ -14805,20 +15128,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:318
+#: build/trans_presets.java:319
 msgid "Road Restrictions"
 msgstr "Road Restrictions"
 
 #. item
-#: build/trans_presets.java:319
+#: build/trans_presets.java:320
 msgid "Edit Road Restrictions"
 msgstr "Edit Road Restrictions"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:321
+#: build/trans_presets.java:322
 msgid "Toll"
 msgstr "Toll"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:322
+#: build/trans_presets.java:323
 msgid "No exit (cul-de-sac)"
 msgstr "No exit (cul-de-sac)"
@@ -14831,8 +15154,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:323 build/trans_presets.java:529
-#: build/trans_presets.java:550 build/trans_presets.java:571
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:634
+#: build/trans_presets.java:324 build/trans_presets.java:530
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:593 build/trans_presets.java:614
+#: build/trans_presets.java:635
 msgid "Access"
 msgstr "Access"
@@ -14886,29 +15209,29 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1397
-#: build/trans_presets.java:1398 build/trans_presets.java:1399
-#: build/trans_presets.java:1763 build/trans_presets.java:1773
-#: build/trans_presets.java:2397 build/trans_presets.java:2433
-#: build/trans_presets.java:2442 build/trans_presets.java:2443
-#: build/trans_presets.java:2444 build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:1396
+#: build/trans_presets.java:1397 build/trans_presets.java:1400
+#: build/trans_presets.java:1401 build/trans_presets.java:1402
+#: build/trans_presets.java:1767 build/trans_presets.java:1777
+#: build/trans_presets.java:2408 build/trans_presets.java:2444
+#: build/trans_presets.java:2453 build/trans_presets.java:2454
+#: build/trans_presets.java:2455 build/trans_presets.java:2725
 msgid "yes"
 msgstr "yes"
@@ -14921,40 +15244,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:212
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:212
 msgid "private"
 msgstr "private"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655
 msgid "designated"
 msgstr "designated"
@@ -14967,19 +15290,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:219
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:219
 msgid "destination"
 msgstr "destination"
@@ -15002,71 +15325,71 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:205
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:205
 msgid "permissive"
 msgstr "permissive"
 
-#: build/trans_presets.java:323 build/trans_presets.java:327
-#: build/trans_presets.java:330 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636
+#: build/trans_presets.java:324 build/trans_presets.java:328
+#: build/trans_presets.java:331 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637
 msgid "agricultural"
 msgstr "agricultural"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
-#: build/trans_presets.java:2433 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1396 build/trans_presets.java:1397
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
+#: build/trans_presets.java:2444 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
+#: build/trans_presets.java:2725
 msgid "no"
 msgstr "no"
 
-#: build/trans_presets.java:326
+#: build/trans_presets.java:327
 msgid "Goods"
 msgstr "Goods"
 
-#: build/trans_presets.java:327
+#: build/trans_presets.java:328
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Heavy Goods Vehicles (hgv)"
@@ -15081,10 +15404,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:328 build/trans_presets.java:651
-#: build/trans_presets.java:858 build/trans_presets.java:891
-#: build/trans_presets.java:913 build/trans_presets.java:950
-#: build/trans_presets.java:963 build/trans_presets.java:975
-#: build/trans_presets.java:987 build/trans_presets.java:999
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:329 build/trans_presets.java:652
+#: build/trans_presets.java:859 build/trans_presets.java:892
+#: build/trans_presets.java:914 build/trans_presets.java:951
+#: build/trans_presets.java:964 build/trans_presets.java:976
+#: build/trans_presets.java:988 build/trans_presets.java:1000
+#: build/trans_presets.java:1040
 msgid "Horse"
 msgstr "Horse"
@@ -15100,13 +15423,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:329 build/trans_presets.java:530
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:635 build/trans_presets.java:859
-#: build/trans_presets.java:877 build/trans_presets.java:892
-#: build/trans_presets.java:914 build/trans_presets.java:951
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:330 build/trans_presets.java:531
+#: build/trans_presets.java:552 build/trans_presets.java:573
+#: build/trans_presets.java:594 build/trans_presets.java:615
+#: build/trans_presets.java:636 build/trans_presets.java:860
+#: build/trans_presets.java:878 build/trans_presets.java:893
+#: build/trans_presets.java:915 build/trans_presets.java:952
+#: build/trans_presets.java:965 build/trans_presets.java:977
+#: build/trans_presets.java:989 build/trans_presets.java:1001
+#: build/trans_presets.java:1041
 msgid "Motorcycle"
 msgstr "Motorcycle"
@@ -15121,30 +15444,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:330 build/trans_presets.java:531
-#: build/trans_presets.java:552 build/trans_presets.java:573
-#: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:636 build/trans_presets.java:654
-#: build/trans_presets.java:878 build/trans_presets.java:893
-#: build/trans_presets.java:915 build/trans_presets.java:952
-#: build/trans_presets.java:965 build/trans_presets.java:977
-#: build/trans_presets.java:989 build/trans_presets.java:1001
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:331 build/trans_presets.java:532
+#: build/trans_presets.java:553 build/trans_presets.java:574
+#: build/trans_presets.java:595 build/trans_presets.java:616
+#: build/trans_presets.java:637 build/trans_presets.java:655
+#: build/trans_presets.java:879 build/trans_presets.java:894
+#: build/trans_presets.java:916 build/trans_presets.java:953
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1042
 msgid "Motorcar"
 msgstr "Motorcar"
 
-#: build/trans_presets.java:331
+#: build/trans_presets.java:332
 msgid "Public Service Vehicles (psv)"
 msgstr "Public Service Vehicles (psv)"
 
-#: build/trans_presets.java:332
+#: build/trans_presets.java:333
 msgid "Motorboat"
 msgstr "Motorboat"
 
-#: build/trans_presets.java:333
+#: build/trans_presets.java:334
 msgid "Boat"
 msgstr "Boat"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:336
 msgid "Min. speed (km/h)"
 msgstr "Min. speed (km/h)"
@@ -15152,25 +15475,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:336 build/trans_presets.java:374
+#: build/trans_presets.java:337 build/trans_presets.java:375
 msgid "Max. weight (tonnes)"
 msgstr "Max. weight (tonnes)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:337
+#: build/trans_presets.java:338
 msgid "Max. Height (meters)"
 msgstr "Max. Height (metres)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Max. Width (meters)"
 msgstr "Max. Width (metres)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:339
+#: build/trans_presets.java:340
 msgid "Max. Length (meters)"
 msgstr "Max. Length (metres)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:341
+#: build/trans_presets.java:342
 msgid "Roundabout"
 msgstr "Roundabout"
@@ -15181,5 +15504,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:346
+#: build/trans_presets.java:347
 msgid "Edit Junction"
 msgstr "Edit Junction"
@@ -15201,9 +15524,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:349 build/trans_presets.java:648
-#: build/trans_presets.java:788 build/trans_presets.java:1135
-#: build/trans_presets.java:1392 build/trans_presets.java:2353
-#: build/trans_presets.java:2901 build/trans_presets.java:2911
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:350 build/trans_presets.java:649
+#: build/trans_presets.java:789 build/trans_presets.java:1137
+#: build/trans_presets.java:1395 build/trans_presets.java:2364
+#: build/trans_presets.java:2913 build/trans_presets.java:2923
+#: build/trans_presets.java:2932
 msgid "Type"
 msgstr "Type"
@@ -15223,10 +15546,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:547
+#: build/trans_presets.java:350 build/trans_style.java:547
 #: build/trans_style.java:555
 msgid "motorway"
 msgstr "motorway"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "motorway_link"
 msgstr "motorway_link"
@@ -15248,10 +15571,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:563
+#: build/trans_presets.java:350 build/trans_style.java:563
 #: build/trans_style.java:571
 msgid "trunk"
 msgstr "trunk"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "trunk_link"
 msgstr "trunk_link"
@@ -15273,10 +15596,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:579
+#: build/trans_presets.java:350 build/trans_style.java:579
 #: build/trans_style.java:587
 msgid "primary"
 msgstr "primary"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "primary_link"
 msgstr "primary_link"
@@ -15298,5 +15621,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:595
+#: build/trans_presets.java:350 build/trans_style.java:595
 #: build/trans_style.java:603
 msgid "secondary"
@@ -15311,9 +15634,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:349 build/trans_style.java:611
+#: build/trans_presets.java:350 build/trans_style.java:611
 msgid "tertiary"
 msgstr "tertiary"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "unclassified"
 msgstr "unclassified"
@@ -15327,9 +15650,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:349 build/trans_style.java:3143
+#: build/trans_presets.java:350 build/trans_style.java:3151
 msgid "residential"
 msgstr "residential"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "living_street"
 msgstr "living_street"
@@ -15359,10 +15682,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:349 build/trans_style.java:667
-#: build/trans_style.java:4244
+#: build/trans_presets.java:350 build/trans_style.java:667
+#: build/trans_style.java:4252
 msgid "service"
 msgstr "service"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "bus_guideway"
 msgstr "bus_guideway"
@@ -15392,6 +15715,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:349 build/trans_style.java:877
-#: build/trans_style.java:3208 build/trans_style.java:3209
+#: build/trans_presets.java:350 build/trans_style.java:877
+#: build/trans_style.java:3216 build/trans_style.java:3217
 msgid "construction"
 msgstr "construction"
@@ -15402,10 +15725,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Edit Bridge"
 msgstr "Edit Bridge"
 
 #. item
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "Edit Tunnel"
 msgstr "Edit Tunnel"
@@ -15413,19 +15736,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:393
+#: build/trans_presets.java:394
 msgid "Ways"
 msgstr "Ways"
 
 #. group "Ways"
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Construction"
 msgstr "Construction"
 
 #. item
-#: build/trans_presets.java:395
+#: build/trans_presets.java:396
 msgid "Edit Highway Under Construction"
 msgstr "Edit Highway Under Construction"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "Junction"
 msgstr "Junction"
@@ -15441,5 +15764,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:411 build/trans_style.java:895
+#: build/trans_presets.java:412 build/trans_style.java:895
 msgid "roundabout"
 msgstr "roundabout"
@@ -15448,5 +15771,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:417
+#: build/trans_presets.java:418
 msgid "Bridleway"
 msgstr "Bridleway"
@@ -15454,5 +15777,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:419
+#: build/trans_presets.java:420
 msgid "Edit Bridleway"
 msgstr "Edit Bridleway"
@@ -15460,5 +15783,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:435
+#: build/trans_presets.java:436
 msgid "Cycleway"
 msgstr "Cycleway"
@@ -15468,10 +15791,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:439
+#: build/trans_presets.java:440
 msgid "Edit Cycleway"
 msgstr "Edit Cycleway"
 
 #. item "Ways/Cycleway" check "Embankment"
-#: build/trans_presets.java:449
+#: build/trans_presets.java:450
 msgid "Pedestrians"
 msgstr ""
@@ -15479,5 +15802,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Footway"
 msgstr "Footway"
@@ -15486,10 +15809,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Footway"
 msgstr "Edit Footway"
 
 #. item "Ways/Footway" check "Embankment"
-#: build/trans_presets.java:469
+#: build/trans_presets.java:470
 msgid "Bikes"
 msgstr ""
@@ -15497,5 +15820,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:476
+#: build/trans_presets.java:477
 msgid "Pedestrian"
 msgstr "Pedestrian"
@@ -15504,5 +15827,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Edit Pedestrian Street"
 msgstr "Edit Pedestrian Street"
@@ -15510,5 +15833,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:494
+#: build/trans_presets.java:495
 msgid "Steps"
 msgstr "Steps"
@@ -15518,5 +15841,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:498
+#: build/trans_presets.java:499
 msgid "Edit Flight of Steps"
 msgstr "Edit Flight of Steps"
@@ -15525,5 +15848,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:515
+#: build/trans_presets.java:516
 msgid "Track"
 msgstr "Track"
@@ -15532,5 +15855,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:518
+#: build/trans_presets.java:519
 msgid "Edit Track"
 msgstr "Edit Track"
@@ -15538,5 +15861,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:535
+#: build/trans_presets.java:536
 msgid "Track Grade 1"
 msgstr "Track Grade 1"
@@ -15545,5 +15868,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:538
+#: build/trans_presets.java:539
 msgid "Edit Track of grade 1"
 msgstr "Edit Track of grade 1"
@@ -15551,5 +15874,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:556
+#: build/trans_presets.java:557
 msgid "Track Grade 2"
 msgstr "Track Grade 2"
@@ -15558,5 +15881,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:559
+#: build/trans_presets.java:560
 msgid "Edit Track of grade 2"
 msgstr "Edit Track of grade 2"
@@ -15564,5 +15887,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:577
+#: build/trans_presets.java:578
 msgid "Track Grade 3"
 msgstr "Track Grade 3"
@@ -15571,5 +15894,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:580
+#: build/trans_presets.java:581
 msgid "Edit Track of grade 3"
 msgstr "Edit Track of grade 3"
@@ -15577,5 +15900,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:598
+#: build/trans_presets.java:599
 msgid "Track Grade 4"
 msgstr "Track Grade 4"
@@ -15584,5 +15907,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:601
+#: build/trans_presets.java:602
 msgid "Edit Track of grade 4"
 msgstr "Edit Track of grade 4"
@@ -15590,5 +15913,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:619
+#: build/trans_presets.java:620
 msgid "Track Grade 5"
 msgstr "Track Grade 5"
@@ -15597,5 +15920,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:622
+#: build/trans_presets.java:623
 msgid "Edit Track of grade 5"
 msgstr "Edit Track of grade 5"
@@ -15604,5 +15927,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:641
+#: build/trans_presets.java:642
 msgid "Path"
 msgstr "Path"
@@ -15611,13 +15934,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:644
+#: build/trans_presets.java:645
 msgid "Edit Path"
 msgstr "Edit Path"
 
-#: build/trans_presets.java:652
+#: build/trans_presets.java:653
 msgid "Ski"
 msgstr "Ski"
 
-#: build/trans_presets.java:653
+#: build/trans_presets.java:654
 msgid "Snowmobile"
 msgstr "Snowmobile"
@@ -15627,6 +15950,6 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:670 build/trans_presets.java:1725
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:671 build/trans_presets.java:1729
+#: build/trans_presets.java:1752
 msgid "Hiking"
 msgstr "Hiking"
@@ -15636,5 +15959,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:674
+#: build/trans_presets.java:675
 msgid "Edit Hiking"
 msgstr "Edit Hiking"
@@ -15642,5 +15965,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:683
+#: build/trans_presets.java:684
 msgid "Mountain Hiking"
 msgstr "Mountain Hiking"
@@ -15650,5 +15973,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:687
+#: build/trans_presets.java:688
 msgid "Edit Mountain Hiking"
 msgstr "Edit Mountain Hiking"
@@ -15656,5 +15979,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:696
+#: build/trans_presets.java:697
 msgid "Demanding Mountain Hiking"
 msgstr "Demanding Mountain Hiking"
@@ -15664,5 +15987,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:700
+#: build/trans_presets.java:701
 msgid "Edit Demanding Mountain Hiking"
 msgstr "Edit Demanding Mountain Hiking"
@@ -15670,5 +15993,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:709
+#: build/trans_presets.java:710
 msgid "Alpine Hiking"
 msgstr "Alpine Hiking"
@@ -15678,5 +16001,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:713
+#: build/trans_presets.java:714
 msgid "Edit Alpine Hiking"
 msgstr "Edit Alpine Hiking"
@@ -15684,5 +16007,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:723
 msgid "Demanding Alpine Hiking"
 msgstr "Demanding Alpine Hiking"
@@ -15692,5 +16015,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:726
+#: build/trans_presets.java:727
 msgid "Edit Demanding Alpine Hiking"
 msgstr "Edit Demanding Alpine Hiking"
@@ -15698,5 +16021,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:735
+#: build/trans_presets.java:736
 msgid "Difficult Alpine Hiking"
 msgstr "Difficult Alpine Hiking"
@@ -15706,5 +16029,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:739
+#: build/trans_presets.java:740
 msgid "Edit Difficult Alpine Hiking"
 msgstr "Edit Difficult Alpine Hiking"
@@ -15712,10 +16035,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:749
+#: build/trans_presets.java:750
 msgid "Waypoints"
 msgstr "Waypoints"
 
 #. group "Waypoints"
-#: build/trans_presets.java:750
+#: build/trans_presets.java:751
 msgid "Motorway Junction"
 msgstr "Motorway Junction"
@@ -15723,15 +16046,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:752
+#: build/trans_presets.java:753
 msgid "Edit Motorway Junction"
 msgstr "Edit Motorway Junction"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:757
 msgid "Number"
 msgstr "Number"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:759
 msgid "Services"
 msgstr "Services"
@@ -15739,5 +16062,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:761
 msgid "Edit Service Station"
 msgstr "Edit Service Station"
@@ -15775,15 +16098,15 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:765 build/trans_presets.java:902
-#: build/trans_presets.java:1382 build/trans_presets.java:1406
-#: build/trans_presets.java:1413 build/trans_presets.java:1419
-#: build/trans_presets.java:1427 build/trans_presets.java:1434
-#: build/trans_presets.java:1761 build/trans_presets.java:1771
-#: build/trans_presets.java:2361 build/trans_presets.java:2368
-#: build/trans_presets.java:2384 build/trans_presets.java:2395
-#: build/trans_presets.java:2403 build/trans_presets.java:2410
-#: build/trans_presets.java:2464 build/trans_presets.java:2512
-#: build/trans_presets.java:2678 build/trans_presets.java:2693
-#: build/trans_presets.java:2732 build/trans_presets.java:3151
+#: build/trans_presets.java:766 build/trans_presets.java:903
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
+#: build/trans_presets.java:1416 build/trans_presets.java:1422
+#: build/trans_presets.java:1430 build/trans_presets.java:1437
+#: build/trans_presets.java:1765 build/trans_presets.java:1775
+#: build/trans_presets.java:2372 build/trans_presets.java:2379
+#: build/trans_presets.java:2395 build/trans_presets.java:2406
+#: build/trans_presets.java:2414 build/trans_presets.java:2421
+#: build/trans_presets.java:2475 build/trans_presets.java:2523
+#: build/trans_presets.java:2689 build/trans_presets.java:2704
+#: build/trans_presets.java:2743 build/trans_presets.java:3163
 msgid "Operator"
 msgstr "Operator"
@@ -15792,5 +16115,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:769
+#: build/trans_presets.java:770
 msgid "Traffic Signal"
 msgstr "Traffic Lights"
@@ -15800,5 +16123,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:774
 msgid "Pedestrian crossing type"
 msgstr "Pedestrian crossing type"
@@ -15807,27 +16130,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "uncontrolled"
 msgstr "uncontrolled"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "traffic_signals"
 msgstr "traffic_signals"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "island"
 msgstr "island"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "unmarked"
 msgstr "unmarked"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:774 build/trans_presets.java:790
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:775 build/trans_presets.java:791
+#: build/trans_presets.java:1334
 msgid "Cross on horseback"
 msgstr "Cross on horseback"
@@ -15835,6 +16158,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:775 build/trans_presets.java:789
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:776 build/trans_presets.java:790
+#: build/trans_presets.java:1335
 msgid "Cross by bicycle"
 msgstr "Cross by bicycle"
@@ -15843,11 +16166,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:776 build/trans_presets.java:791
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:1336
 msgid "Crossing attendant"
 msgstr "Crossing attendant"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:778
 msgid "Crossing type name (UK)"
 msgstr "Crossing type name (UK)"
@@ -15855,30 +16178,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pelican"
 msgstr "pelican"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "toucan"
 msgstr "toucan"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "puffin"
 msgstr "puffin"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pegasus"
 msgstr "pegasus"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "tiger"
 msgstr "tiger"
 
 #. </optional>
-#: build/trans_presets.java:780
+#: build/trans_presets.java:781
 msgid "Stop"
 msgstr "Stop"
@@ -15886,5 +16209,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:783
+#: build/trans_presets.java:784
 msgid "Pedestrian Crossing"
 msgstr "Pedestrian Crossing"
@@ -15893,14 +16216,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:786
+#: build/trans_presets.java:787
 msgid "Edit Crossing"
 msgstr "Edit Crossing"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:793
 msgid "Type name (UK)"
 msgstr "Type name (UK)"
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:795
 msgid "Mini-roundabout"
 msgstr "Mini-roundabout"
@@ -15911,14 +16234,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "Direction"
 msgstr "Direction"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "clockwise"
 msgstr "clockwise"
 
-#: build/trans_presets.java:801
+#: build/trans_presets.java:802
 msgid "Turning Circle"
 msgstr "Turning Circle"
@@ -15928,20 +16251,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:806
+#: build/trans_presets.java:807
 msgid "City Limit"
 msgstr "City Limit"
 
 #. item
-#: build/trans_presets.java:807
+#: build/trans_presets.java:808
 msgid "Edit City Limit Sign"
 msgstr "Edit City Limit Sign"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:812
+#: build/trans_presets.java:813
 msgid "Second Name"
 msgstr "Second Name"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:814
+#: build/trans_presets.java:815
 msgid "Speed Camera"
 msgstr "Speed Camera"
@@ -15949,5 +16272,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:817
+#: build/trans_presets.java:818
 msgid "Emergency Phone"
 msgstr "Emergency Phone"
@@ -15955,5 +16278,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:820
+#: build/trans_presets.java:821
 msgid "Incline"
 msgstr "Incline"
@@ -15961,5 +16284,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:823
+#: build/trans_presets.java:824
 msgid "Incline Steep"
 msgstr "Incline Steep"
@@ -15968,10 +16291,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:827
+#: build/trans_presets.java:828
 msgid "Ford"
 msgstr "Ford"
 
 #. item
-#: build/trans_presets.java:828
+#: build/trans_presets.java:829
 msgid "Edit Ford"
 msgstr "Edit Ford"
@@ -15979,5 +16302,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:835
+#: build/trans_presets.java:836
 msgid "Mountain Pass"
 msgstr "Mountain Pass"
@@ -15985,5 +16308,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:837
+#: build/trans_presets.java:838
 msgid "Edit Mountain Pass"
 msgstr "Edit Mountain Pass"
@@ -15995,7 +16318,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:842 build/trans_presets.java:1600
-#: build/trans_presets.java:1745 build/trans_presets.java:2845
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:843 build/trans_presets.java:1604
+#: build/trans_presets.java:1749 build/trans_presets.java:2857
+#: build/trans_presets.java:2864 build/trans_presets.java:2871
 msgid "Elevation"
 msgstr "Elevation"
@@ -16003,5 +16326,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:846
+#: build/trans_presets.java:847
 msgid "Barriers"
 msgstr "Barriers"
@@ -16009,5 +16332,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:849
+#: build/trans_presets.java:850
 msgid "Bollard"
 msgstr "Bollard"
@@ -16015,5 +16338,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:852
 msgid "Edit Bollard"
 msgstr "Edit Bollard"
@@ -16058,16 +16381,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:854 build/trans_presets.java:873
-#: build/trans_presets.java:887 build/trans_presets.java:909
-#: build/trans_presets.java:946 build/trans_presets.java:959
-#: build/trans_presets.java:971 build/trans_presets.java:983
-#: build/trans_presets.java:995 build/trans_presets.java:1007
-#: build/trans_presets.java:1017 build/trans_presets.java:1026
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:855 build/trans_presets.java:874
+#: build/trans_presets.java:888 build/trans_presets.java:910
+#: build/trans_presets.java:947 build/trans_presets.java:960
+#: build/trans_presets.java:972 build/trans_presets.java:984
+#: build/trans_presets.java:996 build/trans_presets.java:1008
+#: build/trans_presets.java:1018 build/trans_presets.java:1027
+#: build/trans_presets.java:1036
 msgid "Allowed traffic:"
 msgstr "Allowed traffic:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:861
+#: build/trans_presets.java:862
 msgid "Cycle Barrier"
 msgstr "Cycle Barrier"
@@ -16076,5 +16399,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:865
+#: build/trans_presets.java:866
 msgid "Block"
 msgstr "Block"
@@ -16082,5 +16405,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:868
+#: build/trans_presets.java:869
 msgid "Cattle Grid"
 msgstr "Cattle Grid"
@@ -16088,10 +16411,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:870
+#: build/trans_presets.java:871
 msgid "Edit Cattle Grid"
 msgstr "Edit Cattle Grid"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:880
+#: build/trans_presets.java:881
 msgid "Bus Trap"
 msgstr "Bus Trap"
@@ -16099,15 +16422,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:883
+#: build/trans_presets.java:884
 msgid "Spikes"
 msgstr "Spikes"
 
 #. item
-#: build/trans_presets.java:884
+#: build/trans_presets.java:885
 msgid "Edit Spikes"
 msgstr "Edit Spikes"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:896
 msgid "Toll Booth"
 msgstr "Toll Booth"
@@ -16115,5 +16438,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:897
+#: build/trans_presets.java:898
 msgid "Edit Toll Booth"
 msgstr "Edit Toll Booth"
@@ -16121,10 +16444,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:905
+#: build/trans_presets.java:906
 msgid "Border Control"
 msgstr "Border Control point"
 
 #. item
-#: build/trans_presets.java:906
+#: build/trans_presets.java:907
 msgid "Edit Border Control"
 msgstr "Edit Border Control point"
@@ -16134,5 +16457,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:920
+#: build/trans_presets.java:921
 msgid "Hedge"
 msgstr "Hedge"
@@ -16141,5 +16464,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:925
 msgid "Fence"
 msgstr "Fence"
@@ -16148,5 +16471,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:929
 msgid "Wall"
 msgstr "Wall"
@@ -16154,5 +16477,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:931
+#: build/trans_presets.java:932
 msgid "City Wall"
 msgstr "City Wall"
@@ -16161,5 +16484,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:935
+#: build/trans_presets.java:936
 msgid "Retaining Wall"
 msgstr "Retaining Wall"
@@ -16171,15 +16494,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:942
+#: build/trans_presets.java:943
 msgid "Entrance"
 msgstr "Entrance"
 
 #. item
-#: build/trans_presets.java:943
+#: build/trans_presets.java:944
 msgid "Edit Entrance"
 msgstr "Edit an Entrance"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:954
+#: build/trans_presets.java:955
 msgid "Gate"
 msgstr "Gate"
@@ -16187,50 +16510,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:956
+#: build/trans_presets.java:957
 msgid "Edit Gate"
 msgstr "Edit Gate"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:967
+#: build/trans_presets.java:968
 msgid "Lift Gate"
 msgstr "Lift Gate"
 
 #. item
-#: build/trans_presets.java:968
+#: build/trans_presets.java:969
 msgid "Edit Lift Gate"
 msgstr "Edit Lift Gate"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:979
+#: build/trans_presets.java:980
 msgid "Hampshire Gate"
 msgstr "Hampshire Gate"
 
 #. item
-#: build/trans_presets.java:980
+#: build/trans_presets.java:981
 msgid "Edit Hampshire Gate"
 msgstr "Edit Hampshire Gate"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:991
+#: build/trans_presets.java:992
 msgid "Bump Gate"
 msgstr "Bump Gate"
 
 #. item
-#: build/trans_presets.java:992
+#: build/trans_presets.java:993
 msgid "Edit Bump Gate"
 msgstr "Edit Bump Gate"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:1003
+#: build/trans_presets.java:1004
 msgid "Kissing Gate"
 msgstr "Kissing Gate"
 
 #. item
-#: build/trans_presets.java:1004
+#: build/trans_presets.java:1005
 msgid "Edit Kissing Gate"
 msgstr "Edit Kissing Gate"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1013
 msgid "Stile"
 msgstr "Stile"
@@ -16238,25 +16561,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1014
+#: build/trans_presets.java:1015
 msgid "Edit Stile"
 msgstr "Edit Stile"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1023
 msgid "Turnstile"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1024
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1032
 msgid "Sally Port"
 msgstr "Sally Port"
 
 #. item
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1033
 msgid "Edit Sally Port"
 msgstr "Edit Sally Port"
@@ -16264,13 +16587,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #.
-#. <separator/>
+#. group "Water"
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1046 build/trans_presets.java:1089
+#: build/trans_presets.java:1047 build/trans_presets.java:1048
+#: build/trans_presets.java:1091
 msgid "Water"
 msgstr "Water"
 
 #. group "Water"
-#: build/trans_presets.java:1047
+#: build/trans_presets.java:1049
 msgid "Spring"
 msgstr "Spring"
@@ -16278,5 +16602,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1049
+#: build/trans_presets.java:1051
 msgid "Edit Spring"
 msgstr "Edit Spring"
@@ -16284,5 +16608,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1056
 msgid "Drain"
 msgstr "Drain"
@@ -16290,10 +16614,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1058
 msgid "Edit Drain"
 msgstr "Edit Drain"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1064
 msgid "Stream"
 msgstr "Stream"
@@ -16301,10 +16625,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1066
 msgid "Edit Stream"
 msgstr "Edit Stream"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1072
 msgid "Canal"
 msgstr "Canal"
@@ -16312,10 +16636,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1074
 msgid "Edit Canal"
 msgstr "Edit Canal"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1080
 msgid "River"
 msgstr "River"
@@ -16325,5 +16649,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1084
 msgid "Edit River"
 msgstr "Edit River"
@@ -16331,15 +16655,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1093
 msgid "Edit Water"
 msgstr "Edit Water"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1097
 msgid "Land"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1098
 msgid "Edit Land"
 msgstr "Edit Land"
@@ -16347,15 +16671,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1103
 msgid "Basin"
 msgstr "Basin"
 
 #. item
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1104
 msgid "Edit Basin Landuse"
 msgstr "Edit Basin Landuse"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1109
 msgid "Reservoir"
 msgstr "Reservoir"
@@ -16363,15 +16687,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1109
+#: build/trans_presets.java:1111
 msgid "Edit Reservoir Landuse"
 msgstr "Edit Reservoir Landuse"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1116
 msgid "Covered Reservoir"
 msgstr "Covered Reservoir"
 
 #. item
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1117
 msgid "Edit Covered Reservoir"
 msgstr "Edit Covered Reservoir"
@@ -16379,5 +16703,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1120
+#: build/trans_presets.java:1122
 msgid "Riverbank"
 msgstr "Riverbank"
@@ -16386,10 +16710,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1125
 msgid "Edit Riverbank"
 msgstr "Edit Riverbank"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1127
+#: build/trans_presets.java:1129
 msgid "Wetland"
 msgstr "Wetland"
@@ -16400,14 +16724,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1134
 msgid "Edit Wetland"
 msgstr "Edit Wetland"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "swamp"
 msgstr "swamp"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "bog"
 msgstr "bog"
@@ -16421,35 +16745,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1135 build/trans_style.java:3384
+#: build/trans_presets.java:1137 build/trans_style.java:3392
 msgid "marsh"
 msgstr "marsh"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "reedbed"
 msgstr "reedbed"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "saltmarsh"
 msgstr "saltmarsh"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "tidalflat"
 msgstr "tidalflat"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "mangrove"
 msgstr "mangrove"
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1139
 msgid "Mud"
 msgstr "Mud"
 
 #. item
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1140
 msgid "Edit Mud"
 msgstr "Edit Mud"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1144
 msgid "Beach"
 msgstr "Beach"
@@ -16457,20 +16781,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1144
+#: build/trans_presets.java:1146
 msgid "Edit Beach"
 msgstr "Edit Beach"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1150
 msgid "Bay"
 msgstr "Bay"
 
 #. item
-#: build/trans_presets.java:1149
+#: build/trans_presets.java:1151
 msgid "Edit Bay"
 msgstr "Edit Bay"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1155
 msgid "Cliff"
 msgstr "Cliff"
@@ -16478,10 +16802,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1157
 msgid "Edit Cliff"
 msgstr "Edit Cliff"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1159
+#: build/trans_presets.java:1161
 msgid "Coastline"
 msgstr "Coastline"
@@ -16489,5 +16813,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1163
 msgid "Edit Coastline"
 msgstr "Edit Coastline"
@@ -16495,5 +16819,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1168
 msgid "Ferry Route"
 msgstr "Ferry Route"
@@ -16501,5 +16825,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1170
 msgid "Edit Ferry"
 msgstr "Edit Ferry"
@@ -16508,5 +16832,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1176
+#: build/trans_presets.java:1178
 msgid "Boatyard"
 msgstr "Boatyard"
@@ -16514,10 +16838,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:1180
 msgid "Edit Boatyard"
 msgstr "Edit Boatyard"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1185
 msgid "Dock"
 msgstr "Dock"
@@ -16525,5 +16849,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1187
 msgid "Edit Dock"
 msgstr "Edit Dock"
@@ -16531,5 +16855,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1193
 msgid "Dam"
 msgstr "Dam"
@@ -16537,15 +16861,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1195
 msgid "Edit Dam"
 msgstr "Edit Dam"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1199
+#: build/trans_presets.java:1201
 msgid "Waterway Point"
 msgstr "Waterway Point"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1202
 msgid "Lock Gate"
 msgstr "Lock Gate"
@@ -16554,5 +16878,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1206
 msgid "Weir"
 msgstr "Weir"
@@ -16560,20 +16884,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1208
 msgid "Edit Weir"
 msgstr "Edit Weir"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1213
 msgid "Waterfall"
 msgstr "Waterfall"
 
 #. item
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1214
 msgid "Edit Waterfall"
 msgstr "Edit Waterfall"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1219
 msgid "Turning Point"
 msgstr "Turning Point"
@@ -16582,15 +16906,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1221
+#: build/trans_presets.java:1223
 msgid "Marina"
 msgstr "Marina"
 
 #. item
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1224
 msgid "Edit Marina"
 msgstr "Edit Marina"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1228
 msgid "Pier"
 msgstr "Pier"
@@ -16598,10 +16922,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1230
 msgid "Edit Pier"
 msgstr "Edit Pier"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1234
 msgid "Ferry Terminal"
 msgstr "Ferry Terminal"
@@ -16609,10 +16933,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1236
 msgid "Edit Ferry Terminal"
 msgstr "Edit Ferry Terminal"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1240
 msgid "Slipway"
 msgstr "Slipway"
@@ -16622,16 +16946,21 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1244
 msgid "Edit Slipway"
 msgstr "Edit Slipway"
 
 #. item "Waterway Point/Slipway" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1250
+#, fuzzy
+msgid "Transport"
+msgstr "Public Transport"
+
+#. group "Transport"
+#: build/trans_presets.java:1251
 msgid "Railway"
 msgstr "Railway"
 
 #. group "Railway"
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1252
 msgid "Rail"
 msgstr "Railway"
@@ -16639,5 +16968,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:1254
 msgid "Edit Rail"
 msgstr "Edit Railway"
@@ -16667,8 +16996,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "Optional Types"
 msgstr "Optional Types"
@@ -16682,35 +17011,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "yard"
 msgstr "yard"
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "siding"
 msgstr "siding"
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "spur"
 msgstr "spur"
 
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1259
 msgid "Narrow Gauge Rail"
 msgstr "Narrow Gauge Railway"
 
 #. item
-#: build/trans_presets.java:1257
+#: build/trans_presets.java:1260
 msgid "Edit Narrow Gauge Rail"
 msgstr "Edit Narrow Gauge Railway"
 
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1265
 msgid "Monorail"
 msgstr "Monorail"
@@ -16718,45 +17047,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1267
 msgid "Edit Monorail"
 msgstr "Edit Monorail"
 
-#: build/trans_presets.java:1269
+#: build/trans_presets.java:1272
 msgid "Preserved"
 msgstr "Preserved"
 
 #. item
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1273
 msgid "Edit Preserved Railway"
 msgstr "Edit Preserved Railway"
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1278
 msgid "Light Rail"
 msgstr "Light Rail"
 
 #. item
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1279
 msgid "Edit Light Rail"
 msgstr "Edit Light Rail"
 
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1284
 msgid "Subway"
 msgstr "Subway"
 
 #. item
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1285
 msgid "Edit Subway"
 msgstr "Edit Subway"
 
-#: build/trans_presets.java:1287
+#: build/trans_presets.java:1290
 msgid "Tram"
 msgstr "Tram"
 
 #. item
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1291
 msgid "Edit Tram"
 msgstr "Edit Tram"
 
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1296
 msgid "Bus Guideway"
 msgstr "Bus Guideway"
@@ -16764,5 +17093,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1295
+#: build/trans_presets.java:1298
 msgid "Edit Bus Guideway"
 msgstr "Edit Bus Guideway"
@@ -16771,14 +17100,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1315
 msgid "Disused Rail"
 msgstr "Disused Rail"
 
 #. item
-#: build/trans_presets.java:1313
+#: build/trans_presets.java:1316
 msgid "Edit Disused Railway"
 msgstr "Edit Disused Railway"
 
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1321
 msgid "Abandoned Rail"
 msgstr "Abandoned Rail"
@@ -16787,5 +17116,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1325
 msgid "Level Crossing"
 msgstr "Level Crossing"
@@ -16794,5 +17123,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1329
 msgid "Crossing"
 msgstr "Crossing"
@@ -16802,5 +17131,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1333
 msgid "Crossing type"
 msgstr "Crossing type"
@@ -16808,5 +17137,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1339
 msgid "Turntable"
 msgstr "Turntable"
@@ -16815,10 +17144,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1344
 msgid "Aerialway"
 msgstr "Aerialway"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1345
 msgid "Chair Lift"
 msgstr "Chair Lift"
@@ -16826,10 +17155,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1347
 msgid "Edit Chair Lift"
 msgstr "Edit Chair Lift"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1351
 msgid "Drag Lift"
 msgstr "Drag Lift"
@@ -16837,10 +17166,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1353
 msgid "Edit Drag Lift"
 msgstr "Edit Drag Lift"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1357
 msgid "Cable Car"
 msgstr "Cable Car"
@@ -16848,10 +17177,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1359
 msgid "Edit Cable Car"
 msgstr "Edit Cable Car"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1360
+#: build/trans_presets.java:1363
 msgid "Gondola"
 msgstr "Gondola"
@@ -16859,5 +17188,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1365
 msgid "Edit Gondola"
 msgstr "Edit Gondola"
@@ -16865,5 +17194,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1366 build/trans_presets.java:1461
+#: build/trans_presets.java:1369 build/trans_presets.java:1464
 msgid "Station"
 msgstr "Station"
@@ -16874,10 +17203,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1368 build/trans_presets.java:1464
+#: build/trans_presets.java:1371 build/trans_presets.java:1467
 msgid "Edit Station"
 msgstr "Edit Station"
 
 #. group "Car"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1378
 msgid "Fuel"
 msgstr "Fuel"
@@ -16887,5 +17216,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1382
 msgid "Edit Fuel"
 msgstr "Edit Fuel"
@@ -16943,32 +17272,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1671 build/trans_presets.java:1678
-#: build/trans_presets.java:1686 build/trans_presets.java:1699
-#: build/trans_presets.java:1713 build/trans_presets.java:1810
-#: build/trans_presets.java:1818 build/trans_presets.java:1909
-#: build/trans_presets.java:1915 build/trans_presets.java:2226
-#: build/trans_presets.java:2250 build/trans_presets.java:2465
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1703
+#: build/trans_presets.java:1717 build/trans_presets.java:1814
+#: build/trans_presets.java:1822 build/trans_presets.java:1919
+#: build/trans_presets.java:1925 build/trans_presets.java:2237
+#: build/trans_presets.java:2261 build/trans_presets.java:2476
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Opening Hours"
 msgstr "Opening Hours"
@@ -17027,91 +17356,91 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -17126,5 +17455,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1385 build/trans_presets.java:1438
+#: build/trans_presets.java:1388 build/trans_presets.java:1441
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -17134,5 +17463,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1391
 msgid "Edit Parking"
 msgstr "Edit Parking"
@@ -17143,24 +17472,24 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1391 build/trans_presets.java:1762
-#: build/trans_presets.java:1772 build/trans_presets.java:2396
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:1394 build/trans_presets.java:1766
+#: build/trans_presets.java:1776 build/trans_presets.java:2407
+#: build/trans_presets.java:2524
 msgid "Reference number"
 msgstr "Reference number"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "multi-storey"
 msgstr "multi-storey"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "surface"
 msgstr "surface"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "underground"
 msgstr "underground"
 
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1396
 msgid "Park and Ride"
 msgstr ""
@@ -17169,38 +17498,38 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1394 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
+#: build/trans_presets.java:1397 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
 msgid "Fee"
 msgstr "Fee"
 
 #. <space />
-#: build/trans_presets.java:1396
+#: build/trans_presets.java:1399
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1400
 msgid "Spaces for Disabled"
 msgstr "Spaces for Disabled"
 
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1401
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1402
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1403
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1405
 msgid "Wash"
 msgstr "Wash"
 
 #. item
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1406
 msgid "Edit Car Wash"
 msgstr "Edit Car Wash"
@@ -17208,5 +17537,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1408 build/trans_presets.java:1452
+#: build/trans_presets.java:1411 build/trans_presets.java:1455
 msgid "Shop"
 msgstr "Shop"
@@ -17214,15 +17543,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1413
 msgid "Edit Car Shop"
 msgstr "Edit Car Shop"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1418
 msgid "Repair"
 msgstr "Repair"
 
 #. item
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1419
 msgid "Edit Car Repair"
 msgstr "Edit Car Repair"
@@ -17230,5 +17559,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1421 build/trans_presets.java:1445
+#: build/trans_presets.java:1424 build/trans_presets.java:1448
 msgid "Rental"
 msgstr "Rental"
@@ -17237,10 +17566,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1427
 msgid "Edit Car Rental"
 msgstr "Edit Car Rental"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1432
 msgid "Sharing"
 msgstr "Sharing"
@@ -17248,5 +17577,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1434
 msgid "Edit Car Sharing"
 msgstr "Edit Car Sharing"
@@ -17254,10 +17583,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Parking"
 msgstr "Edit Bicycle Parking"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1446
 msgid "Capacity"
 msgstr "Capacity"
@@ -17266,5 +17595,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1448
+#: build/trans_presets.java:1451
 msgid "Edit Bicycle Rental"
 msgstr "Edit Bicycle Rental"
@@ -17273,15 +17602,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1458
 msgid "Edit Bicycle Shop"
 msgstr "Edit Bicycle Shop"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1463
 msgid "Public Transport"
 msgstr "Public Transport"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:1472
 msgid "UIC-Reference"
 msgstr "UIC-Reference"
@@ -17289,5 +17618,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1475
 msgid "Railway Halt"
 msgstr "Railway Halt"
@@ -17295,5 +17624,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1477
 msgid "Edit Halt"
 msgstr "Edit Halt"
@@ -17301,5 +17630,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1484
 msgid "Tram Stop"
 msgstr "Tram Stop"
@@ -17308,5 +17637,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1484
+#: build/trans_presets.java:1487
 msgid "Edit Tram Stop"
 msgstr "Edit Tram Stop"
@@ -17314,5 +17643,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1494
 msgid "Railway Platform"
 msgstr "Railway Platform"
@@ -17321,5 +17650,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1497
 msgid "Edit Railway Platform"
 msgstr "Edit Railway Platform"
@@ -17331,5 +17660,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1497 build/trans_presets.java:1539
+#: build/trans_presets.java:1500 build/trans_presets.java:1542
 msgid "Reference (track number)"
 msgstr "Reference (track number)"
@@ -17337,10 +17666,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1499 build/trans_presets.java:1541
+#: build/trans_presets.java:1502 build/trans_presets.java:1544
 msgid "Area"
 msgstr "Area"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1504
 msgid "Subway Entrance"
 msgstr "Subway Entrance"
@@ -17349,10 +17678,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1507
 msgid "Edit Subway Entrance"
 msgstr "Edit Subway Entrance"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1512
 msgid "Wheelchair"
 msgstr "Wheelchair"
@@ -17361,5 +17690,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1517
 msgid "Bus Station"
 msgstr "Bus Station"
@@ -17368,5 +17697,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1520
 msgid "Edit Bus Station"
 msgstr "Edit Bus Station"
@@ -17374,5 +17703,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1526
 msgid "Bus Stop"
 msgstr "Bus Stop"
@@ -17382,5 +17711,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1530
 msgid "Edit Bus Stop"
 msgstr "Edit Bus Stop"
@@ -17389,6 +17718,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1532 build/trans_presets.java:1785
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:1535 build/trans_presets.java:1789
+#: build/trans_presets.java:2453
 msgid "Shelter"
 msgstr "Shelter"
@@ -17396,10 +17725,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1538
 msgid "Bus Platform"
 msgstr "Bus Platform"
 
 #. item
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1539
 msgid "Edit Bus Platform"
 msgstr "Edit Bus Platform"
@@ -17407,5 +17736,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1547
 msgid "Taxi"
 msgstr "Taxi"
@@ -17413,5 +17742,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1549
 msgid "Edit Taxi station"
 msgstr "Edit Taxi station"
@@ -17419,5 +17748,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1554
 msgid "Airport"
 msgstr "Airport"
@@ -17425,15 +17754,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1556
 msgid "Edit Airport"
 msgstr "Edit Airport"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1561
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1559
+#: build/trans_presets.java:1562
 msgid "ICAO"
 msgstr "ICAO"
@@ -17441,6 +17770,11 @@
 #. item "Public Transport/Airport" text "ICAO"
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1567
+#, fuzzy
+msgid "Travel"
+msgstr "gravel"
+
+#. group "Travel"
+#: build/trans_presets.java:1568
 msgid "Accomodation"
 msgstr "Accomodation"
@@ -17452,5 +17786,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1565 build/trans_surveyor.java:43
+#: build/trans_presets.java:1569 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -17459,15 +17793,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:1568
+#: build/trans_presets.java:1572
 msgid "Edit Hotel"
 msgstr "Edit Hotel"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1575
 msgid "Stars"
 msgstr "Stars"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1577
 msgid "Motel"
 msgstr "Motel"
@@ -17475,20 +17809,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1579
 msgid "Edit Motel"
 msgstr "Edit Motel"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1583
 msgid "Guest House"
 msgstr "Guest House"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1584
 msgid "Edit Guest House"
 msgstr "Edit Guest House"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1588
 msgid "Chalet"
 msgstr "Chalet"
@@ -17496,10 +17830,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1590
 msgid "Edit Chalet"
 msgstr "Edit Chalet"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1594
 msgid "Hostel"
 msgstr "Hostel"
@@ -17507,30 +17841,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1592
+#: build/trans_presets.java:1596
 msgid "Edit Hostel"
 msgstr "Edit Hostel"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1600
 msgid "Alpine Hut"
 msgstr "Alpine Hut"
 
 #. item
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1601
 msgid "Edit Alpine Hut"
 msgstr "Edit Alpine Hut"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1606
 msgid "Caravan Site"
 msgstr "Caravan Site"
 
 #. item
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1607
 msgid "Edit Caravan Site"
 msgstr "Edit Caravan Site"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1611
 msgid "Camping Site"
 msgstr "Camp Site"
@@ -17538,10 +17872,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1613
 msgid "Edit Camping Site"
 msgstr "Edit Camp Site"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1618
 msgid "Food+Drinks"
 msgstr "Food+Drinks"
@@ -17552,5 +17886,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1615 build/trans_surveyor.java:47
+#: build/trans_presets.java:1619 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -17558,5 +17892,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1621
 msgid "Edit Restaurant"
 msgstr "Edit Restaurant"
@@ -17564,5 +17898,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "Cuisine"
 msgstr "Cuisine"
@@ -17570,61 +17904,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "italian"
 msgstr "italian"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "chinese"
 msgstr "chinese"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "burger"
 msgstr "burger"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "greek"
 msgstr "greek"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "german"
 msgstr "german"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "indian"
 msgstr "indian"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "turkish"
 msgstr "turkish"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "asian"
 msgstr "asian"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "mexican"
 msgstr "mexican"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "japanese"
 msgstr "japanese"
 
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1627
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -17632,9 +17966,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1629
 msgid "Edit Fast Food Restaurant"
 msgstr "Edit Fast Food Restaurant"
 
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1635
 msgid "Cafe"
 msgstr "Cafe"
@@ -17642,9 +17976,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1633
+#: build/trans_presets.java:1637
 msgid "Edit Cafe"
 msgstr "Edit Cafe"
 
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1642
 msgid "Pub"
 msgstr "Pub"
@@ -17652,18 +17986,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1644
 msgid "Edit Pub"
 msgstr "Edit Pub"
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1649
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item
-#: build/trans_presets.java:1646
+#: build/trans_presets.java:1650
 msgid "Edit Biergarten"
 msgstr "Edit Biergarten"
 
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1655
 msgid "Bar"
 msgstr "Bar"
@@ -17671,9 +18005,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1657
 msgid "Edit Bar"
 msgstr "Edit Bar"
 
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1662
 msgid "Nightclub"
 msgstr "Nightclub"
@@ -17681,24 +18015,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1664
 msgid "Edit Nightclub"
 msgstr "Edit Nightclub"
 
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1670
 msgid "Tourism"
 msgstr "Tourism"
 
 #. group "Tourism"
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1671
 msgid "Attraction"
 msgstr "Attraction"
 
 #. item
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1672
 msgid "Edit Attraction"
 msgstr "Edit Attraction"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1677
 msgid "Museum"
 msgstr "Museum"
@@ -17706,9 +18040,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1679
 msgid "Edit Museum"
 msgstr "Edit Museum"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1684
 msgid "Zoo"
 msgstr "Zoo"
@@ -17717,9 +18051,9 @@
 #. <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:1683
+#: build/trans_presets.java:1687
 msgid "Edit Zoo"
 msgstr "Edit Zoo"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1692
 msgid "Viewpoint"
 msgstr "Viewpoint"
@@ -17727,24 +18061,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1694
 msgid "Edit Viewpoint"
 msgstr "Edit Viewpoint"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1697
 msgid "Look-Out Tower"
 msgstr "Look-Out Tower"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1699
 msgid "Theme Park"
 msgstr "Theme Park"
 
 #. item
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1700
 msgid "Edit Theme Park"
 msgstr "Edit Theme Park"
 
-#: build/trans_presets.java:1701
+#: build/trans_presets.java:1705
 msgid "Artwork"
 msgstr "Artwork"
@@ -17752,5 +18086,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1707
 msgid "Edit Artwork"
 msgstr "Edit Artwork"
@@ -17758,19 +18092,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1712
 msgid "Information Office"
 msgstr "Information Office"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1719
 msgid "Map"
 msgstr "Map"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "topo"
 msgstr ""
@@ -17808,5 +18142,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1720 build/trans_style.java:619
+#: build/trans_presets.java:1724 build/trans_style.java:619
 #: build/trans_style.java:635 build/trans_style.java:651
 #: build/trans_style.java:659
@@ -17814,28 +18148,28 @@
 msgstr "street"
 
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1722 build/trans_presets.java:1738
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1726 build/trans_presets.java:1742
+#: build/trans_presets.java:1786
 msgid "Closer Description"
 msgstr "Closer Description"
@@ -17845,5 +18179,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1724 build/trans_presets.java:1747
+#: build/trans_presets.java:1728 build/trans_presets.java:1751
 msgid "Routes shown for:"
 msgstr ""
@@ -17851,6 +18185,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1726 build/trans_presets.java:1749
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1965
 msgid "Cycling"
 msgstr "Cycling"
@@ -17858,5 +18192,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1727 build/trans_presets.java:1750
+#: build/trans_presets.java:1731 build/trans_presets.java:1754
 msgid "Mountainbiking"
 msgstr ""
@@ -17864,6 +18198,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1728 build/trans_presets.java:1751
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:1732 build/trans_presets.java:1755
+#: build/trans_presets.java:2019
 msgid "Skiing"
 msgstr "Skiing"
@@ -17871,5 +18205,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1729 build/trans_presets.java:1752
+#: build/trans_presets.java:1733 build/trans_presets.java:1756
 msgid "Riding"
 msgstr ""
@@ -17877,46 +18211,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1734 build/trans_presets.java:1757
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1736
 msgid "Information Board"
 msgstr "Information Board"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "history"
 msgstr "history"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "nature"
 msgstr "nature"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "wildlife"
 msgstr "wildlife"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1744
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1759
 msgid "Information Terminal"
 msgstr ""
@@ -17924,29 +18258,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1760 build/trans_presets.java:1770
+#: build/trans_presets.java:1764 build/trans_presets.java:1774
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1769
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1779
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1780
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1778
+#: build/trans_presets.java:1782
 msgid "Other Information Points"
 msgstr "Other Information Points"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1790
 msgid "Edit Shelter"
 msgstr "Edit Shelter"
@@ -17954,25 +18288,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1789 build/trans_presets.java:1795
+#: build/trans_presets.java:1793 build/trans_presets.java:1799
 msgid "Fireplace"
 msgstr "Fireplace"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1791
+#: build/trans_presets.java:1795
 msgid "Picnic Site"
 msgstr "Picnic Site"
 
 #. item
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1796
 msgid "Edit Picnic Site"
 msgstr "Edit Picnic Site"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1802
 msgid "Historic Places"
 msgstr "Historic Places"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1799
+#: build/trans_presets.java:1803
 msgid "Castle"
 msgstr "Castle"
@@ -17981,19 +18315,19 @@
 #. <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:1802
+#: build/trans_presets.java:1806
 msgid "Edit Castle"
 msgstr "Edit Castle"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1810
 msgid "Ruins"
 msgstr "Ruins"
 
 #. item
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1811
 msgid "Edit Ruins"
 msgstr "Edit Ruins"
 
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1816
 msgid "Archaeological Site"
 msgstr "Archaeological Site"
@@ -18002,9 +18336,9 @@
 #. <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:1815
+#: build/trans_presets.java:1819
 msgid "Edit Archaeological Site"
 msgstr "Edit Archaeological Site"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1824
 msgid "Battlefield"
 msgstr "Battlefield"
@@ -18012,5 +18346,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1826
 msgid "Edit Battlefield"
 msgstr "Edit Battlefield"
@@ -18018,15 +18352,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1831
 msgid "Monument"
 msgstr "Monument"
 
 #. item
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1832
 msgid "Edit Monument"
 msgstr "Edit Monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1836
 msgid "Memorial"
 msgstr "Memorial"
@@ -18034,45 +18368,57 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1838
 msgid "Edit Memorial"
 msgstr "Edit Memorial"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1842
 msgid "Wayside Cross"
 msgstr "Wayside Cross"
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1843
 msgid "Edit Wayside Cross"
 msgstr "Edit Wayside Cross"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1847
 msgid "Wayside Shrine"
 msgstr "Wayside Shrine"
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1848
 msgid "Edit Wayside Shrine"
 msgstr "Edit Wayside Shrine"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1852
+#, fuzzy
+msgid "Boundary Stone"
+msgstr "Boundaries"
+
+#. item
+#: build/trans_presets.java:1853
+#, fuzzy
+msgid "Edit Boundary Stone"
+msgstr "Edit Bus Stop"
+
+#. item "Historic Places/Boundary Stone" text "Name"
+#: build/trans_presets.java:1858
 msgid "Leisure"
 msgstr "Leisure"
 
 #. group "Leisure"
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1859
 msgid "Water Park"
 msgstr "Water Park"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1860
 msgid "Edit Water Park"
 msgstr "Edit Water Park"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1864
 msgid "Playground"
 msgstr "Playground"
@@ -18080,31 +18426,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1866
 msgid "Edit Playground"
 msgstr "Edit Playground"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1870
 msgid "Fishing"
 msgstr "Fishing"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1871
 msgid "Edit Fishing"
 msgstr "Edit Fishing"
 
 #. item "Leisure/Fishing" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1877 build/trans_presets.java:2669
+msgid "Sports"
+msgstr "Sports"
+
+#. group "Sports"
+#: build/trans_presets.java:1878
 msgid "Sport Facilities"
 msgstr "Sport Facilities"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1879
 msgid "Stadium"
 msgstr "Stadium"
 
 #. item
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1880
 msgid "Edit Stadium"
 msgstr "Edit Stadium"
@@ -18118,6 +18468,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1874 build/trans_presets.java:1883
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1902 build/trans_presets.java:1911
 msgid "select sport:"
 msgstr "select sport:"
@@ -18509,30 +18859,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884 build/trans_style.java:3892
-#: build/trans_style.java:3900 build/trans_style.java:3908
-#: build/trans_style.java:3916 build/trans_style.java:3924
-#: build/trans_style.java:3932
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_style.java:3572 build/trans_style.java:3580
+#: build/trans_style.java:3588 build/trans_style.java:3596
+#: build/trans_style.java:3604 build/trans_style.java:3612
+#: build/trans_style.java:3620 build/trans_style.java:3628
+#: build/trans_style.java:3636 build/trans_style.java:3644
+#: build/trans_style.java:3652 build/trans_style.java:3660
+#: build/trans_style.java:3668 build/trans_style.java:3676
+#: build/trans_style.java:3684 build/trans_style.java:3692
+#: build/trans_style.java:3700 build/trans_style.java:3708
+#: build/trans_style.java:3716 build/trans_style.java:3724
+#: build/trans_style.java:3732 build/trans_style.java:3740
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3764 build/trans_style.java:3772
+#: build/trans_style.java:3780 build/trans_style.java:3788
+#: build/trans_style.java:3796 build/trans_style.java:3804
+#: build/trans_style.java:3812 build/trans_style.java:3820
+#: build/trans_style.java:3828 build/trans_style.java:3836
+#: build/trans_style.java:3844 build/trans_style.java:3852
+#: build/trans_style.java:3860 build/trans_style.java:3868
+#: build/trans_style.java:3876 build/trans_style.java:3884
+#: build/trans_style.java:3892 build/trans_style.java:3900
+#: build/trans_style.java:3908 build/trans_style.java:3916
+#: build/trans_style.java:3924 build/trans_style.java:3932
+#: build/trans_style.java:3940
 msgid "sport"
 msgstr "sport"
@@ -18542,225 +18892,225 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "archery"
 msgstr "archery"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "athletics"
 msgstr "athletics"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "australian_football"
 msgstr "australian_football"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "bowls"
 msgstr "lawn bowls"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "canoe"
 msgstr "canoeing"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "climbing"
 msgstr "climbing"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket_nets"
 msgstr "cricket nets"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cycling"
 msgstr "cycling"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "dog_racing"
 msgstr "dog racing"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "equestrian"
 msgstr "equestrian"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "football"
 msgstr "football"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "gymnastics"
 msgstr "gymnastics"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "horse_racing"
 msgstr "horse_racing"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "racquet"
 msgstr "racquet"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "shooting"
 msgstr "shooting"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skating"
 msgstr "skating"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skiing"
 msgstr "skiing"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "soccer"
 msgstr "soccer"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "swimming"
 msgstr "swimming"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "table_tennis"
 msgstr "table_tennis"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1888
 msgid "Sports Centre"
 msgstr "Sports Centre"
 
 #. item
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1889
 msgid "Edit Sports Centre"
 msgstr "Edit Sports Centre"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1897
 msgid "Pitch"
 msgstr "Pitch"
 
 #. item
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1898
 msgid "Edit Pitch"
 msgstr "Edit Pitch"
 
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1906
 msgid "Racetrack"
 msgstr "Racetrack"
 
 #. item
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1907
 msgid "Edit Racetrack"
 msgstr "Edit Racetrack"
 
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1915
 msgid "Golf Course"
 msgstr "Golf Course"
 
 #. item
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1916
 msgid "Edit Golf Course"
 msgstr "Edit Golf Course"
 
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1921
 msgid "Miniature Golf"
 msgstr "Miniature Golf"
 
 #. item
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1922
 msgid "Edit Miniature Golf"
 msgstr "Edit Miniature Golf"
 
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1928
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1929
 msgid "Multi"
 msgstr "Multi"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1930
 msgid "Edit Multi"
 msgstr "Edit Multi"
@@ -18799,183 +19149,183 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "pitch"
 msgstr "pitch"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "sports_centre"
 msgstr "sports_centre"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "stadium"
 msgstr "stadium"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1935
 msgid "10pin"
 msgstr "10pin"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1936
 msgid "Edit 10pin"
 msgstr "Edit 10pin"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1941
 msgid "Athletics"
 msgstr "Athletics"
 
 #. item
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1942
 msgid "Edit Athletics"
 msgstr "Edit Athletics"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1947
 msgid "Archery"
 msgstr "Archery"
 
 #. item
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1948
 msgid "Edit Archery"
 msgstr "Edit Archery"
 
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1953
 msgid "Climbing"
 msgstr "Climbing"
 
 #. item
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:1954
 msgid "Edit Climbing"
 msgstr "Edit Climbing"
 
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1959
 msgid "Canoeing"
 msgstr "Canoeing"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1960
 msgid "Edit Canoeing"
 msgstr "Edit Canoeing"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1966
 msgid "Edit Cycling"
 msgstr "Edit Cycling"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1971
 msgid "Dog Racing"
 msgstr "Dog Racing"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1972
 msgid "Edit Dog Racing"
 msgstr "Edit Dog Racing"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1977
 msgid "Equestrian"
 msgstr "Equestrian"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1978
 msgid "Edit Equestrian"
 msgstr "Edit Equestrian"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1983
 msgid "Horse Racing"
 msgstr "Horse Racing"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1984
 msgid "Edit Horse Racing"
 msgstr "Edit Horse Racing"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1989
 msgid "Gymnastics"
 msgstr "Gymnastics"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1990
 msgid "Edit Gymnastics"
 msgstr "Edit Gymnastics"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1995
 msgid "Motor Sports"
 msgstr "Motor Sports"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1996
 msgid "Edit Motor Sports"
 msgstr "Edit Motor Sports"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2001
 msgid "Skating"
 msgstr "Skating"
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2002
 msgid "Edit Skating"
 msgstr "Edit Skating"
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2007
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2008
 msgid "Edit Skateboard"
 msgstr "Edit Skateboard"
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2013
 msgid "Swimming"
 msgstr "Swimming"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2014
 msgid "Edit Swimming"
 msgstr "Edit Swimming"
@@ -18983,56 +19333,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2021
 msgid "Edit Skiing"
 msgstr "Edit Skiing"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "Piste type"
 msgstr "Piste type"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "downhill"
 msgstr "downhill"
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "nordic"
 msgstr "nordic"
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "snow_park"
 msgstr "snow_park"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "Difficulty"
 msgstr "Difficulty"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "novice"
 msgstr "novice"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "easy"
 msgstr "easy"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "intermediate"
 msgstr "intermediate"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "advanced"
 msgstr "advanced"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "freeride"
 msgstr "freeride"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2028
 msgid "Shooting"
 msgstr "Shooting"
@@ -19040,178 +19390,183 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2030
 msgid "Edit Shooting"
 msgstr "Edit Shooting"
 
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2036
 msgid "Sport (Ball)"
 msgstr "Sport (Ball)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2037
 msgid "Soccer"
 msgstr "Football"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2038
 msgid "Edit Soccer"
 msgstr "Edit Football"
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2043
 msgid "Football"
 msgstr "American Football"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2044
 msgid "Edit Football"
 msgstr "Edit American Football"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2049
 msgid "Australian Football"
 msgstr "Australian Football"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2050
 msgid "Edit Australian Football"
 msgstr "Edit Australian Football"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2055
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2056
 msgid "Edit Baseball"
 msgstr "Edit Baseball"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2061
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2062
 msgid "Edit Basketball"
 msgstr "Edit Basketball"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2067
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2068
 msgid "Edit Golf"
 msgstr "Edit Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2071
 msgid "golf_course"
 msgstr "golf_course"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2073
 msgid "Boule"
 msgstr "Boule"
 
 #. item
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2074
 msgid "Edit Boule"
 msgstr "Edit Boule"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2079
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2080
 msgid "Edit Bowls"
 msgstr "Edit Bowls"
 
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2085
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2086
 msgid "Edit Cricket"
 msgstr "Edit Cricket"
 
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2091
 msgid "Cricket Nets"
 msgstr "Cricket Nets"
 
 #. item
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2092
 msgid "Edit Cricket Nets"
 msgstr "Edit Cricket Nets"
 
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2097
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2098
 msgid "Edit Croquet"
 msgstr "Edit Croquet"
 
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2103
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2104
 msgid "Edit Hockey"
 msgstr "Edit Hockey"
 
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2109
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2110
 msgid "Edit Pelota"
 msgstr "Edit Pelota"
 
-#: build/trans_presets.java:2105
+#: build/trans_presets.java:2115
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2116
 msgid "Edit Racquet"
 msgstr "Edit Racquet"
 
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2121
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2122
 msgid "Edit Rugby"
 msgstr "Edit Rugby"
 
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2127
 msgid "Table Tennis"
 msgstr "Table Tennis"
 
 #. item
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2128
 msgid "Edit Table Tennis"
 msgstr "Edit Table Tennis"
 
-#: build/trans_presets.java:2123
+#: build/trans_presets.java:2133
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2134
 msgid "Edit Tennis"
 msgstr "Edit Tennis"
 
-#. <separator/>
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2141
+#, fuzzy
+msgid "Man-Made"
+msgstr "Man Made"
+
+#. group "Man-Made"
+#: build/trans_presets.java:2142
 msgid "Buildings"
 msgstr "Buildings"
 
 #. group "Buildings"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2143
 msgid "Building"
 msgstr "Building"
@@ -19219,5 +19574,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Public Building"
 msgstr "Public Building"
@@ -19225,10 +19580,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2148
 msgid "Edit Public Building"
 msgstr "Edit Public Building"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2152
 msgid "Town hall"
 msgstr "Town hall"
@@ -19236,10 +19591,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2154
 msgid "Edit Town hall"
 msgstr "Edit Town hall"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:2158
 msgid "Embassy"
 msgstr "Embassy"
@@ -19247,10 +19602,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Edit Embassy"
 msgstr "Edit Embassy"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2164
 msgid "Courthouse"
 msgstr "Courthouse"
@@ -19259,10 +19614,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:2156
+#: build/trans_presets.java:2167
 msgid "Edit Courthouse"
 msgstr "Edit Courthouse"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2171
 msgid "Prison"
 msgstr "Prison"
@@ -19271,10 +19626,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:2163
+#: build/trans_presets.java:2174
 msgid "Edit Prison"
 msgstr "Edit Prison"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2178
 msgid "Police"
 msgstr "Police"
@@ -19284,10 +19639,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:2171
+#: build/trans_presets.java:2182
 msgid "Edit Police"
 msgstr "Edit Police"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2186
 msgid "Fire Station"
 msgstr "Fire Station"
@@ -19296,10 +19651,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:2178
+#: build/trans_presets.java:2189
 msgid "Edit Fire Station"
 msgstr "Edit Fire Station"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "Post Office"
 msgstr "Post Office"
@@ -19307,5 +19662,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Edit Post Office"
 msgstr "Edit Post Office"
@@ -19313,15 +19668,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2200
 msgid "Kindergarten"
 msgstr "Preschool"
 
 #. item
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Kindergarten"
 msgstr "Edit Preschool"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2205
 msgid "School"
 msgstr "School"
@@ -19329,10 +19684,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Edit School"
 msgstr "Edit School"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2211
 msgid "University"
 msgstr "University"
@@ -19340,10 +19695,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit University"
 msgstr "Edit University"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "College"
 msgstr "College"
@@ -19351,5 +19706,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2219
 msgid "Edit College"
 msgstr "Edit College"
@@ -19357,5 +19712,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2224
 msgid "Cinema"
 msgstr "Cinema"
@@ -19364,10 +19719,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:2216
+#: build/trans_presets.java:2227
 msgid "Edit Cinema"
 msgstr "Edit Cinema"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2231
 msgid "Library"
 msgstr "Library"
@@ -19376,9 +19731,9 @@
 #. <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:2223
+#: build/trans_presets.java:2234
 msgid "Edit Library"
 msgstr "Edit Library"
 
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Arts Centre"
 msgstr "Arts Centre"
@@ -19386,10 +19741,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Arts Centre"
 msgstr "Edit Arts Centre"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Theatre"
 msgstr "Theatre"
@@ -19398,10 +19753,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:2237
+#: build/trans_presets.java:2248
 msgid "Edit Theatre"
 msgstr "Edit Theatre"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2252
 msgid "Place of Worship"
 msgstr "Place of Worship"
@@ -19411,5 +19766,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:2245
+#: build/trans_presets.java:2256
 msgid "Edit Place of Worship"
 msgstr "Edit Place of Worship"
@@ -19418,6 +19773,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "Religion"
 msgstr "Religion"
@@ -19426,66 +19781,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "buddhist"
 msgstr "buddhist"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "christian"
 msgstr "christian"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jewish"
 msgstr "jewish"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "muslim"
 msgstr "muslim"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "unitarian"
 msgstr "unitarian"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "zoroastrian"
 msgstr "zoroastrian"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "Denomination"
 msgstr "Denomination"
@@ -19494,81 +19849,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "anglican"
 msgstr "anglican"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "catholic"
 msgstr "catholic"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "evangelical"
 msgstr "evangelical"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "jehovahs_witness"
 msgstr "jehovahs_witness"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "lutheran"
 msgstr "lutheran"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "methodist"
 msgstr "methodist"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "mormon"
 msgstr "mormon"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "presbyterian"
 msgstr "presbyterian"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "sunni"
 msgstr "sunni"
 
 #. <separator/>
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2264
 msgid "Addresses"
 msgstr "Addresses"
@@ -19577,5 +19932,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:2256
+#: build/trans_presets.java:2267
 msgid "Edit Address Information"
 msgstr "Edit Address Information"
@@ -19583,5 +19938,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2269
 msgid "House number"
 msgstr "House number"
@@ -19589,20 +19944,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "House name"
 msgstr "House name"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "City name"
 msgstr "City name"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2274
 msgid "Post code"
 msgstr "Post code"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2275
 msgid "Country code"
 msgstr "Country code"
@@ -19610,5 +19965,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Address Interpolation"
 msgstr "Address Interpolation"
@@ -19617,5 +19972,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:2270
+#: build/trans_presets.java:2281
 msgid "Edit Address Interpolation"
 msgstr "Edit Address Interpolation"
@@ -19623,67 +19978,67 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "Numbering scheme"
 msgstr "Numbering scheme"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "odd"
 msgstr "odd"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "even"
 msgstr "even"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "alphabetic"
 msgstr "alphabetic"
 
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2286
 msgid "Man Made"
 msgstr "Man Made"
 
 #. group "Man Made"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Works"
 msgstr "Works"
 
 #. item
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2288
 msgid "Edit Works"
 msgstr "Edit Works"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2292
 msgid "Tower"
 msgstr "Tower"
 
 #. item
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2293
 msgid "Edit Tower"
 msgstr "Edit Tower"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Water Tower"
 msgstr "Water Tower"
 
 #. item
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2298
 msgid "Edit Water Tower"
 msgstr "Edit Water Tower"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Gasometer"
 msgstr "Gasometer"
 
 #. item
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2303
 msgid "Edit Gasometer"
 msgstr "Edit Gasometer"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Lighthouse"
 msgstr "Lighthouse"
@@ -19691,10 +20046,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2309
 msgid "Edit Lighthouse"
 msgstr "Edit Lighthouse"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Windmill"
 msgstr "Windmill"
@@ -19702,10 +20057,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2315
 msgid "Edit Windmill"
 msgstr "Edit Windmill"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2319
 msgid "Pipeline"
 msgstr "Pipeline"
@@ -19713,10 +20068,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Edit Pipeline"
 msgstr "Edit Pipeline"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2325
 msgid "Wastewater Plant"
 msgstr "Sewerage Plant"
@@ -19726,10 +20081,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:2318
+#: build/trans_presets.java:2329
 msgid "Edit Wastewater Plant"
 msgstr "Edit Sewerage Plant"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2333
 msgid "Crane"
 msgstr "Crane"
@@ -19737,10 +20092,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2335
 msgid "Edit Crane"
 msgstr "Edit Crane"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Beacon"
 msgstr "Beacon"
@@ -19748,10 +20103,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2341
 msgid "Edit Beacon"
 msgstr "Edit Beacon"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2345
 msgid "Survey Point"
 msgstr "Survey Point"
@@ -19759,10 +20114,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Edit Survey Point"
 msgstr "Edit Survey Point"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2351
 msgid "Surveillance"
 msgstr "Surveillance"
@@ -19770,5 +20125,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2353
 msgid "Edit Surveillance Camera"
 msgstr "Edit Surveillance Camera"
@@ -19776,5 +20131,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Power Generator"
 msgstr "Power Generator"
@@ -19784,39 +20139,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:2351
+#: build/trans_presets.java:2362
 msgid "Edit Power Generator"
 msgstr "Edit Power Generator"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "wind"
 msgstr "wind"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "hydro"
 msgstr "hydro"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "coal"
 msgstr "coal"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "photovoltaic"
 msgstr "photovoltaic"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "gas"
 msgstr "gas"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2367
 msgid "Power Station"
 msgstr "Power Station"
@@ -19825,10 +20180,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:2359
+#: build/trans_presets.java:2370
 msgid "Edit Power Station"
 msgstr "Edit Power Station"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2374
 msgid "Power Sub Station"
 msgstr "Power Sub Station"
@@ -19837,5 +20192,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:2366
+#: build/trans_presets.java:2377
 msgid "Edit Power Sub Station"
 msgstr "Edit Power Sub Station"
@@ -19843,10 +20198,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2369 build/trans_presets.java:2385
+#: build/trans_presets.java:2380 build/trans_presets.java:2396
 msgid "Line reference"
 msgstr "Line reference"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2382
 msgid "Power Tower"
 msgstr "Power Tower"
@@ -19857,5 +20212,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:2376
+#: build/trans_presets.java:2387
 msgid "Edit Power Tower"
 msgstr "Edit Power Tower"
@@ -19863,5 +20218,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2390
 msgid "Power Line"
 msgstr "Power Line"
@@ -19870,40 +20225,40 @@
 #. <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:2382
+#: build/trans_presets.java:2393
 msgid "Edit Power Line"
 msgstr "Edit Power Line"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Voltage"
 msgstr "Voltage"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2398
 msgid "Amount of Wires"
 msgstr "Amount of Wires"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Amenities"
 msgstr "Amenities"
 
 #. group "Amenities"
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2402
 msgid "Toilets"
 msgstr "Toilets"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2398 build/trans_presets.java:2514
+#: build/trans_presets.java:2409 build/trans_presets.java:2525
 msgid "Note"
 msgstr "Note"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2411
 msgid "Post Box"
 msgstr "Post Box"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2416
 msgid "Telephone"
 msgstr "Telephone"
@@ -19912,5 +20267,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:2408
+#: build/trans_presets.java:2419
 msgid "Edit Telephone"
 msgstr "Edit Telephone"
@@ -19918,5 +20273,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2411 build/trans_presets.java:2515
+#: build/trans_presets.java:2422 build/trans_presets.java:2526
 msgid "Coins"
 msgstr "Coins"
@@ -19924,5 +20279,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2412 build/trans_presets.java:2516
+#: build/trans_presets.java:2423 build/trans_presets.java:2527
 msgid "Notes"
 msgstr "Notes"
@@ -19930,5 +20285,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2413 build/trans_presets.java:2517
+#: build/trans_presets.java:2424 build/trans_presets.java:2528
 msgid "Electronic purses and Charge cards"
 msgstr "Electronic purses and Charge cards"
@@ -19936,5 +20291,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2414 build/trans_presets.java:2518
+#: build/trans_presets.java:2425 build/trans_presets.java:2529
 msgid "Debit cards"
 msgstr "Debit cards"
@@ -19942,15 +20297,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2415 build/trans_presets.java:2519
+#: build/trans_presets.java:2426 build/trans_presets.java:2530
 msgid "Credit cards"
 msgstr "Credit cards"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2427
 msgid "Telephone cards"
 msgstr "Telephone cards"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2429
 msgid "Recycling"
 msgstr "Recycling"
@@ -19959,5 +20314,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:2421
+#: build/trans_presets.java:2432
 msgid "Edit Recycling station"
 msgstr "Edit Recycling station"
@@ -19965,35 +20320,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Batteries"
 msgstr "Batteries"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2435
 msgid "Cans"
 msgstr "Cans"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Clothes"
 msgstr "Clothes"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2437
 msgid "Glass"
 msgstr "Glass"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2438
 msgid "Paper"
 msgstr "Paper"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2439
 msgid "Scrap Metal"
 msgstr "Scrap Metal"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2441
 msgid "Bench"
 msgstr "Bench"
@@ -20002,40 +20357,33 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2433
-#, fuzzy
+#: build/trans_presets.java:2444
 msgid "Backrest"
-msgstr "Back"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "Material"
-msgstr "Memorial"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2434
-#, fuzzy
+#: build/trans_presets.java:2445
 msgid "stone"
-msgstr "none"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "plastic"
-msgstr "place"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "Colour"
-msgstr "Colour"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "black"
-msgstr "Back"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "brown"
-msgstr "down"
+msgstr ""
 
 #. color historic
@@ -20104,39 +20452,35 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2435 build/trans_style.java:3055
-#: build/trans_style.java:3063 build/trans_style.java:3071
-#: build/trans_style.java:3079 build/trans_style.java:3127
-#: build/trans_style.java:3135 build/trans_style.java:3233
-#: build/trans_style.java:3241
+#: build/trans_presets.java:2446 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3135
+#: build/trans_style.java:3143 build/trans_style.java:3241
+#: build/trans_style.java:3249
 msgid "green"
 msgstr "green"
 
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "red"
-msgstr "end"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "blue"
-msgstr "Value"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "white"
-msgstr "water"
-
-#: build/trans_presets.java:2436
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2447
 msgid "Amount of Seats"
-msgstr "Amount of Wires"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2449
 msgid "Hunting Stand"
 msgstr "Hunting Stand"
 
 #. item
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2450
 msgid "Edit Hunting Stand"
 msgstr "Edit Hunting Stand"
@@ -20145,30 +20489,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2441 build/trans_presets.java:2902
+#: build/trans_presets.java:2452 build/trans_presets.java:2914
 msgid "Height"
 msgstr "Height"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "low"
 msgstr "low"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "half"
 msgstr "half"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "full"
 msgstr "full"
 
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2454
 msgid "Hide"
 msgstr "Hide"
 
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2455
 msgid "Lock"
 msgstr "Lock"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Fountain"
 msgstr "Fountain"
@@ -20177,10 +20521,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:2449
+#: build/trans_presets.java:2460
 msgid "Edit Fountain"
 msgstr "Edit Fountain"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2464
 msgid "Drinking Water"
 msgstr "Drinking Water"
@@ -20189,10 +20533,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:2456
+#: build/trans_presets.java:2467
 msgid "Edit Drinking Water"
 msgstr "Edit Drinking Water"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2471
 msgid "Baby Hatch"
 msgstr "Baby Hatch"
@@ -20200,33 +20544,33 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Baby Hatch"
 msgstr "Edit Baby Hatch"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2479
 msgid "Shops"
 msgstr "Shops"
 
 #. group "Shops"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2480
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2481
 msgid "Edit Supermarket"
 msgstr "Edit Supermarket"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2486
 msgid "Chemist"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2487
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2492
 msgid "Convenience Store"
 msgstr "Convenience Store"
@@ -20234,9 +20578,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Edit Convenience Store"
 msgstr "Edit Convenience Store"
 
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2499
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -20244,27 +20588,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Kiosk"
 msgstr "Edit Kiosk"
 
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Book Store"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2507
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2512
 msgid "Travel Agency"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2513
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2518
 msgid "Vending machine"
 msgstr "Vending machine"
@@ -20272,5 +20616,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Edit Vending machine"
 msgstr "Edit Vending machine"
@@ -20278,88 +20622,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "Vending products"
 msgstr "Vending products"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_tickets"
 msgstr "public_transport_tickets"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_plans"
 msgstr "public_transport_plans"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "parking_tickets"
 msgstr "parking_tickets"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "food"
 msgstr "food"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "drinks"
 msgstr "drinks"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "sweets"
 msgstr "sweets"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "cigarettes"
 msgstr "cigarettes"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "photos"
 msgstr "photos"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "animal_food"
 msgstr "animal_food"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "news_papers"
 msgstr "news_papers"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "toys"
 msgstr "toys"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "stamps"
 msgstr "stamps"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "SIM-cards"
 msgstr "SIM-cards"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "telephone_vouchers"
 msgstr "telephone_vouchers"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "vouchers"
 msgstr "vouchers"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "condoms"
 msgstr "condoms"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "excrement_bags"
 msgstr "excrement_bags"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Account or loyalty cards"
 msgstr "Account or loyalty cards"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Butcher"
 msgstr "Butcher"
@@ -20367,9 +20711,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2535
 msgid "Edit Butcher"
 msgstr "Edit Butcher"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2540
 msgid "Baker"
 msgstr "Baker"
@@ -20377,9 +20721,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2542
 msgid "Edit Baker"
 msgstr "Edit Baker"
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2547
 msgid "Florist"
 msgstr "Florist"
@@ -20387,18 +20731,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Florist"
 msgstr "Edit Florist"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2554
 msgid "Organic"
 msgstr "Organic"
 
 #. item
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Edit Organic Shop"
 msgstr "Edit Organic Shop"
 
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2560
 msgid "Alcohol"
 msgstr "Alcohol"
@@ -20406,54 +20750,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2562
 msgid "Edit Alcohol Shop"
 msgstr "Edit Alcohol Shop"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2567
 msgid "Beverages"
 msgstr "Beverages"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2568
 msgid "Edit Beverages Shop"
 msgstr "Edit Beverages Shop"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2573
 msgid "Computer"
 msgstr "Computer"
 
 #. item
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2574
 msgid "Edit Computer Shop"
 msgstr "Edit Computer Shop"
 
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Electronics"
 msgstr "Electronics"
 
 #. item
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2580
 msgid "Edit Electronics Shop"
 msgstr "Edit Electronics Shop"
 
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2585
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2586
 msgid "Edit Hifi Shop"
 msgstr "Edit Hifi Shop"
 
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2591
 msgid "Furniture"
 msgstr "Furniture"
 
 #. item
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Edit Furniture Shop"
 msgstr "Edit Furniture Shop"
 
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Garden Centre"
 msgstr "Garden Centre"
@@ -20461,9 +20805,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2599
 msgid "Edit Garden Centre"
 msgstr "Edit Garden Centre"
 
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Hardware"
 msgstr "Hardware"
@@ -20471,9 +20815,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2606
 msgid "Edit Hardware Store"
 msgstr "Edit Hardware Store"
 
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "Do-it-yourself-store"
 msgstr "Do-it-yourself-store"
@@ -20481,54 +20825,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2613
 msgid "Edit Do-it-yourself-store"
 msgstr "Edit Do-it-yourself-store"
 
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2618
 msgid "Stationery"
 msgstr "Stationery"
 
 #. item
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2619
 msgid "Edit Stationery Shop"
 msgstr "Edit Stationery Shop"
 
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Hairdresser"
 msgstr "Hairdresser"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Hairdresser"
 msgstr "Edit Hairdresser"
 
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Shoes"
 msgstr "Shoes"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Shoe Shop"
 msgstr "Edit Shoe Shop"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2636
 msgid "Toys"
 msgstr "Toys"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit Toy Shop"
 msgstr "Edit Toy Shop"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Video"
 msgstr "Video"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Video Shop"
 msgstr "Edit Video Shop"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "Dry Cleaning"
 msgstr "Dry Cleaning"
@@ -20536,9 +20880,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2650
 msgid "Edit Dry Cleaning"
 msgstr "Edit Dry Cleaning"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "Laundry"
 msgstr "Laundry"
@@ -20546,9 +20890,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2657
 msgid "Edit Laundry"
 msgstr "Edit Laundry"
 
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2662
 msgid "Outdoor"
 msgstr "Outdoor"
@@ -20556,32 +20900,28 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2664
 msgid "Edit Outdoor Shop"
 msgstr "Edit Outdoor Shop"
 
-#: build/trans_presets.java:2658
-msgid "Sports"
-msgstr "Sports"
-
-#. item
-#: build/trans_presets.java:2659
+#. item
+#: build/trans_presets.java:2670
 msgid "Edit Sports Shop"
 msgstr "Edit Sports Shop"
 
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Optician"
 msgstr "Optician"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Optician"
 msgstr "Edit Optician"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2683
 msgid "Cash"
 msgstr "Cash"
 
 #. group "Cash"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2684
 msgid "Bank"
 msgstr "Bank"
@@ -20589,14 +20929,14 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2686
 msgid "Edit Bank"
 msgstr "Edit Bank"
 
-#: build/trans_presets.java:2680 build/trans_presets.java:2689
+#: build/trans_presets.java:2691 build/trans_presets.java:2700
 msgid "Automated Teller Machine"
 msgstr "Automated Teller Machine"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2693
 msgid "Money Exchange"
 msgstr "Money Exchange"
@@ -20604,5 +20944,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Edit Money Exchange"
 msgstr "Edit Money Exchange"
@@ -20610,15 +20950,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2691
+#: build/trans_presets.java:2702
 msgid "Edit Automated Teller Machine"
 msgstr "Edit Automated Teller Machine"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2707
 msgid "Health"
 msgstr "Health"
 
 #. group "Health"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2708
 msgid "Doctors"
 msgstr "Doctors"
@@ -20626,18 +20966,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2710
 msgid "Edit Doctors"
 msgstr "Edit Doctors"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2715
 msgid "Dentist"
 msgstr "Dentist"
 
 #. item
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Edit Dentist"
 msgstr "Edit Dentist"
 
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2721
 msgid "Pharmacy"
 msgstr "Pharmacy"
@@ -20645,5 +20985,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Edit Pharmacy"
 msgstr "Edit Pharmacy"
@@ -20651,9 +20991,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Dispensing"
 msgstr "Dispensing"
 
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2729
 msgid "Hospital"
 msgstr "Hospital"
@@ -20661,10 +21001,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Edit Hospital"
 msgstr "Edit Hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2735
 msgid "Emergency Access Point"
 msgstr "Emergency Access Point"
@@ -20673,5 +21013,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:2727
+#: build/trans_presets.java:2738
 msgid "Edit Emergency Access Point"
 msgstr "Edit Emergency Access Point"
@@ -20680,20 +21020,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2741
 msgid "Point Number"
 msgstr "Point Number"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2742
 msgid "Point Name"
 msgstr "Point Name"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Phone Number"
 msgstr "Phone Number"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Use international code, like +12-345-67890)"
@@ -20701,5 +21041,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2748
 msgid "Veterinary"
 msgstr "Veterinary"
@@ -20708,55 +21048,60 @@
 #. <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:2740
+#: build/trans_presets.java:2751
 msgid "Edit Veterinary"
 msgstr "Edit Veterinary"
 
+#: build/trans_presets.java:2758
+#, fuzzy
+msgid "Geography"
+msgstr "WGS84 Geographic"
+
 #. group "Places"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2760
 msgid "Continent"
 msgstr "Continent"
 
 #. item
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2761
 msgid "Edit Continent"
 msgstr "Edit Continent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2766
 msgid "Country"
 msgstr "Country"
 
 #. item
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2767
 msgid "Edit Country"
 msgstr "Edit Country"
 
 #. item "Places/Country" text "Name"
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2772
 msgid "State"
 msgstr "State"
 
 #. item
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2773
 msgid "Edit State"
 msgstr "Edit State"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2778
 msgid "Region"
 msgstr "Region"
 
 #. item
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2779
 msgid "Edit Region"
 msgstr "Edit Region"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2784
 msgid "County"
 msgstr "County"
 
 #. item
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2785
 msgid "Edit County"
 msgstr "Edit County"
@@ -20764,15 +21109,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2791
 msgid "City"
 msgstr "City"
 
 #. item
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2792
 msgid "Edit City"
 msgstr "Edit City"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2797
 msgid "Town"
 msgstr "Town"
@@ -20780,10 +21125,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2799
 msgid "Edit Town"
 msgstr "Edit Town"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2804
 msgid "Suburb"
 msgstr "Suburb"
@@ -20791,25 +21136,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2806
 msgid "Edit Suburb"
 msgstr "Edit Suburb"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2811
 msgid "Village"
 msgstr "Village"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2812
 msgid "Edit Village"
 msgstr "Edit Village"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2817
 msgid "Hamlet"
 msgstr "Hamlet"
 
 #. item
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2818
 msgid "Edit Hamlet"
 msgstr "Edit Hamlet"
@@ -20817,5 +21162,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2824
 msgid "Locality"
 msgstr "Locality"
@@ -20823,10 +21168,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2826
 msgid "Edit Locality"
 msgstr "Edit Locality"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2831
 msgid "Island"
 msgstr "Island"
@@ -20834,10 +21179,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2833
 msgid "Edit Island"
 msgstr "Edit Island"
 
 #. item "Places/Island" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2838
 msgid "Islet"
 msgstr ""
@@ -20845,5 +21190,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2840
 msgid "Edit Islet"
 msgstr ""
@@ -20851,5 +21196,5 @@
 #. item "Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2846
 msgid "Cave Entrance"
 msgstr "Cave Entrance"
@@ -20857,10 +21202,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2848
 msgid "Edit Cave Entrance"
 msgstr "Edit Cave Entrance"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2852
 msgid "Peak"
 msgstr "Peak"
@@ -20868,10 +21213,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2854
 msgid "Edit Peak"
 msgstr "Edit Peak"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2859
 msgid "Glacier"
 msgstr "Glacier"
@@ -20879,10 +21224,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2861
 msgid "Edit Glacier"
 msgstr "Edit Glacier"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2854
+#: build/trans_presets.java:2866
 msgid "Volcano"
 msgstr "Volcano"
@@ -20890,70 +21235,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2868
 msgid "Edit Volcano"
 msgstr "Edit Volcano"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2874
 msgid "Boundaries"
 msgstr "Boundaries"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2875
 msgid "National"
 msgstr "National"
 
 #. item
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2876
 msgid "Edit National Boundary"
 msgstr "Edit National Boundary"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2881
 msgid "Administrative"
 msgstr "Administrative"
 
 #. item
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2882
 msgid "Edit Administrative Boundary"
 msgstr "Edit Administrative Boundary"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:2887
 msgid "Civil"
 msgstr "Civil"
 
 #. item
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2888
 msgid "Edit Civil Boundary"
 msgstr "Edit Civil Boundary"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2893
 msgid "Political"
 msgstr "Political"
 
 #. item
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2894
 msgid "Edit Political Boundary"
 msgstr "Edit Political Boundary"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2899
 msgid "National park"
 msgstr "National park"
 
 #. item
-#: build/trans_presets.java:2888
+#: build/trans_presets.java:2900
 msgid "Edit National Park Boundary"
 msgstr "Edit National Park Boundary"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2906
 msgid "Land use"
 msgstr "Land use"
 
 #. group "Land use"
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2907
 msgid "Tree"
 msgstr "Tree"
@@ -20962,15 +21307,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:2898
+#: build/trans_presets.java:2910
 msgid "Edit Tree"
 msgstr "Edit Tree"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2915
 msgid "Botanical Name"
 msgstr "Botanical Name"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2917
 msgid "Wood"
 msgstr "Wood"
@@ -20979,5 +21324,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:2908
+#: build/trans_presets.java:2920
 msgid "Edit Wood"
 msgstr "Edit Wood"
@@ -20985,17 +21330,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "coniferous"
 msgstr "coniferous"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "deciduous"
 msgstr "deciduous"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "mixed"
 msgstr "mixed"
 
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2925
 msgid "Forest"
 msgstr "Forest"
@@ -21004,14 +21349,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:2916
+#: build/trans_presets.java:2928
 msgid "Edit Forest Landuse"
 msgstr "Edit Forest Landuse"
 
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2934
 msgid "Nature Reserve"
 msgstr "Nature Reserve"
 
 #. item
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2935
 msgid "Edit Nature Reserve"
 msgstr "Edit Nature Reserve"
@@ -21019,25 +21364,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2940
 msgid "Scree"
 msgstr "Scree"
 
 #. item
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2941
 msgid "Edit Scree"
 msgstr "Edit Scree"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2945
 msgid "Scrub"
 msgstr "Scrub"
 
 #. item
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2946
 msgid "Edit Scrub"
 msgstr "Edit Scrub"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2950
 msgid "Fell"
 msgstr "Fell"
@@ -21045,10 +21390,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2952
 msgid "Edit Fell"
 msgstr "Edit Fell"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2956
 msgid "Heath"
 msgstr "Heath"
@@ -21056,5 +21401,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2958
 msgid "Edit Heath"
 msgstr "Edit Heath"
@@ -21062,5 +21407,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2963
 msgid "Farmyard"
 msgstr "Farmyard"
@@ -21069,45 +21414,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:2954
+#: build/trans_presets.java:2966
 msgid "Edit Farmyard Landuse"
 msgstr "Edit Farmyard Landuse"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2971
 msgid "Farmland"
 msgstr "Farmland"
 
 #. item
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2972
 msgid "Edit Farmland Landuse"
 msgstr "Edit Farmland Landuse"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2977
 msgid "Meadow"
 msgstr "Meadow"
 
 #. item
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2978
 msgid "Edit Meadow Landuse"
 msgstr "Edit Meadow Landuse"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2983
 msgid "Vineyard"
 msgstr "Vineyard"
 
 #. item
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2984
 msgid "Edit Vineyard Landuse"
 msgstr "Edit Vineyard Landuse"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:2989
 msgid "Allotments"
 msgstr "Allotments"
 
 #. item
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2990
 msgid "Edit Allotments Landuse"
 msgstr "Edit Allotments Landuse"
@@ -21115,25 +21460,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2996
 msgid "Garden"
 msgstr "Garden"
 
 #. item
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2997
 msgid "Edit Garden"
 msgstr "Edit Garden"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3001
 msgid "Grass"
 msgstr "Grass"
 
 #. item
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3002
 msgid "Edit Grass Landuse"
 msgstr "Edit Grass Landuse"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3007
 msgid "Village Green"
 msgstr "Village Green"
@@ -21141,10 +21486,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3009
 msgid "Edit Village Green Landuse"
 msgstr "Edit Village Green Landuse"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3014
 msgid "Common"
 msgstr "Common"
@@ -21152,20 +21497,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3004
+#: build/trans_presets.java:3016
 msgid "Edit Common"
 msgstr "Edit Common"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3020
 msgid "Park"
 msgstr "Park"
 
 #. item
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3021
 msgid "Edit Park"
 msgstr "Edit Park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3025
 msgid "Recreation Ground"
 msgstr "Recreation Ground"
@@ -21173,5 +21518,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3027
 msgid "Edit Recreation Ground Landuse"
 msgstr "Edit Recreation Ground Landuse"
@@ -21179,15 +21524,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3033
 msgid "Residential area"
 msgstr "Residential area"
 
 #. item
-#: build/trans_presets.java:3022
+#: build/trans_presets.java:3034
 msgid "Edit Residential Landuse"
 msgstr "Edit Residential Landuse"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3039
 msgid "Graveyard"
 msgstr "Graveyard"
@@ -21195,9 +21540,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3029
+#: build/trans_presets.java:3041
 msgid "Edit Graveyard"
 msgstr "Edit Graveyard"
 
-#: build/trans_presets.java:3035
+#: build/trans_presets.java:3047
 msgid "Cemetery"
 msgstr "Cemetery"
@@ -21205,39 +21550,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3049
 msgid "Edit Cemetery Landuse"
 msgstr "Edit Cemetery Landuse"
 
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3056
 msgid "Retail"
 msgstr "Retail"
 
 #. item
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3057
 msgid "Edit Retail Landuse"
 msgstr "Edit Retail Landuse"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3062
 msgid "Commercial"
 msgstr "Commercial"
 
 #. item
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3063
 msgid "Edit Commercial Landuse"
 msgstr "Edit Commercial Landuse"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3056
+#: build/trans_presets.java:3068
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3069
 msgid "Edit Industrial Landuse"
 msgstr "Edit Industrial Landuse"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3074
 msgid "Railway land"
 msgstr "Railway land"
@@ -21245,15 +21590,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3076
 msgid "Edit Railway Landuse"
 msgstr "Edit Railway Landuse"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3081
 msgid "Military"
 msgstr "Military"
 
 #. item
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3082
 msgid "Edit Military Landuse"
 msgstr "Edit Military Landuse"
@@ -21261,55 +21606,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3088
 msgid "Construction area"
 msgstr "Construction area"
 
 #. item
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3089
 msgid "Edit Construction Landuse"
 msgstr "Edit Construction Landuse"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3094
 msgid "Brownfield"
 msgstr "Brownfield"
 
 #. item
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3095
 msgid "Edit Brownfield Landuse"
 msgstr "Edit Brownfield Landuse"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3100
 msgid "Greenfield"
 msgstr "Greenfield"
 
 #. item
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3101
 msgid "Edit Greenfield Landuse"
 msgstr "Edit Greenfield Landuse"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3106
 msgid "Landfill"
 msgstr "Landfill"
 
 #. item
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3107
 msgid "Edit Landfill Landuse"
 msgstr "Edit Landfill Landuse"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3112
 msgid "Quarry"
 msgstr "Quarry"
 
 #. item
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3113
 msgid "Edit Quarry Landuse"
 msgstr "Edit Quarry Landuse"
 
 #. group "Relations"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3122
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -21319,5 +21664,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:3114
+#: build/trans_presets.java:3126
 msgid "Edit Multipolygon"
 msgstr "Edit Multipolygon"
@@ -21326,10 +21671,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3132
 msgid "outer segment"
 msgstr "outer segment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3133
 msgid "inner segment"
 msgstr "inner segment"
@@ -21337,5 +21682,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3136
 msgid "Turn restriction"
 msgstr "Turn restriction"
@@ -21344,5 +21689,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3139
 msgid "Edit Turn Restriction"
 msgstr "Edit Turn Restriction"
@@ -21350,34 +21695,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "Restriction"
 msgstr "Restriction"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_left_turn"
 msgstr "no left turn"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_right_turn"
 msgstr "no right turn"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_straight_on"
 msgstr "no straight on"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_u_turn"
 msgstr "no U turn"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_right_turn"
 msgstr "only turn right"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_left_turn"
 msgstr "only turn left"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_straight_on"
 msgstr "only straight on"
@@ -21386,15 +21731,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3146
 msgid "from way"
 msgstr "from way"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3147
 msgid "via node or way"
 msgstr "via node or way"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3148
 msgid "to way"
 msgstr "to way"
@@ -21402,5 +21747,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3151
 msgid "Route"
 msgstr "Route"
@@ -21409,5 +21754,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3154
 msgid "Edit Route"
 msgstr "Edit Route"
@@ -21415,5 +21760,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "Route type"
 msgstr "Route type"
@@ -21485,5 +21830,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3144 build/trans_style.java:233
+#: build/trans_presets.java:3156 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -21492,17 +21837,17 @@
 msgstr "bicycle"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "road"
 msgstr "road"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ski"
 msgstr "ski"
@@ -21555,5 +21900,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3144 build/trans_style.java:247
+#: build/trans_presets.java:3156 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -21562,13 +21907,13 @@
 msgstr "foot"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "hiking"
 msgstr "hiking"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "detour"
 msgstr "detour"
@@ -21582,10 +21927,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3144 build/trans_style.java:1206
+#: build/trans_presets.java:3156 build/trans_style.java:1206
 msgid "subway"
 msgstr "subway"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3159
 msgid "Symbol description"
 msgstr "Symbol description"
@@ -21593,31 +21938,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3162
 msgid "Network"
 msgstr "Network"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "proposed"
 msgstr "proposed"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "alternate"
 msgstr "alternate"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "temporary"
 msgstr "temporary"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "connection"
 msgstr "connection"
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "Color (hex)"
 msgstr "Colour (hex)"
@@ -21626,30 +21971,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3168
 msgid "route segment"
 msgstr "route segment"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3169
 msgid "forward segment"
 msgstr "forward segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3170
 msgid "backward segment"
 msgstr "backward segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3171
 msgid "halt point"
 msgstr "halt point"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3172
 msgid "forward halt point"
 msgstr "forward halt point"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3173
 msgid "backward halt point"
 msgstr "backward halt point"
@@ -22087,11 +22432,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3375 build/trans_style.java:3376
-#: build/trans_style.java:3946 build/trans_style.java:4254
-#: build/trans_style.java:4263 build/trans_style.java:4272
-#: build/trans_style.java:4281 build/trans_style.java:4290
-#: build/trans_style.java:4299 build/trans_style.java:4308
-#: build/trans_style.java:4309 build/trans_style.java:4318
-#: build/trans_style.java:4327
+#: build/trans_style.java:3383 build/trans_style.java:3384
+#: build/trans_style.java:3954 build/trans_style.java:4262
+#: build/trans_style.java:4271 build/trans_style.java:4280
+#: build/trans_style.java:4289 build/trans_style.java:4298
+#: build/trans_style.java:4307 build/trans_style.java:4316
+#: build/trans_style.java:4317 build/trans_style.java:4326
+#: build/trans_style.java:4335
 msgid "deprecated"
 msgstr "deprecated"
@@ -24115,5 +24460,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3294
+#: build/trans_style.java:3302
 msgid "light_water"
 msgstr "light_water"
@@ -24795,8 +25140,17 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="boundary_stone"/>
+#. <icon annotate="true" src="historic/boundary_stone.png"/>
 #: build/trans_style.java:2990 build/trans_style.java:2998
 #: build/trans_style.java:3006 build/trans_style.java:3014
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
+#: build/trans_style.java:3054
 msgid "historic"
 msgstr "historic"
@@ -24810,5 +25164,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3095
 msgid "quarry"
 msgstr "quarry"
@@ -24822,5 +25176,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "landfill"
 msgstr "landfill"
@@ -24842,5 +25196,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3103 build/trans_style.java:3111
+#: build/trans_style.java:3111 build/trans_style.java:3119
 msgid "basin"
 msgstr "basin"
@@ -24854,5 +25208,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3127
 msgid "forest"
 msgstr "forest"
@@ -24866,5 +25220,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3159
 msgid "farmyard"
 msgstr "farmyard"
@@ -24887,5 +25241,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3160 build/trans_style.java:3168
+#: build/trans_style.java:3168 build/trans_style.java:3176
 msgid "retail"
 msgstr "retail"
@@ -24899,5 +25253,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3176
+#: build/trans_style.java:3184
 msgid "industrial"
 msgstr "industrial"
@@ -24911,5 +25265,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "brownfield"
 msgstr "brownfield"
@@ -24923,5 +25277,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "greenfield"
 msgstr "greenfield"
@@ -24935,5 +25289,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "railland"
 msgstr "railland"
@@ -24990,7 +25344,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3217 build/trans_style.java:3252
-#: build/trans_style.java:3260 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3225 build/trans_style.java:3260
+#: build/trans_style.java:3268 build/trans_style.java:3276
+#: build/trans_style.java:3284 build/trans_style.java:3292
 msgid "military"
 msgstr "military"
@@ -25004,5 +25358,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3225
+#: build/trans_style.java:3233
 msgid "cemetery"
 msgstr "cemetery"
@@ -25015,5 +25369,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3301
+#: build/trans_style.java:3309
 msgid "peak"
 msgstr "peak"
@@ -25028,5 +25382,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3310
+#: build/trans_style.java:3318
 msgid "glacier"
 msgstr "glacier"
@@ -25040,5 +25394,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "volcano"
 msgstr "volcano"
@@ -25093,8 +25447,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3326 build/trans_style.java:3327
-#: build/trans_style.java:3335 build/trans_style.java:3351
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440
+#: build/trans_style.java:3334 build/trans_style.java:3335
+#: build/trans_style.java:3343 build/trans_style.java:3359
+#: build/trans_style.java:3432 build/trans_style.java:3440
+#: build/trans_style.java:3448
 msgid "natural"
 msgstr "natural"
@@ -25108,5 +25462,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3343
+#: build/trans_style.java:3351
 msgid "scrub"
 msgstr "scrub"
@@ -25120,5 +25474,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3359
+#: build/trans_style.java:3367
 msgid "heath"
 msgstr "heath"
@@ -25132,5 +25486,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3408
+#: build/trans_style.java:3416
 msgid "mud"
 msgstr "mud"
@@ -25144,5 +25498,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "beach"
 msgstr "beach"
@@ -25220,8 +25574,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
-#: build/trans_style.java:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496 build/trans_style.java:3504
+#: build/trans_style.java:3512 build/trans_style.java:3520
 msgid "route"
 msgstr "route"
@@ -25269,7 +25623,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3522 build/trans_style.java:3530
-#: build/trans_style.java:3538 build/trans_style.java:3546
-#: build/trans_style.java:3554
+#: build/trans_style.java:3530 build/trans_style.java:3538
+#: build/trans_style.java:3546 build/trans_style.java:3554
+#: build/trans_style.java:3562
 msgid "boundary"
 msgstr "boundary"
@@ -25419,11 +25773,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090
+#: build/trans_style.java:4002 build/trans_style.java:4010
+#: build/trans_style.java:4018 build/trans_style.java:4026
+#: build/trans_style.java:4034 build/trans_style.java:4042
+#: build/trans_style.java:4050 build/trans_style.java:4058
+#: build/trans_style.java:4066 build/trans_style.java:4074
+#: build/trans_style.java:4082 build/trans_style.java:4090
+#: build/trans_style.java:4098
 msgid "place"
 msgstr "place"
@@ -25471,6 +25825,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4207 build/trans_style.java:4214
-#: build/trans_style.java:4221 build/trans_style.java:4228
+#: build/trans_style.java:4215 build/trans_style.java:4222
+#: build/trans_style.java:4229 build/trans_style.java:4236
 msgid "address"
 msgstr "address"
@@ -25778,12 +26132,215 @@
 msgstr ""
 
+#~ msgid "- running version is {0}"
+#~ msgstr "- running version is {0}"
+
+#~ msgid "INFO: entering compatibilty mode for JOSM with Main.ds"
+#~ msgstr "INFO: entering compatibilty mode for JOSM with Main.ds"
+
+#~ msgid ""
+#~ "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
+#~ msgstr ""
+#~ "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
+
+#~ msgid ""
+#~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
+#~ "found."
+#~ msgstr ""
+#~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
+#~ "found."
+
+#~ msgid "Move"
+#~ msgstr "Move"
+
+#~ msgid "Data Layer"
+#~ msgstr "Data Layer"
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr "No document open so nothing to save."
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Unknown file extension."
+
+#~ msgid "Resolve Conflicts"
+#~ msgstr "Resolve Conflicts"
+
+#~ msgid "Object"
+#~ msgstr "Object"
+
+#~ msgid "There were conflicts during import."
+#~ msgstr "There were conflicts during import."
+
+#~ msgid "Hint: Some changes came from uploading new data to the server."
+#~ msgstr "Hint: Some changes came from uploading new data to the server."
+
+#~ msgid "my version:"
+#~ msgstr "my version:"
+
+#~ msgid "their version:"
+#~ msgstr "their version:"
+
+#~ msgid "resolved version:"
+#~ msgstr "resolved version:"
+
+#~ msgid "Contacting the OSM server..."
+#~ msgstr "Contacting the OSM server..."
+
+#~ msgid "Unknown version"
+#~ msgstr "Unknown version"
+
+#~ msgid "Aborting..."
+#~ msgstr "Aborting..."
+
+#~ msgid "position"
+#~ msgstr "position"
+
+#~ msgid "different"
+#~ msgstr "different"
+
+#~ msgid "true"
+#~ msgstr "true"
+
+#~ msgid "false"
+#~ msgstr "false"
+
+#~ msgid "Resolve {0} conflicts in {1} objects"
+#~ msgstr "Resolve {0} conflicts in {1} objects"
+
+#~ msgid "Change"
+#~ msgstr "Change"
+
+#~ msgid "unnamed"
+#~ msgstr "unnamed"
+
+#~ msgid "Cannot open preferences directory: {0}"
+#~ msgstr "Cannot open preferences directory: {0}"
+
+#~ msgid "{0} object has conflicts:"
+#~ msgid_plural "{0} objects have conflicts:"
+#~ msgstr[0] "{0} object has conflicts:"
+#~ msgstr[1] "{0} objects have conflicts:"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Click Reload to refresh list"
+
+#~ msgid "Date"
+#~ msgstr "Date"
+
+#~ msgid "Revert"
+#~ msgstr "Revert"
+
+#~ msgid ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+
+#~ msgid "Email"
+#~ msgstr "E-Mail"
+
+#~ msgid "Navigation"
+#~ msgstr "Navigation"
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM username (e-mail)"
+
+#~ msgid ""
+#~ "The plugin could not be removed. Please tell the people you got JOSM from "
+#~ "about the problem."
+#~ msgstr ""
+#~ "The plugin could not be removed. Please tell the people you got JOSM from "
+#~ "about the problem."
+
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "Found <nd> element in non-way."
+
+#~ 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 "<nd> has zero ref"
+#~ msgstr "<nd> has zero ref"
+
+#~ msgid "Plugin requires JOSM update: {0}."
+#~ msgstr "Plugin requires JOSM update: {0}."
+
+#~ msgid "Commit comment"
+#~ msgstr "Commit comment"
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "Transfer aborted due to error (will wait for 5 seconds):"
+
+#~ 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 "Tags (empty value deletes tag)"
+#~ msgstr "Tags (empty value deletes tag)"
+
+#~ msgid "Occupied By"
+#~ msgstr "Occupied By"
+
+#~ msgid "Add all currently selected objects as members"
+#~ msgstr "Add all currently selected objects as members"
+
+#~ msgid "Remove the member in the current table row from this relation"
+#~ msgstr "Remove the member in the current table row from this relation"
+
+#~ msgid "Error parsing server response."
+#~ msgstr "Error parsing server response."
+
+#~ msgid "Cannot connect to server."
+#~ msgstr "Cannot connect to server."
+
+#~ msgid "Tagging preset sources"
+#~ msgstr "Tagging preset sources"
+
+#~ msgid "Tagging preset source"
+#~ msgstr "Tagging preset source"
+
+#~ msgid "Add a new tagging preset source to the list."
+#~ msgstr "Add a new tagging preset source to the list."
+
+#~ msgid "Add either site-josm.xml or Wiki Pages."
+#~ msgstr "Add either site-josm.xml or Wiki Pages."
+
+#~ msgid "Error deleting plugin file: {0}"
+#~ msgstr "Error deleting plugin file: {0}"
+
+#~ msgid "Plugin already exists"
+#~ msgstr "Plugin already exists"
+
+#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
+#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
+#~ msgstr[0] "{0} Plugin successfully updated. Please restart JOSM."
+#~ msgstr[1] "{0} Plugins successfully updated. Please restart JOSM."
+
+#~ msgid "Could not download plugin: {0} from {1}"
+#~ msgstr "Could not download plugin: {0} from {1}"
+
+#~ msgid "Rotate"
+#~ msgstr "Rotate"
+
+#~ msgid "Delete {1} {0}"
+#~ msgstr "Delete {1} {0}"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
 #~ msgid "All the ways were empty"
 #~ msgstr "All the ways were empty"
 
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Merge nodes with different memberships?"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Merge Anyway"
+#~ msgid "Some of the nodes are (almost) in the line"
+#~ msgstr "Some of the nodes are (almost) in the line"
+
+#~ msgid ""
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
+#~ msgstr ""
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
 
 #~ msgid ""
@@ -25794,212 +26351,6 @@
 #~ "want to merge them?"
 
-#~ msgid "Unknown version"
-#~ msgstr "Unknown version"
-
-#~ msgid "Version number missing from OSM data"
-#~ msgstr "Version number missing from OSM data"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "Found <nd> element in non-way."
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> has zero ref"
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Found <member> element in non-relation."
-
-#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
-#~ msgstr "Unexpected \"type\" on member {0} in relation {1}, got {2}."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Ill-formed node id"
-
-#~ msgid "Move"
-#~ msgstr "Move"
-
-#~ msgid "Data Layer"
-#~ msgstr "Data Layer"
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "No document open so nothing to save."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Unknown file extension."
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Resolve Conflicts"
-
-#~ msgid "Object"
-#~ msgstr "Object"
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "There were conflicts during import."
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr "Hint: Some changes came from uploading new data to the server."
-
-#~ msgid "my version:"
-#~ msgstr "my version:"
-
-#~ msgid "their version:"
-#~ msgstr "their version:"
-
-#~ msgid "resolved version:"
-#~ msgstr "resolved version:"
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Contacting the OSM server..."
-
-#~ msgid "Aborting..."
-#~ msgstr "Aborting..."
-
-#~ msgid "position"
-#~ msgstr "position"
-
-#~ msgid "different"
-#~ msgstr "different"
-
-#~ msgid "true"
-#~ msgstr "true"
-
-#~ msgid "false"
-#~ msgstr "false"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Resolve {0} conflicts in {1} objects"
-
-#~ msgid "Change"
-#~ msgstr "Change"
-
-#~ msgid "unnamed"
-#~ msgstr "unnamed"
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "Cannot open preferences directory: {0}"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} object has conflicts:"
-#~ msgstr[1] "{0} objects have conflicts:"
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Click Reload to refresh list"
-
-#~ msgid "Date"
-#~ msgstr "Date"
-
-#~ msgid "Revert"
-#~ msgstr "Revert"
-
-#~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-#~ msgstr ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-
-#~ msgid "Email"
-#~ msgstr "E-Mail"
-
-#~ msgid "Navigation"
-#~ msgstr "Navigation"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM username (e-mail)"
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-
-#~ 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 "Plugin requires JOSM update: {0}."
-#~ msgstr "Plugin requires JOSM update: {0}."
-
-#~ msgid "Commit comment"
-#~ msgstr "Commit comment"
-
-#~ msgid "Server does not support changesets"
-#~ msgstr "Server does not support changesets"
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Transfer aborted due to error (will wait for 5 seconds):"
-
-#~ 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 "Tags (empty value deletes tag)"
-#~ msgstr "Tags (empty value deletes tag)"
-
-#~ msgid "Occupied By"
-#~ msgstr "Occupied By"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Add all currently selected objects as members"
-
-#~ msgid "Add Selected"
-#~ msgstr "Add Selected"
-
-#~ msgid "Remove the member in the current table row from this relation"
-#~ msgstr "Remove the member in the current table row from this relation"
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Error parsing server response."
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Cannot connect to server."
-
-#~ msgid "Tagging preset sources"
-#~ msgstr "Tagging preset sources"
-
-#~ msgid "Tagging preset source"
-#~ msgstr "Tagging preset source"
-
-#~ msgid "Add a new tagging preset source to the list."
-#~ msgstr "Add a new tagging preset source to the list."
-
-#~ msgid "Add either site-josm.xml or Wiki Pages."
-#~ msgstr "Add either site-josm.xml or Wiki Pages."
-
-#~ msgid "Error deleting plugin file: {0}"
-#~ msgstr "Error deleting plugin file: {0}"
-
-#~ msgid "Plugin already exists"
-#~ msgstr "Plugin already exists"
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgstr[1] "{0} Plugins successfully updated. Please restart JOSM."
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Could not download plugin: {0} from {1}"
-
-#~ msgid "Rotate"
-#~ msgstr "Rotate"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Delete {1} {0}"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Some of the nodes are (almost) in the line"
-
-#~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
-#~ msgstr ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "Merge nodes with different memberships?"
 
 #~ msgid "Please select ways with almost right angles to orthogonalize."
@@ -26075,4 +26426,10 @@
 #~ msgid "YAHOO (WebKit GTK)"
 #~ msgstr "YAHOO (WebKit GTK+)"
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "Ill-formed node id"
+
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "Found <member> element in non-relation."
 
 #~ msgid ""
@@ -26216,4 +26573,7 @@
 #~ msgstr "Delete and Download"
 
+#~ msgid "Merge Anyway"
+#~ msgstr "Merge Anyway"
+
 #~ msgid "No intersections found. Nothing was changed."
 #~ msgstr "No intersection found. Nothing was changed."
@@ -26325,4 +26685,7 @@
 #~ msgid "Error processing changeset upload response"
 #~ msgstr "Error processing changeset upload response"
+
+#~ msgid "Version number missing from OSM data"
+#~ msgstr "Version number missing from OSM data"
 
 #~ msgid ""
@@ -26356,4 +26719,7 @@
 #~ msgstr "% of lon:"
 
+#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
+#~ msgstr "Unexpected \"type\" on member {0} in relation {1}, got {2}."
+
 #~ msgid "Resolve conflicts in member list of of relation {0}"
 #~ msgstr "Resolve conflicts in member list of relation {0}"
@@ -26405,7 +26771,4 @@
 #~ msgstr "Checking whether primitive {0} is gone ..."
 
-#~ msgid "Delete mine"
-#~ msgstr "Delete mine"
-
 #~ msgid "Update failed"
 #~ msgstr "Update failed"
@@ -26432,7 +26795,4 @@
 #~ msgstr "relations"
 
-#~ msgid "changesets"
-#~ msgstr "changesets"
-
 #~ msgid "Error when communicating with server."
 #~ msgstr "Error when communicating with server."
@@ -26456,7 +26816,4 @@
 #~ msgid "No data"
 #~ msgstr "No data"
-
-#~ msgid "Change {0} {1}"
-#~ msgstr "Change {0} {1}"
 
 #~ msgid "Remove relation member {0} {1}"
Index: applications/editors/josm/i18n/po/es.po
===================================================================
--- applications/editors/josm/i18n/po/es.po	(revision 17655)
+++ applications/editors/josm/i18n/po/es.po	(revision 17697)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-12 18:11+0200\n"
-"PO-Revision-Date: 2009-09-09 18:31+0000\n"
-"Last-Translator: Emilio Gomez Fernandez <Unknown>\n"
+"POT-Creation-Date: 2009-09-19 13:00+0200\n"
+"PO-Revision-Date: 2009-09-15 15:12+0000\n"
+"Last-Translator: Juan Luis <Unknown>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-09-12 16:06+0000\n"
+"X-Launchpad-Export-Date: 2009-09-19 10:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -42,10 +42,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:543
 #: ../core/src/org/openstreetmap/josm/Main.java:551
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -70,5 +70,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -86,6 +86,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:358
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
@@ -101,6 +101,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
@@ -128,10 +128,10 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
 msgid "Save and Exit"
 msgstr "Guardar y salir"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
 msgid "Discard and Exit"
 msgstr "Descartar y salir"
@@ -142,4 +142,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
@@ -147,27 +148,28 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:296
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:258
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:613
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
@@ -175,5 +177,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -193,6 +195,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
@@ -209,17 +211,17 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:654
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1528
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -230,6 +232,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
@@ -283,9 +285,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:607
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:609
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -345,5 +347,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
 msgid "Plugins"
@@ -395,5 +397,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Unir"
@@ -482,5 +484,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -493,4 +495,5 @@
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -526,6 +529,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
@@ -534,6 +537,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:346
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
@@ -647,4 +650,46 @@
 msgstr "No existen conflictos a los que hacer zoom"
 
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#, fuzzy
+msgid "Close open changesets"
+msgstr "No abrir un conjunto de cambios"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#, fuzzy
+msgid "Closes open changesets"
+msgstr "No abrir un conjunto de cambios"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
+#: ../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:114
+#, java-format
+msgid "File: {0}"
+msgstr "Archivo: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
+#, fuzzy
+msgid "There are no open changesets"
+msgstr "No abrir un conjunto de cambios"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
+#, fuzzy
+msgid "No open changesets"
+msgstr "No abrir un conjunto de cambios"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
+#, fuzzy
+msgid "Downloading open changesets ..."
+msgstr "Cerrando conjunto de cambios..."
+
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
@@ -743,10 +788,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:123
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
@@ -791,31 +837,30 @@
 "línea."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
 msgid "Download from OSM..."
 msgstr "Descargar desde OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
 msgid "Download map data from the OSM server."
 msgstr "Descargar datos del mapa del servidor OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
-#, java-format
-msgid "File: {0}"
-msgstr "Archivo: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
 msgid "Download"
 msgstr "Descargar"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "Aceptar"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
 msgid "Please select at least one task to download"
 msgstr "Por favor, seleccione al menos una tarea para descargar"
@@ -837,5 +882,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1527
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307
@@ -855,6 +900,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:376
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1415
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
 msgid "Duplicate"
 msgstr "Duplicar"
@@ -926,10 +971,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
@@ -1017,25 +1063,26 @@
 msgstr "Unir la capar actual en otrar capa"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 msgid "Merge Nodes"
 msgstr "Unir nodos"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
 msgid "Merge nodes into the oldest one."
 msgstr "Unir nodos en el más antiguo."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
 msgid "Please select at least two nodes to merge."
 msgstr "Por favor seleccione por lo menos dos nodos para unir."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:394
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
@@ -1051,8 +1098,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -1078,6 +1125,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
@@ -1086,5 +1137,5 @@
 msgstr "el parámetro ''{0}'' no debe ser nulo"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
@@ -1092,5 +1143,5 @@
 "uso."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283
 #, java-format
 msgid "Merge {0} nodes"
@@ -1162,5 +1213,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "New"
 msgstr "Nuevo"
@@ -1443,14 +1494,15 @@
 msgstr "Ayuda: : {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
 msgid "Status Report"
 msgstr "Informe de estado"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 msgid "Copy to clipboard and close"
 msgstr "Copiar al portapapeles y cerrar"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
@@ -1535,25 +1587,4 @@
 msgstr "Dividir la vía {0} en {1} partes"
 
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24
-msgid "Close current changeset"
-msgstr "Cerrar el actual conjunto de cambios"
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-msgid "Close the current changeset ..."
-msgstr "Cerrar el conjunto de cambios actual..."
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41
-msgid "There is currently no changeset open."
-msgstr "Actualmente no hay un conjunto cambios abierto."
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42
-msgid "No open changeset"
-msgstr "No abrir un conjunto de cambios"
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60
-msgid "Closing changeset"
-msgstr "Cerrando conjunto de cambios"
-
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
@@ -1691,5 +1722,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:77
 msgid "Updating data"
-msgstr "Actualizando datosd"
+msgstr "Actualizando datos"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:78
@@ -1718,40 +1749,41 @@
 msgstr "Selección vacía"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Subir a OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 msgid "Upload all changes to the OSM server."
 msgstr "Subir todos los cambios al servidor OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#, java-format
 msgid ""
 "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
 "resolve them first.</html>"
 msgstr ""
-"<html>No hay capas de capa fuente <br>\"{0}\"<br>podría ser unida a.</html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155
+"<html>Existen conflictos sin resolver en la capa ''{0}''.<br>Has de "
+"corregirlos primero.</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
 msgid "Nothing to upload. Get some data first."
 msgstr "Nada que subir. Consigue algunos datos primero."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 msgid "No changes to upload."
 msgstr "Ningún cambio que subir"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Sincronizar {0} {1} únicamente"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
 msgid "Synchronize entire dataset"
 msgstr "Sincronizar el conjunto de datos completo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
 #, java-format
 msgid ""
@@ -1773,17 +1805,17 @@
 "continuar editando.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
 msgid "Conflict detected"
 msgstr "Conflicto detectado"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr "Retorno de valor inexperado. Obtenido {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:267
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
 #, java-format
 msgid ""
@@ -1799,5 +1831,17 @@
 "<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
+msgid ""
+"<html>Uploading <strong>failed</strong> because you've been "
+"using<br>changeset {0} which was already closed at {1}.<br>Please upload "
+"again with a new or an existing open changeset."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+#, fuzzy
+msgid "Changeset closed"
+msgstr "conjuntos de cambios"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
@@ -1806,23 +1850,23 @@
 "\"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr "Error de cabecera \"{0}\" no coincide con el patrón esperado \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr "<html>Subida <strong>fallida</strong>.<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
 msgid "Upload to OSM API failed"
 msgstr "Subida a la API de OSM fallida"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
 msgid "Updating primitive"
 msgstr "Actualizando primitiva"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -2048,14 +2092,14 @@
 msgstr "Añadir un nodo a la vía y conectar"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:930
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:932
 msgid "Create new node."
 msgstr "Crear un nodo nuevo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
 msgid "Select node under cursor."
 msgstr "Seleccionar el nodo bajo el cursor."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939
 #, java-format
 msgid "Insert new node into way."
@@ -2064,14 +2108,14 @@
 msgstr[1] "Insertar un nuevo nodo en {0} vías."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
 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:949
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951
 msgid "Continue way from last node."
 msgstr "Continuar la vía desde el último nodo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:972
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:974
 msgid "Finish drawing."
 msgstr "Finalizar dibujo."
@@ -2198,60 +2242,70 @@
 "abajo, derecha; mover el zoom con el botón derecho"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Buscar ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Búsqueda de objetos."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
 msgid "Can't search because there is no loaded data."
 msgstr "No se puede buscar porque no hay datos cargados."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
+#, fuzzy
+msgid "Please enter a filter string."
+msgstr "Por favor, introduzca una cadena de búsqueda."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
 msgid "Please enter a search string."
 msgstr "Por favor, introduzca una cadena de búsqueda."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
 msgid "replace selection"
 msgstr "reemplazar selección"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72
 msgid "add to selection"
 msgstr "añadir a la selección"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73
 msgid "remove from selection"
 msgstr "eliminar de la selección"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
+#, fuzzy
+msgid "find in selection"
+msgstr "añadir a la selección"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81
 msgid "case sensitive"
 msgstr "distinguir mayúsculas"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82
 msgid "regular expression"
 msgstr "expresión regular"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
 msgstr "<b>Calle Mayor</b> - 'Calle' y 'Mayor' en cualquier clave o valor."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
 msgstr "<b>\"Calle Mayor\"</b> - 'Calle Mayor' en cualquier clave o nombre."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
 msgstr "<b>name:May</b> - 'May' en cualquier parte del nombre."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
 msgstr "<b>type=route</b> - clave 'type' con el valor exacto 'route'."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid ""
 "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
@@ -2261,17 +2315,17 @@
 "b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
 msgstr "<b>-name:May</b> - sin 'May' en el nombre."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - cualquier valor presente en clave=foot"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
 msgid "<u>Special targets:</u>"
 msgstr "<u>Búsquedas especiales:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
@@ -2280,34 +2334,34 @@
 "<b>relation</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr ""
 "<b>user:</b>... - todos los objetos modificados por un determinado usuario"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 msgid "<b>nodes:</b>... - object with given number of nodes"
 msgstr "<b>nodes:</b>... - objetos con un determinado número de nodos"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - todos los objetos modificados"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - todos los objetos seleccionados"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - todos los objetos incompletos"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - todos los objetos sin etiquetar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2316,5 +2370,5 @@
 "la expresión"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2323,5 +2377,5 @@
 "cumplan la expresión"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
@@ -2329,51 +2383,68 @@
 "lógico O (disyunción)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
 "Usar <b>\"</b> para delimitar operadores (por ejemplo si la clave contiene :)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Usar <b>(</b> y <b>)</b> para agrupar expresiones"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
+msgid "Filter"
+msgstr "Filtrar"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Buscar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
+msgid "Submit filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "Start Search"
 msgstr "Iniciar búsqueda"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "No se encontraron coincidencias para \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "No se ha añadido nada a la selección al buscar \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "No se ha quitado nada de la selección al buscar \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#, fuzzy, java-format
+msgid "Nothing find in selection by searching for ''{0}''"
+msgstr "No se ha añadido nada a la selección al buscar \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262
 #, java-format
 msgid "Found {0} matches"
 msgstr "Se han encontrado {0} coincidencias"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283
 msgid "RX"
 msgstr "RX"
@@ -2400,5 +2471,5 @@
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-msgstr ""
+msgstr "Error en la sintáxis del patrón: ¡el patrón {0} de {1} no es válido!"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:356
@@ -2565,5 +2636,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
 msgid "Double conflict"
 msgstr "Doble conflicto"
@@ -2717,5 +2788,5 @@
 #, java-format
 msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
+msgstr "Eliminar nodo ''{0}'' en la posición {1} de la relación ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:70
@@ -2815,4 +2886,5 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:134
 msgid "Old value"
 msgstr "Valor anterior"
@@ -2874,4 +2946,6 @@
 "isn't a directory.</html>"
 msgstr ""
+"<html>Error al inicializar las preferencias.<br>El directorio de las "
+"preferencias ''{0}'' no es un directorio.</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:388
@@ -2980,27 +3054,59 @@
 
 #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
 msgid "E"
 msgstr "E"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:59
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:203
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
 msgid "Changeset {0}"
 msgstr "Conjunto de cambios {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:323
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
 msgstr "parámetro {0} > 0 necesario. Obtenido {1}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:325
-#, fuzzy, java-format
-msgid "paramete''{0}'' must not be null"
-msgstr "el parámetro ''{0}'' no debe ser nulo"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331
-#, fuzzy, java-format
-msgid "unsupported value ''{0}'' or parameter ''{1}''"
-msgstr "El rol \"{0}\" no es útil para el tramo \"{1}\"."
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "H"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "Text"
+msgstr "texto"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "C"
+msgstr "CS"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "I"
+msgstr "CI"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "M"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#, fuzzy
+msgid "R"
+msgstr "RX"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+msgid "A"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+msgid "D"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+msgid "F"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
@@ -3014,29 +3120,29 @@
 msgstr "Advertencia: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
+#, java-format
 msgid "expected id >= 0. Got {0}"
-msgstr "índice de columna inexperado. Obtenido {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:257
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
 msgid "a primitive with id=0 can't be invisible"
 msgstr "una proimitiva con id=0 no puede ser invisible"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:293
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
+#, java-format
 msgid "id > 0 expected. Got {0}"
-msgstr "Credencial de autentificación inexperada: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
+#, java-format
 msgid "version > 0 expected. Got {0}"
-msgstr "Credencial de autentificación inexperada: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
 msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
 msgstr "el parámetro \"{0}\" no es un nombre de tipo válido, se obtuvo \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
 msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
@@ -3055,5 +3161,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
 msgid "can't add node {0} to incomplete way {1}"
-msgstr ""
+msgstr "No se puede añadir nodo {0} a la vía incompleta {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154
@@ -3107,9 +3213,9 @@
 msgstr "el parametro {0} no está en el intervalo 0..{1}, se obtuvo {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:247
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:249
 msgid "Area style way is not closed."
 msgstr "Vía de tipo área sin cerrar"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:478
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:482
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
@@ -3118,118 +3224,118 @@
 #. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
 #. TODO Remove useless nullcheck when RelationMember.member is encalupsed
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:851
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855
 msgid "Empty member in relation."
 msgstr "Miembro vacío en la relación."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:853
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Miembro ''{0}'' borrado en la relación."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:864
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Vía ''{0}''  con menos de dos puntos."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "More than one \"from\" way found."
 msgstr "Se ha encontrado más de una vía \"desde\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "More than one \"to\" way found."
 msgstr "Se ha encontrado más de una vía \"a\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "More than one \"via\" found."
 msgstr "Se ha encontrado más de un elemento \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Rol ''{0}'' desconocido."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Tipo de miembro \"{0}\" desconocido."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"from\" way found."
 msgstr "No se ha encontrado ninguna vía \"desde\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"to\" way found."
 msgstr "No se ha encontrado ninguna vía \"a\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652
 msgid "No \"via\" node or way found."
 msgstr "No se ha encontrado ningún nodo o vía con el rol \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "La vía \"desde\" no comienza o termina en un nodo \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "La vía \"a\" no comienza o termina en un nodo \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "La vía \"desde\" no comienza o termina en la vía con rol \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "La vía \"a\" no comienza o termina en la vía con rol \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "No se ha encontrado el estilo para la restricción {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "El rol \"{0}\" no es útil para el tramo \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:885
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "La no-vía ''{0}'' en multipolígono"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:943
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Ninguna vía exterior en el multipolígono ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1032
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Intersección entre las vías ''{0}'' y ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1044
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "La vía interior ''{0}'' se encuentra en la parte de fuera."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1097
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "El estilo de la vía interior ''{0}'' es igual al del multipolígono"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1123
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "El estilo de la vía exterior ''{0}'' no coincide."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1327
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331
 msgid "untagged"
 msgstr "sin etiquetar"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1328
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332
 msgid "text"
 msgstr "texto"
@@ -3253,5 +3359,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
@@ -3272,5 +3378,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
@@ -3324,5 +3430,5 @@
 msgstr "Zona Lambert (Francia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
 msgid "Lambert Zone (Estonia)"
 msgstr "Zona Lambert (Estonia)"
@@ -3364,9 +3470,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:38
 msgid "Do not show again"
 msgstr "No mostrar de nuevo"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
 #, java-format
@@ -3374,31 +3480,31 @@
 msgstr " [ID: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:91
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:116
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154
 msgid "incomplete"
 msgstr "incompleto"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
 msgid "highway"
 msgstr "vía"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
-#: build/trans_presets.java:3144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: build/trans_presets.java:3156
 msgid "railway"
 msgstr "ferrocarril"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
 msgid "waterway"
 msgstr "vía fluvial"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "landuse"
 msgstr "uso del suelo"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:474
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
@@ -3408,5 +3514,5 @@
 msgstr[1] "{0} nodos"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
 #, java-format
 msgid "{0} member"
@@ -3436,7 +3542,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
-#, fuzzy
 msgid "Bad Request"
-msgstr "Editar raqueta"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144
@@ -3452,10 +3557,5 @@
 msgstr "El mensaje del dia no está disponible"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67
-#, java-format
-msgid "- running version is {0}"
-msgstr "- la versión en ejecución es la {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:95
 msgid "Downloading \"Message of the day\""
 msgstr "Descargando \"Mensaje del día\""
@@ -3527,10 +3627,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:162
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
 msgid "Username"
 msgstr "Nombre de usuario"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
 msgid "Password"
 msgstr "Contraseña"
@@ -3653,5 +3753,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226
 msgid "Presets"
 msgstr "Predefinidos"
@@ -3725,38 +3825,49 @@
 msgstr "escalar"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
 msgid "The geographic longitude at the mouse pointer."
 msgstr "La longitud geográfica en el puntero del ratón."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The name of the object at the mouse pointer."
 msgstr "El nombre del objeto en el puntero del ratón"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The geographic latitude at the mouse pointer."
 msgstr "La latitud geográfica en el puntero del ratón."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The angle between the previous and the current way segment."
 msgstr "El ángulo entre el segmento actual de vía  y el anterior."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "La dirección (brújula) del segmento de línea que se está dibujando."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The length of the new way segment being drawn."
 msgstr "La longitud del nuevo segmento de línea que se está dibujando."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199
+msgid ""
+"Middle click again to cycle through.<br>Hold CTRL to select directly from "
+"this list with the mouse.<hr>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290
 msgid "(no object)"
 msgstr "(sin objeto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:301
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418
+#, fuzzy
+msgid "User:"
+msgstr "Usuario"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
 msgid "layer not in list."
 msgstr "capa no listada"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:488
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3828,7 +3939,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:224
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Tags"
 msgstr "Etiquetas"
@@ -3843,5 +3954,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
@@ -4046,4 +4157,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
 msgid "Up"
 msgstr "Subir"
@@ -4054,4 +4166,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Down"
 msgstr "Bajar"
@@ -4064,5 +4177,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
@@ -4499,5 +4612,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97
 msgid "Conflicts when combining primitives"
-msgstr ""
+msgstr "Conflictos al combinar primitivas"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103
@@ -4511,23 +4624,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:236
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239
 msgid "No conflicts to resolve"
-msgstr "Ningún conflito de etiqueta pendiente de ser resuelto"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:295
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254
 msgid "Cancel conflict resolution"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:310
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272
+msgstr "Cancelar resolución de conflicto"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269
 msgid "Apply resolved conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Apply"
 msgstr "Aplicar"
@@ -4539,5 +4651,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "all"
 msgstr "todos"
@@ -4545,9 +4657,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52
 msgid "Choose a value"
-msgstr ""
+msgstr "Elija un valor"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:54
 msgid "Please decided which values to keep"
-msgstr ""
+msgstr "Por favor, decida que valor desea mantener"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:59
@@ -4581,7 +4693,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
-msgid "not yet decided"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:213
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
@@ -4590,25 +4699,25 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
 msgid "Not decided yet"
-msgstr ""
+msgstr "Aún no decidido"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49
 msgid "Tags from nodes"
-msgstr ""
+msgstr "Etiquetas de nodos"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50
 msgid "Tags from ways"
-msgstr ""
+msgstr "Etiquetas de vías"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51
 msgid "Tags from relations"
-msgstr ""
+msgstr "Etiquetas de relaciones"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78
 msgid "Conflicts in pasted tags"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:475
+msgstr "Conflictos en la etiquetas pegadas"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
@@ -4618,7 +4727,7 @@
 msgstr[1] "{0} vías"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:152
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
@@ -4628,20 +4737,20 @@
 msgstr[1] "{0} relaciones"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "Paste ..."
 msgstr "Pegar ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "From ..."
 msgstr "Desde ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:372
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "To ..."
 msgstr "A ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:428
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
 #, java-format
 msgid "{0} tag"
@@ -4657,13 +4766,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
-#, fuzzy
 msgid "Remove this relation member from the relation"
-msgstr "Eliminar el miembro en la fila de tabla actual de esta relación"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-#, fuzzy
 msgid "Replace"
-msgstr "lugar"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
@@ -4674,11 +4781,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
-#, fuzzy
 msgid "Undecided"
-msgstr "Pendiente"
+msgstr ""
 
 #. --- role editing
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:56
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510
 msgid "Role:"
 msgstr ""
@@ -4694,7 +4800,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70
-#, fuzzy
 msgid "Value:"
-msgstr "Valor"
+msgstr "Valor:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86
@@ -4707,12 +4812,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51
-#, fuzzy
 msgid "Orig. Way"
-msgstr "Sentido único"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
-#, fuzzy
 msgid "Decision"
-msgstr "Revisión"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -4728,6 +4831,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
@@ -4819,171 +4923,13 @@
 msgstr "Resolver los conflictos de ''{0}'"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-msgid "History"
-msgstr "Historial"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-msgid "Display the history of all selected items."
-msgstr "Mostrar el historial de todos los elementos seleccionados"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
-#, java-format
-msgid "index out of bounds Got {0}"
-msgstr "índice fuera de los límites. Obtenido {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr "Nodo {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr "Vía {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr "Relación {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
-msgid "History item"
-msgstr "Historial del elemento"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-"Recarge todos los objetos actualmente seleccionados y refresque la lista"
-
-#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
-msgid "Show"
-msgstr "Mostrar"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
-msgstr "Mostrando el historial de la primitiva seleccionada"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
-msgid "Dialog not created yet. Invoke createInstance() first"
-msgstr "Diálogo no creado todavía. Invocar primero createInstance()"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
-msgid "Layers"
-msgstr "Capas"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-msgid "Open a list of all loaded layers."
-msgstr "Abrir un listado de todas las capas cargadas."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:297
-msgid "Delete the selected layer."
-msgstr "Borrar la capa seleccionada"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:367
-msgid "Show/Hide"
-msgstr "Mostrar/Ocultar"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:378
-msgid "Toggle visible state of the selected layer."
-msgstr "Cambia estado de visibilidad de la capa seleccionada."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414
-msgid "Activate"
-msgstr "Activar"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:420
-msgid "Activate the selected layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:475
-msgid "Merge this layer into another layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:581
-msgid "Move the selected layer one row up."
-msgstr "Mover la capa seleccionada una fila arriba"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:600
-msgid "Move the selected layer one row down."
-msgstr "Mover la capa seleccionada una fila abajo"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
-msgid "Information about layer"
-msgstr "Información de capa"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
-#, java-format
-msgid "This will change up to {0} object."
-msgid_plural "This will change up to {0} objects."
-msgstr[0] "Esto cambiará {0} objeto."
-msgstr[1] "Esto cambiará {0} objetos."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
-msgid "An empty value deletes the key."
-msgstr "Un valor vacío elimina la clave."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
-msgid "<different>"
-msgstr "<diferente>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
-msgid "Change values?"
-msgstr "¿Modificar valores?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
-#, java-format
-msgid "Change properties of up to {0} object"
-msgid_plural "Change properties of up to {0} objects"
-msgstr[0] "Cambiar las propiedades de hasta {0} objeto"
-msgstr[1] "Cambiar las propiedades de hasta {0} objetos"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
-msgid "Please select a key"
-msgstr "Por favor, selecciona una etiqueta"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
-msgid "Please select a value"
-msgstr "Por favor, selecciona un valor"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
-msgid "Please select the objects you want to change properties for."
-msgstr ""
-"Por favor, seleccione los objetos a los que desea cambiar las propiedades."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
-msgid "Properties/Memberships"
-msgstr "Propiedades/Relaciones"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-msgid "Properties for selected objects."
-msgstr "Propiedades de los objetos seleccionados."
-
-#. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-msgid "Member Of"
-msgstr "Miembro de"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
-msgid "Add Properties"
-msgstr "Añadir propiedades"
-
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+msgid "Filter objects and hide/disable them."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
@@ -4997,4 +4943,214 @@
 msgstr "Añadir"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#, fuzzy
+msgid "Add filter."
+msgstr "Añadir seleccionado"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
+#, fuzzy
+msgid "Edit filter."
+msgstr "Editar embarcadero"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#, fuzzy
+msgid "Delete filter."
+msgstr "Borrar lo mío"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
+#, fuzzy
+msgid "Move filter up."
+msgstr "Mover hacia arriba"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
+#, fuzzy
+msgid "Move filter down."
+msgstr "Mover hacia abajo"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128
+msgid "Enable filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
+#, fuzzy
+msgid "Hide elements"
+msgstr "Solo los elementos"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
+msgid "Apply also for children"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
+msgid "Inverse filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
+#, fuzzy
+msgid "Filter mode"
+msgstr "Filtrar"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
+msgid "History"
+msgstr "Historial"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+msgid "Display the history of all selected items."
+msgstr "Mostrar el historial de todos los elementos seleccionados"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr "índice fuera de los límites. Obtenido {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr "Nodo {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr "Vía {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr "Relación {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
+msgid "History item"
+msgstr "Historial del elemento"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
+msgid "Reload all currently selected objects and refresh the list."
+msgstr ""
+"Recarge todos los objetos actualmente seleccionados y refresque la lista"
+
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
+msgid "Show"
+msgstr "Mostrar"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
+msgid "Display the history of the selected primitive"
+msgstr "Mostrando el historial de la primitiva seleccionada"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84
+msgid "Dialog not created yet. Invoke createInstance() first"
+msgstr "Diálogo no creado todavía. Invocar primero createInstance()"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
+msgid "Layers"
+msgstr "Capas"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+msgid "Open a list of all loaded layers."
+msgstr "Abrir un listado de todas las capas cargadas."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294
+msgid "Delete the selected layer."
+msgstr "Borrar la capa seleccionada"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364
+msgid "Show/Hide"
+msgstr "Mostrar/Ocultar"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375
+msgid "Toggle visible state of the selected layer."
+msgstr "Cambia estado de visibilidad de la capa seleccionada."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgid "Activate"
+msgstr "Activar"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417
+msgid "Activate the selected layer"
+msgstr "Activa la capa selecionada"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472
+msgid "Merge this layer into another layer"
+msgstr "Combina esta capa con otra"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578
+msgid "Move the selected layer one row up."
+msgstr "Mover la capa seleccionada una fila arriba"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597
+msgid "Move the selected layer one row down."
+msgstr "Mover la capa seleccionada una fila abajo"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+msgid "Information about layer"
+msgstr "Información de capa"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+#, java-format
+msgid "This will change up to {0} object."
+msgid_plural "This will change up to {0} objects."
+msgstr[0] "Esto cambiará {0} objeto."
+msgstr[1] "Esto cambiará {0} objetos."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+msgid "An empty value deletes the key."
+msgstr "Un valor vacío elimina la clave."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+msgid "<different>"
+msgstr "<diferente>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+msgid "Change values?"
+msgstr "¿Modificar valores?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#, java-format
+msgid "Change properties of up to {0} object"
+msgid_plural "Change properties of up to {0} objects"
+msgstr[0] "Cambiar las propiedades de hasta {0} objeto"
+msgstr[1] "Cambiar las propiedades de hasta {0} objetos"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+msgid "Please select a key"
+msgstr "Por favor, selecciona una etiqueta"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+msgid "Please select a value"
+msgstr "Por favor, selecciona un valor"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
+msgid "Please select the objects you want to change properties for."
+msgstr ""
+"Por favor, seleccione los objetos a los que desea cambiar las propiedades."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
+msgid "Properties/Memberships"
+msgstr "Propiedades/Relaciones"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+msgid "Properties for selected objects."
+msgstr "Propiedades de los objetos seleccionados."
+
+#. setting up the membership table
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+msgid "Member Of"
+msgstr "Miembro de"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
+msgid "Add Properties"
+msgstr "Añadir propiedades"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574
 msgid "Add a new key/value pair to all objects"
@@ -5036,10 +5192,9 @@
 
 #. item "Land use/Quarry" text "Name"
-#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
-#: build/trans_presets.java:3109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168
+#: build/trans_presets.java:3121
 msgid "Relations"
 msgstr "Relaciones"
@@ -5049,23 +5204,23 @@
 msgstr "Abrir una lista de todas las relaciones."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relaciones: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276
 msgid "Open an editor for the selected relation"
 msgstr "Abrir un editor para la relación seleccionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
 msgid "Delete the selected relation"
 msgstr "Borrar la relación seleccionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349
 msgid "Create a new relation"
 msgstr "Crear un anueva relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:373
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1412
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "Crea una copia de esta relación y la abre en otra ventana de edición."
@@ -5098,5 +5253,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5108,9 +5263,9 @@
 msgstr "Selección: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441
 msgid "Undock the panel"
 msgstr "Desacoplar el panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5119,5 +5274,5 @@
 "herramientas de la izquierda."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:457
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Haga click para minimizar/maximizar el contenido del panel"
@@ -5178,5 +5333,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5200,5 +5355,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1502
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1370
 msgid "Download relation members"
 msgstr "Descargar relación de miembros"
@@ -5228,5 +5383,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -5234,18 +5389,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
 msgid "Tags and Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:167
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5254,14 +5409,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
 msgid "Remove them, clean up relation"
 msgstr "Eliminarlos, limpiar la relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
 msgid "Ignore them, leave relation as is"
 msgstr "Ignorarlos, dejar la relación como está"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613
 #, java-format
 msgid ""
@@ -5271,9 +5426,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid ""
@@ -5283,15 +5438,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5299,5 +5454,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5305,20 +5460,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849
 #, java-format
 msgid ""
@@ -5327,57 +5482,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:961
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909
 msgid "Move the currently selected members up"
 msgstr "Mover los miembro(s) seleccionos hacia arriba"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:979
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:912
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928
 msgid "Move the currently selected members down"
 msgstr "Mover los miembros seleccionados hacia abajo"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:998
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:931
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5386,9 +5541,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1058
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
 #, java-format
 msgid ""
@@ -5397,56 +5552,41 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090
+msgid "Apply the current updates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123
+msgid "Apply the updates and close the dialog"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
-msgid "Apply the current updates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
-msgid "Apply the updates and close the dialog"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "Aceptar"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 msgid "Cancel the updates and close the dialog"
 msgstr "Cancelar las actualizaciones y cerrar el cuadro de diálogo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
-msgid "Delete the currently selected tags"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Descargar todas las vías y nodos incompletos de esta relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 msgid "Download Members"
 msgstr "Descargar miembros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1208
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1211
 msgid "Apply Role"
 msgstr "Aplicar rol"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1356
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 #, java-format
 msgid ""
@@ -5456,13 +5596,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1229
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1367
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
 msgid "Confirm empty role"
 msgstr ""
@@ -5549,37 +5689,37 @@
 msgstr "Marcadores"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:82
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
 msgid "Please enter the desired coordinates first."
 msgstr "Por favor, introduzca las coordenadas deseadas primero."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
 msgid "Please enter a name for the location."
 msgstr "Por favor, introduzca un nombre para la localización."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:107
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
 msgid "Select a bookmark first."
 msgstr "Seleccione un marcador primero."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
 msgid "min lat"
 msgstr "latitud mínima"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
 msgid "min lon"
 msgstr "longitud mínima"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid "max lat"
 msgstr "latitud máxima"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
 msgid "max lon"
 msgstr "longitud máxima"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5588,22 +5728,22 @@
 "URL de www.openstreetmap.org (puede pegar aquí una URL para bajar dicha área)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
 msgid "Bounding Box"
 msgstr "Recuadro delimitador"
 
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
 msgid "Data Sources and Types"
 msgstr "Fuentes de datos y tipos"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
 msgid "Download as new layer"
 msgstr "Descargar como nueva capa"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
 msgid "Download Area"
 msgstr "Descargar área"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
 msgid "Download area too large; will probably be rejected by server"
 msgstr ""
@@ -5611,5 +5751,5 @@
 "servidor"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
 msgid "Download area ok, size probably acceptable to server"
 msgstr ""
@@ -5636,7 +5776,7 @@
 msgstr "Introduzca un lugar para buscar:"
 
-#. <separator/>
+#. group "Geography"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2759
 msgid "Places"
 msgstr "Lugares"
@@ -5683,21 +5823,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "type"
 msgstr "tipo"
@@ -5714,5 +5854,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-#, fuzzy
 msgid ""
 "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
@@ -5720,7 +5859,4 @@
 "Hold left mousebutton and draw a frame."
 msgstr ""
-"<b>Zoom:</b> Rueda del ratón, doble clic or Ctrl + Up/Down <b>Mover mapa:</"
-"b> Mantenga el botón derecho pulsado y mueva el ratón o las teclas de "
-"dirección. <b>Seleccionar:</b> Clic."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
@@ -6181,4 +6317,6 @@
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
 #. <key key="historic" value="wayside_shrine" />
+#. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
+#. <key key="historic" value="boundary_stone" />
 #. item "Leisure/Water Park" label "Edit Water Park"
 #. <key key="leisure" value="water_park" />
@@ -6550,153 +6688,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/trans_presets.java:66 build/trans_presets.java:102
-#: build/trans_presets.java:142 build/trans_presets.java:179
-#: build/trans_presets.java:199 build/trans_presets.java:217
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:272 build/trans_presets.java:305
-#: build/trans_presets.java:351 build/trans_presets.java:371
-#: build/trans_presets.java:386 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:463 build/trans_presets.java:482
-#: build/trans_presets.java:502 build/trans_presets.java:522
-#: build/trans_presets.java:543 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627 build/trans_presets.java:658
-#: build/trans_presets.java:679 build/trans_presets.java:692
-#: build/trans_presets.java:705 build/trans_presets.java:718
-#: build/trans_presets.java:731 build/trans_presets.java:744
-#: build/trans_presets.java:755 build/trans_presets.java:764
-#: build/trans_presets.java:811 build/trans_presets.java:832
-#: build/trans_presets.java:841 build/trans_presets.java:901
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1067 build/trans_presets.java:1075
-#: build/trans_presets.java:1085 build/trans_presets.java:1093
-#: build/trans_presets.java:1098 build/trans_presets.java:1105
-#: build/trans_presets.java:1112 build/trans_presets.java:1117
-#: build/trans_presets.java:1125 build/trans_presets.java:1134
-#: build/trans_presets.java:1140 build/trans_presets.java:1146
-#: build/trans_presets.java:1151 build/trans_presets.java:1157
-#: build/trans_presets.java:1163 build/trans_presets.java:1172
-#: build/trans_presets.java:1181 build/trans_presets.java:1188
-#: build/trans_presets.java:1196 build/trans_presets.java:1209
-#: build/trans_presets.java:1215 build/trans_presets.java:1224
-#: build/trans_presets.java:1230 build/trans_presets.java:1236
-#: build/trans_presets.java:1244 build/trans_presets.java:1299
-#: build/trans_presets.java:1346 build/trans_presets.java:1352
-#: build/trans_presets.java:1358 build/trans_presets.java:1364
-#: build/trans_presets.java:1370 build/trans_presets.java:1381
-#: build/trans_presets.java:1390 build/trans_presets.java:1405
-#: build/trans_presets.java:1412 build/trans_presets.java:1418
-#: build/trans_presets.java:1426 build/trans_presets.java:1433
-#: build/trans_presets.java:1442 build/trans_presets.java:1450
-#: build/trans_presets.java:1457 build/trans_presets.java:1468
-#: build/trans_presets.java:1478 build/trans_presets.java:1488
-#: build/trans_presets.java:1508 build/trans_presets.java:1520
-#: build/trans_presets.java:1531 build/trans_presets.java:1548
-#: build/trans_presets.java:1555 build/trans_presets.java:1570
-#: build/trans_presets.java:1577 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1594
-#: build/trans_presets.java:1599 build/trans_presets.java:1605
-#: build/trans_presets.java:1611 build/trans_presets.java:1619
-#: build/trans_presets.java:1627 build/trans_presets.java:1635
-#: build/trans_presets.java:1642 build/trans_presets.java:1648
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1670 build/trans_presets.java:1677
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1712 build/trans_presets.java:1719
-#: build/trans_presets.java:1736 build/trans_presets.java:1744
-#: build/trans_presets.java:1759 build/trans_presets.java:1769
-#: build/trans_presets.java:1781 build/trans_presets.java:1788
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:1809 build/trans_presets.java:1817
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1841
-#: build/trans_presets.java:1846 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1864
-#: build/trans_presets.java:1872 build/trans_presets.java:1881
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1908 build/trans_presets.java:1914
-#: build/trans_presets.java:1922 build/trans_presets.java:1928
-#: build/trans_presets.java:1934 build/trans_presets.java:1940
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2013
-#: build/trans_presets.java:2022 build/trans_presets.java:2030
-#: build/trans_presets.java:2036 build/trans_presets.java:2042
-#: build/trans_presets.java:2048 build/trans_presets.java:2054
-#: build/trans_presets.java:2060 build/trans_presets.java:2066
-#: build/trans_presets.java:2072 build/trans_presets.java:2078
-#: build/trans_presets.java:2084 build/trans_presets.java:2090
-#: build/trans_presets.java:2096 build/trans_presets.java:2102
-#: build/trans_presets.java:2108 build/trans_presets.java:2114
-#: build/trans_presets.java:2120 build/trans_presets.java:2126
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2158
-#: build/trans_presets.java:2165 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2186
-#: build/trans_presets.java:2192 build/trans_presets.java:2198
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2218 build/trans_presets.java:2225
-#: build/trans_presets.java:2232 build/trans_presets.java:2239
-#: build/trans_presets.java:2247 build/trans_presets.java:2279
-#: build/trans_presets.java:2284 build/trans_presets.java:2289
-#: build/trans_presets.java:2294 build/trans_presets.java:2300
-#: build/trans_presets.java:2306 build/trans_presets.java:2312
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2354
-#: build/trans_presets.java:2451 build/trans_presets.java:2458
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2485 build/trans_presets.java:2492
-#: build/trans_presets.java:2498 build/trans_presets.java:2504
-#: build/trans_presets.java:2526 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2553 build/trans_presets.java:2559
-#: build/trans_presets.java:2565 build/trans_presets.java:2571
-#: build/trans_presets.java:2577 build/trans_presets.java:2583
-#: build/trans_presets.java:2590 build/trans_presets.java:2597
-#: build/trans_presets.java:2604 build/trans_presets.java:2610
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2661
-#: build/trans_presets.java:2667 build/trans_presets.java:2677
-#: build/trans_presets.java:2686 build/trans_presets.java:2701
-#: build/trans_presets.java:2707 build/trans_presets.java:2715
-#: build/trans_presets.java:2722 build/trans_presets.java:2742
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2783
-#: build/trans_presets.java:2790 build/trans_presets.java:2797
-#: build/trans_presets.java:2803 build/trans_presets.java:2809
-#: build/trans_presets.java:2817 build/trans_presets.java:2824
-#: build/trans_presets.java:2831 build/trans_presets.java:2838
-#: build/trans_presets.java:2844 build/trans_presets.java:2851
-#: build/trans_presets.java:2858 build/trans_presets.java:2867
-#: build/trans_presets.java:2873 build/trans_presets.java:2879
-#: build/trans_presets.java:2885 build/trans_presets.java:2891
-#: build/trans_presets.java:2900 build/trans_presets.java:2910
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2948
-#: build/trans_presets.java:2957 build/trans_presets.java:2963
-#: build/trans_presets.java:2969 build/trans_presets.java:2975
-#: build/trans_presets.java:2981 build/trans_presets.java:2987
-#: build/trans_presets.java:2993 build/trans_presets.java:3000
-#: build/trans_presets.java:3006 build/trans_presets.java:3011
-#: build/trans_presets.java:3018 build/trans_presets.java:3025
-#: build/trans_presets.java:3031 build/trans_presets.java:3040
-#: build/trans_presets.java:3048 build/trans_presets.java:3054
-#: build/trans_presets.java:3060 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3080
-#: build/trans_presets.java:3086 build/trans_presets.java:3092
-#: build/trans_presets.java:3098 build/trans_presets.java:3104
-#: build/trans_presets.java:3117 build/trans_presets.java:3131
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:67 build/trans_presets.java:103
+#: build/trans_presets.java:143 build/trans_presets.java:180
+#: build/trans_presets.java:200 build/trans_presets.java:218
+#: build/trans_presets.java:235 build/trans_presets.java:253
+#: build/trans_presets.java:273 build/trans_presets.java:306
+#: build/trans_presets.java:352 build/trans_presets.java:372
+#: build/trans_presets.java:387 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:503 build/trans_presets.java:523
+#: build/trans_presets.java:544 build/trans_presets.java:565
+#: build/trans_presets.java:586 build/trans_presets.java:607
+#: build/trans_presets.java:628 build/trans_presets.java:659
+#: build/trans_presets.java:680 build/trans_presets.java:693
+#: build/trans_presets.java:706 build/trans_presets.java:719
+#: build/trans_presets.java:732 build/trans_presets.java:745
+#: build/trans_presets.java:756 build/trans_presets.java:765
+#: build/trans_presets.java:812 build/trans_presets.java:833
+#: build/trans_presets.java:842 build/trans_presets.java:902
+#: build/trans_presets.java:1053 build/trans_presets.java:1061
+#: build/trans_presets.java:1069 build/trans_presets.java:1077
+#: build/trans_presets.java:1087 build/trans_presets.java:1095
+#: build/trans_presets.java:1100 build/trans_presets.java:1107
+#: build/trans_presets.java:1114 build/trans_presets.java:1119
+#: build/trans_presets.java:1127 build/trans_presets.java:1136
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1153 build/trans_presets.java:1159
+#: build/trans_presets.java:1165 build/trans_presets.java:1174
+#: build/trans_presets.java:1183 build/trans_presets.java:1190
+#: build/trans_presets.java:1198 build/trans_presets.java:1211
+#: build/trans_presets.java:1217 build/trans_presets.java:1226
+#: build/trans_presets.java:1232 build/trans_presets.java:1238
+#: build/trans_presets.java:1246 build/trans_presets.java:1302
+#: build/trans_presets.java:1349 build/trans_presets.java:1355
+#: build/trans_presets.java:1361 build/trans_presets.java:1367
+#: build/trans_presets.java:1373 build/trans_presets.java:1384
+#: build/trans_presets.java:1393 build/trans_presets.java:1408
+#: build/trans_presets.java:1415 build/trans_presets.java:1421
+#: build/trans_presets.java:1429 build/trans_presets.java:1436
+#: build/trans_presets.java:1445 build/trans_presets.java:1453
+#: build/trans_presets.java:1460 build/trans_presets.java:1471
+#: build/trans_presets.java:1481 build/trans_presets.java:1491
+#: build/trans_presets.java:1511 build/trans_presets.java:1523
+#: build/trans_presets.java:1534 build/trans_presets.java:1551
+#: build/trans_presets.java:1558 build/trans_presets.java:1574
+#: build/trans_presets.java:1581 build/trans_presets.java:1586
+#: build/trans_presets.java:1592 build/trans_presets.java:1598
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1646 build/trans_presets.java:1652
+#: build/trans_presets.java:1659 build/trans_presets.java:1666
+#: build/trans_presets.java:1674 build/trans_presets.java:1681
+#: build/trans_presets.java:1689 build/trans_presets.java:1696
+#: build/trans_presets.java:1702 build/trans_presets.java:1709
+#: build/trans_presets.java:1716 build/trans_presets.java:1723
+#: build/trans_presets.java:1740 build/trans_presets.java:1748
+#: build/trans_presets.java:1763 build/trans_presets.java:1773
+#: build/trans_presets.java:1785 build/trans_presets.java:1792
+#: build/trans_presets.java:1798 build/trans_presets.java:1808
+#: build/trans_presets.java:1813 build/trans_presets.java:1821
+#: build/trans_presets.java:1828 build/trans_presets.java:1834
+#: build/trans_presets.java:1840 build/trans_presets.java:1845
+#: build/trans_presets.java:1850 build/trans_presets.java:1855
+#: build/trans_presets.java:1862 build/trans_presets.java:1868
+#: build/trans_presets.java:1873 build/trans_presets.java:1882
+#: build/trans_presets.java:1891 build/trans_presets.java:1900
+#: build/trans_presets.java:1909 build/trans_presets.java:1918
+#: build/trans_presets.java:1924 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 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:2023 build/trans_presets.java:2032
+#: build/trans_presets.java:2040 build/trans_presets.java:2046
+#: build/trans_presets.java:2052 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 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:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2150
+#: build/trans_presets.java:2156 build/trans_presets.java:2162
+#: build/trans_presets.java:2169 build/trans_presets.java:2176
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2197 build/trans_presets.java:2203
+#: build/trans_presets.java:2209 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2229
+#: build/trans_presets.java:2236 build/trans_presets.java:2243
+#: build/trans_presets.java:2250 build/trans_presets.java:2258
+#: build/trans_presets.java:2290 build/trans_presets.java:2295
+#: build/trans_presets.java:2300 build/trans_presets.java:2305
+#: build/trans_presets.java:2311 build/trans_presets.java:2317
+#: build/trans_presets.java:2323 build/trans_presets.java:2331
+#: build/trans_presets.java:2337 build/trans_presets.java:2343
+#: build/trans_presets.java:2349 build/trans_presets.java:2355
+#: build/trans_presets.java:2365 build/trans_presets.java:2462
+#: build/trans_presets.java:2469 build/trans_presets.java:2483
+#: build/trans_presets.java:2489 build/trans_presets.java:2496
+#: build/trans_presets.java:2503 build/trans_presets.java:2509
+#: build/trans_presets.java:2515 build/trans_presets.java:2537
+#: build/trans_presets.java:2544 build/trans_presets.java:2551
+#: build/trans_presets.java:2557 build/trans_presets.java:2564
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2594 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2615
+#: build/trans_presets.java:2621 build/trans_presets.java:2627
+#: build/trans_presets.java:2633 build/trans_presets.java:2639
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2672 build/trans_presets.java:2678
+#: build/trans_presets.java:2688 build/trans_presets.java:2697
+#: build/trans_presets.java:2712 build/trans_presets.java:2718
+#: build/trans_presets.java:2726 build/trans_presets.java:2733
+#: build/trans_presets.java:2753 build/trans_presets.java:2764
+#: build/trans_presets.java:2770 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2788
+#: build/trans_presets.java:2795 build/trans_presets.java:2802
+#: build/trans_presets.java:2809 build/trans_presets.java:2815
+#: build/trans_presets.java:2821 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2912
+#: build/trans_presets.java:2922 build/trans_presets.java:2931
+#: build/trans_presets.java:2937 build/trans_presets.java:2943
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 build/trans_presets.java:2981
+#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:2999 build/trans_presets.java:3005
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3023 build/trans_presets.java:3030
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3066 build/trans_presets.java:3072
+#: build/trans_presets.java:3079 build/trans_presets.java:3085
+#: build/trans_presets.java:3092 build/trans_presets.java:3098
+#: build/trans_presets.java:3104 build/trans_presets.java:3110
+#: build/trans_presets.java:3116 build/trans_presets.java:3129
+#: build/trans_presets.java:3143 build/trans_presets.java:3157
 msgid "Name"
 msgstr "Nombre"
@@ -6730,4 +6869,58 @@
 msgid "Version"
 msgstr "Versión"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
+#, fuzzy
+msgid "Changeset id:"
+msgstr "Conjunto de cambios {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
+#, fuzzy
+msgid "Created at:"
+msgstr "Crear áreas"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
+#, fuzzy
+msgid "Changeset comment:"
+msgstr "Conjunto de cambios {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
+msgid "No open changeset"
+msgstr "No abrir un conjunto de cambios"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48
+#, fuzzy
+msgid "<html>Please select the changesets you want to close</html>"
+msgstr "Por favor, seleccione qué cambios de propiedades desea aplicar."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
+#, fuzzy
+msgid "Open changesets"
+msgstr "No abrir un conjunto de cambios"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101
+#, fuzzy
+msgid "Close changesets"
+msgstr "Cerrando conjunto de cambios"
+
+#. putValue(SMALL_ICON, ImageProvider.get("cancel"));
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
+#, fuzzy
+msgid "Close the selected open changesets"
+msgstr "Cerrar el conjunto de cambios actual..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126
+#, fuzzy
+msgid "Cancel closeing of changesets"
+msgstr "Cerrando conjunto de cambios"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37
+msgid "Closing changeset"
+msgstr "Cerrando conjunto de cambios"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77
+#, fuzzy, java-format
+msgid "Closing changeset {0}"
+msgstr "Cerrando conjunto de cambios"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
@@ -6756,5 +6949,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be uploaded"
+msgid "Layer ''{0}'' has no modifications to be uploaded."
 msgstr ""
 
@@ -6762,5 +6955,5 @@
 #, java-format
 msgid ""
-"Layer ''{0}'' has modifications which should be saved to its assoicated file "
+"Layer ''{0}'' has modifications which should be saved to its associated file "
 "''{1}''."
 msgstr ""
@@ -6768,5 +6961,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be saved"
+msgid "Layer ''{0}'' has no modifications to be saved."
 msgstr ""
 
@@ -6800,17 +6993,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113
 msgid "Unsaved changes - Save/Upload before exiting?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120
+msgstr "Cambios sin guardar. ¿Guardarlos/subirlos antes de salir?"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119
 msgid "Unsaved changes - Save/Upload before deleting?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140
+msgstr "Cambios sin guardar. ¿Guardarlos/subirlos antes de borrar?"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194
 #, java-format
 msgid ""
@@ -6823,10 +7016,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205
 msgid "Unsaved data and conflicts"
-msgstr "Resolver los conflictos"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
+msgstr "Datos sin guardar y conflictos"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212
 #, java-format
 msgid ""
@@ -6840,9 +7032,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223
 msgid "Unsaved data and missing associated file"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
+msgstr "Datos sin guardar y pérdida de archivo asociado"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230
 #, java-format
 msgid ""
@@ -6857,43 +7049,44 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243
 msgid "Unsaved data non-writable files"
-msgstr "Ignorar el uso de etiquetas de archivos por defecto."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286
+msgstr "Datos sin guardar de archivos no modificables"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
 msgid "Close this dialog and resume editing in JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
+msgstr "Salir de JOSM sin guardar. Los cambios sin grabar se perderán."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322
 msgid "Discard and Delete"
 msgstr "Descartar y borrar"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
 msgid "Delete layers without saving. Unsaved changes are lost."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350
+msgstr "Eliminar capas sin guardar.  Los cambios sin grabar se perderán."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
+"Salir de JOSM sin guardar. Los cambios sin grabar se subirán y/o guardarán."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354
 msgid "Save and Delete"
 msgstr "Grabar y borrar"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
 msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403
+"Guardar/subir capas antes de eliminar. Los cambios sin grabar no se perderán."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402
 #, java-format
 msgid "Preparing layer ''{0}'' for upload ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482
+msgstr "Preparando capa ''{0}'' para subir..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
@@ -6901,5 +7094,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491
 msgid "Incomplete upload and/or save"
 msgstr ""
@@ -6939,21 +7132,21 @@
 #. item "Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:200
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:278
-#: build/trans_presets.java:311 build/trans_presets.java:357
-#: build/trans_presets.java:372 build/trans_presets.java:387
-#: build/trans_presets.java:409 build/trans_presets.java:429
-#: build/trans_presets.java:450 build/trans_presets.java:470
-#: build/trans_presets.java:489 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:549
-#: build/trans_presets.java:570 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:633
-#: build/trans_presets.java:664 build/trans_presets.java:1060
-#: build/trans_presets.java:1068 build/trans_presets.java:1076
-#: build/trans_presets.java:1086 build/trans_presets.java:1305
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:242
+#: build/trans_presets.java:260 build/trans_presets.java:279
+#: build/trans_presets.java:312 build/trans_presets.java:358
+#: build/trans_presets.java:373 build/trans_presets.java:388
+#: build/trans_presets.java:410 build/trans_presets.java:430
+#: build/trans_presets.java:451 build/trans_presets.java:471
+#: build/trans_presets.java:490 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:665 build/trans_presets.java:1062
+#: build/trans_presets.java:1070 build/trans_presets.java:1078
+#: build/trans_presets.java:1088 build/trans_presets.java:1308
 msgid "Layer"
 msgstr "Capa"
@@ -6972,69 +7165,32 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:200
 msgid "Upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-msgid "Use a new changeset and close it"
-msgstr "Usar un nuevo conjunto de cambio y cerrarlo"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
-msgid ""
-"Select to upload the data using a new changeset and to close the changeset "
-"after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
-msgid "Use a new changeset and leave it open"
-msgstr "Usar un nuevo conjunto de cambio y dejarlo abierto"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
-msgid ""
-"Select to upload the data using a new changeset and to leave the changeset "
-"open after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
-msgid "Upload to a new or to an existing changeset?"
-msgstr "¿Subirlo a un conjunto de cambios nuevo o a uno ya existente?"
-
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
-msgid "upload all changes in one request"
-msgstr "subir todos los cambios en una petición"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
-msgid ""
-"Enable to upload all changes in one request, disable to use one request per "
-"changed primitive"
-msgstr ""
-"Permitir subir todos los cambios en una petición, no permitir usar una "
-"petición por cambio sencillo"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171
-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/gui/io/UploadDialog.java:216
 msgid "Settings"
 msgstr "Preferencias"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908
 msgid "Tags of new changeset"
 msgstr "Etiquetas del nuevo conjunto de cambios"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:221
 msgid "Objects to add:"
 msgstr "Objetos que añadir:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:227
 msgid "Objects to modify:"
 msgstr "Objetos que modificar:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:233
 msgid "Objects to delete:"
 msgstr "Objetos que eliminar:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
 #, java-format
 msgid "{0} object to add:"
@@ -7043,5 +7199,5 @@
 msgstr[1] "{0} objetos para añadir:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:277
 #, java-format
 msgid "{0} object to modifiy:"
@@ -7050,5 +7206,5 @@
 msgstr[1] "{0} objetos para modificar:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:286
 #, java-format
 msgid "{0} object to delete:"
@@ -7057,59 +7213,96 @@
 msgstr[1] "{0} objetos para eliminar:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422
-#, java-format
-msgid "Use the existing changeset {0} and close it after upload"
-msgstr "Usar el conjunto de cambios existente {0} y cerrarlo después de subir"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:423
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to close the changeset "
-"after this upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426
-#, java-format
-msgid "Use the existing changeset {0} and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:427
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to leave the changeset "
-"open for further uploads"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:470
+msgid "Upload Changes"
+msgstr "Subir cambios"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472
+msgid "Upload the changed primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
+msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:479
+msgid "Illegal upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
+msgid "Cancel the upload and resume editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606
+#, fuzzy
+msgid "Upload all changes in one request"
+msgstr "subir todos los cambios en una petición"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607
+msgid ""
+"Enable to upload all changes in one request, disable to use one request per "
+"changed primitive"
+msgstr ""
+"Permitir subir todos los cambios en una petición, no permitir usar una "
+"petición por cambio sencillo"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:617
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "Introduzca un breve comentario sobre los cambios que se van a subir:"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672
+#, fuzzy
+msgid "Open a new changeset"
+msgstr "Etiquetas del nuevo conjunto de cambios"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
+#, fuzzy
+msgid "Open a new changeset and use it in the next upload"
+msgstr "Usar un nuevo conjunto de cambio y dejarlo abierto"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
+#, fuzzy
+msgid "Use an open changeset"
+msgstr "No abrir un conjunto de cambios"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
+#, fuzzy
+msgid "Upload data to an already opened changeset"
+msgstr "¿Subirlo a un conjunto de cambios nuevo o a uno ya existente?"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
+#, fuzzy
+msgid "Close changeset after upload"
+msgstr "Ningún cambio que subir"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
+msgid "Select to close the changeset after the next upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922
 #, java-format
 msgid "Tags of changeset {0}"
 msgstr "Etiquetas del conjunto de cambios {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584
-msgid "Upload Changes"
-msgstr "Subir cambios"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
 #, fuzzy
-msgid "Upload the changed primitives"
-msgstr "¿Subir estos cambios?"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592
+msgid "Load the list of your open changesets from the server"
+msgstr "Subir las preferencias actuales al servidor"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
 #, fuzzy
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "Por favor, introduzca un nombre para la localización."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:593
-msgid "Illegal upload comment"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
-#, fuzzy
-msgid "Cancel the upload and resume editing"
-msgstr "Cancelar las actualizaciones y cerrar el cuadro de diálogo"
+msgid "Close the currently selected open changeset"
+msgstr "Cerrar el conjunto de cambios actual..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
+#, fuzzy, java-format
+msgid "changeset id > 0 expected. Got {1}"
+msgstr "parámetro \"{0}\" > 0 esperado, obtenido \"{1}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63
 msgid "Preparing primitives to upload ..."
-msgstr ""
+msgstr "Preparando primitivas para subir"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
@@ -7184,5 +7377,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
@@ -7220,5 +7413,5 @@
 msgstr "La hora no pudo ser analizada sintácticamente."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
@@ -7226,30 +7419,30 @@
 msgstr "punto GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
 msgid "Customize line drawing"
 msgstr "Personalice el dibujo de línea"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
 msgid "Use global settings."
 msgstr "Usar las preferencias globales"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Draw lines between points for this layer."
 msgstr "Dibujar las líneas entre puntos en esta capa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Do not draw lines between points for this layer."
 msgstr "No dibujar las líneas entre puntos en esta capa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 msgid "Select line drawing options"
 msgstr "Seleccione las opciones de dibujo de línea"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7257,5 +7450,5 @@
 msgstr "Personalizar colores"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7264,5 +7457,5 @@
 msgstr "Predeterminado"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7271,38 +7464,75 @@
 msgstr "Seleccionar una color"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
 msgid "Markers From Named Points"
 msgstr "Marcadores desde puntos nombrados"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Puntos de traza nombrados desde {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
 msgid "Import Audio"
 msgstr "Importar audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
 msgid "Wave Audio files (*.wav)"
 msgstr "archivos Wave Audio (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Marcadores de audio desde {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
 msgid "Import images"
 msgstr "Importar imágenes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#, java-format
+msgid "Name: {0}"
+msgstr "Nombre: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#, java-format
+msgid "Description: {0}"
+msgstr "Descripción: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#, fuzzy, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
 msgstr[0] "{0} traza, "
 msgstr[1] "{0} trazas, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
+#: build/trans_presets.java:3160
+msgid "Description"
+msgstr "Descripción"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#, fuzzy
+msgid "Timespan"
+msgstr "Rango de tiempo "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#, fuzzy
+msgid "Length"
+msgstr "Longitud: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
+msgid "URL"
+msgstr "URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+msgid "Length: "
+msgstr "Longitud: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
 #, java-format
 msgid "{0} route, "
@@ -7311,5 +7541,5 @@
 msgstr[1] "{0} rutas, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 #, java-format
 msgid "{0} waypoint"
@@ -7318,29 +7548,10 @@
 msgstr[1] "{0} nodos de vía"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
-#, java-format
-msgid "Name: {0}"
-msgstr "Nombre: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
-#, java-format
-msgid "Description: {0}"
-msgstr "Descripción: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
-msgid "Timespan: "
-msgstr "Rango de tiempo "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
-msgid "Length: "
-msgstr "Longitud: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Convertir en capa de datos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7350,10 +7561,10 @@
 "peligroso.<br>Si quiere subir trazas, consulte aquí:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces (EN)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -7364,29 +7575,29 @@
 msgstr "Convertido desde: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
 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:769
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
 msgid "Download everything within:"
 msgstr "Descargar todo entre:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metros"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 msgid "Maximum area per request:"
 msgstr "Área máxima por petición:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
 #, java-format
 msgid ""
@@ -7397,13 +7608,13 @@
 "<br¿Desea continuar?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
 msgid "Download data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
 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:1143
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7414,5 +7625,5 @@
 "comienzo."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7465,30 +7676,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
-#, fuzzy
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
 "<br>If you want to upload traces, look here:</html>"
 msgstr ""
-"<html>La subida de datos gps sin procesar como datos de mapa se considera "
-"peligroso.<br>Si quiere subir trazas, consulte aquí:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "track"
 msgid_plural "tracks"
@@ -7628,4 +7836,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
@@ -7874,9 +8083,14 @@
 msgstr "Dibujar más grandes los puntos GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+msgid "Draw a circle form HDOP value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Velocidad (rojo=lento, verde=rápido)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
@@ -7884,5 +8098,5 @@
 "disponible)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Color único (puede ser personalizado desde las capas nombradas)"
@@ -7890,6 +8104,6 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1374
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:1377
 msgid "Car"
 msgstr "Coche"
@@ -7910,14 +8124,14 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:324 build/trans_presets.java:650
-#: build/trans_presets.java:857 build/trans_presets.java:876
-#: build/trans_presets.java:890 build/trans_presets.java:912
-#: build/trans_presets.java:949 build/trans_presets.java:962
-#: build/trans_presets.java:974 build/trans_presets.java:986
-#: build/trans_presets.java:998 build/trans_presets.java:1010
-#: build/trans_presets.java:1020 build/trans_presets.java:1029
-#: build/trans_presets.java:1038 build/trans_presets.java:1437
-#: build/trans_presets.java:1510
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:325 build/trans_presets.java:651
+#: build/trans_presets.java:858 build/trans_presets.java:877
+#: build/trans_presets.java:891 build/trans_presets.java:913
+#: build/trans_presets.java:950 build/trans_presets.java:963
+#: build/trans_presets.java:975 build/trans_presets.java:987
+#: build/trans_presets.java:999 build/trans_presets.java:1011
+#: build/trans_presets.java:1021 build/trans_presets.java:1030
+#: build/trans_presets.java:1039 build/trans_presets.java:1440
+#: build/trans_presets.java:1513
 msgid "Bicycle"
 msgstr "Bicicleta"
@@ -7950,62 +8164,62 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:325 build/trans_presets.java:649
-#: build/trans_presets.java:856 build/trans_presets.java:875
-#: build/trans_presets.java:889 build/trans_presets.java:911
-#: build/trans_presets.java:948 build/trans_presets.java:961
-#: build/trans_presets.java:973 build/trans_presets.java:985
-#: build/trans_presets.java:997 build/trans_presets.java:1009
-#: build/trans_presets.java:1019 build/trans_presets.java:1028
-#: build/trans_presets.java:1037
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:326 build/trans_presets.java:650
+#: build/trans_presets.java:857 build/trans_presets.java:876
+#: build/trans_presets.java:890 build/trans_presets.java:912
+#: build/trans_presets.java:949 build/trans_presets.java:962
+#: build/trans_presets.java:974 build/trans_presets.java:986
+#: build/trans_presets.java:998 build/trans_presets.java:1010
+#: build/trans_presets.java:1020 build/trans_presets.java:1029
+#: build/trans_presets.java:1038
 msgid "Foot"
 msgstr "Pie"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Dibujar las flechas de dirección"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Visualización rápida (poco vistosa)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Solo marcar direcciones de interés (ej: vías con etiqueta oneway)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Only on the head of a way."
 msgstr "Solo en la cabecera de la vía."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Dibujar los números de orden de los segmentos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Dibujar los límites de los datos descargados"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Dibujar nodos virtuales en el modo selección"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Dibujar las capas inactivas en otro color"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Suavizar los gráficos del mapa (antialias)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:82
 msgid "Draw lines between raw GPS points"
 msgstr "Dibujar líneas entre puntos GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -8015,9 +8229,9 @@
 "Valor '-1' para dibujar todas las líneas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
 msgid "Maximum length for local files (meters)"
 msgstr "Longitud máxima de los archivos locales (en metros)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
@@ -8026,10 +8240,10 @@
 "dibujarlas todas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length (meters)"
 msgstr "Longitud máxima (en metros)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -8038,10 +8252,10 @@
 "información de la línea."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:129
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Dibujar flechas de dirección en las líneas que conectan puntos gps."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:135
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -8050,5 +8264,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:141
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -8057,13 +8271,13 @@
 "No dibujar flechas si no están por lo menos a esta distancia de la anterior"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:144
 msgid "Minimum distance (pixels)"
 msgstr "Distancia mínima en píxeles"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Draw larger dots for the GPS points."
 msgstr "dibuje grandes los puntos gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -8073,9 +8287,9 @@
 "personalizado en el Gestor de Capas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Colors points and track segments by velocity."
 msgstr "Colores de puntos y segmentos de trazas según velocidades."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -8085,5 +8299,5 @@
 "(HPOP). Se requiere que su dispositivo de captura registre esa información."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
@@ -8091,23 +8305,23 @@
 "medias."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid "Track and Point Coloring"
 msgstr "Coloreado de traza y punto"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202
 msgid "GPS Points"
 msgstr "Puntos GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "Draw direction hints for way segments."
 msgstr "Dibujar pistas de dirección para los segmentos de vía"
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:237
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Dibujar los números de orden de todos los segmentos de una vía"
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -8116,10 +8330,10 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Dibujar los límites de los datos descargados del servidor"
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -8128,9 +8342,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257
 msgid "Draw the inactive data layers in a different color."
 msgstr "Dibujar las capas inactivas en un color diferente"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "OSM Data"
 msgstr "Datos OSM"
@@ -8209,45 +8423,46 @@
 msgstr "Estilo usado"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Configure available plugins."
 msgstr "Configurar los complementos disponibles."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50
+#. buttons at the bottom
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
 msgid "Download List"
 msgstr "Descargar lista"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:100
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 msgid "Update"
 msgstr "Actualizar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Configure Sites..."
 msgstr "Configurar sitios ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:125
 msgid "Add JOSM Plugin description URL."
 msgstr "Añadir URL de la descripción del componente de JOSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:126
 msgid "Enter URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:162
 msgid "Please select an entry."
 msgstr "Por favor seleccione una entrada."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:147
 msgid "Edit JOSM Plugin description URL."
 msgstr "Editar la URL de la descripción del componente de JOSM"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:148
 msgid "JOSM Plugin description URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:175
 msgid "Configure Plugin Sites"
 msgstr "Configurar los sitios de complementos"
@@ -8602,6 +8817,6 @@
 msgstr "<multiple>"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:369
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341
 #, java-format
 msgid "Remove old keys from up to {0} object"
@@ -8610,9 +8825,9 @@
 msgstr[1] "Eliminar las claves antiguas de hasta {0} objectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135
 msgid "Add a new tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160
 msgid "Delete the selection in the tag table"
 msgstr ""
@@ -8647,7 +8862,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:68
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:75
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -8691,4 +8906,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24
+#, fuzzy, java-format
+msgid "Preset group ''{0}'' of group ''{1}''"
+msgstr "Usar preferencia ''{0}'' del grupo ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
 #, java-format
 msgid "Preset group ''{0}''"
@@ -8709,4 +8929,10 @@
 msgstr "Descargando puntos {0} al {1}..."
 
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, fuzzy, java-format
+msgid "parameter ''{0}'' > 0 expected. Got {1}"
+msgstr "parámetro \"{0}\" > 0 esperado, obtenido \"{1}\""
+
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8815,5 +9041,5 @@
 msgstr "Análisis sintáctivo fallido del archivo \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
 msgid "Parse error: invalid document structure for gpx document"
 msgstr ""
@@ -8843,15 +9069,15 @@
 #, java-format
 msgid "Fetching node with id {0} from ''{1}''"
-msgstr ""
+msgstr "Obteniendo nodo con ID {0} de ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366
 #, java-format
 msgid "Fetching way with id {0} from ''{1}''"
-msgstr ""
+msgstr "Obteniendo vía con ID {0} de ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367
 #, java-format
 msgid "Fetching relation with id {0} from ''{1}''"
-msgstr ""
+msgstr "Obteniendo relación con ID {0} de ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373
@@ -8863,15 +9089,15 @@
 #, java-format
 msgid "Fetching a package of nodes from ''{0}''"
-msgstr ""
+msgstr "Obteniendo un conjunto de nodos de ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404
 #, java-format
 msgid "Fetching a package of ways from ''{0}''"
-msgstr ""
+msgstr "Obteniendo un conjunto de vías de ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405
 #, java-format
 msgid "Fetching a package of relations from ''{0}''"
-msgstr ""
+msgstr "Obteniendo un conjunto de relaciones de ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416
@@ -8937,10 +9163,11 @@
 msgstr "Establecidas comunicaciones con {0} usando la versión de protocolo {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -8948,75 +9175,79 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315
 msgid "Creating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
 #, java-format
 msgid "Successfully opened changeset {0}"
 msgstr "Conjunto de cambios {0} abierto con éxito"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#, fuzzy, java-format
+msgid "id of changeset > 0 required. Got {0}"
+msgstr "parámetro {0} > 0 necesario. Obtenido {1}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
-#, java-format
-msgid "Changeset {0} is unchanged. Skipping update."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317
+msgstr "Actualizando conjunto de cambios..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
 #, java-format
 msgid "Updating changeset {0}..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
-msgid ""
-"Failed to update changeset. Either there is no current changeset or the id "
-"of the current changeset is 0"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
+msgstr "Actualizando conjunto de cambios {0}..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
 msgid "Closing changeset..."
 msgstr "Cerrando conjunto de cambios..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
-#, java-format
-msgid "Closing changeset {0}..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
-#, java-format
-msgid "Leaving changeset {0} open..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
 msgid "No changeset present for diff upload"
 msgstr "Sin nuevos cambios que enviar"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414
 msgid "Preparing..."
 msgstr "Preparando…"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419
 msgid "Uploading..."
 msgstr "Subiendo..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438
 msgid "Waiting 10 seconds ... "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449
 msgid "OK - trying again."
 msgstr "OK - intentando de nuevo."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:485
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517
 #, java-format
 msgid "Starting retry {0} of {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
+msgid "current changeset is null. Can't upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
+#, java-format
+msgid "id of current changeset > required. Current id is {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
+#, java-format
+msgid "Open changeset expected. Got closed changeset with id {0}"
 msgstr ""
 
@@ -9042,33 +9273,98 @@
 msgstr "Archivo bz2 inválido"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
+#, fuzzy, java-format
+msgid "missing mandatory attribute ''{0}''"
+msgstr "atributo \"{0}\" obligatorio perdido"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:128
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:134
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
+#, fuzzy, java-format
+msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+"valor ilegal para al atributo obligatorio \"{0}\" de tipo entero, obtenido "
+"\"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
+#, fuzzy, java-format
+msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+"valor ilegal para al atributo obligatorio \"{0}\" de tipo entero, obtenido "
+"\"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
+#, fuzzy, java-format
+msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+"valor ilegal para al atributo obligatorio \"{0}\" de tipo entero, obtenido "
+"\"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#, java-format
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#, java-format
+msgid "Unsupported version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:176
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Aborting."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#, java-format
+msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
+#, fuzzy
+msgid "Parsing list of changesets..."
+msgstr "Cerrando conjunto de cambios..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
 msgid "Incorrect password or username."
 msgstr "Contraseña o nombre de usuario incorrectos"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:168
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Advertencia: La contraseña se transferirá sin cifrar."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Save user and password (unencrypted)"
 msgstr "Grabar nombre de usuario y contraseña (sin cifrar)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
 msgid "Enter Password"
 msgstr "Introduzca contraseña"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 msgid "Login"
 msgstr "Inicio de sesión"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:242
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
 msgid "The base URL for the OSM server (REST API)"
 msgstr "La URL base del servidor OSM (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
 msgid "Login name (e-mail) to the OSM account."
 msgstr "Nombre de usuario (correo-e) a la cuenta OSM"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -9077,17 +9373,17 @@
 "clave."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
 msgid "Base Server URL"
 msgstr "URL base del servidor"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
 msgid "OSM username (e-mail)"
 msgstr "Nombre de usuario OSM (correo-e)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
 msgid "OSM password"
 msgstr "Contraseña OSM"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -9096,5 +9392,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:51
+#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #, java-format
 msgid "(at line {0}, column {1})"
@@ -9196,20 +9492,5 @@
 msgstr "Error durante el análisis sintáctico."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124
-#, fuzzy, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr "atributo \"{0}\" obligatorio perdido"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
-#, fuzzy, java-format
-msgid "Missing mandatory attribute ''{0}''"
-msgstr "atributo \"{0}\" obligatorio perdido"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
-#, fuzzy, java-format
-msgid "Unsupported version: {0}"
-msgstr "Versión desconocida: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:155
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -9218,82 +9499,64 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
 msgid "found XML element <nd> element not as direct child of element <way>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
-msgstr "atributo \"{0}\" obligatorio perdido"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
 msgstr ""
-"Valor no válido para el atributo \"ref\" de un miembro de la relación {0}, "
-"valor {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
 msgid "Found XML element <member> not as direct child of element <relation>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}"
 msgstr ""
-"Valor no válido para el atributo \"ref\" de un miembro de la relación {0}, "
-"valor {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217
-#, fuzzy, java-format
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
-"Valor no válido para el atributo \"ref\" de un miembro de la relación {0}, "
-"valor {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
-#, fuzzy, java-format
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}"
 msgstr ""
-"Atributo \"type\" no válido en el miembro {0} de la relación {1}, valor {2}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
-#, fuzzy, java-format
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#, java-format
 msgid ""
 "Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}."
 msgstr ""
-"Valor no válido para el atributo \"ref\" de un miembro de la relación {0}, "
-"valor {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Especificación <miembro> incompleta sin ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
-#, java-format
-msgid "Warning: Undefined element ''{0}'' found in input stream. Skipping."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
-#, fuzzy, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
-msgstr ""
-"valor ilegal para al atributo obligatorio \"{0}\" de tipo entero, obtenido "
-"\"{1}\""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Skipping."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
 msgid "Illegal object with id=0"
 msgstr "Objeto con id=0 ilegal"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#, java-format
 msgid ""
 "Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
 msgstr ""
-"Valor no válido para el atributo \"version\" en la primitiva OSM con id {0}, "
-"valor {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:303
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
 #, java-format
 msgid ""
@@ -9302,5 +9565,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
 #, java-format
 msgid ""
@@ -9309,5 +9572,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
@@ -9317,27 +9580,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:316
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#, java-format
 msgid "Unknown or unsupported API version. Got {0}"
-msgstr "Versión desconocida: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#, java-format
 msgid "Missing attribute ''version'' on OSM primitive with id {0}"
-msgstr "Falta el atributo \"version\" en la primitiva OSM con id {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#, java-format
 msgid "Missing required attribute ''{0}''."
-msgstr "Falta el atributo necesario \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
 msgstr ""
-"valor ilegal para al atributo obligatorio \"{0}\" de tipo entero, obtenido "
-"\"{1}\""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
 #, java-format
 msgid ""
@@ -9345,5 +9606,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
 #, java-format
 msgid ""
@@ -9352,5 +9613,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
 #, java-format
 msgid ""
@@ -9358,26 +9619,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#, java-format
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
 "id ''{1}''"
 msgstr ""
-"no se puede comparar la primitiva con ID ''{0}'' con la primitiva con ID "
-"''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
 msgid "Prepare OSM data..."
 msgstr "Preparando datos OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 msgid "Parsing OSM data..."
-msgstr "Preparando datos OSM..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
 msgid "Preparing data set..."
-msgstr "Preparando datos..."
+msgstr "Preparando conjunto de datos..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
@@ -9398,4 +9655,24 @@
 msgid "Downloading referring relations ..."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51
+#, fuzzy
+msgid "Reading changesets..."
+msgstr "Actualizando conjunto de cambios..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
+#, fuzzy
+msgid "Downloading changesets ..."
+msgstr "Cerrando conjunto de cambios..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85
+#, fuzzy, java-format
+msgid "Reading changeset {0} ..."
+msgstr "Actualizando conjunto de cambios {0}..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91
+#, fuzzy, java-format
+msgid "Downloading changeset {0} ..."
+msgstr "Actualizando conjunto de cambios {0}..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
@@ -9412,10 +9689,14 @@
 msgstr "Contactando con el servidor..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
 msgid "Failed to open connection to API {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
+msgid "Error: failed to add authentication credentials to the connection."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -9424,33 +9705,54 @@
 "conexión a Internet."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+msgid "XML tag <user> is missing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
+#, fuzzy, java-format
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgstr "Usar preferencia ''{0}'' del grupo ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
+#, fuzzy, java-format
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgstr ""
+"valor ilegal para al atributo obligatorio \"{0}\" de tipo entero, obtenido "
+"\"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
 msgid "Starting to upload with one request per primitive ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
 msgid "Starting to upload in one request ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:171
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135
 msgid "Uploading data ..."
-msgstr "Subiendo..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:178
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
 msgid ""
 "WARNING: no API version defined for data to upload. Falling back to version "
@@ -9458,5 +9760,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147
 #, java-format
 msgid ""
@@ -9466,10 +9768,10 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
 msgid "Update Plugins"
 msgstr "Actualizar complementos"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 msgid "Download Plugins"
 msgstr "Descarga de complementos"
@@ -9634,5 +9936,5 @@
 msgstr "Más detalles"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -9641,18 +9943,18 @@
 msgstr[1] "Información del complemento descargada de {0} sitios"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
 msgid "No plugin information found."
 msgstr "No se ha encontrado información del complemento."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr "El complemento llamado {0} no está disponible. Omitir actualización."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:93
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
 msgid "All installed plugins are up to date."
 msgstr "Todos los complementos instalados están actualizados."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
 #, java-format
 msgid ""
@@ -9665,9 +9967,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
 msgid "Download missing plugins"
 msgstr "Descargar los complementos que faltan"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
 #, java-format
 msgid ""
@@ -9682,43 +9984,43 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
 msgid "unknown"
 msgstr "desconocido"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Versión {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 msgid "Plugin bundled with JOSM"
 msgstr "Complemento incluido en JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:357
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -9847,5 +10149,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:165
-#, fuzzy
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -9853,6 +10154,4 @@
 "community."
 msgstr ""
-"El tamaño máximo de bbox es de 0,25 y su solicitud fue demasiado grande. "
-"Solicite un área más pequeña o utilice planet.osm"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:168
@@ -10051,10 +10350,4 @@
 msgid "(What does that mean?)"
 msgstr ""
-
-#. item "Relations/Route" text "Symbol description"
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3148
-msgid "Description"
-msgstr "Descripción"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
@@ -10847,6 +11140,7 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
-msgid "Set "
-msgstr ""
+#, fuzzy, java-format
+msgid "Set {0} Lambert coordinates"
+msgstr "Fijar coordenada Lambert"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -11478,6 +11772,6 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 #: build/trans_style.java:990 build/trans_style.java:1007
-#: build/trans_style.java:1023 build/trans_style.java:3392
-#: build/trans_style.java:3400
+#: build/trans_style.java:1023 build/trans_style.java:3400
+#: build/trans_style.java:3408
 msgid "water"
 msgstr "lámina de agua"
@@ -11776,4 +12070,56 @@
 msgstr "Mediciones"
 
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Michigan Left"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Adds no left turn for sets of 4 or 5 ways."
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45
+#, fuzzy
+msgid "Please select 4 or 5 ways to assign no left turns."
+msgstr ""
+"Por favor, seleccione una o más vías cerradas de al menos cuatro nodos."
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61
+#, fuzzy, java-format
+msgid "{0} extrem nodes."
+msgstr "{0} nodo"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69
+#, fuzzy, java-format
+msgid "Via node {0}, {1}"
+msgstr "Cambiar {0} {1}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75
+#, fuzzy, java-format
+msgid "{0} via nodes."
+msgstr "{0} nodo"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78
+msgid "Unable to find via nodes. Please check your selection"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98
+#, fuzzy, java-format
+msgid "MIddle way: {0}"
+msgstr "Añadir vía {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121
+msgid "Create Michigan left turn restriction"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129
+#, fuzzy, java-format
+msgid "Processing {0}"
+msgstr "Versión {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142
+#, fuzzy, java-format
+msgid "Relation: from {0} to {1} via {2}"
+msgstr "Versión {0} creada en {1} por {2}"
+
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
 msgid "OpenLayers"
@@ -11932,7 +12278,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
-#, fuzzy
 msgid "create new objects"
-msgstr "Crear un nodo nuevo."
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
@@ -11997,7 +12342,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
-#, fuzzy
 msgid "Remote Control has been asked to create a new node."
-msgstr "El control remoto ha pedido cagar datos desde el API."
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
@@ -12259,5 +12603,5 @@
 msgstr "Lanza la ventana de dialogo del editor de etiquetas"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:158
 msgid "JOSM Tag Editor Plugin"
 msgstr "Componente JOSM Tag Editor"
@@ -12267,5 +12611,5 @@
 msgstr "Resaltado"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:370
 #, java-format
 msgid "Updating properties of up to {0} object"
@@ -12274,18 +12618,4 @@
 msgstr[1] "Actualizar las propiedades de hasta {0} objetos"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44
-msgid "INFO: entering compatibilty mode for JOSM with Main.ds"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47
-msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49
-msgid ""
-"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-"found."
-msgstr ""
-
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
 msgid "Group"
@@ -12295,9 +12625,4 @@
 msgid "Item"
 msgstr "Objeto"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-msgid "Filter"
-msgstr "Filtrar"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63
@@ -12387,5 +12712,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2272
 msgid "Street name"
 msgstr "Nombre de la calle"
@@ -12554,8 +12879,4 @@
 msgid "Zoom (in metres)"
 msgstr "Zoom (en metros)"
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
-msgid "URL"
-msgstr "URL"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -12759,15 +13080,14 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:460
 msgid "Fixing errors ..."
-msgstr ""
+msgstr "Corrigiendo errores..."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:484
 #, java-format
 msgid "Fixing ({0}/{1}): ''{2}''"
-msgstr ""
+msgstr "Corrigiendo ({0}/{1}): ''{2}''"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501
-#, fuzzy
 msgid "Updating map ..."
-msgstr "Actualizando datosd"
+msgstr "Actualizando mapa..."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69
@@ -12826,5 +13146,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76
 msgid "Duplicated ways"
-msgstr ""
+msgstr "Vías duplicadas"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
@@ -12840,5 +13160,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22
 msgid "Duplicated way nodes."
-msgstr "Nodos de la via duplicados."
+msgstr "Nodos vía duplicados."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23
@@ -12848,5 +13168,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:36
 msgid "Duplicated way nodes"
-msgstr "Nodos de la via duplicados"
+msgstr "Nodos de vía duplicados"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:21
@@ -13270,7 +13590,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
-#: build/trans_style.java:4179
+#: build/trans_style.java:4159 build/trans_style.java:4166
+#: build/trans_style.java:4173 build/trans_style.java:4180
+#: build/trans_style.java:4187
 msgid "building"
 msgstr "edificio"
@@ -13284,5 +13604,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4186
+#: build/trans_style.java:4194
 msgid "area"
 msgstr "área"
@@ -13416,10 +13736,10 @@
 msgstr "Seleccione un nodo de inicio en el extremo de la vía"
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:148
 msgid "Reached the end of the line"
 msgstr "Extender al final de la línea"
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:155
 msgid "Reached a junction"
 msgstr "Alcanzar una intersección"
@@ -13557,4 +13877,6 @@
 "settings."
 msgstr ""
+"Advertencia: La obtención de teselas WMS es probable que falle. Por favor, "
+"comprueba la configuración de tus preferencias."
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
@@ -13725,12 +14047,10 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
-#, fuzzy
 msgid "% of east:"
-msgstr "% de lat:"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
-#, fuzzy
 msgid "% of north:"
-msgstr "% de lat:"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -13903,6 +14223,11 @@
 "de recorridos (los cuales pueden ser importados desde una capa GPS)."
 
+#. Plugin michigan_left
+#: build/trans_plugins.java:35
+msgid "Adds no left turn for sets of 4 or 5 ways"
+msgstr ""
+
 #. Plugin nearclick
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid ""
 "Simulates a click when you do a small and short drag. This is usefull for "
@@ -13916,10 +14241,10 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid "Displays an OpenLayers background image"
 msgstr "Muestra una imágen OpenLayers de fondo"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
@@ -13928,5 +14253,5 @@
 
 #. Plugin openvisible
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13936,5 +14261,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13944,5 +14269,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13953,15 +14278,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "El gran JGoodies Plastic Look and Feel."
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Let other applications send commands to JOSM."
 msgstr "Dejar que otras aplicaciones envíen comandos a JOSM."
 
 #. Plugin routes
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13973,10 +14298,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Provides routing capabilities."
 msgstr "Proporciona capacidades de enrutamiento."
 
 #. Plugin slippymap
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13987,10 +14312,10 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Permite añadir marcadores/nodos a las posiciones GPS actual."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
@@ -13999,5 +14324,5 @@
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -14011,10 +14336,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Make terraced houses out of single blocks."
 msgstr "Crea edificios entremedianeras a partir de bloques únicos"
 
 #. Plugin usertools
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -14026,5 +14351,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -14035,5 +14360,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -14045,5 +14370,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -14054,5 +14379,5 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
@@ -14060,5 +14385,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -14116,4 +14441,10 @@
 #. <annotations>
 #: build/trans_presets.java:57
+#, fuzzy
+msgid "Highways"
+msgstr "vía"
+
+#. group "Highways"
+#: build/trans_presets.java:58
 msgid "Streets"
 msgstr "Calles"
@@ -14124,5 +14455,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:58 build/trans_surveyor.java:72
+#: build/trans_presets.java:59 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Autopista"
@@ -14131,5 +14462,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:61
+#: build/trans_presets.java:62
 msgid "Edit Motorway"
 msgstr "Editar autopista"
@@ -14156,8 +14487,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:120 build/trans_presets.java:140
-#: build/trans_presets.java:177 build/trans_presets.java:197
-#: build/trans_presets.java:1557 build/trans_presets.java:3146
+#: build/trans_presets.java:65 build/trans_presets.java:101
+#: build/trans_presets.java:121 build/trans_presets.java:141
+#: build/trans_presets.java:178 build/trans_presets.java:198
+#: build/trans_presets.java:1560 build/trans_presets.java:3158
 msgid "Reference"
 msgstr "Referencia"
@@ -14171,8 +14502,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:358
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:359
 msgid "Lanes"
 msgstr "Carriles"
@@ -14189,15 +14520,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:224 build/trans_presets.java:280
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:373 build/trans_presets.java:388
-#: build/trans_presets.java:412 build/trans_presets.java:431
-#: build/trans_presets.java:452 build/trans_presets.java:472
-#: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1307
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:225 build/trans_presets.java:281
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:374 build/trans_presets.java:389
+#: build/trans_presets.java:413 build/trans_presets.java:432
+#: build/trans_presets.java:453 build/trans_presets.java:473
+#: build/trans_presets.java:511 build/trans_presets.java:667
+#: build/trans_presets.java:1310
 msgid "Max. speed (km/h)"
 msgstr "Velocidad max. (km/h)"
@@ -14234,16 +14565,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:293 build/trans_presets.java:306
-#: build/trans_presets.java:320 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:464
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:659 build/trans_presets.java:1300
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:294 build/trans_presets.java:307
+#: build/trans_presets.java:321 build/trans_presets.java:353
+#: build/trans_presets.java:405 build/trans_presets.java:425
+#: build/trans_presets.java:445 build/trans_presets.java:465
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:660 build/trans_presets.java:1303
 msgid "Oneway"
 msgstr "Sentido único"
@@ -14285,19 +14616,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:353
-#: build/trans_presets.java:362 build/trans_presets.java:405
-#: build/trans_presets.java:425 build/trans_presets.java:445
-#: build/trans_presets.java:465 build/trans_presets.java:485
-#: build/trans_presets.java:504 build/trans_presets.java:523
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:586 build/trans_presets.java:607
-#: build/trans_presets.java:628 build/trans_presets.java:660
-#: build/trans_presets.java:1301 build/trans_surveyor.java:12
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:354
+#: build/trans_presets.java:363 build/trans_presets.java:406
+#: build/trans_presets.java:426 build/trans_presets.java:446
+#: build/trans_presets.java:466 build/trans_presets.java:486
+#: build/trans_presets.java:505 build/trans_presets.java:524
+#: build/trans_presets.java:545 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629 build/trans_presets.java:661
+#: build/trans_presets.java:1304 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Puente"
@@ -14333,19 +14664,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:354
-#: build/trans_presets.java:378 build/trans_presets.java:406
-#: build/trans_presets.java:426 build/trans_presets.java:446
-#: build/trans_presets.java:466 build/trans_presets.java:486
-#: build/trans_presets.java:505 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629 build/trans_presets.java:661
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:355
+#: build/trans_presets.java:379 build/trans_presets.java:407
+#: build/trans_presets.java:427 build/trans_presets.java:447
+#: build/trans_presets.java:467 build/trans_presets.java:487
+#: build/trans_presets.java:506 build/trans_presets.java:525
+#: build/trans_presets.java:546 build/trans_presets.java:567
+#: build/trans_presets.java:588 build/trans_presets.java:609
+#: build/trans_presets.java:630 build/trans_presets.java:662
+#: build/trans_presets.java:1305
 msgid "Tunnel"
 msgstr "Túnel"
@@ -14379,18 +14710,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:73 build/trans_presets.java:90
-#: build/trans_presets.java:110 build/trans_presets.java:129
-#: build/trans_presets.java:150 build/trans_presets.java:166
-#: build/trans_presets.java:186 build/trans_presets.java:205
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:355
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:467
-#: build/trans_presets.java:487 build/trans_presets.java:506
-#: build/trans_presets.java:525 build/trans_presets.java:546
-#: build/trans_presets.java:567 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:630
-#: build/trans_presets.java:662 build/trans_presets.java:1303
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:356
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:468
+#: build/trans_presets.java:488 build/trans_presets.java:507
+#: build/trans_presets.java:526 build/trans_presets.java:547
+#: build/trans_presets.java:568 build/trans_presets.java:589
+#: build/trans_presets.java:610 build/trans_presets.java:631
+#: build/trans_presets.java:663 build/trans_presets.java:1306
 msgid "Cutting"
 msgstr "Desmonte"
@@ -14424,18 +14755,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:74 build/trans_presets.java:91
-#: build/trans_presets.java:111 build/trans_presets.java:130
-#: build/trans_presets.java:151 build/trans_presets.java:167
-#: build/trans_presets.java:187 build/trans_presets.java:206
-#: build/trans_presets.java:222 build/trans_presets.java:240
-#: build/trans_presets.java:258 build/trans_presets.java:277
-#: build/trans_presets.java:310 build/trans_presets.java:356
-#: build/trans_presets.java:408 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:468
-#: build/trans_presets.java:488 build/trans_presets.java:507
-#: build/trans_presets.java:526 build/trans_presets.java:547
-#: build/trans_presets.java:568 build/trans_presets.java:589
-#: build/trans_presets.java:610 build/trans_presets.java:631
-#: build/trans_presets.java:663 build/trans_presets.java:1304
+#: build/trans_presets.java:75 build/trans_presets.java:92
+#: build/trans_presets.java:112 build/trans_presets.java:131
+#: build/trans_presets.java:152 build/trans_presets.java:168
+#: build/trans_presets.java:188 build/trans_presets.java:207
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:357
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:469
+#: build/trans_presets.java:489 build/trans_presets.java:508
+#: build/trans_presets.java:527 build/trans_presets.java:548
+#: build/trans_presets.java:569 build/trans_presets.java:590
+#: build/trans_presets.java:611 build/trans_presets.java:632
+#: build/trans_presets.java:664 build/trans_presets.java:1307
 msgid "Embankment"
 msgstr "Terraplén"
@@ -14443,5 +14774,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Motorway Link"
 msgstr "Enlace de autopista"
@@ -14450,5 +14781,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:80
+#: build/trans_presets.java:81
 msgid "Edit Motorway Link"
 msgstr "Editar enlace de autopista"
@@ -14456,5 +14787,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:94
+#: build/trans_presets.java:95
 msgid "Trunk"
 msgstr "Carretera principal"
@@ -14463,5 +14794,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:97
+#: build/trans_presets.java:98
 msgid "Edit Trunk"
 msgstr "Editar carretera principal"
@@ -14471,6 +14802,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
 msgid "Motorroad"
 msgstr "Autovía"
@@ -14478,5 +14809,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:114
+#: build/trans_presets.java:115
 msgid "Trunk Link"
 msgstr "Enlace a carretera principal"
@@ -14485,5 +14816,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:117
+#: build/trans_presets.java:118
 msgid "Edit Trunk Link"
 msgstr "Editar enlace a carretera principal"
@@ -14496,5 +14827,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:134 build/trans_surveyor.java:76
+#: build/trans_presets.java:135 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Carretera primaria"
@@ -14503,5 +14834,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:137
+#: build/trans_presets.java:138
 msgid "Edit Primary Road"
 msgstr "Editar carretera primaria"
@@ -14509,10 +14840,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:154
+#: build/trans_presets.java:155
 msgid "Primary Link"
 msgstr "Enlace a carretera primaria"
 
 #. item
-#: build/trans_presets.java:155
+#: build/trans_presets.java:156
 msgid "Edit Primary Link"
 msgstr "Editar carretera primaria"
@@ -14524,5 +14855,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:170 build/trans_surveyor.java:80
+#: build/trans_presets.java:171 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Carretera secundaria"
@@ -14532,5 +14863,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:174
+#: build/trans_presets.java:175
 msgid "Edit Secondary Road"
 msgstr "Editar carretera secundaria"
@@ -14538,5 +14869,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:190
+#: build/trans_presets.java:191
 msgid "Tertiary"
 msgstr "Carretera local"
@@ -14546,5 +14877,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:194
+#: build/trans_presets.java:195
 msgid "Edit Tertiary Road"
 msgstr "Editar"
@@ -14556,5 +14887,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:209 build/trans_surveyor.java:84
+#: build/trans_presets.java:210 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Carretera sin denominación"
@@ -14564,5 +14895,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:213
+#: build/trans_presets.java:214
 msgid "Edit Unclassified Road"
 msgstr "Editar carretera sin denominación"
@@ -14589,19 +14920,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:225 build/trans_presets.java:243
-#: build/trans_presets.java:261 build/trans_presets.java:281
-#: build/trans_presets.java:314 build/trans_presets.java:359
-#: build/trans_presets.java:375 build/trans_presets.java:389
-#: build/trans_presets.java:413 build/trans_presets.java:432
-#: build/trans_presets.java:453 build/trans_presets.java:473
-#: build/trans_presets.java:491 build/trans_presets.java:511
-#: build/trans_presets.java:532 build/trans_presets.java:553
-#: build/trans_presets.java:574 build/trans_presets.java:595
-#: build/trans_presets.java:616 build/trans_presets.java:637
-#: build/trans_presets.java:667 build/trans_presets.java:680
-#: build/trans_presets.java:693 build/trans_presets.java:706
-#: build/trans_presets.java:719 build/trans_presets.java:732
-#: build/trans_presets.java:745 build/trans_presets.java:1308
-#: build/trans_presets.java:1498 build/trans_presets.java:1540
+#: build/trans_presets.java:226 build/trans_presets.java:244
+#: build/trans_presets.java:262 build/trans_presets.java:282
+#: build/trans_presets.java:315 build/trans_presets.java:360
+#: build/trans_presets.java:376 build/trans_presets.java:390
+#: build/trans_presets.java:414 build/trans_presets.java:433
+#: build/trans_presets.java:454 build/trans_presets.java:474
+#: build/trans_presets.java:492 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:554
+#: build/trans_presets.java:575 build/trans_presets.java:596
+#: build/trans_presets.java:617 build/trans_presets.java:638
+#: build/trans_presets.java:668 build/trans_presets.java:681
+#: build/trans_presets.java:694 build/trans_presets.java:707
+#: build/trans_presets.java:720 build/trans_presets.java:733
+#: build/trans_presets.java:746 build/trans_presets.java:1311
+#: build/trans_presets.java:1501 build/trans_presets.java:1543
 msgid "Width (meters)"
 msgstr "Anchura (metros)"
@@ -14613,5 +14944,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:228 build/trans_surveyor.java:88
+#: build/trans_presets.java:229 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Calle urbana"
@@ -14620,5 +14951,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:231
+#: build/trans_presets.java:232
 msgid "Edit Residential Street"
 msgstr "Editar calle urbana"
@@ -14643,14 +14974,14 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:611
-#: build/trans_presets.java:632 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "Surface"
 msgstr "Superficie"
@@ -14671,53 +15002,53 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paved"
 msgstr "pavimentada"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "unpaved"
 msgstr "sin pavimentar"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "concrete"
 msgstr "hormigón"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
 msgid "metal"
 msgstr ""
@@ -14731,22 +15062,22 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
-#: build/trans_style.java:3367
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
+#: build/trans_style.java:3375
 msgid "wood"
 msgstr "bosque"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paving_stones"
 msgstr ""
@@ -14754,77 +15085,77 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "cobblestone"
 msgstr "adoquinado"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "gravel"
 msgstr "grava"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "grass"
 msgstr "hierba"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "sand"
 msgstr "arena"
@@ -14832,13 +15163,13 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "ground"
 msgstr "suelo"
@@ -14846,5 +15177,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:246
+#: build/trans_presets.java:247
 msgid "Living Street"
 msgstr "Calle residencial"
@@ -14853,5 +15184,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:249
+#: build/trans_presets.java:250
 msgid "Edit Living Street"
 msgstr "Editar calle residencial"
@@ -14859,5 +15190,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:264
+#: build/trans_presets.java:265
 msgid "Service"
 msgstr "Vía de servicio"
@@ -14866,5 +15197,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:267
+#: build/trans_presets.java:268
 msgid "Edit Serviceway"
 msgstr "Editar vía de servicio"
@@ -14874,18 +15205,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "Serviceway type"
 msgstr "Tipo de vía de servicio"
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "alley"
 msgstr "callejón"
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "driveway"
 msgstr "camino de entrada (a garage, casa, etc.)"
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "parking_aisle"
 msgstr "pasillo de aparcamiento"
@@ -14893,5 +15224,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:284
+#: build/trans_presets.java:285
 msgid "Parking Aisle"
 msgstr "Pasillo de aparcamiento"
@@ -14901,5 +15232,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:288
+#: build/trans_presets.java:289
 msgid "Edit Parking Aisle"
 msgstr "Editar pasillo de aparcamiento"
@@ -14907,5 +15238,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:298
+#: build/trans_presets.java:299
 msgid "Road (Unknown Type)"
 msgstr "Carretera (tipología desconocida)"
@@ -14914,5 +15245,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Edit Road of unknown type"
 msgstr "Editar carretera (tipología desconocida)"
@@ -14921,20 +15252,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:318
+#: build/trans_presets.java:319
 msgid "Road Restrictions"
 msgstr "Restricciones de tráfico"
 
 #. item
-#: build/trans_presets.java:319
+#: build/trans_presets.java:320
 msgid "Edit Road Restrictions"
 msgstr "Editar restricciones de tráfico"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:321
+#: build/trans_presets.java:322
 msgid "Toll"
 msgstr "Peaje"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:322
+#: build/trans_presets.java:323
 msgid "No exit (cul-de-sac)"
 msgstr "Sin salida (cul-de-sac)"
@@ -14947,8 +15278,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:323 build/trans_presets.java:529
-#: build/trans_presets.java:550 build/trans_presets.java:571
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:634
+#: build/trans_presets.java:324 build/trans_presets.java:530
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:593 build/trans_presets.java:614
+#: build/trans_presets.java:635
 msgid "Access"
 msgstr "Acceso"
@@ -15002,29 +15333,29 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1397
-#: build/trans_presets.java:1398 build/trans_presets.java:1399
-#: build/trans_presets.java:1763 build/trans_presets.java:1773
-#: build/trans_presets.java:2397 build/trans_presets.java:2433
-#: build/trans_presets.java:2442 build/trans_presets.java:2443
-#: build/trans_presets.java:2444 build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:1396
+#: build/trans_presets.java:1397 build/trans_presets.java:1400
+#: build/trans_presets.java:1401 build/trans_presets.java:1402
+#: build/trans_presets.java:1767 build/trans_presets.java:1777
+#: build/trans_presets.java:2408 build/trans_presets.java:2444
+#: build/trans_presets.java:2453 build/trans_presets.java:2454
+#: build/trans_presets.java:2455 build/trans_presets.java:2725
 msgid "yes"
 msgstr "sí"
@@ -15037,40 +15368,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:212
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:212
 msgid "private"
 msgstr "privado"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655
 msgid "designated"
 msgstr "designado"
@@ -15083,19 +15414,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:219
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:219
 msgid "destination"
 msgstr "destino"
@@ -15118,71 +15449,71 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:205
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:205
 msgid "permissive"
 msgstr "permisivo"
 
-#: build/trans_presets.java:323 build/trans_presets.java:327
-#: build/trans_presets.java:330 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636
+#: build/trans_presets.java:324 build/trans_presets.java:328
+#: build/trans_presets.java:331 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637
 msgid "agricultural"
 msgstr "agrícola"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
-#: build/trans_presets.java:2433 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1396 build/trans_presets.java:1397
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
+#: build/trans_presets.java:2444 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
+#: build/trans_presets.java:2725
 msgid "no"
 msgstr "no"
 
-#: build/trans_presets.java:326
+#: build/trans_presets.java:327
 msgid "Goods"
 msgstr "Mercancías"
 
-#: build/trans_presets.java:327
+#: build/trans_presets.java:328
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Vehículo de mercacías pesado (hgv)"
@@ -15197,10 +15528,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:328 build/trans_presets.java:651
-#: build/trans_presets.java:858 build/trans_presets.java:891
-#: build/trans_presets.java:913 build/trans_presets.java:950
-#: build/trans_presets.java:963 build/trans_presets.java:975
-#: build/trans_presets.java:987 build/trans_presets.java:999
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:329 build/trans_presets.java:652
+#: build/trans_presets.java:859 build/trans_presets.java:892
+#: build/trans_presets.java:914 build/trans_presets.java:951
+#: build/trans_presets.java:964 build/trans_presets.java:976
+#: build/trans_presets.java:988 build/trans_presets.java:1000
+#: build/trans_presets.java:1040
 msgid "Horse"
 msgstr "Caballo"
@@ -15216,13 +15547,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:329 build/trans_presets.java:530
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:635 build/trans_presets.java:859
-#: build/trans_presets.java:877 build/trans_presets.java:892
-#: build/trans_presets.java:914 build/trans_presets.java:951
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:330 build/trans_presets.java:531
+#: build/trans_presets.java:552 build/trans_presets.java:573
+#: build/trans_presets.java:594 build/trans_presets.java:615
+#: build/trans_presets.java:636 build/trans_presets.java:860
+#: build/trans_presets.java:878 build/trans_presets.java:893
+#: build/trans_presets.java:915 build/trans_presets.java:952
+#: build/trans_presets.java:965 build/trans_presets.java:977
+#: build/trans_presets.java:989 build/trans_presets.java:1001
+#: build/trans_presets.java:1041
 msgid "Motorcycle"
 msgstr "Moto"
@@ -15237,30 +15568,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:330 build/trans_presets.java:531
-#: build/trans_presets.java:552 build/trans_presets.java:573
-#: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:636 build/trans_presets.java:654
-#: build/trans_presets.java:878 build/trans_presets.java:893
-#: build/trans_presets.java:915 build/trans_presets.java:952
-#: build/trans_presets.java:965 build/trans_presets.java:977
-#: build/trans_presets.java:989 build/trans_presets.java:1001
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:331 build/trans_presets.java:532
+#: build/trans_presets.java:553 build/trans_presets.java:574
+#: build/trans_presets.java:595 build/trans_presets.java:616
+#: build/trans_presets.java:637 build/trans_presets.java:655
+#: build/trans_presets.java:879 build/trans_presets.java:894
+#: build/trans_presets.java:916 build/trans_presets.java:953
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1042
 msgid "Motorcar"
 msgstr "Coche"
 
-#: build/trans_presets.java:331
+#: build/trans_presets.java:332
 msgid "Public Service Vehicles (psv)"
 msgstr "Vehiculos de servicio público (psv)"
 
-#: build/trans_presets.java:332
+#: build/trans_presets.java:333
 msgid "Motorboat"
 msgstr "Barco a motor"
 
-#: build/trans_presets.java:333
+#: build/trans_presets.java:334
 msgid "Boat"
 msgstr "Barco"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:336
 msgid "Min. speed (km/h)"
 msgstr "Velocidad mínima (km/h)"
@@ -15268,25 +15599,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:336 build/trans_presets.java:374
+#: build/trans_presets.java:337 build/trans_presets.java:375
 msgid "Max. weight (tonnes)"
 msgstr "Peso máximo (t)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:337
+#: build/trans_presets.java:338
 msgid "Max. Height (meters)"
 msgstr "Altura max. (en metros)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Max. Width (meters)"
 msgstr "Anchura max. (en metros)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:339
+#: build/trans_presets.java:340
 msgid "Max. Length (meters)"
 msgstr "Longitud max. (en metros)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:341
+#: build/trans_presets.java:342
 msgid "Roundabout"
 msgstr "Rotonda"
@@ -15297,5 +15628,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:346
+#: build/trans_presets.java:347
 msgid "Edit Junction"
 msgstr "Editar una intersección"
@@ -15317,9 +15648,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:349 build/trans_presets.java:648
-#: build/trans_presets.java:788 build/trans_presets.java:1135
-#: build/trans_presets.java:1392 build/trans_presets.java:2353
-#: build/trans_presets.java:2901 build/trans_presets.java:2911
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:350 build/trans_presets.java:649
+#: build/trans_presets.java:789 build/trans_presets.java:1137
+#: build/trans_presets.java:1395 build/trans_presets.java:2364
+#: build/trans_presets.java:2913 build/trans_presets.java:2923
+#: build/trans_presets.java:2932
 msgid "Type"
 msgstr "Tipo"
@@ -15339,10 +15670,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:547
+#: build/trans_presets.java:350 build/trans_style.java:547
 #: build/trans_style.java:555
 msgid "motorway"
 msgstr "Autopista"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "motorway_link"
 msgstr "Acceso a autopista"
@@ -15364,10 +15695,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:563
+#: build/trans_presets.java:350 build/trans_style.java:563
 #: build/trans_style.java:571
 msgid "trunk"
 msgstr "Carretera principal"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "trunk_link"
 msgstr "Enlace a carretera principal"
@@ -15389,10 +15720,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:579
+#: build/trans_presets.java:350 build/trans_style.java:579
 #: build/trans_style.java:587
 msgid "primary"
 msgstr "vía primaria"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "primary_link"
 msgstr "acceso a vía primaria"
@@ -15414,5 +15745,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:595
+#: build/trans_presets.java:350 build/trans_style.java:595
 #: build/trans_style.java:603
 msgid "secondary"
@@ -15427,9 +15758,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:349 build/trans_style.java:611
+#: build/trans_presets.java:350 build/trans_style.java:611
 msgid "tertiary"
 msgstr "carretera local"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "unclassified"
 msgstr "carretera sin denominación"
@@ -15443,9 +15774,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:349 build/trans_style.java:3143
+#: build/trans_presets.java:350 build/trans_style.java:3151
 msgid "residential"
 msgstr "calle urbana"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "living_street"
 msgstr "calle residencial"
@@ -15475,10 +15806,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:349 build/trans_style.java:667
-#: build/trans_style.java:4244
+#: build/trans_presets.java:350 build/trans_style.java:667
+#: build/trans_style.java:4252
 msgid "service"
 msgstr "vía de servicio"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "bus_guideway"
 msgstr "carril bus guiado"
@@ -15508,6 +15839,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:349 build/trans_style.java:877
-#: build/trans_style.java:3208 build/trans_style.java:3209
+#: build/trans_presets.java:350 build/trans_style.java:877
+#: build/trans_style.java:3216 build/trans_style.java:3217
 msgid "construction"
 msgstr "en construcción"
@@ -15518,10 +15849,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Edit Bridge"
 msgstr "Editar un puente"
 
 #. item
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "Edit Tunnel"
 msgstr "Editar túnel"
@@ -15529,19 +15860,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:393
+#: build/trans_presets.java:394
 msgid "Ways"
 msgstr "Vías"
 
 #. group "Ways"
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Construction"
 msgstr "En construcción"
 
 #. item
-#: build/trans_presets.java:395
+#: build/trans_presets.java:396
 msgid "Edit Highway Under Construction"
 msgstr "Editar una vía en construcción"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "Junction"
 msgstr "Intersección"
@@ -15557,5 +15888,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:411 build/trans_style.java:895
+#: build/trans_presets.java:412 build/trans_style.java:895
 msgid "roundabout"
 msgstr "rotonda"
@@ -15564,5 +15895,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:417
+#: build/trans_presets.java:418
 msgid "Bridleway"
 msgstr "Camino de herradura"
@@ -15570,5 +15901,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:419
+#: build/trans_presets.java:420
 msgid "Edit Bridleway"
 msgstr "Editar camino de herradura"
@@ -15576,5 +15907,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:435
+#: build/trans_presets.java:436
 msgid "Cycleway"
 msgstr "Vía ciclable"
@@ -15584,10 +15915,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:439
+#: build/trans_presets.java:440
 msgid "Edit Cycleway"
 msgstr "Editar vía ciclable"
 
 #. item "Ways/Cycleway" check "Embankment"
-#: build/trans_presets.java:449
+#: build/trans_presets.java:450
 msgid "Pedestrians"
 msgstr ""
@@ -15595,5 +15926,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Footway"
 msgstr "Vía peatonal"
@@ -15602,10 +15933,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Footway"
 msgstr "Editar vía peatonal"
 
 #. item "Ways/Footway" check "Embankment"
-#: build/trans_presets.java:469
+#: build/trans_presets.java:470
 msgid "Bikes"
 msgstr ""
@@ -15613,5 +15944,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:476
+#: build/trans_presets.java:477
 msgid "Pedestrian"
 msgstr "Calle peatonal"
@@ -15620,5 +15951,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Edit Pedestrian Street"
 msgstr "Editar una vía peatonal"
@@ -15626,5 +15957,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:494
+#: build/trans_presets.java:495
 msgid "Steps"
 msgstr "Escaleras"
@@ -15634,5 +15965,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:498
+#: build/trans_presets.java:499
 msgid "Edit Flight of Steps"
 msgstr "Editar tramo de escaleras"
@@ -15641,5 +15972,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:515
+#: build/trans_presets.java:516
 msgid "Track"
 msgstr "Pista"
@@ -15648,5 +15979,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:518
+#: build/trans_presets.java:519
 msgid "Edit Track"
 msgstr "Editar una pista"
@@ -15654,5 +15985,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:535
+#: build/trans_presets.java:536
 msgid "Track Grade 1"
 msgstr "Pista de grado 1 (pavimentada)"
@@ -15661,5 +15992,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:538
+#: build/trans_presets.java:539
 msgid "Edit Track of grade 1"
 msgstr "Editar pista de grado 1 (pavimentada)"
@@ -15667,5 +15998,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:556
+#: build/trans_presets.java:557
 msgid "Track Grade 2"
 msgstr "Pista de grado 2 (de áridos o zahorra)"
@@ -15674,5 +16005,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:559
+#: build/trans_presets.java:560
 msgid "Edit Track of grade 2"
 msgstr "Editar pista de grado 2 (de áridos o zahorra)"
@@ -15680,5 +16011,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:577
+#: build/trans_presets.java:578
 msgid "Track Grade 3"
 msgstr "Pista de grado 3 (de áridos con vegetación entre rodaduras)"
@@ -15687,5 +16018,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:580
+#: build/trans_presets.java:581
 msgid "Edit Track of grade 3"
 msgstr "Editar pista de grado 3 (de áridos con vegetación entre rodaduras)"
@@ -15693,5 +16024,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:598
+#: build/trans_presets.java:599
 msgid "Track Grade 4"
 msgstr "Pista de grado 4 (de tierra con vegetación entre rodaduras)"
@@ -15700,5 +16031,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:601
+#: build/trans_presets.java:602
 msgid "Edit Track of grade 4"
 msgstr "Editar pista de grado 4 (de tierra con vegetación entre rodaduras)"
@@ -15706,5 +16037,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:619
+#: build/trans_presets.java:620
 msgid "Track Grade 5"
 msgstr "Pista de grado 5 (con rodaduras apenas visibles entre la vegetación)"
@@ -15713,5 +16044,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:622
+#: build/trans_presets.java:623
 msgid "Edit Track of grade 5"
 msgstr ""
@@ -15721,5 +16052,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:641
+#: build/trans_presets.java:642
 msgid "Path"
 msgstr "Camino"
@@ -15728,13 +16059,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:644
+#: build/trans_presets.java:645
 msgid "Edit Path"
 msgstr "Editar camino"
 
-#: build/trans_presets.java:652
+#: build/trans_presets.java:653
 msgid "Ski"
 msgstr "Esquí"
 
-#: build/trans_presets.java:653
+#: build/trans_presets.java:654
 msgid "Snowmobile"
 msgstr "Trineo"
@@ -15744,6 +16075,6 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:670 build/trans_presets.java:1725
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:671 build/trans_presets.java:1729
+#: build/trans_presets.java:1752
 msgid "Hiking"
 msgstr "Sendero"
@@ -15753,5 +16084,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:674
+#: build/trans_presets.java:675
 msgid "Edit Hiking"
 msgstr "Editar sendero"
@@ -15759,5 +16090,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:683
+#: build/trans_presets.java:684
 msgid "Mountain Hiking"
 msgstr "Sendero de montaña"
@@ -15767,5 +16098,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:687
+#: build/trans_presets.java:688
 msgid "Edit Mountain Hiking"
 msgstr "Editar sendero de montaña"
@@ -15773,5 +16104,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:696
+#: build/trans_presets.java:697
 msgid "Demanding Mountain Hiking"
 msgstr "Sendero de montaña exigente"
@@ -15781,5 +16112,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:700
+#: build/trans_presets.java:701
 msgid "Edit Demanding Mountain Hiking"
 msgstr "Editar sendero de montaña exigente"
@@ -15787,5 +16118,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:709
+#: build/trans_presets.java:710
 msgid "Alpine Hiking"
 msgstr "Sendero alpino"
@@ -15795,5 +16126,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:713
+#: build/trans_presets.java:714
 msgid "Edit Alpine Hiking"
 msgstr "Editar sendero alpino"
@@ -15801,5 +16132,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:723
 msgid "Demanding Alpine Hiking"
 msgstr "Sendero alpino exigente"
@@ -15809,5 +16140,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:726
+#: build/trans_presets.java:727
 msgid "Edit Demanding Alpine Hiking"
 msgstr "Editar sendero de montaña exigente"
@@ -15815,5 +16146,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:735
+#: build/trans_presets.java:736
 msgid "Difficult Alpine Hiking"
 msgstr "Sendero alpino difícil"
@@ -15823,5 +16154,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:739
+#: build/trans_presets.java:740
 msgid "Edit Difficult Alpine Hiking"
 msgstr "Editar sendero alpino difícil"
@@ -15829,10 +16160,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:749
+#: build/trans_presets.java:750
 msgid "Waypoints"
 msgstr "Nodos de Vía"
 
 #. group "Waypoints"
-#: build/trans_presets.java:750
+#: build/trans_presets.java:751
 msgid "Motorway Junction"
 msgstr "Salida de autopista"
@@ -15840,15 +16171,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:752
+#: build/trans_presets.java:753
 msgid "Edit Motorway Junction"
 msgstr "Editar salida de autopista"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:757
 msgid "Number"
 msgstr "Número"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:759
 msgid "Services"
 msgstr "Servicios"
@@ -15856,5 +16187,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:761
 msgid "Edit Service Station"
 msgstr "Editar estación de servicio"
@@ -15892,15 +16223,15 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:765 build/trans_presets.java:902
-#: build/trans_presets.java:1382 build/trans_presets.java:1406
-#: build/trans_presets.java:1413 build/trans_presets.java:1419
-#: build/trans_presets.java:1427 build/trans_presets.java:1434
-#: build/trans_presets.java:1761 build/trans_presets.java:1771
-#: build/trans_presets.java:2361 build/trans_presets.java:2368
-#: build/trans_presets.java:2384 build/trans_presets.java:2395
-#: build/trans_presets.java:2403 build/trans_presets.java:2410
-#: build/trans_presets.java:2464 build/trans_presets.java:2512
-#: build/trans_presets.java:2678 build/trans_presets.java:2693
-#: build/trans_presets.java:2732 build/trans_presets.java:3151
+#: build/trans_presets.java:766 build/trans_presets.java:903
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
+#: build/trans_presets.java:1416 build/trans_presets.java:1422
+#: build/trans_presets.java:1430 build/trans_presets.java:1437
+#: build/trans_presets.java:1765 build/trans_presets.java:1775
+#: build/trans_presets.java:2372 build/trans_presets.java:2379
+#: build/trans_presets.java:2395 build/trans_presets.java:2406
+#: build/trans_presets.java:2414 build/trans_presets.java:2421
+#: build/trans_presets.java:2475 build/trans_presets.java:2523
+#: build/trans_presets.java:2689 build/trans_presets.java:2704
+#: build/trans_presets.java:2743 build/trans_presets.java:3163
 msgid "Operator"
 msgstr "Operador"
@@ -15909,5 +16240,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:769
+#: build/trans_presets.java:770
 msgid "Traffic Signal"
 msgstr "Semáforo"
@@ -15917,5 +16248,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:774
 msgid "Pedestrian crossing type"
 msgstr "Tipo de cruce peatonal"
@@ -15924,27 +16255,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "uncontrolled"
 msgstr "sin supervisión"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "traffic_signals"
 msgstr "semáforos"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "island"
 msgstr "isla"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "unmarked"
 msgstr "sin marcar"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:774 build/trans_presets.java:790
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:775 build/trans_presets.java:791
+#: build/trans_presets.java:1334
 msgid "Cross on horseback"
 msgstr "Cruce de caballos"
@@ -15952,6 +16283,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:775 build/trans_presets.java:789
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:776 build/trans_presets.java:790
+#: build/trans_presets.java:1335
 msgid "Cross by bicycle"
 msgstr "Cruce de bicicletas"
@@ -15960,11 +16291,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:776 build/trans_presets.java:791
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:1336
 msgid "Crossing attendant"
 msgstr "Guarda cruces"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:778
 msgid "Crossing type name (UK)"
 msgstr "Tipo de nombre de cruce (Reino Unido)"
@@ -15972,30 +16303,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "zebra"
 msgstr "cebra"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pelican"
 msgstr "pelícano"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "toucan"
 msgstr "tucán"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "puffin"
 msgstr "frailecillo"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pegasus"
 msgstr "pegaso"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "tiger"
 msgstr "tigre"
 
 #. </optional>
-#: build/trans_presets.java:780
+#: build/trans_presets.java:781
 msgid "Stop"
 msgstr "Stop"
@@ -16003,5 +16334,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:783
+#: build/trans_presets.java:784
 msgid "Pedestrian Crossing"
 msgstr "Paso peatonal"
@@ -16010,14 +16341,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:786
+#: build/trans_presets.java:787
 msgid "Edit Crossing"
 msgstr "Editar cruce"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:793
 msgid "Type name (UK)"
 msgstr "Tipo de nombre (Reino Unido)"
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:795
 msgid "Mini-roundabout"
 msgstr "mini-rotonda"
@@ -16028,14 +16359,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "Direction"
 msgstr "Dirección"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "clockwise"
 msgstr "agujas del reloj"
 
-#: build/trans_presets.java:801
+#: build/trans_presets.java:802
 msgid "Turning Circle"
 msgstr "Círculo de giro"
@@ -16045,20 +16376,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:806
+#: build/trans_presets.java:807
 msgid "City Limit"
 msgstr "Límite de ciudad"
 
 #. item
-#: build/trans_presets.java:807
+#: build/trans_presets.java:808
 msgid "Edit City Limit Sign"
 msgstr "Editar la señal de límite de ciudad"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:812
+#: build/trans_presets.java:813
 msgid "Second Name"
 msgstr "Nombre alternativo"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:814
+#: build/trans_presets.java:815
 msgid "Speed Camera"
 msgstr "Radar de tráfico"
@@ -16066,5 +16397,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:817
+#: build/trans_presets.java:818
 msgid "Emergency Phone"
 msgstr "Teléfono de emergencia"
@@ -16072,5 +16403,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:820
+#: build/trans_presets.java:821
 msgid "Incline"
 msgstr "Pendiente"
@@ -16078,5 +16409,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:823
+#: build/trans_presets.java:824
 msgid "Incline Steep"
 msgstr "Pendiente pronunciada"
@@ -16085,10 +16416,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:827
+#: build/trans_presets.java:828
 msgid "Ford"
 msgstr "Vado"
 
 #. item
-#: build/trans_presets.java:828
+#: build/trans_presets.java:829
 msgid "Edit Ford"
 msgstr "Editar vado"
@@ -16096,5 +16427,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:835
+#: build/trans_presets.java:836
 msgid "Mountain Pass"
 msgstr "Puerto de montaña"
@@ -16102,5 +16433,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:837
+#: build/trans_presets.java:838
 msgid "Edit Mountain Pass"
 msgstr "Editar puerto de montaña"
@@ -16112,7 +16443,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:842 build/trans_presets.java:1600
-#: build/trans_presets.java:1745 build/trans_presets.java:2845
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:843 build/trans_presets.java:1604
+#: build/trans_presets.java:1749 build/trans_presets.java:2857
+#: build/trans_presets.java:2864 build/trans_presets.java:2871
 msgid "Elevation"
 msgstr "Altitud"
@@ -16120,5 +16451,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:846
+#: build/trans_presets.java:847
 msgid "Barriers"
 msgstr "Barreras"
@@ -16126,5 +16457,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:849
+#: build/trans_presets.java:850
 msgid "Bollard"
 msgstr "Bolardo"
@@ -16132,5 +16463,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:852
 msgid "Edit Bollard"
 msgstr "Editar un bolardo"
@@ -16175,16 +16506,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:854 build/trans_presets.java:873
-#: build/trans_presets.java:887 build/trans_presets.java:909
-#: build/trans_presets.java:946 build/trans_presets.java:959
-#: build/trans_presets.java:971 build/trans_presets.java:983
-#: build/trans_presets.java:995 build/trans_presets.java:1007
-#: build/trans_presets.java:1017 build/trans_presets.java:1026
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:855 build/trans_presets.java:874
+#: build/trans_presets.java:888 build/trans_presets.java:910
+#: build/trans_presets.java:947 build/trans_presets.java:960
+#: build/trans_presets.java:972 build/trans_presets.java:984
+#: build/trans_presets.java:996 build/trans_presets.java:1008
+#: build/trans_presets.java:1018 build/trans_presets.java:1027
+#: build/trans_presets.java:1036
 msgid "Allowed traffic:"
 msgstr "Tráfico permitido:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:861
+#: build/trans_presets.java:862
 msgid "Cycle Barrier"
 msgstr "Barrera para bicicletas"
@@ -16193,5 +16524,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:865
+#: build/trans_presets.java:866
 msgid "Block"
 msgstr "Bloques"
@@ -16199,5 +16530,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:868
+#: build/trans_presets.java:869
 msgid "Cattle Grid"
 msgstr "Barrera canadiense"
@@ -16205,10 +16536,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:870
+#: build/trans_presets.java:871
 msgid "Edit Cattle Grid"
 msgstr "Editar barrera canadiense"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:880
+#: build/trans_presets.java:881
 msgid "Bus Trap"
 msgstr "Trampa para coches"
@@ -16216,15 +16547,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:883
+#: build/trans_presets.java:884
 msgid "Spikes"
 msgstr "Pinchos"
 
 #. item
-#: build/trans_presets.java:884
+#: build/trans_presets.java:885
 msgid "Edit Spikes"
 msgstr "Editar pinchos"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:896
 msgid "Toll Booth"
 msgstr "Cabina de peaje"
@@ -16232,5 +16563,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:897
+#: build/trans_presets.java:898
 msgid "Edit Toll Booth"
 msgstr "Editar cabina de peaje"
@@ -16238,10 +16569,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:905
+#: build/trans_presets.java:906
 msgid "Border Control"
 msgstr "Aduana"
 
 #. item
-#: build/trans_presets.java:906
+#: build/trans_presets.java:907
 msgid "Edit Border Control"
 msgstr "Editar aduana"
@@ -16251,5 +16582,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:920
+#: build/trans_presets.java:921
 msgid "Hedge"
 msgstr "Seto"
@@ -16258,5 +16589,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:925
 msgid "Fence"
 msgstr "Valla o cerca"
@@ -16265,5 +16596,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:929
 msgid "Wall"
 msgstr "Muro"
@@ -16271,5 +16602,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:931
+#: build/trans_presets.java:932
 msgid "City Wall"
 msgstr "Muralla"
@@ -16278,5 +16609,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:935
+#: build/trans_presets.java:936
 msgid "Retaining Wall"
 msgstr "Muro de contención"
@@ -16288,15 +16619,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:942
+#: build/trans_presets.java:943
 msgid "Entrance"
 msgstr "Entrada"
 
 #. item
-#: build/trans_presets.java:943
+#: build/trans_presets.java:944
 msgid "Edit Entrance"
 msgstr "Editar una entrada"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:954
+#: build/trans_presets.java:955
 msgid "Gate"
 msgstr "Puerta"
@@ -16304,50 +16635,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:956
+#: build/trans_presets.java:957
 msgid "Edit Gate"
 msgstr "Editar puerta"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:967
+#: build/trans_presets.java:968
 msgid "Lift Gate"
 msgstr "Barrera"
 
 #. item
-#: build/trans_presets.java:968
+#: build/trans_presets.java:969
 msgid "Edit Lift Gate"
 msgstr "Editar una barrera"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:979
+#: build/trans_presets.java:980
 msgid "Hampshire Gate"
 msgstr "Portilla de malla metálica"
 
 #. item
-#: build/trans_presets.java:980
+#: build/trans_presets.java:981
 msgid "Edit Hampshire Gate"
 msgstr "Editar portilla de malla metálica"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:991
+#: build/trans_presets.java:992
 msgid "Bump Gate"
 msgstr "Banda reductora de velocidad"
 
 #. item
-#: build/trans_presets.java:992
+#: build/trans_presets.java:993
 msgid "Edit Bump Gate"
 msgstr "Editar banda reductora de velocidad"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:1003
+#: build/trans_presets.java:1004
 msgid "Kissing Gate"
 msgstr "Portilla giratoria"
 
 #. item
-#: build/trans_presets.java:1004
+#: build/trans_presets.java:1005
 msgid "Edit Kissing Gate"
 msgstr "Editar portilla giratoria"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1013
 msgid "Stile"
 msgstr "Escalera de paso"
@@ -16355,25 +16686,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1014
+#: build/trans_presets.java:1015
 msgid "Edit Stile"
 msgstr "Editar una escalera de paso"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1023
 msgid "Turnstile"
 msgstr "Torno"
 
 #. item
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1024
 msgid "Edit Turnstile"
 msgstr "Editar torno"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1032
 msgid "Sally Port"
 msgstr "Poterna"
 
 #. item
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1033
 msgid "Edit Sally Port"
 msgstr "Editar poterna"
@@ -16381,13 +16712,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #.
-#. <separator/>
+#. group "Water"
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1046 build/trans_presets.java:1089
+#: build/trans_presets.java:1047 build/trans_presets.java:1048
+#: build/trans_presets.java:1091
 msgid "Water"
 msgstr "Lámina de agua"
 
 #. group "Water"
-#: build/trans_presets.java:1047
+#: build/trans_presets.java:1049
 msgid "Spring"
 msgstr "Fuente"
@@ -16395,5 +16727,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1049
+#: build/trans_presets.java:1051
 msgid "Edit Spring"
 msgstr "Editar fuente"
@@ -16401,5 +16733,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1056
 msgid "Drain"
 msgstr "Desagüe"
@@ -16407,10 +16739,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1058
 msgid "Edit Drain"
 msgstr "Editar canal de desagüe"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1064
 msgid "Stream"
 msgstr "Riachuelo"
@@ -16418,10 +16750,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1066
 msgid "Edit Stream"
 msgstr "editar un riachuelo"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1072
 msgid "Canal"
 msgstr "Canal"
@@ -16429,10 +16761,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1074
 msgid "Edit Canal"
 msgstr "Editar un canal"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1080
 msgid "River"
 msgstr "Río"
@@ -16442,5 +16774,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1084
 msgid "Edit River"
 msgstr "Editar un río"
@@ -16448,15 +16780,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1093
 msgid "Edit Water"
 msgstr "Editar lámina de agua"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1097
 msgid "Land"
 msgstr "Suelo"
 
 #. item
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1098
 msgid "Edit Land"
 msgstr "Editar suelo"
@@ -16464,15 +16796,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1103
 msgid "Basin"
 msgstr "Cuenca"
 
 #. item
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1104
 msgid "Edit Basin Landuse"
 msgstr "Editar cuenca"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1109
 msgid "Reservoir"
 msgstr "Embalse"
@@ -16480,15 +16812,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1109
+#: build/trans_presets.java:1111
 msgid "Edit Reservoir Landuse"
 msgstr "Editar embalse"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1116
 msgid "Covered Reservoir"
 msgstr "Depósito de agua"
 
 #. item
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1117
 msgid "Edit Covered Reservoir"
 msgstr "Editar depósito de agua"
@@ -16496,5 +16828,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1120
+#: build/trans_presets.java:1122
 msgid "Riverbank"
 msgstr "Ribera (para orillas de ríos anchos)"
@@ -16503,10 +16835,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1125
 msgid "Edit Riverbank"
 msgstr "Editar ribera"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1127
+#: build/trans_presets.java:1129
 msgid "Wetland"
 msgstr "Pantano"
@@ -16517,14 +16849,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1134
 msgid "Edit Wetland"
 msgstr "Editar pantano"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "swamp"
 msgstr "Ciénaga"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "bog"
 msgstr "ciénaga"
@@ -16538,35 +16870,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1135 build/trans_style.java:3384
+#: build/trans_presets.java:1137 build/trans_style.java:3392
 msgid "marsh"
 msgstr "marísma"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "reedbed"
 msgstr "juncal"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "saltmarsh"
 msgstr "saladar"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "tidalflat"
 msgstr "superficie mareal"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "mangrove"
 msgstr "manglar"
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1139
 msgid "Mud"
 msgstr "Lodazal"
 
 #. item
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1140
 msgid "Edit Mud"
 msgstr "Editar lodazal"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1144
 msgid "Beach"
 msgstr "Playa"
@@ -16574,20 +16906,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1144
+#: build/trans_presets.java:1146
 msgid "Edit Beach"
 msgstr "Editar playa"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1150
 msgid "Bay"
 msgstr "Bahía"
 
 #. item
-#: build/trans_presets.java:1149
+#: build/trans_presets.java:1151
 msgid "Edit Bay"
 msgstr "Editar bahía"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1155
 msgid "Cliff"
 msgstr "Acantilado"
@@ -16595,10 +16927,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1157
 msgid "Edit Cliff"
 msgstr "Editar acantilado"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1159
+#: build/trans_presets.java:1161
 msgid "Coastline"
 msgstr "Línea de costa"
@@ -16606,5 +16938,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1163
 msgid "Edit Coastline"
 msgstr "Editar línea de costa"
@@ -16612,5 +16944,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1168
 msgid "Ferry Route"
 msgstr "Ruta de ferry"
@@ -16618,5 +16950,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1170
 msgid "Edit Ferry"
 msgstr "Editar una ruta de ferry"
@@ -16625,5 +16957,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1176
+#: build/trans_presets.java:1178
 msgid "Boatyard"
 msgstr "Astillero"
@@ -16631,10 +16963,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:1180
 msgid "Edit Boatyard"
 msgstr "Editar un astillero"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1185
 msgid "Dock"
 msgstr "Muelle"
@@ -16642,5 +16974,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1187
 msgid "Edit Dock"
 msgstr "Editar un muelle"
@@ -16648,5 +16980,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1193
 msgid "Dam"
 msgstr "Presa"
@@ -16654,15 +16986,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1195
 msgid "Edit Dam"
 msgstr "Editar una presa"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1199
+#: build/trans_presets.java:1201
 msgid "Waterway Point"
 msgstr "Nodo en vía fluvial"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1202
 msgid "Lock Gate"
 msgstr "Esclusa"
@@ -16671,5 +17003,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1206
 msgid "Weir"
 msgstr "Represa"
@@ -16677,20 +17009,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1208
 msgid "Edit Weir"
 msgstr "Editar una represa"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1213
 msgid "Waterfall"
 msgstr "Cascada"
 
 #. item
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1214
 msgid "Edit Waterfall"
 msgstr "Editar una cascada"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1219
 msgid "Turning Point"
 msgstr "Ensanche para giro"
@@ -16699,15 +17031,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1221
+#: build/trans_presets.java:1223
 msgid "Marina"
 msgstr "Puerto deportivo"
 
 #. item
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1224
 msgid "Edit Marina"
 msgstr "Editar puerto deportivo"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1228
 msgid "Pier"
 msgstr "Embarcadero"
@@ -16715,10 +17047,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1230
 msgid "Edit Pier"
 msgstr "Editar embarcadero"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1234
 msgid "Ferry Terminal"
 msgstr "Terminal de ferry"
@@ -16726,10 +17058,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1236
 msgid "Edit Ferry Terminal"
 msgstr "Editar la terminal de ferry"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1240
 msgid "Slipway"
 msgstr "Rampa"
@@ -16739,16 +17071,21 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1244
 msgid "Edit Slipway"
 msgstr "Editar rampa"
 
 #. item "Waterway Point/Slipway" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1250
+#, fuzzy
+msgid "Transport"
+msgstr "Transporte público"
+
+#. group "Transport"
+#: build/trans_presets.java:1251
 msgid "Railway"
 msgstr "Ferrocarril"
 
 #. group "Railway"
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1252
 msgid "Rail"
 msgstr "Vía de tren"
@@ -16756,5 +17093,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:1254
 msgid "Edit Rail"
 msgstr "Ediar vía de tren"
@@ -16784,8 +17121,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "Optional Types"
 msgstr "Tipos opcionales"
@@ -16799,35 +17136,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "yard"
 msgstr "yarda"
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "siding"
 msgstr "vía muerta"
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "spur"
 msgstr "ramal"
 
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1259
 msgid "Narrow Gauge Rail"
 msgstr "Vía estrecha"
 
 #. item
-#: build/trans_presets.java:1257
+#: build/trans_presets.java:1260
 msgid "Edit Narrow Gauge Rail"
 msgstr "Editar vía estrecha"
 
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1265
 msgid "Monorail"
 msgstr "Monoraíl"
@@ -16835,45 +17172,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1267
 msgid "Edit Monorail"
 msgstr "Editar monoraíl"
 
-#: build/trans_presets.java:1269
+#: build/trans_presets.java:1272
 msgid "Preserved"
 msgstr "Vía para tren histórico"
 
 #. item
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1273
 msgid "Edit Preserved Railway"
 msgstr "Editar vía para tren histórico"
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1278
 msgid "Light Rail"
 msgstr "Metro ligero"
 
 #. item
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1279
 msgid "Edit Light Rail"
 msgstr "Editar metro ligero"
 
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1284
 msgid "Subway"
 msgstr "Metro"
 
 #. item
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1285
 msgid "Edit Subway"
 msgstr "Editar metro"
 
-#: build/trans_presets.java:1287
+#: build/trans_presets.java:1290
 msgid "Tram"
 msgstr "Tranvía"
 
 #. item
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1291
 msgid "Edit Tram"
 msgstr "Editar tranvía"
 
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1296
 msgid "Bus Guideway"
 msgstr "Vía para autobús guiado"
@@ -16881,5 +17218,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1295
+#: build/trans_presets.java:1298
 msgid "Edit Bus Guideway"
 msgstr "Editar vía para autobús guiado"
@@ -16888,14 +17225,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1315
 msgid "Disused Rail"
 msgstr "Vía de tren en desuso"
 
 #. item
-#: build/trans_presets.java:1313
+#: build/trans_presets.java:1316
 msgid "Edit Disused Railway"
 msgstr "Editar vía de tren en desuso"
 
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1321
 msgid "Abandoned Rail"
 msgstr "Vía de tren abandonada"
@@ -16904,5 +17241,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1325
 msgid "Level Crossing"
 msgstr "Paso a nivel"
@@ -16911,5 +17248,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1329
 msgid "Crossing"
 msgstr "Paso a nivel peatonal"
@@ -16919,5 +17256,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1333
 msgid "Crossing type"
 msgstr "Tipo de paso"
@@ -16925,5 +17262,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1339
 msgid "Turntable"
 msgstr "Plataforma de giro"
@@ -16932,10 +17269,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1344
 msgid "Aerialway"
 msgstr "Remonte"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1345
 msgid "Chair Lift"
 msgstr "Telesilla"
@@ -16943,10 +17280,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1347
 msgid "Edit Chair Lift"
 msgstr "Editar telesilla"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1351
 msgid "Drag Lift"
 msgstr "Telearrastre"
@@ -16954,10 +17291,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1353
 msgid "Edit Drag Lift"
 msgstr "Editar telearrastre"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1357
 msgid "Cable Car"
 msgstr "Telecabina"
@@ -16965,10 +17302,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1359
 msgid "Edit Cable Car"
 msgstr "Ediatr telecabina"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1360
+#: build/trans_presets.java:1363
 msgid "Gondola"
 msgstr "Góndola"
@@ -16976,5 +17313,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1365
 msgid "Edit Gondola"
 msgstr "Editar góndola"
@@ -16982,5 +17319,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1366 build/trans_presets.java:1461
+#: build/trans_presets.java:1369 build/trans_presets.java:1464
 msgid "Station"
 msgstr "Estación"
@@ -16991,10 +17328,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1368 build/trans_presets.java:1464
+#: build/trans_presets.java:1371 build/trans_presets.java:1467
 msgid "Edit Station"
 msgstr "Editar Estación"
 
 #. group "Car"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1378
 msgid "Fuel"
 msgstr "Gasolinera"
@@ -17004,5 +17341,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1382
 msgid "Edit Fuel"
 msgstr "Ediatr gasolinera"
@@ -17060,32 +17397,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1671 build/trans_presets.java:1678
-#: build/trans_presets.java:1686 build/trans_presets.java:1699
-#: build/trans_presets.java:1713 build/trans_presets.java:1810
-#: build/trans_presets.java:1818 build/trans_presets.java:1909
-#: build/trans_presets.java:1915 build/trans_presets.java:2226
-#: build/trans_presets.java:2250 build/trans_presets.java:2465
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1703
+#: build/trans_presets.java:1717 build/trans_presets.java:1814
+#: build/trans_presets.java:1822 build/trans_presets.java:1919
+#: build/trans_presets.java:1925 build/trans_presets.java:2237
+#: build/trans_presets.java:2261 build/trans_presets.java:2476
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Opening Hours"
 msgstr "Horario de apertura"
@@ -17144,91 +17481,91 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -17243,5 +17580,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1385 build/trans_presets.java:1438
+#: build/trans_presets.java:1388 build/trans_presets.java:1441
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -17251,5 +17588,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1391
 msgid "Edit Parking"
 msgstr "Editar aparcamiento"
@@ -17260,24 +17597,24 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1391 build/trans_presets.java:1762
-#: build/trans_presets.java:1772 build/trans_presets.java:2396
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:1394 build/trans_presets.java:1766
+#: build/trans_presets.java:1776 build/trans_presets.java:2407
+#: build/trans_presets.java:2524
 msgid "Reference number"
 msgstr "Número de referencia"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "multi-storey"
 msgstr "de pisos"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "surface"
 msgstr "al aire libre"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "underground"
 msgstr "subterráneo"
 
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1396
 msgid "Park and Ride"
 msgstr ""
@@ -17286,38 +17623,38 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1394 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
+#: build/trans_presets.java:1397 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
 msgid "Fee"
 msgstr "De pago"
 
 #. <space />
-#: build/trans_presets.java:1396
+#: build/trans_presets.java:1399
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1400
 msgid "Spaces for Disabled"
 msgstr "Plazas para Personas de Movilidad Reducida"
 
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1401
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1402
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1403
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1405
 msgid "Wash"
 msgstr "Limpieza"
 
 #. item
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1406
 msgid "Edit Car Wash"
 msgstr "Editar lavado de vehículos"
@@ -17325,5 +17662,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1408 build/trans_presets.java:1452
+#: build/trans_presets.java:1411 build/trans_presets.java:1455
 msgid "Shop"
 msgstr "Concesionario"
@@ -17331,15 +17668,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1413
 msgid "Edit Car Shop"
 msgstr "Editar concesionario de automóviles"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1418
 msgid "Repair"
 msgstr "Taller"
 
 #. item
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1419
 msgid "Edit Car Repair"
 msgstr "Editar reparación de automóviles"
@@ -17347,5 +17684,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1421 build/trans_presets.java:1445
+#: build/trans_presets.java:1424 build/trans_presets.java:1448
 msgid "Rental"
 msgstr "Alquiler"
@@ -17354,10 +17691,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1427
 msgid "Edit Car Rental"
 msgstr "Editar alquiler de automóviles"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1432
 msgid "Sharing"
 msgstr "Compartido"
@@ -17365,5 +17702,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1434
 msgid "Edit Car Sharing"
 msgstr "Editar automóviles compartidos"
@@ -17371,10 +17708,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Parking"
 msgstr "Editar aparcamiento para bicicletas"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1446
 msgid "Capacity"
 msgstr "Capacidad (Coches)"
@@ -17383,5 +17720,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1448
+#: build/trans_presets.java:1451
 msgid "Edit Bicycle Rental"
 msgstr "Editar alquiler de bicicletas"
@@ -17390,15 +17727,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1458
 msgid "Edit Bicycle Shop"
 msgstr "Editar tienda de bicicletas"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1463
 msgid "Public Transport"
 msgstr "Transporte público"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:1472
 msgid "UIC-Reference"
 msgstr "UIC-Referencia"
@@ -17406,5 +17743,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1475
 msgid "Railway Halt"
 msgstr "Apeadero de ferrocarril"
@@ -17412,5 +17749,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1477
 msgid "Edit Halt"
 msgstr "Editar apeadero"
@@ -17418,5 +17755,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1484
 msgid "Tram Stop"
 msgstr "Parada de tranvía"
@@ -17425,5 +17762,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1484
+#: build/trans_presets.java:1487
 msgid "Edit Tram Stop"
 msgstr "Editar parada de tranvía"
@@ -17431,5 +17768,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1494
 msgid "Railway Platform"
 msgstr "Andén de ferrocarril"
@@ -17438,5 +17775,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1497
 msgid "Edit Railway Platform"
 msgstr "Editar andén de ferrocarril"
@@ -17448,5 +17785,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1497 build/trans_presets.java:1539
+#: build/trans_presets.java:1500 build/trans_presets.java:1542
 msgid "Reference (track number)"
 msgstr "Referencia (número de pista)"
@@ -17454,10 +17791,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1499 build/trans_presets.java:1541
+#: build/trans_presets.java:1502 build/trans_presets.java:1544
 msgid "Area"
 msgstr "Área"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1504
 msgid "Subway Entrance"
 msgstr "Boca de metro"
@@ -17466,10 +17803,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1507
 msgid "Edit Subway Entrance"
 msgstr "Editar boca de metro"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1512
 msgid "Wheelchair"
 msgstr "Silla de ruedas"
@@ -17478,5 +17815,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1517
 msgid "Bus Station"
 msgstr "Estación de autobús"
@@ -17485,5 +17822,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1520
 msgid "Edit Bus Station"
 msgstr "Editar estación de autobús"
@@ -17491,5 +17828,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1526
 msgid "Bus Stop"
 msgstr "Parada de autobús"
@@ -17499,5 +17836,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1530
 msgid "Edit Bus Stop"
 msgstr "Editar parada de autobús"
@@ -17506,6 +17843,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1532 build/trans_presets.java:1785
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:1535 build/trans_presets.java:1789
+#: build/trans_presets.java:2453
 msgid "Shelter"
 msgstr "Refugio"
@@ -17513,10 +17850,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1538
 msgid "Bus Platform"
 msgstr "Andén de autobús"
 
 #. item
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1539
 msgid "Edit Bus Platform"
 msgstr "Editar andén de autobús"
@@ -17524,5 +17861,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1547
 msgid "Taxi"
 msgstr "Taxi"
@@ -17530,5 +17867,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1549
 msgid "Edit Taxi station"
 msgstr "Editar parada de taxi"
@@ -17536,5 +17873,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1554
 msgid "Airport"
 msgstr "Aeropuerto"
@@ -17542,15 +17879,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1556
 msgid "Edit Airport"
 msgstr "Editar Aeropuerto"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1561
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1559
+#: build/trans_presets.java:1562
 msgid "ICAO"
 msgstr "ICAO"
@@ -17558,6 +17895,11 @@
 #. item "Public Transport/Airport" text "ICAO"
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1567
+#, fuzzy
+msgid "Travel"
+msgstr "grava"
+
+#. group "Travel"
+#: build/trans_presets.java:1568
 msgid "Accomodation"
 msgstr "Alojamiento"
@@ -17569,5 +17911,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1565 build/trans_surveyor.java:43
+#: build/trans_presets.java:1569 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -17576,15 +17918,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:1568
+#: build/trans_presets.java:1572
 msgid "Edit Hotel"
 msgstr "Editar hotel"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1575
 msgid "Stars"
 msgstr "Estrellas"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1577
 msgid "Motel"
 msgstr "Motel"
@@ -17592,20 +17934,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1579
 msgid "Edit Motel"
 msgstr "Editar motel"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1583
 msgid "Guest House"
 msgstr "Pensión"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1584
 msgid "Edit Guest House"
 msgstr "Editar pensión"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1588
 msgid "Chalet"
 msgstr "Chalet"
@@ -17613,10 +17955,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1590
 msgid "Edit Chalet"
 msgstr "Editar chalet"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1594
 msgid "Hostel"
 msgstr "Albergue"
@@ -17624,30 +17966,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1592
+#: build/trans_presets.java:1596
 msgid "Edit Hostel"
 msgstr "Editar albergue"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1600
 msgid "Alpine Hut"
 msgstr "Cabaña alpina"
 
 #. item
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1601
 msgid "Edit Alpine Hut"
 msgstr "Editar cabaña alpina"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1606
 msgid "Caravan Site"
 msgstr "Zona de caravanas"
 
 #. item
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1607
 msgid "Edit Caravan Site"
 msgstr "Editar zona de caravanas"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1611
 msgid "Camping Site"
 msgstr "Lugar de acampada"
@@ -17655,10 +17997,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1613
 msgid "Edit Camping Site"
 msgstr "Editar lugar de acampada"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1618
 msgid "Food+Drinks"
 msgstr "Comida+Bebidas"
@@ -17669,5 +18011,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1615 build/trans_surveyor.java:47
+#: build/trans_presets.java:1619 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurante"
@@ -17675,5 +18017,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1621
 msgid "Edit Restaurant"
 msgstr "Editar restaurante"
@@ -17681,5 +18023,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "Cuisine"
 msgstr "Cocina"
@@ -17687,61 +18029,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "italian"
 msgstr "italiano"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "chinese"
 msgstr "chino"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "pizza"
 msgstr "pizzería"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "burger"
 msgstr "hamburguesería"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "greek"
 msgstr "griego"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "german"
 msgstr "alemán"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "indian"
 msgstr "india"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "turkish"
 msgstr "turco"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "asian"
 msgstr "asiático"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "thai"
 msgstr "tailandés"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "mexican"
 msgstr "mexicano"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "japanese"
 msgstr "japonés"
 
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1627
 msgid "Fast Food"
 msgstr "Establecimiento de comida rápida"
@@ -17749,9 +18091,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1629
 msgid "Edit Fast Food Restaurant"
 msgstr "Editar establecimiento de comida rápida"
 
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1635
 msgid "Cafe"
 msgstr "Cafetería"
@@ -17759,9 +18101,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1633
+#: build/trans_presets.java:1637
 msgid "Edit Cafe"
 msgstr "Editar cafetería"
 
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1642
 msgid "Pub"
 msgstr "Bar"
@@ -17769,18 +18111,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1644
 msgid "Edit Pub"
 msgstr "Editar bar"
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1649
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item
-#: build/trans_presets.java:1646
+#: build/trans_presets.java:1650
 msgid "Edit Biergarten"
 msgstr "Editar biergarten"
 
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1655
 msgid "Bar"
 msgstr "Bar"
@@ -17788,9 +18130,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1657
 msgid "Edit Bar"
 msgstr "Editar Bar"
 
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1662
 msgid "Nightclub"
 msgstr "Club nocturno"
@@ -17798,24 +18140,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1664
 msgid "Edit Nightclub"
 msgstr "Editar club nocturno"
 
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1670
 msgid "Tourism"
 msgstr "Turismo"
 
 #. group "Tourism"
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1671
 msgid "Attraction"
 msgstr "Atracción"
 
 #. item
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1672
 msgid "Edit Attraction"
 msgstr "Editar atracción"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1677
 msgid "Museum"
 msgstr "Museo"
@@ -17823,9 +18165,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1679
 msgid "Edit Museum"
 msgstr "Editar museo"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1684
 msgid "Zoo"
 msgstr "Zoo"
@@ -17834,9 +18176,9 @@
 #. <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:1683
+#: build/trans_presets.java:1687
 msgid "Edit Zoo"
 msgstr "Editar zoo"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1692
 msgid "Viewpoint"
 msgstr "Panorámica"
@@ -17844,24 +18186,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1694
 msgid "Edit Viewpoint"
 msgstr "Editar panorámica"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1697
 msgid "Look-Out Tower"
 msgstr "Torre de vigía"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1699
 msgid "Theme Park"
 msgstr "Parque temático"
 
 #. item
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1700
 msgid "Edit Theme Park"
 msgstr "Editar parque temático"
 
-#: build/trans_presets.java:1701
+#: build/trans_presets.java:1705
 msgid "Artwork"
 msgstr "Trabajo artístico"
@@ -17869,5 +18211,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1707
 msgid "Edit Artwork"
 msgstr "Editar trabajo artístico"
@@ -17875,19 +18217,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1712
 msgid "Information Office"
 msgstr "Oficina de información"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1719
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "topo"
 msgstr ""
@@ -17925,5 +18267,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1720 build/trans_style.java:619
+#: build/trans_presets.java:1724 build/trans_style.java:619
 #: build/trans_style.java:635 build/trans_style.java:651
 #: build/trans_style.java:659
@@ -17931,28 +18273,28 @@
 msgstr "calle"
 
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1722 build/trans_presets.java:1738
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1726 build/trans_presets.java:1742
+#: build/trans_presets.java:1786
 msgid "Closer Description"
 msgstr "Descripción detallada"
@@ -17962,5 +18304,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1724 build/trans_presets.java:1747
+#: build/trans_presets.java:1728 build/trans_presets.java:1751
 msgid "Routes shown for:"
 msgstr ""
@@ -17968,6 +18310,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1726 build/trans_presets.java:1749
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1965
 msgid "Cycling"
 msgstr "Ciclismo"
@@ -17975,5 +18317,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1727 build/trans_presets.java:1750
+#: build/trans_presets.java:1731 build/trans_presets.java:1754
 msgid "Mountainbiking"
 msgstr ""
@@ -17981,6 +18323,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1728 build/trans_presets.java:1751
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:1732 build/trans_presets.java:1755
+#: build/trans_presets.java:2019
 msgid "Skiing"
 msgstr "Esquí"
@@ -17988,5 +18330,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1729 build/trans_presets.java:1752
+#: build/trans_presets.java:1733 build/trans_presets.java:1756
 msgid "Riding"
 msgstr ""
@@ -17994,46 +18336,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1734 build/trans_presets.java:1757
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1736
 msgid "Information Board"
 msgstr "Panel informativo"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "history"
 msgstr "historia"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "nature"
 msgstr "naturaleza"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "wildlife"
 msgstr "vida salvaje"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1744
 msgid "Guidepost"
 msgstr "Poste indicador"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1759
 msgid "Information Terminal"
 msgstr "Punto de información"
@@ -18041,29 +18383,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1760 build/trans_presets.java:1770
+#: build/trans_presets.java:1764 build/trans_presets.java:1774
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1769
 msgid "Audioguide"
 msgstr "Audioguía"
 
 #. <space />
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1779
 msgid "Audioguide via mobile phone?"
 msgstr "¿Audioguía a través de telefono móvil?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1780
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1778
+#: build/trans_presets.java:1782
 msgid "Other Information Points"
 msgstr "Otros Puntos de Información"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1790
 msgid "Edit Shelter"
 msgstr "Editar refugio"
@@ -18071,25 +18413,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1789 build/trans_presets.java:1795
+#: build/trans_presets.java:1793 build/trans_presets.java:1799
 msgid "Fireplace"
 msgstr "Barbacoa"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1791
+#: build/trans_presets.java:1795
 msgid "Picnic Site"
 msgstr "Zona de picnic"
 
 #. item
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1796
 msgid "Edit Picnic Site"
 msgstr "Editar zona de picnic"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1802
 msgid "Historic Places"
 msgstr "Lugares históricos"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1799
+#: build/trans_presets.java:1803
 msgid "Castle"
 msgstr "Castillo"
@@ -18098,19 +18440,19 @@
 #. <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:1802
+#: build/trans_presets.java:1806
 msgid "Edit Castle"
 msgstr "Editar castillo"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1810
 msgid "Ruins"
 msgstr "Ruinas"
 
 #. item
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1811
 msgid "Edit Ruins"
 msgstr "Editar ruinas"
 
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1816
 msgid "Archaeological Site"
 msgstr "Lugar arqueológico"
@@ -18119,9 +18461,9 @@
 #. <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:1815
+#: build/trans_presets.java:1819
 msgid "Edit Archaeological Site"
 msgstr "Editar lugar arqueológico"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1824
 msgid "Battlefield"
 msgstr "Campo de batalla"
@@ -18129,5 +18471,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1826
 msgid "Edit Battlefield"
 msgstr "Editar campo de batalla"
@@ -18135,15 +18477,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1831
 msgid "Monument"
 msgstr "Monumento"
 
 #. item
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1832
 msgid "Edit Monument"
 msgstr "Editar monumento"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1836
 msgid "Memorial"
 msgstr "Monumento conmemorativo"
@@ -18151,45 +18493,57 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1838
 msgid "Edit Memorial"
 msgstr "Editar monumento conmemorativo"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1842
 msgid "Wayside Cross"
 msgstr "Crucero"
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1843
 msgid "Edit Wayside Cross"
 msgstr "Editar crucero"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1847
 msgid "Wayside Shrine"
 msgstr "Humilladero"
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1848
 msgid "Edit Wayside Shrine"
 msgstr "Editar humilladero"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1852
+#, fuzzy
+msgid "Boundary Stone"
+msgstr "Fronteras"
+
+#. item
+#: build/trans_presets.java:1853
+#, fuzzy
+msgid "Edit Boundary Stone"
+msgstr "Editar librería"
+
+#. item "Historic Places/Boundary Stone" text "Name"
+#: build/trans_presets.java:1858
 msgid "Leisure"
 msgstr "Ocio"
 
 #. group "Leisure"
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1859
 msgid "Water Park"
 msgstr "Parque acuático"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1860
 msgid "Edit Water Park"
 msgstr "Editar parque acuático"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1864
 msgid "Playground"
 msgstr "Zona de juegos"
@@ -18197,31 +18551,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1866
 msgid "Edit Playground"
 msgstr "Editar zona de juegos"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1870
 msgid "Fishing"
 msgstr "Pesca"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1871
 msgid "Edit Fishing"
 msgstr "Editando pesca"
 
 #. item "Leisure/Fishing" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1877 build/trans_presets.java:2669
+msgid "Sports"
+msgstr "Deportes"
+
+#. group "Sports"
+#: build/trans_presets.java:1878
 msgid "Sport Facilities"
 msgstr "Instalaciones deportivas"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1879
 msgid "Stadium"
 msgstr "Estadio"
 
 #. item
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1880
 msgid "Edit Stadium"
 msgstr "Editar estadio"
@@ -18235,6 +18593,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1874 build/trans_presets.java:1883
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1902 build/trans_presets.java:1911
 msgid "select sport:"
 msgstr "seleccionar deporte:"
@@ -18626,30 +18984,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884 build/trans_style.java:3892
-#: build/trans_style.java:3900 build/trans_style.java:3908
-#: build/trans_style.java:3916 build/trans_style.java:3924
-#: build/trans_style.java:3932
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_style.java:3572 build/trans_style.java:3580
+#: build/trans_style.java:3588 build/trans_style.java:3596
+#: build/trans_style.java:3604 build/trans_style.java:3612
+#: build/trans_style.java:3620 build/trans_style.java:3628
+#: build/trans_style.java:3636 build/trans_style.java:3644
+#: build/trans_style.java:3652 build/trans_style.java:3660
+#: build/trans_style.java:3668 build/trans_style.java:3676
+#: build/trans_style.java:3684 build/trans_style.java:3692
+#: build/trans_style.java:3700 build/trans_style.java:3708
+#: build/trans_style.java:3716 build/trans_style.java:3724
+#: build/trans_style.java:3732 build/trans_style.java:3740
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3764 build/trans_style.java:3772
+#: build/trans_style.java:3780 build/trans_style.java:3788
+#: build/trans_style.java:3796 build/trans_style.java:3804
+#: build/trans_style.java:3812 build/trans_style.java:3820
+#: build/trans_style.java:3828 build/trans_style.java:3836
+#: build/trans_style.java:3844 build/trans_style.java:3852
+#: build/trans_style.java:3860 build/trans_style.java:3868
+#: build/trans_style.java:3876 build/trans_style.java:3884
+#: build/trans_style.java:3892 build/trans_style.java:3900
+#: build/trans_style.java:3908 build/trans_style.java:3916
+#: build/trans_style.java:3924 build/trans_style.java:3932
+#: build/trans_style.java:3940
 msgid "sport"
 msgstr "deporte"
@@ -18659,225 +19017,225 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "multi"
 msgstr "diversos"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "archery"
 msgstr "tiro con arco"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "athletics"
 msgstr "atletismo"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "australian_football"
 msgstr "fútbol australiano"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "baseball"
 msgstr "béisbol"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "basketball"
 msgstr "baloncesto"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "bowls"
 msgstr "bolos"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "canoe"
 msgstr "piragua"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "climbing"
 msgstr "escalada"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket_nets"
 msgstr "Cricket con redes"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cycling"
 msgstr "ciclismo"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "dog_racing"
 msgstr "carrera de perros"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "equestrian"
 msgstr "hípica"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "football"
 msgstr "fútbol"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "gymnastics"
 msgstr "gimnasia"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "horse_racing"
 msgstr "carrera de caballos"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "pelota"
 msgstr "pelota vasca"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "racquet"
 msgstr "raqueta"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "shooting"
 msgstr "tiro"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skateboard"
 msgstr "monopatín"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skating"
 msgstr "patinaje"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skiing"
 msgstr "esquí"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "soccer"
 msgstr "Fútbol"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "swimming"
 msgstr "natación"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "table_tennis"
 msgstr "tenis de mesa"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1888
 msgid "Sports Centre"
 msgstr "Polideportivo"
 
 #. item
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1889
 msgid "Edit Sports Centre"
 msgstr "Editar polideportivo"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1897
 msgid "Pitch"
 msgstr "Campo de juego"
 
 #. item
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1898
 msgid "Edit Pitch"
 msgstr "Editar campo de juego"
 
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1906
 msgid "Racetrack"
 msgstr "Pista de carreras"
 
 #. item
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1907
 msgid "Edit Racetrack"
 msgstr "Editar pista de carreras"
 
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1915
 msgid "Golf Course"
 msgstr "Campo de golf"
 
 #. item
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1916
 msgid "Edit Golf Course"
 msgstr "Editar campo de golf"
 
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1921
 msgid "Miniature Golf"
 msgstr "Mini golf"
 
 #. item
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1922
 msgid "Edit Miniature Golf"
 msgstr "Editar mini golf"
 
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1928
 msgid "Sport"
 msgstr "Deporte"
 
 #. group "Sport"
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1929
 msgid "Multi"
 msgstr "Multi"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1930
 msgid "Edit Multi"
 msgstr "Editar multi"
@@ -18916,183 +19274,183 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "pitch"
 msgstr "campo de juego"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "sports_centre"
 msgstr "Polideportivo"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "stadium"
 msgstr "Estadio"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1935
 msgid "10pin"
 msgstr "Bowling"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1936
 msgid "Edit 10pin"
 msgstr "Editar bowling"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1941
 msgid "Athletics"
 msgstr "Atletismo"
 
 #. item
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1942
 msgid "Edit Athletics"
 msgstr "Editar atletismo"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1947
 msgid "Archery"
 msgstr "Tiro con arco"
 
 #. item
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1948
 msgid "Edit Archery"
 msgstr "Editar tiro con arco"
 
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1953
 msgid "Climbing"
 msgstr "Alpinismo"
 
 #. item
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:1954
 msgid "Edit Climbing"
 msgstr "Editar alpinismo"
 
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1959
 msgid "Canoeing"
 msgstr "Piragüismo"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1960
 msgid "Edit Canoeing"
 msgstr "Editar piragüismo"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1966
 msgid "Edit Cycling"
 msgstr "Editar ciclismo"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1971
 msgid "Dog Racing"
 msgstr "Carreras de perros"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1972
 msgid "Edit Dog Racing"
 msgstr "Editar carreras de perros"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1977
 msgid "Equestrian"
 msgstr "Hípica"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1978
 msgid "Edit Equestrian"
 msgstr "Editar hípica"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1983
 msgid "Horse Racing"
 msgstr "Carreras de caballos"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1984
 msgid "Edit Horse Racing"
 msgstr "Editar carreras de caballos"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1989
 msgid "Gymnastics"
 msgstr "Gimnasia"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1990
 msgid "Edit Gymnastics"
 msgstr "Editar gimnasia"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1995
 msgid "Motor Sports"
 msgstr "Deportes de motor"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1996
 msgid "Edit Motor Sports"
 msgstr "Editar deportes de motor"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2001
 msgid "Skating"
 msgstr "Patinaje"
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2002
 msgid "Edit Skating"
 msgstr "Editar patinaje"
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2007
 msgid "Skateboard"
 msgstr "Monopatín"
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2008
 msgid "Edit Skateboard"
 msgstr "Editar monopatín"
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2013
 msgid "Swimming"
 msgstr "Natación"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2014
 msgid "Edit Swimming"
 msgstr "Editar natación"
@@ -19100,56 +19458,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2021
 msgid "Edit Skiing"
 msgstr "Editar esquí"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "Piste type"
 msgstr "Tipo de pista de esquí"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "downhill"
 msgstr "de descenso"
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "nordic"
 msgstr "nórdico"
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "snow_park"
 msgstr "parque de snowboard"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "Difficulty"
 msgstr "Dificultad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "novice"
 msgstr "novato"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "easy"
 msgstr "fácil"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "intermediate"
 msgstr "intermedio"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "advanced"
 msgstr "avanzado"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "expert"
 msgstr "experto"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "freeride"
 msgstr "fuera de pista"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2028
 msgid "Shooting"
 msgstr "Tiro"
@@ -19157,178 +19515,183 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2030
 msgid "Edit Shooting"
 msgstr "Editar tiro"
 
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2036
 msgid "Sport (Ball)"
 msgstr "Deporte (Pelota)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2037
 msgid "Soccer"
 msgstr "Fútbol"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2038
 msgid "Edit Soccer"
 msgstr "Editar fútbol"
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2043
 msgid "Football"
 msgstr "Fútbol americano"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2044
 msgid "Edit Football"
 msgstr "Editar fútbol americano"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2049
 msgid "Australian Football"
 msgstr "Fútbol australiano"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2050
 msgid "Edit Australian Football"
 msgstr "Editar fútbol australiano"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2055
 msgid "Baseball"
 msgstr "Béisbol"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2056
 msgid "Edit Baseball"
 msgstr "Editar béisbol"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2061
 msgid "Basketball"
 msgstr "Baloncesto"
 
 #. item
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2062
 msgid "Edit Basketball"
 msgstr "Editar baloncesto"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2067
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2068
 msgid "Edit Golf"
 msgstr "Editar golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2071
 msgid "golf_course"
 msgstr "campo de golf"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2073
 msgid "Boule"
 msgstr "Boule"
 
 #. item
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2074
 msgid "Edit Boule"
 msgstr "Editar boule"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2079
 msgid "Bowls"
 msgstr "Bolos"
 
 #. item
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2080
 msgid "Edit Bowls"
 msgstr "Editar bolos"
 
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2085
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2086
 msgid "Edit Cricket"
 msgstr "Edit cricket"
 
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2091
 msgid "Cricket Nets"
 msgstr "Cricket con redes"
 
 #. item
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2092
 msgid "Edit Cricket Nets"
 msgstr "Editar cricket con redes"
 
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2097
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2098
 msgid "Edit Croquet"
 msgstr "Editar croquet"
 
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2103
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2104
 msgid "Edit Hockey"
 msgstr "Editar hockey"
 
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2109
 msgid "Pelota"
 msgstr "Pelota vasca"
 
 #. item
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2110
 msgid "Edit Pelota"
 msgstr "Editar pelota vasca"
 
-#: build/trans_presets.java:2105
+#: build/trans_presets.java:2115
 msgid "Racquet"
 msgstr "Raqueta"
 
 #. item
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2116
 msgid "Edit Racquet"
 msgstr "Editar raqueta"
 
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2121
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2122
 msgid "Edit Rugby"
 msgstr "Editar rugby"
 
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2127
 msgid "Table Tennis"
 msgstr "Ping-pong"
 
 #. item
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2128
 msgid "Edit Table Tennis"
 msgstr "Editar ping-pong"
 
-#: build/trans_presets.java:2123
+#: build/trans_presets.java:2133
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2134
 msgid "Edit Tennis"
 msgstr "Editar tenis"
 
-#. <separator/>
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2141
+#, fuzzy
+msgid "Man-Made"
+msgstr "Construcciones"
+
+#. group "Man-Made"
+#: build/trans_presets.java:2142
 msgid "Buildings"
 msgstr "Edificios"
 
 #. group "Buildings"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2143
 msgid "Building"
 msgstr "Edificio"
@@ -19336,5 +19699,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Public Building"
 msgstr "Edificio público"
@@ -19342,10 +19705,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2148
 msgid "Edit Public Building"
 msgstr "Editar edificio público"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2152
 msgid "Town hall"
 msgstr "Ayuntamiento"
@@ -19353,10 +19716,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2154
 msgid "Edit Town hall"
 msgstr "Editar ayuntamiento"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:2158
 msgid "Embassy"
 msgstr "Embajada"
@@ -19364,10 +19727,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Edit Embassy"
 msgstr "Editar embajada"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2164
 msgid "Courthouse"
 msgstr "Juzgado"
@@ -19376,10 +19739,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:2156
+#: build/trans_presets.java:2167
 msgid "Edit Courthouse"
 msgstr "Editar juzgado"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2171
 msgid "Prison"
 msgstr "Prisión"
@@ -19388,10 +19751,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:2163
+#: build/trans_presets.java:2174
 msgid "Edit Prison"
 msgstr "Editar prisión"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2178
 msgid "Police"
 msgstr "Policía"
@@ -19401,10 +19764,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:2171
+#: build/trans_presets.java:2182
 msgid "Edit Police"
 msgstr "Editar policía"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2186
 msgid "Fire Station"
 msgstr "Parque de bomberos"
@@ -19413,10 +19776,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:2178
+#: build/trans_presets.java:2189
 msgid "Edit Fire Station"
 msgstr "Editar parque de bomberos"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "Post Office"
 msgstr "Oficina postal"
@@ -19424,5 +19787,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Edit Post Office"
 msgstr "Editar oficina postal"
@@ -19430,15 +19793,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2200
 msgid "Kindergarten"
 msgstr "Jardín de infancia"
 
 #. item
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Kindergarten"
 msgstr "Editar jardín de infancia"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2205
 msgid "School"
 msgstr "Escuela"
@@ -19446,10 +19809,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Edit School"
 msgstr "Editar escuela"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2211
 msgid "University"
 msgstr "Universidad"
@@ -19457,10 +19820,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit University"
 msgstr "Editar universidad"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "College"
 msgstr "Instituto de enseñanza secundaria"
@@ -19468,5 +19831,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2219
 msgid "Edit College"
 msgstr "Editar instituto de enseñanza secundaria"
@@ -19474,5 +19837,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2224
 msgid "Cinema"
 msgstr "Cine"
@@ -19481,10 +19844,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:2216
+#: build/trans_presets.java:2227
 msgid "Edit Cinema"
 msgstr "Editar cine"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2231
 msgid "Library"
 msgstr "Biblioteca"
@@ -19493,9 +19856,9 @@
 #. <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:2223
+#: build/trans_presets.java:2234
 msgid "Edit Library"
 msgstr "Editar biblioteca"
 
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Arts Centre"
 msgstr "Centro de arte"
@@ -19503,10 +19866,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Arts Centre"
 msgstr "Editar centro de arte"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Theatre"
 msgstr "Teatro"
@@ -19515,10 +19878,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:2237
+#: build/trans_presets.java:2248
 msgid "Edit Theatre"
 msgstr "Editar teatro"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2252
 msgid "Place of Worship"
 msgstr "Lugar de culto"
@@ -19528,5 +19891,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:2245
+#: build/trans_presets.java:2256
 msgid "Edit Place of Worship"
 msgstr "Editar lugar de culto"
@@ -19535,6 +19898,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "Religion"
 msgstr "Religión"
@@ -19543,66 +19906,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "bahai"
 msgstr "bahaísta"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "buddhist"
 msgstr "budista"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "christian"
 msgstr "cristiana"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "hindu"
 msgstr "hindú"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jain"
 msgstr "jainista"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jewish"
 msgstr "judía"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "muslim"
 msgstr "musulmana"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "sikh"
 msgstr "sijista"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "spiritualist"
 msgstr "espiritualista"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "taoist"
 msgstr "taoista"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "unitarian"
 msgstr "unitarismo"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "zoroastrian"
 msgstr "zoroástrica"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "Denomination"
 msgstr "Confesión"
@@ -19611,81 +19974,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "anglican"
 msgstr "anglicano"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "baptist"
 msgstr "baptista"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "catholic"
 msgstr "católico"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "evangelical"
 msgstr "evangélico"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "jehovahs_witness"
 msgstr "testigos de Jehová"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "lutheran"
 msgstr "luterano"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "methodist"
 msgstr "metodista"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "mormon"
 msgstr "mormón"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "orthodox"
 msgstr "ortodoxo"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "presbyterian"
 msgstr "presbiteriano"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "protestant"
 msgstr "protestante"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "quaker"
 msgstr "cuáquero"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "shia"
 msgstr "chiita"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "sunni"
 msgstr "suní"
 
 #. <separator/>
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2264
 msgid "Addresses"
 msgstr "Direcciones"
@@ -19694,5 +20057,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:2256
+#: build/trans_presets.java:2267
 msgid "Edit Address Information"
 msgstr "Editar direcciones"
@@ -19700,5 +20063,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2269
 msgid "House number"
 msgstr "Número de portal"
@@ -19706,20 +20069,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "House name"
 msgstr "Nombre del edificio"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "City name"
 msgstr "Nombre de la ciudad"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2274
 msgid "Post code"
 msgstr "Código postal"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2275
 msgid "Country code"
 msgstr "Código del país"
@@ -19727,5 +20090,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Address Interpolation"
 msgstr "Direcciones interpoladas"
@@ -19734,5 +20097,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:2270
+#: build/trans_presets.java:2281
 msgid "Edit Address Interpolation"
 msgstr "Editar direcciones interpoladas"
@@ -19740,67 +20103,67 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "Numbering scheme"
 msgstr "Esquema numérico"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "odd"
 msgstr "impares"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "even"
 msgstr "pares"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "alphabetic"
 msgstr "alfabético"
 
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2286
 msgid "Man Made"
 msgstr "Construcciones"
 
 #. group "Man Made"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Works"
 msgstr "Fábrica"
 
 #. item
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2288
 msgid "Edit Works"
 msgstr "Editar fábrica"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2292
 msgid "Tower"
 msgstr "Torre"
 
 #. item
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2293
 msgid "Edit Tower"
 msgstr "Editar torre"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Water Tower"
 msgstr "Torre de agua"
 
 #. item
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2298
 msgid "Edit Water Tower"
 msgstr "Editar torre de agua"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Gasometer"
 msgstr "Gasómetro"
 
 #. item
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2303
 msgid "Edit Gasometer"
 msgstr "Editar gasómetro"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Lighthouse"
 msgstr "Faro"
@@ -19808,10 +20171,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2309
 msgid "Edit Lighthouse"
 msgstr "Editar faro"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Windmill"
 msgstr "Molino de viento"
@@ -19819,10 +20182,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2315
 msgid "Edit Windmill"
 msgstr "Editar molino de viento"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2319
 msgid "Pipeline"
 msgstr "Tubería"
@@ -19830,10 +20193,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Edit Pipeline"
 msgstr "Editar tubería"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2325
 msgid "Wastewater Plant"
 msgstr "Depuradora"
@@ -19843,10 +20206,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:2318
+#: build/trans_presets.java:2329
 msgid "Edit Wastewater Plant"
 msgstr "Editar depuradora"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2333
 msgid "Crane"
 msgstr "Grúa"
@@ -19854,10 +20217,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2335
 msgid "Edit Crane"
 msgstr "Editar grúa"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Beacon"
 msgstr "Baliza"
@@ -19865,10 +20228,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2341
 msgid "Edit Beacon"
 msgstr "Editar baliza"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2345
 msgid "Survey Point"
 msgstr "Vértice geodésico"
@@ -19876,10 +20239,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Edit Survey Point"
 msgstr "Editar vértice geodésico"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2351
 msgid "Surveillance"
 msgstr "Cámara de vigilacia"
@@ -19887,5 +20250,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2353
 msgid "Edit Surveillance Camera"
 msgstr "Editar cámara de vigilancia"
@@ -19893,5 +20256,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Power Generator"
 msgstr "Generador de energía"
@@ -19901,39 +20264,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:2351
+#: build/trans_presets.java:2362
 msgid "Edit Power Generator"
 msgstr "Editar generador de energía"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "wind"
 msgstr "eólico"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "hydro"
 msgstr "hidráulico"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "fossil"
 msgstr "fósil"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "coal"
 msgstr "carbón"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "photovoltaic"
 msgstr "fotovoltaico"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "gas"
 msgstr "gas"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2367
 msgid "Power Station"
 msgstr "Central eléctrica"
@@ -19942,10 +20305,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:2359
+#: build/trans_presets.java:2370
 msgid "Edit Power Station"
 msgstr "Editar central eléctrica"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2374
 msgid "Power Sub Station"
 msgstr "Subestación eléctrica"
@@ -19954,5 +20317,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:2366
+#: build/trans_presets.java:2377
 msgid "Edit Power Sub Station"
 msgstr "Editar subestación eléctrica"
@@ -19960,10 +20323,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2369 build/trans_presets.java:2385
+#: build/trans_presets.java:2380 build/trans_presets.java:2396
 msgid "Line reference"
 msgstr "Línea de referencia"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2382
 msgid "Power Tower"
 msgstr "Torre de electricidad"
@@ -19974,5 +20337,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:2376
+#: build/trans_presets.java:2387
 msgid "Edit Power Tower"
 msgstr "Editar torre de electricidad"
@@ -19980,5 +20343,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2390
 msgid "Power Line"
 msgstr "Tendido eléctrico"
@@ -19987,40 +20350,40 @@
 #. <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:2382
+#: build/trans_presets.java:2393
 msgid "Edit Power Line"
 msgstr "Editar tendido eléctrico"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Voltage"
 msgstr "Voltaje"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2398
 msgid "Amount of Wires"
 msgstr "Número de cables"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Amenities"
 msgstr "Servicios"
 
 #. group "Amenities"
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2402
 msgid "Toilets"
 msgstr "Baños"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2398 build/trans_presets.java:2514
+#: build/trans_presets.java:2409 build/trans_presets.java:2525
 msgid "Note"
 msgstr "Nota"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2411
 msgid "Post Box"
 msgstr "Buzón de correos"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2416
 msgid "Telephone"
 msgstr "Teléfono"
@@ -20029,5 +20392,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:2408
+#: build/trans_presets.java:2419
 msgid "Edit Telephone"
 msgstr "Editar teléfono"
@@ -20035,5 +20398,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2411 build/trans_presets.java:2515
+#: build/trans_presets.java:2422 build/trans_presets.java:2526
 msgid "Coins"
 msgstr "Monedas"
@@ -20041,5 +20404,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2412 build/trans_presets.java:2516
+#: build/trans_presets.java:2423 build/trans_presets.java:2527
 msgid "Notes"
 msgstr "Billetes"
@@ -20047,5 +20410,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2413 build/trans_presets.java:2517
+#: build/trans_presets.java:2424 build/trans_presets.java:2528
 msgid "Electronic purses and Charge cards"
 msgstr "Tarjetas de recarga y monederos electrónicos"
@@ -20053,5 +20416,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2414 build/trans_presets.java:2518
+#: build/trans_presets.java:2425 build/trans_presets.java:2529
 msgid "Debit cards"
 msgstr "Tarjetas de débito"
@@ -20059,15 +20422,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2415 build/trans_presets.java:2519
+#: build/trans_presets.java:2426 build/trans_presets.java:2530
 msgid "Credit cards"
 msgstr "Tarjetas de crédito"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2427
 msgid "Telephone cards"
 msgstr "Tarjetas telefónicas"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2429
 msgid "Recycling"
 msgstr "Reciclaje"
@@ -20076,5 +20439,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:2421
+#: build/trans_presets.java:2432
 msgid "Edit Recycling station"
 msgstr "Editar punto limpio"
@@ -20082,35 +20445,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Batteries"
 msgstr "Baterías"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2435
 msgid "Cans"
 msgstr "Envases"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Clothes"
 msgstr "Ropas"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2437
 msgid "Glass"
 msgstr "Vidrio"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2438
 msgid "Paper"
 msgstr "Papel"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2439
 msgid "Scrap Metal"
 msgstr "Chatarra"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2441
 msgid "Bench"
 msgstr "Banco"
@@ -20119,40 +20482,33 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2433
-#, fuzzy
+#: build/trans_presets.java:2444
 msgid "Backrest"
-msgstr "Retroceder"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "Material"
-msgstr "Monumento conmemorativo"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2434
-#, fuzzy
+#: build/trans_presets.java:2445
 msgid "stone"
-msgstr "ninguno"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "plastic"
-msgstr "lugar"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "Colour"
-msgstr "Color"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "black"
-msgstr "Retroceder"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "brown"
-msgstr "abajo"
+msgstr ""
 
 #. color historic
@@ -20221,39 +20577,35 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2435 build/trans_style.java:3055
-#: build/trans_style.java:3063 build/trans_style.java:3071
-#: build/trans_style.java:3079 build/trans_style.java:3127
-#: build/trans_style.java:3135 build/trans_style.java:3233
-#: build/trans_style.java:3241
+#: build/trans_presets.java:2446 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3135
+#: build/trans_style.java:3143 build/trans_style.java:3241
+#: build/trans_style.java:3249
 msgid "green"
 msgstr "zona verde"
 
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "red"
-msgstr "fin"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr "red"
+
+#: build/trans_presets.java:2446
 msgid "blue"
-msgstr "Valor"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr "azul"
+
+#: build/trans_presets.java:2446
 msgid "white"
-msgstr "lámina de agua"
-
-#: build/trans_presets.java:2436
-#, fuzzy
+msgstr "blanco"
+
+#: build/trans_presets.java:2447
 msgid "Amount of Seats"
-msgstr "Número de cables"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2449
 msgid "Hunting Stand"
 msgstr "Apostadero de caza"
 
 #. item
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2450
 msgid "Edit Hunting Stand"
 msgstr "Editar apostadero de caza"
@@ -20262,30 +20614,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2441 build/trans_presets.java:2902
+#: build/trans_presets.java:2452 build/trans_presets.java:2914
 msgid "Height"
 msgstr "Altura"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "low"
 msgstr "profundidad"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "half"
 msgstr "media"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "full"
 msgstr "total"
 
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2454
 msgid "Hide"
 msgstr "Oculto"
 
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2455
 msgid "Lock"
 msgstr "Esclusa"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Fountain"
 msgstr "Fuente"
@@ -20294,10 +20646,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:2449
+#: build/trans_presets.java:2460
 msgid "Edit Fountain"
 msgstr "Editar fuente"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2464
 msgid "Drinking Water"
 msgstr "Agua potable"
@@ -20306,10 +20658,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:2456
+#: build/trans_presets.java:2467
 msgid "Edit Drinking Water"
 msgstr "Editar agua potable"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2471
 msgid "Baby Hatch"
 msgstr "Caja tibia"
@@ -20317,33 +20669,33 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Baby Hatch"
 msgstr "Editar caja tibia"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2479
 msgid "Shops"
 msgstr "Tiendas"
 
 #. group "Shops"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2480
 msgid "Supermarket"
 msgstr "Supermercado"
 
 #. item
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2481
 msgid "Edit Supermarket"
 msgstr "Editar supermercado"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2486
 msgid "Chemist"
 msgstr "Farmacia"
 
 #. item
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2487
 msgid "Edit Chemist"
 msgstr "Editar farmacia"
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2492
 msgid "Convenience Store"
 msgstr "Tienda de alimentación"
@@ -20351,9 +20703,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Edit Convenience Store"
 msgstr "Editar tienda de alimentación"
 
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2499
 msgid "Kiosk"
 msgstr "Kiosco"
@@ -20361,27 +20713,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Kiosk"
 msgstr "Editar kiosco"
 
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Book Store"
 msgstr "Librería"
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2507
 msgid "Edit Book Store"
 msgstr "Editar librería"
 
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2512
 msgid "Travel Agency"
 msgstr "Agencia de viajes"
 
 #. item
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2513
 msgid "Edit Travel Agency"
 msgstr "Editar agencia de viajes"
 
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2518
 msgid "Vending machine"
 msgstr "Máquina expendedora"
@@ -20389,5 +20741,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Edit Vending machine"
 msgstr "Editar máquina expendedora"
@@ -20395,88 +20747,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "Vending products"
 msgstr "Expendedor automático de productos"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_tickets"
 msgstr "billetes de de transporte público"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_plans"
 msgstr "abonos de transporte público"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "parking_tickets"
 msgstr "billetes de aparcamiento"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "food"
 msgstr "Alimentación"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "drinks"
 msgstr "Bebidas"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "sweets"
 msgstr "Caramelos"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "cigarettes"
 msgstr "Estanco"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "photos"
 msgstr "fotos"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "animal_food"
 msgstr "comida para animales"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "news_papers"
 msgstr "Periódicos"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "toys"
 msgstr "juguetes"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "stamps"
 msgstr "sellos"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "SIM-cards"
 msgstr "Tarjetas SIM"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "telephone_vouchers"
 msgstr "Tarjetas telefónicas"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "vouchers"
 msgstr "Bonos"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "condoms"
 msgstr "condones"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "tampons"
 msgstr "tampones"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "excrement_bags"
 msgstr "Bolsas para excrementos"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 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:2522
+#: build/trans_presets.java:2533
 msgid "Butcher"
 msgstr "Carnicería"
@@ -20484,9 +20836,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2535
 msgid "Edit Butcher"
 msgstr "Editar carnicería"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2540
 msgid "Baker"
 msgstr "Panadería"
@@ -20494,9 +20846,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2542
 msgid "Edit Baker"
 msgstr "Editar panadería"
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2547
 msgid "Florist"
 msgstr "Floristería"
@@ -20504,18 +20856,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Florist"
 msgstr "Editar floristería"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2554
 msgid "Organic"
 msgstr "Tienda de productos orgánicos"
 
 #. item
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Edit Organic Shop"
 msgstr "Editar tienda de productos orgánicos"
 
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2560
 msgid "Alcohol"
 msgstr "Tienda de bebidas alcohólicas"
@@ -20523,54 +20875,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2562
 msgid "Edit Alcohol Shop"
 msgstr "Editar tienda de bebidas alcohólicas"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2567
 msgid "Beverages"
 msgstr "Bebidas"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2568
 msgid "Edit Beverages Shop"
 msgstr "Editar tienda de bebidas"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2573
 msgid "Computer"
 msgstr "Tienda de informática"
 
 #. item
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2574
 msgid "Edit Computer Shop"
 msgstr "Editar tienda de informática"
 
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Electronics"
 msgstr "Electrónica"
 
 #. item
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2580
 msgid "Edit Electronics Shop"
 msgstr "Editar tienda de electrónica"
 
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2585
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2586
 msgid "Edit Hifi Shop"
 msgstr "Editar Tienda Hifi"
 
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2591
 msgid "Furniture"
 msgstr "Muebles"
 
 #. item
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Edit Furniture Shop"
 msgstr "Editar mueblería"
 
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Garden Centre"
 msgstr "Centro de jardinería"
@@ -20578,9 +20930,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2599
 msgid "Edit Garden Centre"
 msgstr "Editar centro de jardinería"
 
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Hardware"
 msgstr "Hardware"
@@ -20588,9 +20940,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2606
 msgid "Edit Hardware Store"
 msgstr "Editar almacén de hardware"
 
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "Do-it-yourself-store"
 msgstr "Almacén de bricolaje"
@@ -20598,54 +20950,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2613
 msgid "Edit Do-it-yourself-store"
 msgstr "Editar almacén de bricolaje"
 
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2618
 msgid "Stationery"
 msgstr "Papelería"
 
 #. item
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2619
 msgid "Edit Stationery Shop"
 msgstr "Editar papelería"
 
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Hairdresser"
 msgstr "Peluquería"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Hairdresser"
 msgstr "Editar peluquería"
 
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Shoes"
 msgstr "Zapatos"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Shoe Shop"
 msgstr "Editar zapatería"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2636
 msgid "Toys"
 msgstr "Juguetes"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit Toy Shop"
 msgstr "Editar juguetería"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Video"
 msgstr "Video"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Video Shop"
 msgstr "Editar tienda de videos"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "Dry Cleaning"
 msgstr "Tintorería"
@@ -20653,9 +21005,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2650
 msgid "Edit Dry Cleaning"
 msgstr "Editar tintorería"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "Laundry"
 msgstr "Lavandería"
@@ -20663,9 +21015,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2657
 msgid "Edit Laundry"
 msgstr "Editar lavandería"
 
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2662
 msgid "Outdoor"
 msgstr "Tienda de actividades al aire libre"
@@ -20673,32 +21025,28 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2664
 msgid "Edit Outdoor Shop"
 msgstr "Editar tienda de actividades al aire libre"
 
-#: build/trans_presets.java:2658
-msgid "Sports"
-msgstr "Deportes"
-
-#. item
-#: build/trans_presets.java:2659
+#. item
+#: build/trans_presets.java:2670
 msgid "Edit Sports Shop"
 msgstr "Editar tienda de material de deportes"
 
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Optician"
 msgstr "Óptica"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Optician"
 msgstr "Editar óptica"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2683
 msgid "Cash"
 msgstr "Dinero en efectivo"
 
 #. group "Cash"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2684
 msgid "Bank"
 msgstr "Banco"
@@ -20706,14 +21054,14 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2686
 msgid "Edit Bank"
 msgstr "Editar banco"
 
-#: build/trans_presets.java:2680 build/trans_presets.java:2689
+#: build/trans_presets.java:2691 build/trans_presets.java:2700
 msgid "Automated Teller Machine"
 msgstr "Cajero automático"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2693
 msgid "Money Exchange"
 msgstr "Cambio de moneda"
@@ -20721,5 +21069,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Edit Money Exchange"
 msgstr "Editar cambio de moneda"
@@ -20727,15 +21075,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2691
+#: build/trans_presets.java:2702
 msgid "Edit Automated Teller Machine"
 msgstr "Editar cajero automático"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2707
 msgid "Health"
 msgstr "Centro médico"
 
 #. group "Health"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2708
 msgid "Doctors"
 msgstr "Médico"
@@ -20743,18 +21091,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2710
 msgid "Edit Doctors"
 msgstr "Editar médico"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2715
 msgid "Dentist"
 msgstr "Dentista"
 
 #. item
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Edit Dentist"
 msgstr "Editar dentista"
 
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2721
 msgid "Pharmacy"
 msgstr "Farmacia/Parafarmacia"
@@ -20762,5 +21110,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Edit Pharmacy"
 msgstr "Editar farmacia/parafarmacia"
@@ -20768,9 +21116,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Dispensing"
 msgstr "Expende con receta médica"
 
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2729
 msgid "Hospital"
 msgstr "Hospital"
@@ -20778,10 +21126,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Edit Hospital"
 msgstr "Editar hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2735
 msgid "Emergency Access Point"
 msgstr "Punto de acceso para emergencias"
@@ -20790,5 +21138,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:2727
+#: build/trans_presets.java:2738
 msgid "Edit Emergency Access Point"
 msgstr "Editar punto de acceso para emergencias"
@@ -20797,20 +21145,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2741
 msgid "Point Number"
 msgstr "Número de punto"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2742
 msgid "Point Name"
 msgstr "Nombre del Punto"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Phone Number"
 msgstr "Número de teléfono"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Utilizar código internacional, como +12-345-67890)"
@@ -20818,5 +21166,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2748
 msgid "Veterinary"
 msgstr "Veterinario"
@@ -20825,55 +21173,60 @@
 #. <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:2740
+#: build/trans_presets.java:2751
 msgid "Edit Veterinary"
 msgstr "Editar veterinario"
 
+#: build/trans_presets.java:2758
+#, fuzzy
+msgid "Geography"
+msgstr "WGS84 Geográfica"
+
 #. group "Places"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2760
 msgid "Continent"
 msgstr "Continente"
 
 #. item
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2761
 msgid "Edit Continent"
 msgstr "Editar continente"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2766
 msgid "Country"
 msgstr "País"
 
 #. item
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2767
 msgid "Edit Country"
 msgstr "Editar país"
 
 #. item "Places/Country" text "Name"
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2772
 msgid "State"
 msgstr "Estado/Provincia"
 
 #. item
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2773
 msgid "Edit State"
 msgstr "Editar estado/provincia"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2778
 msgid "Region"
 msgstr "Región"
 
 #. item
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2779
 msgid "Edit Region"
 msgstr "Editar región"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2784
 msgid "County"
 msgstr "Municipio"
 
 #. item
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2785
 msgid "Edit County"
 msgstr "Editar municipio"
@@ -20881,15 +21234,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2791
 msgid "City"
 msgstr "Ciudad (>100.000 hab.)"
 
 #. item
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2792
 msgid "Edit City"
 msgstr "Editar ciudad (>100.00 hab.)"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2797
 msgid "Town"
 msgstr "Ciudad (10.000 - 100.000 hab.)"
@@ -20897,10 +21250,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2799
 msgid "Edit Town"
 msgstr "Editar ciudad (10.000 - 100.000 hab.)"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2804
 msgid "Suburb"
 msgstr ""
@@ -20910,5 +21263,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2806
 msgid "Edit Suburb"
 msgstr ""
@@ -20917,15 +21270,15 @@
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2811
 msgid "Village"
 msgstr "Población (< 10.000 hab.)"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2812
 msgid "Edit Village"
 msgstr "Editar población (< 10.000 hab.)"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2817
 msgid "Hamlet"
 msgstr ""
@@ -20933,5 +21286,5 @@
 
 #. item
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2818
 msgid "Edit Hamlet"
 msgstr ""
@@ -20941,5 +21294,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2824
 msgid "Locality"
 msgstr "Paraje"
@@ -20947,10 +21300,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2826
 msgid "Edit Locality"
 msgstr "Editar paraje"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2831
 msgid "Island"
 msgstr "Isla"
@@ -20958,10 +21311,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2833
 msgid "Edit Island"
 msgstr "Editar isla"
 
 #. item "Places/Island" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2838
 msgid "Islet"
 msgstr "Islote"
@@ -20969,5 +21322,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2840
 msgid "Edit Islet"
 msgstr "Editar islote"
@@ -20975,5 +21328,5 @@
 #. item "Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2846
 msgid "Cave Entrance"
 msgstr "Entrada de cueva"
@@ -20981,10 +21334,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2848
 msgid "Edit Cave Entrance"
 msgstr "Editar entrada de cueva"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2852
 msgid "Peak"
 msgstr "Pico"
@@ -20992,10 +21345,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2854
 msgid "Edit Peak"
 msgstr "Editar pico"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2859
 msgid "Glacier"
 msgstr "Glaciar"
@@ -21003,10 +21356,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2861
 msgid "Edit Glacier"
 msgstr "Editar glaciar"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2854
+#: build/trans_presets.java:2866
 msgid "Volcano"
 msgstr "Volcán"
@@ -21014,70 +21367,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2868
 msgid "Edit Volcano"
 msgstr "Editar volcán"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2874
 msgid "Boundaries"
 msgstr "Fronteras"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2875
 msgid "National"
 msgstr "Nacional"
 
 #. item
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2876
 msgid "Edit National Boundary"
 msgstr "Editar frontera nacional"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2881
 msgid "Administrative"
 msgstr "Administrativa"
 
 #. item
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2882
 msgid "Edit Administrative Boundary"
 msgstr "Editar frontera administrativa"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:2887
 msgid "Civil"
 msgstr "Civil"
 
 #. item
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2888
 msgid "Edit Civil Boundary"
 msgstr "Editar frontera civil"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2893
 msgid "Political"
 msgstr "Político"
 
 #. item
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2894
 msgid "Edit Political Boundary"
 msgstr "Editar frontera política"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2899
 msgid "National park"
 msgstr "Parque Nacional"
 
 #. item
-#: build/trans_presets.java:2888
+#: build/trans_presets.java:2900
 msgid "Edit National Park Boundary"
 msgstr "Editar límites del parque nacional"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2906
 msgid "Land use"
 msgstr "Uso del suelo"
 
 #. group "Land use"
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2907
 msgid "Tree"
 msgstr "Árbol"
@@ -21086,15 +21439,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:2898
+#: build/trans_presets.java:2910
 msgid "Edit Tree"
 msgstr "Editar árbol"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2915
 msgid "Botanical Name"
 msgstr "Nombre botánico"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2917
 msgid "Wood"
 msgstr "Bosque"
@@ -21103,5 +21456,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:2908
+#: build/trans_presets.java:2920
 msgid "Edit Wood"
 msgstr "Editar bosque"
@@ -21109,17 +21462,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "coniferous"
 msgstr "conífera"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "deciduous"
 msgstr "caducifolio"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "mixed"
 msgstr "mixto"
 
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2925
 msgid "Forest"
 msgstr "Plantación forestal"
@@ -21128,14 +21481,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:2916
+#: build/trans_presets.java:2928
 msgid "Edit Forest Landuse"
 msgstr "Editar zona forestal"
 
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2934
 msgid "Nature Reserve"
 msgstr "Reserva natural"
 
 #. item
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2935
 msgid "Edit Nature Reserve"
 msgstr "Editar reserva natural"
@@ -21143,25 +21496,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2940
 msgid "Scree"
 msgstr "Pedregal"
 
 #. item
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2941
 msgid "Edit Scree"
 msgstr "Editar pedregal"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2945
 msgid "Scrub"
 msgstr "Matorral"
 
 #. item
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2946
 msgid "Edit Scrub"
 msgstr "Editar matorral"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2950
 msgid "Fell"
 msgstr "Braña"
@@ -21169,10 +21522,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2952
 msgid "Edit Fell"
 msgstr "Editar braña"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2956
 msgid "Heath"
 msgstr "Brezal o landa"
@@ -21180,5 +21533,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2958
 msgid "Edit Heath"
 msgstr "Editar brezal o landa"
@@ -21186,5 +21539,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2963
 msgid "Farmyard"
 msgstr "Edificio agrario"
@@ -21193,45 +21546,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:2954
+#: build/trans_presets.java:2966
 msgid "Edit Farmyard Landuse"
 msgstr "Editar edificio agrario"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2971
 msgid "Farmland"
 msgstr "Tierra de labranza"
 
 #. item
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2972
 msgid "Edit Farmland Landuse"
 msgstr "Editar tierra de labranza"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2977
 msgid "Meadow"
 msgstr "Prado"
 
 #. item
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2978
 msgid "Edit Meadow Landuse"
 msgstr "Editar prado"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2983
 msgid "Vineyard"
 msgstr "Viñedo"
 
 #. item
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2984
 msgid "Edit Vineyard Landuse"
 msgstr "Editar viñedo"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:2989
 msgid "Allotments"
 msgstr "Huertos de ocio"
 
 #. item
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2990
 msgid "Edit Allotments Landuse"
 msgstr "Editar zona de huertos de ocio"
@@ -21239,25 +21592,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2996
 msgid "Garden"
 msgstr "Jardín"
 
 #. item
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2997
 msgid "Edit Garden"
 msgstr "Editar jardín"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3001
 msgid "Grass"
 msgstr "Pastizal"
 
 #. item
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3002
 msgid "Edit Grass Landuse"
 msgstr "Editar pastizal"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3007
 msgid "Village Green"
 msgstr "Parque municipal"
@@ -21265,10 +21618,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3009
 msgid "Edit Village Green Landuse"
 msgstr "Editar parque municipal"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3014
 msgid "Common"
 msgstr "Espacio de uso común (plazas, alamedas, bulevares, etc.)"
@@ -21276,20 +21629,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3004
+#: build/trans_presets.java:3016
 msgid "Edit Common"
 msgstr "Editar espacio de uso común"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3020
 msgid "Park"
 msgstr "Parque"
 
 #. item
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3021
 msgid "Edit Park"
 msgstr "Editar parque"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3025
 msgid "Recreation Ground"
 msgstr "Área de esparcimiento"
@@ -21297,5 +21650,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3027
 msgid "Edit Recreation Ground Landuse"
 msgstr "Editar área de esparcimiento"
@@ -21303,15 +21656,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3033
 msgid "Residential area"
 msgstr "Área residencial"
 
 #. item
-#: build/trans_presets.java:3022
+#: build/trans_presets.java:3034
 msgid "Edit Residential Landuse"
 msgstr "Editar suelo residencial"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3039
 msgid "Graveyard"
 msgstr "Cementario"
@@ -21319,9 +21672,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3029
+#: build/trans_presets.java:3041
 msgid "Edit Graveyard"
 msgstr "Editar cementerio"
 
-#: build/trans_presets.java:3035
+#: build/trans_presets.java:3047
 msgid "Cemetery"
 msgstr "Cementerio"
@@ -21329,39 +21682,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3049
 msgid "Edit Cemetery Landuse"
 msgstr "Editar cementerio"
 
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3056
 msgid "Retail"
 msgstr "Comercios"
 
 #. item
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3057
 msgid "Edit Retail Landuse"
 msgstr "Editar comercios"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3062
 msgid "Commercial"
 msgstr "Oficinas"
 
 #. item
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3063
 msgid "Edit Commercial Landuse"
 msgstr "Editar oficinas"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3056
+#: build/trans_presets.java:3068
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3069
 msgid "Edit Industrial Landuse"
 msgstr "Editar suelo industrial"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3074
 msgid "Railway land"
 msgstr "Zona ferroviaria"
@@ -21369,15 +21722,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3076
 msgid "Edit Railway Landuse"
 msgstr "Editar zona ferroviaria"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3081
 msgid "Military"
 msgstr "Militar"
 
 #. item
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3082
 msgid "Edit Military Landuse"
 msgstr "Editar área militar"
@@ -21385,55 +21738,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3088
 msgid "Construction area"
 msgstr "Zona en construcción"
 
 #. item
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3089
 msgid "Edit Construction Landuse"
 msgstr "Editar zona en construcción"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3094
 msgid "Brownfield"
 msgstr "Baldío"
 
 #. item
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3095
 msgid "Edit Brownfield Landuse"
 msgstr "Editar terreno baldío"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3100
 msgid "Greenfield"
 msgstr "Suelo en construcción"
 
 #. item
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3101
 msgid "Edit Greenfield Landuse"
 msgstr "Editar suelo en contrucción"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3106
 msgid "Landfill"
 msgstr "Vertedero"
 
 #. item
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3107
 msgid "Edit Landfill Landuse"
 msgstr "Editar vertedero"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3112
 msgid "Quarry"
 msgstr "Cantera"
 
 #. item
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3113
 msgid "Edit Quarry Landuse"
 msgstr "Editar cantera"
 
 #. group "Relations"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3122
 msgid "Multipolygon"
 msgstr "Multipolígono"
@@ -21443,5 +21796,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:3114
+#: build/trans_presets.java:3126
 msgid "Edit Multipolygon"
 msgstr "Editar multipolígono"
@@ -21450,10 +21803,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3132
 msgid "outer segment"
 msgstr "segmento exterior"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3133
 msgid "inner segment"
 msgstr "segmento interior"
@@ -21461,5 +21814,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3136
 msgid "Turn restriction"
 msgstr "Restricción de giro"
@@ -21468,5 +21821,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3139
 msgid "Edit Turn Restriction"
 msgstr "Editar restricción de giro"
@@ -21474,34 +21827,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "Restriction"
 msgstr "Restricción"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_left_turn"
 msgstr "prohibido girar a la izquierda"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_right_turn"
 msgstr "prohibido girar a la derecha"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_straight_on"
 msgstr "prohibido continuar recto"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_u_turn"
 msgstr "prohibido giro en U"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_right_turn"
 msgstr "solo giro a la derecha"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_left_turn"
 msgstr "solo giro a la izquierda"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_straight_on"
 msgstr "solo recto"
@@ -21510,15 +21863,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3146
 msgid "from way"
 msgstr "desde la vía"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3147
 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:3136
+#: build/trans_presets.java:3148
 msgid "to way"
 msgstr "a la vía"
@@ -21526,5 +21879,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3151
 msgid "Route"
 msgstr "Ruta"
@@ -21533,5 +21886,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3154
 msgid "Edit Route"
 msgstr "Editar ruta"
@@ -21539,5 +21892,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "Route type"
 msgstr "Tipo de ruta"
@@ -21609,5 +21962,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3144 build/trans_style.java:233
+#: build/trans_presets.java:3156 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -21616,17 +21969,17 @@
 msgstr "bicicleta"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "road"
 msgstr "carretera"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ski"
 msgstr "ski"
@@ -21679,5 +22032,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3144 build/trans_style.java:247
+#: build/trans_presets.java:3156 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -21686,13 +22039,13 @@
 msgstr "pie"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "hiking"
 msgstr "senderismo"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "tram"
 msgstr "tranvía"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "detour"
 msgstr "desvío"
@@ -21706,10 +22059,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3144 build/trans_style.java:1206
+#: build/trans_presets.java:3156 build/trans_style.java:1206
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3159
 msgid "Symbol description"
 msgstr "Descripción del símbolo"
@@ -21717,31 +22070,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3162
 msgid "Network"
 msgstr "Red"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "Route state"
 msgstr "Ruta estatal"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "proposed"
 msgstr "Propuesto"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "alternate"
 msgstr "Suplente"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "temporary"
 msgstr "temporal"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "connection"
 msgstr "Conexión"
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "Color (hex)"
 msgstr "Color (hex)"
@@ -21750,30 +22103,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3168
 msgid "route segment"
 msgstr "segmento de la ruta"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3169
 msgid "forward segment"
 msgstr "segmento siguiente"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3170
 msgid "backward segment"
 msgstr "segmento anterior"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3171
 msgid "halt point"
 msgstr "punto de detención"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3172
 msgid "forward halt point"
 msgstr "próximo punto de parada"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3173
 msgid "backward halt point"
 msgstr "anterior punto de parada"
@@ -22211,11 +22564,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3375 build/trans_style.java:3376
-#: build/trans_style.java:3946 build/trans_style.java:4254
-#: build/trans_style.java:4263 build/trans_style.java:4272
-#: build/trans_style.java:4281 build/trans_style.java:4290
-#: build/trans_style.java:4299 build/trans_style.java:4308
-#: build/trans_style.java:4309 build/trans_style.java:4318
-#: build/trans_style.java:4327
+#: build/trans_style.java:3383 build/trans_style.java:3384
+#: build/trans_style.java:3954 build/trans_style.java:4262
+#: build/trans_style.java:4271 build/trans_style.java:4280
+#: build/trans_style.java:4289 build/trans_style.java:4298
+#: build/trans_style.java:4307 build/trans_style.java:4316
+#: build/trans_style.java:4317 build/trans_style.java:4326
+#: build/trans_style.java:4335
 msgid "deprecated"
 msgstr "obsoleto"
@@ -24239,5 +24592,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3294
+#: build/trans_style.java:3302
 msgid "light_water"
 msgstr "agua (claro)"
@@ -24919,8 +25272,17 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="boundary_stone"/>
+#. <icon annotate="true" src="historic/boundary_stone.png"/>
 #: build/trans_style.java:2990 build/trans_style.java:2998
 #: build/trans_style.java:3006 build/trans_style.java:3014
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
+#: build/trans_style.java:3054
 msgid "historic"
 msgstr "patrimonio histórico"
@@ -24934,5 +25296,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3095
 msgid "quarry"
 msgstr "cantera"
@@ -24946,5 +25308,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "landfill"
 msgstr "vertedero"
@@ -24966,5 +25328,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3103 build/trans_style.java:3111
+#: build/trans_style.java:3111 build/trans_style.java:3119
 msgid "basin"
 msgstr "cuenca"
@@ -24978,5 +25340,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3127
 msgid "forest"
 msgstr "plantación forestal"
@@ -24990,5 +25352,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3159
 msgid "farmyard"
 msgstr "edificio agrario"
@@ -25011,5 +25373,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3160 build/trans_style.java:3168
+#: build/trans_style.java:3168 build/trans_style.java:3176
 msgid "retail"
 msgstr "venta al por menor"
@@ -25023,5 +25385,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3176
+#: build/trans_style.java:3184
 msgid "industrial"
 msgstr "industrial"
@@ -25035,5 +25397,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "brownfield"
 msgstr "área postindustrial degradada"
@@ -25047,5 +25409,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "greenfield"
 msgstr "área rururbana"
@@ -25059,5 +25421,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "railland"
 msgstr "zona ferroviaria"
@@ -25114,7 +25476,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3217 build/trans_style.java:3252
-#: build/trans_style.java:3260 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3225 build/trans_style.java:3260
+#: build/trans_style.java:3268 build/trans_style.java:3276
+#: build/trans_style.java:3284 build/trans_style.java:3292
 msgid "military"
 msgstr "zona militar"
@@ -25128,5 +25490,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3225
+#: build/trans_style.java:3233
 msgid "cemetery"
 msgstr "cementerio"
@@ -25139,5 +25501,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3301
+#: build/trans_style.java:3309
 msgid "peak"
 msgstr "pico"
@@ -25152,5 +25514,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3310
+#: build/trans_style.java:3318
 msgid "glacier"
 msgstr "glaciar"
@@ -25164,5 +25526,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "volcano"
 msgstr "volcán"
@@ -25217,8 +25579,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3326 build/trans_style.java:3327
-#: build/trans_style.java:3335 build/trans_style.java:3351
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440
+#: build/trans_style.java:3334 build/trans_style.java:3335
+#: build/trans_style.java:3343 build/trans_style.java:3359
+#: build/trans_style.java:3432 build/trans_style.java:3440
+#: build/trans_style.java:3448
 msgid "natural"
 msgstr "espacio natural"
@@ -25232,5 +25594,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3343
+#: build/trans_style.java:3351
 msgid "scrub"
 msgstr "matorral"
@@ -25244,5 +25606,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3359
+#: build/trans_style.java:3367
 msgid "heath"
 msgstr "monte"
@@ -25256,5 +25618,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3408
+#: build/trans_style.java:3416
 msgid "mud"
 msgstr "lodazal"
@@ -25268,5 +25630,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "beach"
 msgstr "playa"
@@ -25344,8 +25706,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
-#: build/trans_style.java:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496 build/trans_style.java:3504
+#: build/trans_style.java:3512 build/trans_style.java:3520
 msgid "route"
 msgstr "ruta"
@@ -25393,7 +25755,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3522 build/trans_style.java:3530
-#: build/trans_style.java:3538 build/trans_style.java:3546
-#: build/trans_style.java:3554
+#: build/trans_style.java:3530 build/trans_style.java:3538
+#: build/trans_style.java:3546 build/trans_style.java:3554
+#: build/trans_style.java:3562
 msgid "boundary"
 msgstr "frontera"
@@ -25543,11 +25905,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090
+#: build/trans_style.java:4002 build/trans_style.java:4010
+#: build/trans_style.java:4018 build/trans_style.java:4026
+#: build/trans_style.java:4034 build/trans_style.java:4042
+#: build/trans_style.java:4050 build/trans_style.java:4058
+#: build/trans_style.java:4066 build/trans_style.java:4074
+#: build/trans_style.java:4082 build/trans_style.java:4090
+#: build/trans_style.java:4098
 msgid "place"
 msgstr "lugar"
@@ -25595,6 +25957,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4207 build/trans_style.java:4214
-#: build/trans_style.java:4221 build/trans_style.java:4228
+#: build/trans_style.java:4215 build/trans_style.java:4222
+#: build/trans_style.java:4229 build/trans_style.java:4236
 msgid "address"
 msgstr "dirección"
@@ -25902,73 +26264,58 @@
 msgstr ""
 
-#~ msgid "All the ways were empty"
-#~ msgstr "Todas la vías están vacías"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "¿Unir nodos con diferentes relaciones?"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Unir de todos modos"
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
+#~ msgid "Close current changeset"
+#~ msgstr "Cerrar el actual conjunto de cambios"
+
+#~ msgid "There is currently no changeset open."
+#~ msgstr "Actualmente no hay un conjunto cambios abierto."
+
+#~ msgid "- running version is {0}"
+#~ msgstr "- la versión en ejecución es la {0}"
+
+#~ msgid "Use a new changeset and close it"
+#~ msgstr "Usar un nuevo conjunto de cambio y cerrarlo"
+
+#~ msgid "Use the existing changeset {0} and close it after upload"
 #~ msgstr ""
-#~ "Los nodos seleccionados pertenecen a distintas relaciones. ¿Seguro que "
-#~ "quiere unirlos?"
+#~ "Usar el conjunto de cambios existente {0} y cerrarlo después de subir"
+
+#~ msgid "Move"
+#~ msgstr "Mover"
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Extensión de archivo desconocida."
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr "Ningún documento abierto luego nada por grabar."
+
+#~ msgid "Email"
+#~ msgstr "Correo Electrónico"
+
+#~ msgid "Resolve Conflicts"
+#~ msgstr "Resolver conflictos"
+
+#~ msgid "There were conflicts during import."
+#~ msgstr "Existieron conflictos durante la importación"
+
+#~ msgid "Cannot open preferences directory: {0}"
+#~ msgstr "No se puede abrir el directorio de preferencias: {0}"
+
+#~ msgid "Contacting the OSM server..."
+#~ msgstr "Contactando con el servidor OSM..."
+
+#~ msgid "their version:"
+#~ msgstr "su versión:"
+
+#~ msgid "resolved version:"
+#~ msgstr "versión resuelta:"
+
+#~ msgid "my version:"
+#~ msgstr "mi versión:"
+
+#~ msgid "Object"
+#~ msgstr "Objeto"
 
 #~ msgid "Unknown version"
 #~ msgstr "Versión desconocida"
-
-#~ msgid "Version number missing from OSM data"
-#~ msgstr "Falta número de versión en los datos OSM"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "Encontrado elemento <nd> en una no Vía"
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> no tiene ref"
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Encontrada una etiqueta <miembro> fuera de una relación."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "id del nodo mal formado"
-
-#~ msgid "Move"
-#~ msgstr "Mover"
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Extensión de archivo desconocida."
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Ningún documento abierto luego nada por grabar."
-
-#~ msgid "Email"
-#~ msgstr "Correo Electrónico"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Resolver conflictos"
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Existieron conflictos durante la importación"
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "No se puede abrir el directorio de preferencias: {0}"
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Contactando con el servidor OSM..."
-
-#~ msgid "their version:"
-#~ msgstr "su versión:"
-
-#~ msgid "resolved version:"
-#~ msgstr "versión resuelta:"
-
-#~ msgid "my version:"
-#~ msgstr "mi versión:"
-
-#~ msgid "Object"
-#~ msgstr "Objeto"
 
 #~ msgid "position"
@@ -26011,4 +26358,10 @@
 #~ msgid "Charge"
 #~ msgstr "Pago"
+
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "Encontrado elemento <nd> en una no Vía"
+
+#~ msgid "<nd> has zero ref"
+#~ msgstr "<nd> no tiene ref"
 
 #~ msgid "{0} object has conflicts:"
@@ -26066,7 +26419,4 @@
 #~ msgstr "Añadir todos los objetos"
 
-#~ msgid "Add Selected"
-#~ msgstr "Añadir seleccionado"
-
 #~ msgid "Click Reload to refresh list"
 #~ msgstr "clique Recargar para refrescar la lista"
@@ -26109,4 +26459,7 @@
 #~ msgstr "Rotar"
 
+#~ msgid "All the ways were empty"
+#~ msgstr "Todas la vías están vacías"
+
 #~ msgid "Some of the nodes are (almost) in the line"
 #~ msgstr "Algunos nodos están (casi) en la línea"
@@ -26179,4 +26532,10 @@
 #~ msgid "Validate"
 #~ msgstr "Validar"
+
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "Encontrada una etiqueta <miembro> fuera de una relación."
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "id del nodo mal formado"
 
 #~ msgid ""
@@ -26273,4 +26632,7 @@
 #~ msgid "Delete and Download"
 #~ msgstr "Eliminar y descargar"
+
+#~ msgid "Merge Anyway"
+#~ msgstr "Unir de todos modos"
 
 #~ msgid "Continue anyway"
@@ -26470,4 +26832,7 @@
 #~ msgstr "La subida de datos ha fallado por una razón desconocida"
 
+#~ msgid "Version number missing from OSM data"
+#~ msgstr "Falta número de versión en los datos OSM"
+
 #~ msgid ""
 #~ "Please select at least one node, way or relation. Only already uploaded "
@@ -26476,4 +26841,14 @@
 #~ "Seleccione al menos un nodo, víaa o relación. Solamente los elementos "
 #~ "previamente enviados tienen historial."
+
+#~ msgid ""
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
+#~ msgstr ""
+#~ "Los nodos seleccionados pertenecen a distintas relaciones. ¿Seguro que "
+#~ "quiere unirlos?"
+
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "¿Unir nodos con diferentes relaciones?"
 
 #~ msgid "Undeleting Way..."
@@ -26523,7 +26898,4 @@
 #~ "{3}</strong> para cancelar.<br>"
 
-#~ msgid "Delete mine"
-#~ msgstr "Borrar lo mío"
-
 #~ msgid "Checking whether node {0} is gone ..."
 #~ msgstr "Comprobando si falta el nodo {0}..."
@@ -26561,7 +26933,4 @@
 #~ msgstr "Validar la selección actual o el conjunto de datos completado"
 
-#~ msgid "Change {0} {1}"
-#~ msgstr "Cambiar {0} {1}"
-
 #~ msgid "WGS84 Geographisch"
 #~ msgstr "WGS84 Geográfico"
@@ -26578,7 +26947,4 @@
 #~ msgid "Adjust the position of the WMS layer (raster images only)"
 #~ msgstr "Ajustar la posición de la capa WMS (sólo imágenes raster)"
-
-#~ msgid "changesets"
-#~ msgstr "conjuntos de cambios"
 
 #~ msgid "No data"
@@ -26595,7 +26961,4 @@
 #~ msgid "Conflict created"
 #~ msgstr "Conflicto creado"
-
-#~ msgid "Set Lambert coordinate"
-#~ msgstr "Fijar coordenada Lambert"
 
 #~ msgid "Warning: failed to put a dialog always on top. Exception was: {0}"
Index: applications/editors/josm/i18n/po/et.po
===================================================================
--- applications/editors/josm/i18n/po/et.po	(revision 17655)
+++ applications/editors/josm/i18n/po/et.po	(revision 17697)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-12 18:11+0200\n"
-"PO-Revision-Date: 2009-09-06 13:16+0000\n"
+"POT-Creation-Date: 2009-09-19 13:00+0200\n"
+"PO-Revision-Date: 2009-09-15 02:58+0000\n"
 "Last-Translator: lyyser <logard.1961@gmail.com>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-09-12 16:06+0000\n"
+"X-Launchpad-Export-Date: 2009-09-19 10:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -42,10 +42,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:543
 #: ../core/src/org/openstreetmap/josm/Main.java:551
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -70,5 +70,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -86,6 +86,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:358
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
@@ -101,6 +101,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
@@ -124,10 +124,10 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
 msgid "Save and Exit"
 msgstr "Salvesta ja välju"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
 msgid "Discard and Exit"
 msgstr "Tühista ja välju"
@@ -138,4 +138,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
@@ -143,27 +144,28 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:296
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:258
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:613
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
@@ -171,5 +173,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -189,6 +191,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
@@ -205,17 +207,17 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:654
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1528
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -226,6 +228,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
@@ -278,9 +280,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:607
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:609
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -340,5 +342,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
 msgid "Plugins"
@@ -388,5 +390,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Ühenda"
@@ -474,5 +476,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -485,4 +487,5 @@
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -518,6 +521,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
@@ -526,6 +529,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:346
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
@@ -633,4 +636,45 @@
 msgstr "Ei ole vastuolusid, millele suumida"
 
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#, fuzzy
+msgid "Close open changesets"
+msgstr "Sulgen muutustekogumit..."
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#, fuzzy
+msgid "Closes open changesets"
+msgstr "Sulgen muutustekogumit..."
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
+#: ../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:114
+#, java-format
+msgid "File: {0}"
+msgstr "Fail: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
+msgid "There are no open changesets"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
+#, fuzzy
+msgid "No open changesets"
+msgstr "Sulgen muutustekogumit..."
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
+#, fuzzy
+msgid "Downloading open changesets ..."
+msgstr "Sulgen muutustekogumit..."
+
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
@@ -725,10 +769,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:123
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
@@ -771,31 +816,30 @@
 msgstr "Aseta valitud sõlmed võrdsete vahemaade tagant mööda joont."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
 msgid "Download from OSM..."
 msgstr "Lae OSM serverist..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
 msgid "Download map data from the OSM server."
 msgstr "Lae kaardi andmed OSM serverist"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
-#, java-format
-msgid "File: {0}"
-msgstr "Fail: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
 msgid "Download"
 msgstr "Lae alla"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
 msgid "Please select at least one task to download"
 msgstr "Palun vali allalaadimiseks vähemalt üks toiming."
@@ -816,5 +860,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1527
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307
@@ -834,6 +878,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:376
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1415
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
 msgid "Duplicate"
 msgstr "Kahekordista"
@@ -905,10 +949,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
@@ -992,25 +1037,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 msgid "Merge Nodes"
 msgstr "Liida sõlmed."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
 msgid "Merge nodes into the oldest one."
 msgstr "Liida sõlmed vanimaks."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
 msgid "Please select at least two nodes to merge."
 msgstr "Palun vali vähemalt kaks sõlme mida liita."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:394
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
@@ -1026,8 +1072,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -1053,6 +1099,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
@@ -1061,9 +1111,9 @@
 msgstr "parameeter ''{0}'' ei tohi olla null"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr "Ei saa sõlmi liita: tuleb kustutada tee, mis on endiselt kasutusel."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283
 #, java-format
 msgid "Merge {0} nodes"
@@ -1135,5 +1185,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "New"
 msgstr "Uus"
@@ -1406,14 +1456,15 @@
 msgstr "Abi: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
 msgid "Status Report"
 msgstr "Staatus"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 msgid "Copy to clipboard and close"
 msgstr "Kopeeri puhvrisse ja sulge."
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
@@ -1494,25 +1545,4 @@
 msgstr "Lõika tee {0} {1} osaks"
 
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24
-msgid "Close current changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-msgid "Close the current changeset ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41
-msgid "There is currently no changeset open."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42
-msgid "No open changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60
-msgid "Closing changeset"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
@@ -1680,14 +1710,14 @@
 msgstr "Tühi valik"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Lae OSMi serverisse"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 msgid "Upload all changes to the OSM server."
 msgstr "Lae kõik muudatused OSM serverisse üles."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
 #, java-format
 msgid ""
@@ -1696,23 +1726,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
 msgid "Nothing to upload. Get some data first."
 msgstr "Midagi pole üles laadida. Hangi esmalt andmeid."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 msgid "No changes to upload."
 msgstr "Pole muudatusi mida üles laadida."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Sünkroniseeri ainult {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
 msgid "Synchronize entire dataset"
 msgstr "Sünkroniseeri kogu andmekogu"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
 #, java-format
 msgid ""
@@ -1726,17 +1756,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
 msgid "Conflict detected"
 msgstr "Avastatud konflikt"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:267
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
 #, java-format
 msgid ""
@@ -1747,28 +1777,40 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
+msgid ""
+"<html>Uploading <strong>failed</strong> because you've been "
+"using<br>changeset {0} which was already closed at {1}.<br>Please upload "
+"again with a new or an existing open changeset."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+#, fuzzy
+msgid "Changeset closed"
+msgstr "Muuta väärtusi?"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
 msgid "Upload to OSM API failed"
 msgstr "Laadimine OSM API-le ebaõnnestus"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
 msgid "Updating primitive"
 msgstr "Primitiivi uuendamine"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1985,14 +2027,14 @@
 msgstr "Lisa sõlm teele ja ühenda"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:930
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:932
 msgid "Create new node."
 msgstr "Loo uus sõlm."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
 msgid "Select node under cursor."
 msgstr "Vali kursori all olev sõlm."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939
 #, java-format
 msgid "Insert new node into way."
@@ -2001,14 +2043,14 @@
 msgstr[1] "Lisa {0} teele uus sõlm."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
 msgid "Start new way from last node."
 msgstr "Alusta uut teed viimasest sõlmest."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951
 msgid "Continue way from last node."
 msgstr "Jätke teed viimasest sõlmest."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:972
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:974
 msgid "Finish drawing."
 msgstr "Lõpeta joonistamine."
@@ -2122,60 +2164,70 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Otsi..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Otsi objekte."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
 msgid "Can't search because there is no loaded data."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
+#, fuzzy
+msgid "Please enter a filter string."
+msgstr "Palun sisesta otsingu tekst"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
 msgid "Please enter a search string."
 msgstr "Palun sisesta otsingu tekst"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
 msgid "replace selection"
 msgstr "asenda valik"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72
 msgid "add to selection"
 msgstr "lisa valikusse"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73
 msgid "remove from selection"
 msgstr "eemalda valikust"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
+#, fuzzy
+msgid "find in selection"
+msgstr "lisa valikusse"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81
 msgid "case sensitive"
 msgstr "tõstutundlik"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82
 msgid "regular expression"
 msgstr "regulaaravaldis"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid ""
 "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
@@ -2183,109 +2235,126 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
 msgid "<u>Special targets:</u>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 msgid "<b>nodes:</b>... - object with given number of nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
 msgid "<b>modified</b> - all changed objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
 msgid "<b>selected</b> - all selected objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "<b>untagged</b> - all untagged objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
+msgid "Filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Otsi"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
+msgid "Submit filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "Start Search"
 msgstr "Alusta otsingut"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#, java-format
+msgid "Nothing find in selection by searching for ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262
 #, java-format
 msgid "Found {0} matches"
 msgstr "Leitud {0} vastet"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CS"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CI"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283
 msgid "RX"
 msgstr ""
@@ -2467,5 +2536,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
 msgid "Double conflict"
 msgstr ""
@@ -2705,4 +2774,5 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:134
 msgid "Old value"
 msgstr ""
@@ -2866,27 +2936,57 @@
 
 #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
 msgid "E"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:59
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:203
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
 msgid "Changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:323
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:325
-#, fuzzy, java-format
-msgid "paramete''{0}'' must not be null"
-msgstr "parameeter ''{0}'' ei tohi olla null"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331
-#, fuzzy, java-format
-msgid "unsupported value ''{0}'' or parameter ''{1}''"
-msgstr "Kasuta eelseadet ''{0}'' grupist ''{1}''"
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "H"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "Text"
+msgstr "Test"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "C"
+msgstr "WC"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "I"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "M"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+msgid "R"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+msgid "A"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+msgid "D"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+msgid "F"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
@@ -2900,29 +3000,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
 #, java-format
 msgid "expected id >= 0. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:257
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
 msgid "a primitive with id=0 can't be invisible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:293
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
 #, java-format
 msgid "id > 0 expected. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
 msgid "version > 0 expected. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
 msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
 msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
@@ -2989,9 +3089,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:247
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:249
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:478
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:482
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
@@ -3000,118 +3100,118 @@
 #. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
 #. TODO Remove useless nullcheck when RelationMember.member is encalupsed
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:851
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855
 msgid "Empty member in relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:853
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:864
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652
 msgid "No \"via\" node or way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:885
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:943
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1032
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1044
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1097
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1123
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1327
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331
 msgid "untagged"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1328
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332
 msgid "text"
 msgstr ""
@@ -3132,5 +3232,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
@@ -3151,5 +3251,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
@@ -3198,5 +3298,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
 msgid "Lambert Zone (Estonia)"
 msgstr ""
@@ -3238,9 +3338,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:38
 msgid "Do not show again"
 msgstr "Rohkem ei näidata"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
 #, java-format
@@ -3248,31 +3348,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:91
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:116
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154
 msgid "incomplete"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
 msgid "highway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
-#: build/trans_presets.java:3144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: build/trans_presets.java:3156
 msgid "railway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
 msgid "waterway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "landuse"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:474
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
@@ -3282,5 +3382,5 @@
 msgstr[1] "{0} punkti"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
 #, java-format
 msgid "{0} member"
@@ -3325,10 +3425,5 @@
 msgstr "Päeva sõnum pole saadaval"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67
-#, java-format
-msgid "- running version is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:95
 msgid "Downloading \"Message of the day\""
 msgstr "Laen alla \"päeva sõnumit\""
@@ -3400,10 +3495,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:162
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
 msgid "Username"
 msgstr "Kasutajanimi"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
 msgid "Password"
 msgstr "Salasõna"
@@ -3524,5 +3619,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226
 msgid "Presets"
 msgstr "Eelseaded"
@@ -3596,38 +3691,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
 msgid "The geographic longitude at the mouse pointer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The name of the object at the mouse pointer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The geographic latitude at the mouse pointer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The angle between the previous and the current way segment."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The (compass) heading of the line segment being drawn."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The length of the new way segment being drawn."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199
+msgid ""
+"Middle click again to cycle through.<br>Hold CTRL to select directly from "
+"this list with the mouse.<hr>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290
 msgid "(no object)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:301
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418
+#, fuzzy
+msgid "User:"
+msgstr "Kasutajanimi"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
 msgid "layer not in list."
 msgstr "kiht ei ole nimekirjas"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:488
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3697,7 +3803,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:224
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Tags"
 msgstr ""
@@ -3712,5 +3818,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
@@ -3891,4 +3997,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
 msgid "Up"
 msgstr ""
@@ -3899,4 +4006,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Down"
 msgstr ""
@@ -3909,5 +4017,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
@@ -4330,23 +4438,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:236
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239
 msgid "No conflicts to resolve"
-msgstr "Ei ole vastuolusid, millele suumida"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:295
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254
 msgid "Cancel conflict resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:310
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269
 msgid "Apply resolved conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Apply"
 msgstr ""
@@ -4358,5 +4465,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "all"
 msgstr "kõik"
@@ -4400,7 +4507,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
-msgid "not yet decided"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:213
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
@@ -4427,7 +4531,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
@@ -4437,7 +4541,7 @@
 msgstr[1] "{0} teed"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:152
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
@@ -4447,20 +4551,20 @@
 msgstr[1] "{0} seosed"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "Paste ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "From ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:372
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "To ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:428
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
 #, java-format
 msgid "{0} tag"
@@ -4476,13 +4580,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
-#, fuzzy
 msgid "Remove this relation member from the relation"
-msgstr "Eemalda hetkel valitud tabelirea liige sellest seosest"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-#, fuzzy
 msgid "Replace"
-msgstr "koht"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
@@ -4498,5 +4600,5 @@
 #. --- role editing
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:56
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510
 msgid "Role:"
 msgstr ""
@@ -4512,7 +4614,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70
-#, fuzzy
 msgid "Value:"
-msgstr "Väärtus"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86
@@ -4525,12 +4626,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51
-#, fuzzy
 msgid "Orig. Way"
-msgstr "Ühesuunaline"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
-#, fuzzy
 msgid "Decision"
-msgstr "Revisjon"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -4546,6 +4645,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
@@ -4635,169 +4735,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-msgid "History"
-msgstr "Ajalugu"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-msgid "Display the history of all selected items."
-msgstr "Näita kõigi valitud objektide ajalugu."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
-#, java-format
-msgid "index out of bounds Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
-msgid "History item"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Lae kõik hetkel valitud objektid uuesti ja värskenda nimekirja."
-
-#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
-msgid "Show"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
-msgid "Dialog not created yet. Invoke createInstance() first"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
-msgid "Layers"
-msgstr "Kihid"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-msgid "Open a list of all loaded layers."
-msgstr "Ava kõikide laetud kihtide nimekiri."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:297
-msgid "Delete the selected layer."
-msgstr "Kustuta valitud kiht"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:367
-msgid "Show/Hide"
-msgstr "Näita/Peida"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:378
-msgid "Toggle visible state of the selected layer."
-msgstr "Muuda valitud kihi nähtavust."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:420
-msgid "Activate the selected layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:475
-msgid "Merge this layer into another layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:581
-msgid "Move the selected layer one row up."
-msgstr "Liiguta valitud kiht ühe rea võrra üles."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:600
-msgid "Move the selected layer one row down."
-msgstr "Liiguta valitud kiht ühe rea võrra alla."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
-msgid "Information about layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
-#, java-format
-msgid "This will change up to {0} object."
-msgid_plural "This will change up to {0} objects."
-msgstr[0] "See muudab kuni {0} objekti."
-msgstr[1] "See muudab kuni {0} objekti."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
-msgid "An empty value deletes the key."
-msgstr "Tühi väärtus kustutab võtme."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
-msgid "<different>"
-msgstr "<erinev>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
-msgid "Change values?"
-msgstr "Muuta väärtusi?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
-#, java-format
-msgid "Change properties of up to {0} object"
-msgid_plural "Change properties of up to {0} objects"
-msgstr[0] "Muuda kuni {0} objekti seadeid"
-msgstr[1] "Muuda kuni {0} objekti seadeid"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
-msgid "Please select a key"
-msgstr "Palun vali võti"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
-msgid "Please select a value"
-msgstr "Palun vali väärtus"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
-msgid "Please select the objects you want to change properties for."
-msgstr "Palun vali objektid mille seadeid soovid muuta."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
-msgid "Properties/Memberships"
-msgstr "Seaded/Liikmelisus"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-msgid "Properties for selected objects."
-msgstr "Valitud objektide seaded"
-
-#. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-msgid "Member Of"
-msgstr "On liikmeks järgnevas"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
-msgid "Add Properties"
-msgstr "Lisa seaded"
-
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+msgid "Filter objects and hide/disable them."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
@@ -4811,4 +4755,212 @@
 msgstr "Lisa"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#, fuzzy
+msgid "Add filter."
+msgstr "Lisa valitud"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
+#, fuzzy
+msgid "Edit filter."
+msgstr "Vali lihunik"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#, fuzzy
+msgid "Delete filter."
+msgstr "Vali miski:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
+#, fuzzy
+msgid "Move filter up."
+msgstr "Liigu üles"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
+#, fuzzy
+msgid "Move filter down."
+msgstr "Liigu alla"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128
+msgid "Enable filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
+#, fuzzy
+msgid "Hide elements"
+msgstr "siseosa"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
+msgid "Apply also for children"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
+msgid "Inverse filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
+#, fuzzy
+msgid "Filter mode"
+msgstr "Kustutusrežiim"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
+msgid "History"
+msgstr "Ajalugu"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+msgid "Display the history of all selected items."
+msgstr "Näita kõigi valitud objektide ajalugu."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
+msgid "History item"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
+msgid "Reload all currently selected objects and refresh the list."
+msgstr "Lae kõik hetkel valitud objektid uuesti ja värskenda nimekirja."
+
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
+msgid "Show"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
+msgid "Display the history of the selected primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84
+msgid "Dialog not created yet. Invoke createInstance() first"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
+msgid "Layers"
+msgstr "Kihid"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+msgid "Open a list of all loaded layers."
+msgstr "Ava kõikide laetud kihtide nimekiri."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294
+msgid "Delete the selected layer."
+msgstr "Kustuta valitud kiht"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364
+msgid "Show/Hide"
+msgstr "Näita/Peida"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375
+msgid "Toggle visible state of the selected layer."
+msgstr "Muuda valitud kihi nähtavust."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgid "Activate"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417
+msgid "Activate the selected layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472
+msgid "Merge this layer into another layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578
+msgid "Move the selected layer one row up."
+msgstr "Liiguta valitud kiht ühe rea võrra üles."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597
+msgid "Move the selected layer one row down."
+msgstr "Liiguta valitud kiht ühe rea võrra alla."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+msgid "Information about layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+#, java-format
+msgid "This will change up to {0} object."
+msgid_plural "This will change up to {0} objects."
+msgstr[0] "See muudab kuni {0} objekti."
+msgstr[1] "See muudab kuni {0} objekti."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+msgid "An empty value deletes the key."
+msgstr "Tühi väärtus kustutab võtme."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+msgid "<different>"
+msgstr "<erinev>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+msgid "Change values?"
+msgstr "Muuta väärtusi?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#, java-format
+msgid "Change properties of up to {0} object"
+msgid_plural "Change properties of up to {0} objects"
+msgstr[0] "Muuda kuni {0} objekti seadeid"
+msgstr[1] "Muuda kuni {0} objekti seadeid"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+msgid "Please select a key"
+msgstr "Palun vali võti"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+msgid "Please select a value"
+msgstr "Palun vali väärtus"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
+msgid "Please select the objects you want to change properties for."
+msgstr "Palun vali objektid mille seadeid soovid muuta."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
+msgid "Properties/Memberships"
+msgstr "Seaded/Liikmelisus"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+msgid "Properties for selected objects."
+msgstr "Valitud objektide seaded"
+
+#. setting up the membership table
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+msgid "Member Of"
+msgstr "On liikmeks järgnevas"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
+msgid "Add Properties"
+msgstr "Lisa seaded"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574
 msgid "Add a new key/value pair to all objects"
@@ -4850,10 +5002,9 @@
 
 #. item "Land use/Quarry" text "Name"
-#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
-#: build/trans_presets.java:3109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168
+#: build/trans_presets.java:3121
 msgid "Relations"
 msgstr "Seosed"
@@ -4863,23 +5014,23 @@
 msgstr "Ava kõikide seoste nimekiri"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166
 #, java-format
 msgid "Relations: {0}"
 msgstr "Seosed: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276
 msgid "Open an editor for the selected relation"
 msgstr "Ava toimetajas valitud seos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
 msgid "Delete the selected relation"
 msgstr "Kustuta valitud seos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349
 msgid "Create a new relation"
 msgstr "Loo uus seos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:373
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1412
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
@@ -4912,5 +5063,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4922,9 +5073,9 @@
 msgstr "Valik: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441
 msgid "Undock the panel"
 msgstr "Lase paneel vabaks"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -4932,5 +5083,5 @@
 "Sulge see paneel. Te saate selle uuesti avada nupust vasakul tööriistaribal."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:457
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Vajuta et minimeerida/maksimeerida paneeli sisu"
@@ -4991,5 +5142,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5013,5 +5164,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1502
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1370
 msgid "Download relation members"
 msgstr ""
@@ -5041,5 +5192,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -5047,18 +5198,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
 msgid "Tags and Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:167
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5067,14 +5218,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613
 #, java-format
 msgid ""
@@ -5084,9 +5235,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid ""
@@ -5096,15 +5247,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5112,5 +5263,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5118,20 +5269,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849
 #, java-format
 msgid ""
@@ -5140,57 +5291,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:961
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909
 msgid "Move the currently selected members up"
 msgstr "Liiguta hetkel valitud liiget ülespoole"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:979
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:912
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928
 msgid "Move the currently selected members down"
 msgstr "Liiguta hetkel valitud liiget allapoole"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:998
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:931
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5199,9 +5350,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1058
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
 #, java-format
 msgid ""
@@ -5210,56 +5361,41 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090
+msgid "Apply the current updates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123
+msgid "Apply the updates and close the dialog"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
-msgid "Apply the current updates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
-msgid "Apply the updates and close the dialog"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
-msgid "Delete the currently selected tags"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Lae alla kõik sellest seosest puudu olevad teed ja puntid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 msgid "Download Members"
 msgstr "Lae alla liikmed"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1208
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1211
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1356
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 #, java-format
 msgid ""
@@ -5269,13 +5405,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1229
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1367
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
 msgid "Confirm empty role"
 msgstr ""
@@ -5362,37 +5498,37 @@
 msgstr "Järjehoidjad"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:82
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
 msgid "Please enter the desired coordinates first."
 msgstr "Palun sisesta enne soovitud kordinaadid."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
 msgid "Please enter a name for the location."
 msgstr "Palun sisesta koha nimi."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:107
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
 msgid "Select a bookmark first."
 msgstr "Vali enne järjehoidja."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
 msgid "min lat"
 msgstr "min lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
 msgid "min lon"
 msgstr "min lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid "max lat"
 msgstr "max lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
 msgid "max lon"
 msgstr "max lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5401,26 +5537,26 @@
 "URL lehelt www.openstreetmap.org (saad kleepida siia allalaetava ala URL''i)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
 msgid "Bounding Box"
 msgstr "Ümbritsev kast"
 
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
 msgid "Data Sources and Types"
 msgstr "Andme allikad ja tüübid"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
 msgid "Download as new layer"
 msgstr "Lae alla uue kihina"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
 msgid "Download Area"
 msgstr "Allalaetav ala"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
 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:219
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
 msgid "Download area ok, size probably acceptable to server"
 msgstr "Allalaetav ala paras, suurus serverile tõenäoliselt sobiv"
@@ -5445,7 +5581,7 @@
 msgstr "Sisesta otsitava koha nimi:"
 
-#. <separator/>
+#. group "Geography"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2759
 msgid "Places"
 msgstr "Asukohad"
@@ -5492,21 +5628,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "type"
 msgstr "tüüp"
@@ -5986,4 +6122,6 @@
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
 #. <key key="historic" value="wayside_shrine" />
+#. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
+#. <key key="historic" value="boundary_stone" />
 #. item "Leisure/Water Park" label "Edit Water Park"
 #. <key key="leisure" value="water_park" />
@@ -6355,153 +6493,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/trans_presets.java:66 build/trans_presets.java:102
-#: build/trans_presets.java:142 build/trans_presets.java:179
-#: build/trans_presets.java:199 build/trans_presets.java:217
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:272 build/trans_presets.java:305
-#: build/trans_presets.java:351 build/trans_presets.java:371
-#: build/trans_presets.java:386 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:463 build/trans_presets.java:482
-#: build/trans_presets.java:502 build/trans_presets.java:522
-#: build/trans_presets.java:543 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627 build/trans_presets.java:658
-#: build/trans_presets.java:679 build/trans_presets.java:692
-#: build/trans_presets.java:705 build/trans_presets.java:718
-#: build/trans_presets.java:731 build/trans_presets.java:744
-#: build/trans_presets.java:755 build/trans_presets.java:764
-#: build/trans_presets.java:811 build/trans_presets.java:832
-#: build/trans_presets.java:841 build/trans_presets.java:901
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1067 build/trans_presets.java:1075
-#: build/trans_presets.java:1085 build/trans_presets.java:1093
-#: build/trans_presets.java:1098 build/trans_presets.java:1105
-#: build/trans_presets.java:1112 build/trans_presets.java:1117
-#: build/trans_presets.java:1125 build/trans_presets.java:1134
-#: build/trans_presets.java:1140 build/trans_presets.java:1146
-#: build/trans_presets.java:1151 build/trans_presets.java:1157
-#: build/trans_presets.java:1163 build/trans_presets.java:1172
-#: build/trans_presets.java:1181 build/trans_presets.java:1188
-#: build/trans_presets.java:1196 build/trans_presets.java:1209
-#: build/trans_presets.java:1215 build/trans_presets.java:1224
-#: build/trans_presets.java:1230 build/trans_presets.java:1236
-#: build/trans_presets.java:1244 build/trans_presets.java:1299
-#: build/trans_presets.java:1346 build/trans_presets.java:1352
-#: build/trans_presets.java:1358 build/trans_presets.java:1364
-#: build/trans_presets.java:1370 build/trans_presets.java:1381
-#: build/trans_presets.java:1390 build/trans_presets.java:1405
-#: build/trans_presets.java:1412 build/trans_presets.java:1418
-#: build/trans_presets.java:1426 build/trans_presets.java:1433
-#: build/trans_presets.java:1442 build/trans_presets.java:1450
-#: build/trans_presets.java:1457 build/trans_presets.java:1468
-#: build/trans_presets.java:1478 build/trans_presets.java:1488
-#: build/trans_presets.java:1508 build/trans_presets.java:1520
-#: build/trans_presets.java:1531 build/trans_presets.java:1548
-#: build/trans_presets.java:1555 build/trans_presets.java:1570
-#: build/trans_presets.java:1577 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1594
-#: build/trans_presets.java:1599 build/trans_presets.java:1605
-#: build/trans_presets.java:1611 build/trans_presets.java:1619
-#: build/trans_presets.java:1627 build/trans_presets.java:1635
-#: build/trans_presets.java:1642 build/trans_presets.java:1648
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1670 build/trans_presets.java:1677
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1712 build/trans_presets.java:1719
-#: build/trans_presets.java:1736 build/trans_presets.java:1744
-#: build/trans_presets.java:1759 build/trans_presets.java:1769
-#: build/trans_presets.java:1781 build/trans_presets.java:1788
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:1809 build/trans_presets.java:1817
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1841
-#: build/trans_presets.java:1846 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1864
-#: build/trans_presets.java:1872 build/trans_presets.java:1881
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1908 build/trans_presets.java:1914
-#: build/trans_presets.java:1922 build/trans_presets.java:1928
-#: build/trans_presets.java:1934 build/trans_presets.java:1940
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2013
-#: build/trans_presets.java:2022 build/trans_presets.java:2030
-#: build/trans_presets.java:2036 build/trans_presets.java:2042
-#: build/trans_presets.java:2048 build/trans_presets.java:2054
-#: build/trans_presets.java:2060 build/trans_presets.java:2066
-#: build/trans_presets.java:2072 build/trans_presets.java:2078
-#: build/trans_presets.java:2084 build/trans_presets.java:2090
-#: build/trans_presets.java:2096 build/trans_presets.java:2102
-#: build/trans_presets.java:2108 build/trans_presets.java:2114
-#: build/trans_presets.java:2120 build/trans_presets.java:2126
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2158
-#: build/trans_presets.java:2165 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2186
-#: build/trans_presets.java:2192 build/trans_presets.java:2198
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2218 build/trans_presets.java:2225
-#: build/trans_presets.java:2232 build/trans_presets.java:2239
-#: build/trans_presets.java:2247 build/trans_presets.java:2279
-#: build/trans_presets.java:2284 build/trans_presets.java:2289
-#: build/trans_presets.java:2294 build/trans_presets.java:2300
-#: build/trans_presets.java:2306 build/trans_presets.java:2312
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2354
-#: build/trans_presets.java:2451 build/trans_presets.java:2458
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2485 build/trans_presets.java:2492
-#: build/trans_presets.java:2498 build/trans_presets.java:2504
-#: build/trans_presets.java:2526 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2553 build/trans_presets.java:2559
-#: build/trans_presets.java:2565 build/trans_presets.java:2571
-#: build/trans_presets.java:2577 build/trans_presets.java:2583
-#: build/trans_presets.java:2590 build/trans_presets.java:2597
-#: build/trans_presets.java:2604 build/trans_presets.java:2610
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2661
-#: build/trans_presets.java:2667 build/trans_presets.java:2677
-#: build/trans_presets.java:2686 build/trans_presets.java:2701
-#: build/trans_presets.java:2707 build/trans_presets.java:2715
-#: build/trans_presets.java:2722 build/trans_presets.java:2742
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2783
-#: build/trans_presets.java:2790 build/trans_presets.java:2797
-#: build/trans_presets.java:2803 build/trans_presets.java:2809
-#: build/trans_presets.java:2817 build/trans_presets.java:2824
-#: build/trans_presets.java:2831 build/trans_presets.java:2838
-#: build/trans_presets.java:2844 build/trans_presets.java:2851
-#: build/trans_presets.java:2858 build/trans_presets.java:2867
-#: build/trans_presets.java:2873 build/trans_presets.java:2879
-#: build/trans_presets.java:2885 build/trans_presets.java:2891
-#: build/trans_presets.java:2900 build/trans_presets.java:2910
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2948
-#: build/trans_presets.java:2957 build/trans_presets.java:2963
-#: build/trans_presets.java:2969 build/trans_presets.java:2975
-#: build/trans_presets.java:2981 build/trans_presets.java:2987
-#: build/trans_presets.java:2993 build/trans_presets.java:3000
-#: build/trans_presets.java:3006 build/trans_presets.java:3011
-#: build/trans_presets.java:3018 build/trans_presets.java:3025
-#: build/trans_presets.java:3031 build/trans_presets.java:3040
-#: build/trans_presets.java:3048 build/trans_presets.java:3054
-#: build/trans_presets.java:3060 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3080
-#: build/trans_presets.java:3086 build/trans_presets.java:3092
-#: build/trans_presets.java:3098 build/trans_presets.java:3104
-#: build/trans_presets.java:3117 build/trans_presets.java:3131
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:67 build/trans_presets.java:103
+#: build/trans_presets.java:143 build/trans_presets.java:180
+#: build/trans_presets.java:200 build/trans_presets.java:218
+#: build/trans_presets.java:235 build/trans_presets.java:253
+#: build/trans_presets.java:273 build/trans_presets.java:306
+#: build/trans_presets.java:352 build/trans_presets.java:372
+#: build/trans_presets.java:387 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:503 build/trans_presets.java:523
+#: build/trans_presets.java:544 build/trans_presets.java:565
+#: build/trans_presets.java:586 build/trans_presets.java:607
+#: build/trans_presets.java:628 build/trans_presets.java:659
+#: build/trans_presets.java:680 build/trans_presets.java:693
+#: build/trans_presets.java:706 build/trans_presets.java:719
+#: build/trans_presets.java:732 build/trans_presets.java:745
+#: build/trans_presets.java:756 build/trans_presets.java:765
+#: build/trans_presets.java:812 build/trans_presets.java:833
+#: build/trans_presets.java:842 build/trans_presets.java:902
+#: build/trans_presets.java:1053 build/trans_presets.java:1061
+#: build/trans_presets.java:1069 build/trans_presets.java:1077
+#: build/trans_presets.java:1087 build/trans_presets.java:1095
+#: build/trans_presets.java:1100 build/trans_presets.java:1107
+#: build/trans_presets.java:1114 build/trans_presets.java:1119
+#: build/trans_presets.java:1127 build/trans_presets.java:1136
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1153 build/trans_presets.java:1159
+#: build/trans_presets.java:1165 build/trans_presets.java:1174
+#: build/trans_presets.java:1183 build/trans_presets.java:1190
+#: build/trans_presets.java:1198 build/trans_presets.java:1211
+#: build/trans_presets.java:1217 build/trans_presets.java:1226
+#: build/trans_presets.java:1232 build/trans_presets.java:1238
+#: build/trans_presets.java:1246 build/trans_presets.java:1302
+#: build/trans_presets.java:1349 build/trans_presets.java:1355
+#: build/trans_presets.java:1361 build/trans_presets.java:1367
+#: build/trans_presets.java:1373 build/trans_presets.java:1384
+#: build/trans_presets.java:1393 build/trans_presets.java:1408
+#: build/trans_presets.java:1415 build/trans_presets.java:1421
+#: build/trans_presets.java:1429 build/trans_presets.java:1436
+#: build/trans_presets.java:1445 build/trans_presets.java:1453
+#: build/trans_presets.java:1460 build/trans_presets.java:1471
+#: build/trans_presets.java:1481 build/trans_presets.java:1491
+#: build/trans_presets.java:1511 build/trans_presets.java:1523
+#: build/trans_presets.java:1534 build/trans_presets.java:1551
+#: build/trans_presets.java:1558 build/trans_presets.java:1574
+#: build/trans_presets.java:1581 build/trans_presets.java:1586
+#: build/trans_presets.java:1592 build/trans_presets.java:1598
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1646 build/trans_presets.java:1652
+#: build/trans_presets.java:1659 build/trans_presets.java:1666
+#: build/trans_presets.java:1674 build/trans_presets.java:1681
+#: build/trans_presets.java:1689 build/trans_presets.java:1696
+#: build/trans_presets.java:1702 build/trans_presets.java:1709
+#: build/trans_presets.java:1716 build/trans_presets.java:1723
+#: build/trans_presets.java:1740 build/trans_presets.java:1748
+#: build/trans_presets.java:1763 build/trans_presets.java:1773
+#: build/trans_presets.java:1785 build/trans_presets.java:1792
+#: build/trans_presets.java:1798 build/trans_presets.java:1808
+#: build/trans_presets.java:1813 build/trans_presets.java:1821
+#: build/trans_presets.java:1828 build/trans_presets.java:1834
+#: build/trans_presets.java:1840 build/trans_presets.java:1845
+#: build/trans_presets.java:1850 build/trans_presets.java:1855
+#: build/trans_presets.java:1862 build/trans_presets.java:1868
+#: build/trans_presets.java:1873 build/trans_presets.java:1882
+#: build/trans_presets.java:1891 build/trans_presets.java:1900
+#: build/trans_presets.java:1909 build/trans_presets.java:1918
+#: build/trans_presets.java:1924 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 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:2023 build/trans_presets.java:2032
+#: build/trans_presets.java:2040 build/trans_presets.java:2046
+#: build/trans_presets.java:2052 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 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:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2150
+#: build/trans_presets.java:2156 build/trans_presets.java:2162
+#: build/trans_presets.java:2169 build/trans_presets.java:2176
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2197 build/trans_presets.java:2203
+#: build/trans_presets.java:2209 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2229
+#: build/trans_presets.java:2236 build/trans_presets.java:2243
+#: build/trans_presets.java:2250 build/trans_presets.java:2258
+#: build/trans_presets.java:2290 build/trans_presets.java:2295
+#: build/trans_presets.java:2300 build/trans_presets.java:2305
+#: build/trans_presets.java:2311 build/trans_presets.java:2317
+#: build/trans_presets.java:2323 build/trans_presets.java:2331
+#: build/trans_presets.java:2337 build/trans_presets.java:2343
+#: build/trans_presets.java:2349 build/trans_presets.java:2355
+#: build/trans_presets.java:2365 build/trans_presets.java:2462
+#: build/trans_presets.java:2469 build/trans_presets.java:2483
+#: build/trans_presets.java:2489 build/trans_presets.java:2496
+#: build/trans_presets.java:2503 build/trans_presets.java:2509
+#: build/trans_presets.java:2515 build/trans_presets.java:2537
+#: build/trans_presets.java:2544 build/trans_presets.java:2551
+#: build/trans_presets.java:2557 build/trans_presets.java:2564
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2594 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2615
+#: build/trans_presets.java:2621 build/trans_presets.java:2627
+#: build/trans_presets.java:2633 build/trans_presets.java:2639
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2672 build/trans_presets.java:2678
+#: build/trans_presets.java:2688 build/trans_presets.java:2697
+#: build/trans_presets.java:2712 build/trans_presets.java:2718
+#: build/trans_presets.java:2726 build/trans_presets.java:2733
+#: build/trans_presets.java:2753 build/trans_presets.java:2764
+#: build/trans_presets.java:2770 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2788
+#: build/trans_presets.java:2795 build/trans_presets.java:2802
+#: build/trans_presets.java:2809 build/trans_presets.java:2815
+#: build/trans_presets.java:2821 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2912
+#: build/trans_presets.java:2922 build/trans_presets.java:2931
+#: build/trans_presets.java:2937 build/trans_presets.java:2943
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 build/trans_presets.java:2981
+#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:2999 build/trans_presets.java:3005
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3023 build/trans_presets.java:3030
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3066 build/trans_presets.java:3072
+#: build/trans_presets.java:3079 build/trans_presets.java:3085
+#: build/trans_presets.java:3092 build/trans_presets.java:3098
+#: build/trans_presets.java:3104 build/trans_presets.java:3110
+#: build/trans_presets.java:3116 build/trans_presets.java:3129
+#: build/trans_presets.java:3143 build/trans_presets.java:3157
 msgid "Name"
 msgstr "Nimi"
@@ -6535,4 +6674,58 @@
 msgid "Version"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
+#, fuzzy
+msgid "Changeset id:"
+msgstr "Muuda seost"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
+#, fuzzy
+msgid "Created at:"
+msgstr "Alade loomine"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
+#, fuzzy
+msgid "Changeset comment:"
+msgstr "Muuda seost"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
+msgid "No open changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48
+#, fuzzy
+msgid "<html>Please select the changesets you want to close</html>"
+msgstr "Palun vali objektid mille seadeid soovid muuta."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
+#, fuzzy
+msgid "Open changesets"
+msgstr "Sulgen muutustekogumit..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101
+#, fuzzy
+msgid "Close changesets"
+msgstr "Sulgen muutustekogumit..."
+
+#. putValue(SMALL_ICON, ImageProvider.get("cancel"));
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
+#, fuzzy
+msgid "Close the selected open changesets"
+msgstr "Kustuta valitud objektid."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126
+#, fuzzy
+msgid "Cancel closeing of changesets"
+msgstr "Sulgen muutustekogumit..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37
+msgid "Closing changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77
+#, fuzzy, java-format
+msgid "Closing changeset {0}"
+msgstr "Sulgen muutustekogumit..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
@@ -6561,5 +6754,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be uploaded"
+msgid "Layer ''{0}'' has no modifications to be uploaded."
 msgstr ""
 
@@ -6567,5 +6760,5 @@
 #, java-format
 msgid ""
-"Layer ''{0}'' has modifications which should be saved to its assoicated file "
+"Layer ''{0}'' has modifications which should be saved to its associated file "
 "''{1}''."
 msgstr ""
@@ -6573,5 +6766,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be saved"
+msgid "Layer ''{0}'' has no modifications to be saved."
 msgstr ""
 
@@ -6605,17 +6798,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113
 msgid "Unsaved changes - Save/Upload before exiting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194
 #, java-format
 msgid ""
@@ -6628,9 +6821,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205
 msgid "Unsaved data and conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212
 #, java-format
 msgid ""
@@ -6644,9 +6837,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223
 msgid "Unsaved data and missing associated file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230
 #, java-format
 msgid ""
@@ -6661,42 +6854,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243
 msgid "Unsaved data non-writable files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
 msgid "Close this dialog and resume editing in JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322
+msgid "Discard and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
-msgid "Discard and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354
+msgid "Save and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
-msgid "Save and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
 msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402
 #, java-format
 msgid "Preparing layer ''{0}'' for upload ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
@@ -6704,5 +6897,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491
 msgid "Incomplete upload and/or save"
 msgstr ""
@@ -6742,21 +6935,21 @@
 #. item "Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:200
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:278
-#: build/trans_presets.java:311 build/trans_presets.java:357
-#: build/trans_presets.java:372 build/trans_presets.java:387
-#: build/trans_presets.java:409 build/trans_presets.java:429
-#: build/trans_presets.java:450 build/trans_presets.java:470
-#: build/trans_presets.java:489 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:549
-#: build/trans_presets.java:570 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:633
-#: build/trans_presets.java:664 build/trans_presets.java:1060
-#: build/trans_presets.java:1068 build/trans_presets.java:1076
-#: build/trans_presets.java:1086 build/trans_presets.java:1305
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:242
+#: build/trans_presets.java:260 build/trans_presets.java:279
+#: build/trans_presets.java:312 build/trans_presets.java:358
+#: build/trans_presets.java:373 build/trans_presets.java:388
+#: build/trans_presets.java:410 build/trans_presets.java:430
+#: build/trans_presets.java:451 build/trans_presets.java:471
+#: build/trans_presets.java:490 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:665 build/trans_presets.java:1062
+#: build/trans_presets.java:1070 build/trans_presets.java:1078
+#: build/trans_presets.java:1088 build/trans_presets.java:1308
 msgid "Layer"
 msgstr ""
@@ -6775,69 +6968,32 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:200
 msgid "Upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-msgid "Use a new changeset and close it"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
-msgid ""
-"Select to upload the data using a new changeset and to close the changeset "
-"after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
-msgid "Use a new changeset and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
-msgid ""
-"Select to upload the data using a new changeset and to leave the changeset "
-"open after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
-msgid "Upload to a new or to an existing changeset?"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
-msgid "upload all changes in one request"
-msgstr "lae kõik muudatused ühe päringuga"
+msgid "Settings"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
-msgid ""
-"Enable to upload all changes in one request, disable to use one request per "
-"changed primitive"
-msgstr ""
-"Lülita sisse kõikide muudatuste laadimiseks ühe päringuga, lülita välja iga "
-"muudetud primitiivi kohta eraldi päringu kasutamiseks"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "Esitada lühike kommentaar üleslaetavatele muutustele:"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:216
-msgid "Settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908
 msgid "Tags of new changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:221
 msgid "Objects to add:"
 msgstr "Objektid lisada:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:227
 msgid "Objects to modify:"
 msgstr "Objektid muuta:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:233
 msgid "Objects to delete:"
 msgstr "Objektid kustutada:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
 #, java-format
 msgid "{0} object to add:"
@@ -6846,5 +7002,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:277
 #, java-format
 msgid "{0} object to modifiy:"
@@ -6853,5 +7009,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:286
 #, java-format
 msgid "{0} object to delete:"
@@ -6860,53 +7016,88 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422
-#, java-format
-msgid "Use the existing changeset {0} and close it after upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:423
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to close the changeset "
-"after this upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426
-#, java-format
-msgid "Use the existing changeset {0} and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:427
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to leave the changeset "
-"open for further uploads"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
-#, java-format
-msgid "Tags of changeset {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:470
 msgid "Upload Changes"
 msgstr "Lae muudatused üles"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472
+msgid "Upload the changed primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
+msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:479
+msgid "Illegal upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
+msgid "Cancel the upload and resume editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606
 #, fuzzy
-msgid "Upload the changed primitives"
-msgstr "Kas laen need muudatused üles?"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592
+msgid "Upload all changes in one request"
+msgstr "lae kõik muudatused ühe päringuga"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607
+msgid ""
+"Enable to upload all changes in one request, disable to use one request per "
+"changed primitive"
+msgstr ""
+"Lülita sisse kõikide muudatuste laadimiseks ühe päringuga, lülita välja iga "
+"muudetud primitiivi kohta eraldi päringu kasutamiseks"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:617
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "Esitada lühike kommentaar üleslaetavatele muutustele:"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672
+msgid "Open a new changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
+msgid "Open a new changeset and use it in the next upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
 #, fuzzy
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "Palun sisesta koha nimi."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:593
-msgid "Illegal upload comment"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
-msgid "Cancel the upload and resume editing"
+msgid "Use an open changeset"
+msgstr "Salvestamata muudatused"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
+msgid "Upload data to an already opened changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
+#, fuzzy
+msgid "Close changeset after upload"
+msgstr "Pole muudatusi mida üles laadida."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
+msgid "Select to close the changeset after the next upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922
+#, java-format
+msgid "Tags of changeset {0}"
+msgstr ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
+#, fuzzy
+msgid "Load the list of your open changesets from the server"
+msgstr "Lae käesolikud valikud serverisse"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
+#, fuzzy
+msgid "Close the currently selected open changeset"
+msgstr "Liiguta hetkel valitud liiget ülespoole"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
+#, java-format
+msgid "changeset id > 0 expected. Got {1}"
 msgstr ""
 
@@ -6985,5 +7176,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
@@ -7021,5 +7212,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
@@ -7027,30 +7218,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
 msgid "Customize line drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
 msgid "Use global settings."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Draw lines between points for this layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Do not draw lines between points for this layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 msgid "Select line drawing options"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7058,5 +7249,5 @@
 msgstr "Kohanda värvi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7065,5 +7256,5 @@
 msgstr "Vaikimisi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7072,38 +7263,73 @@
 msgstr "Vali värv"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
 msgid "Import Audio"
 msgstr "Heli import"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
 msgid "Wave Audio files (*.wav)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #, java-format
 msgid "Audio markers from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
 msgid "Import images"
 msgstr "Piltide import"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#, java-format
+msgid "Name: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#, java-format
+msgid "Description: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#, fuzzy, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
+msgstr[0] "{0} tee"
+msgstr[1] "{0} teed"
+
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
+#: build/trans_presets.java:3160
+msgid "Description"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+msgid "Timespan"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+msgid "Length"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
+msgid "URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+msgid "Length: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
 #, java-format
 msgid "{0} route, "
@@ -7112,5 +7338,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 #, java-format
 msgid "{0} waypoint"
@@ -7119,29 +7345,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
-#, java-format
-msgid "Name: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
-#, java-format
-msgid "Description: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
-msgid "Timespan: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
-msgid "Length: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Muuda andme kihiks"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7151,10 +7358,10 @@
 "kahjulikuks. <br> Kui soovite üles laadida radasid, vaata siia:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -7165,29 +7372,29 @@
 msgstr "Muudetud sellest: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
 msgid "Download from OSM along this track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
 msgid "Download everything within:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
 #, java-format
 msgid "{0} meters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 msgid "Maximum area per request:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
 #, java-format
 msgid "{0} sq km"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
 #, java-format
 msgid ""
@@ -7196,13 +7403,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
 msgid "Download data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7210,5 +7417,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7259,30 +7466,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
-#, fuzzy
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
 "<br>If you want to upload traces, look here:</html>"
 msgstr ""
-"<html> Töötlemata GPS andmete üleslaadimist kaardi andmetena loetakse "
-"kahjulikuks. <br> Kui soovite üles laadida radasid, vaata siia:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "track"
 msgid_plural "tracks"
@@ -7415,4 +7619,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
@@ -7639,13 +7844,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+msgid "Draw a circle form HDOP value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -7653,6 +7863,6 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1374
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:1377
 msgid "Car"
 msgstr ""
@@ -7673,14 +7883,14 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:324 build/trans_presets.java:650
-#: build/trans_presets.java:857 build/trans_presets.java:876
-#: build/trans_presets.java:890 build/trans_presets.java:912
-#: build/trans_presets.java:949 build/trans_presets.java:962
-#: build/trans_presets.java:974 build/trans_presets.java:986
-#: build/trans_presets.java:998 build/trans_presets.java:1010
-#: build/trans_presets.java:1020 build/trans_presets.java:1029
-#: build/trans_presets.java:1038 build/trans_presets.java:1437
-#: build/trans_presets.java:1510
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:325 build/trans_presets.java:651
+#: build/trans_presets.java:858 build/trans_presets.java:877
+#: build/trans_presets.java:891 build/trans_presets.java:913
+#: build/trans_presets.java:950 build/trans_presets.java:963
+#: build/trans_presets.java:975 build/trans_presets.java:987
+#: build/trans_presets.java:999 build/trans_presets.java:1011
+#: build/trans_presets.java:1021 build/trans_presets.java:1030
+#: build/trans_presets.java:1039 build/trans_presets.java:1440
+#: build/trans_presets.java:1513
 msgid "Bicycle"
 msgstr ""
@@ -7713,62 +7923,62 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:325 build/trans_presets.java:649
-#: build/trans_presets.java:856 build/trans_presets.java:875
-#: build/trans_presets.java:889 build/trans_presets.java:911
-#: build/trans_presets.java:948 build/trans_presets.java:961
-#: build/trans_presets.java:973 build/trans_presets.java:985
-#: build/trans_presets.java:997 build/trans_presets.java:1009
-#: build/trans_presets.java:1019 build/trans_presets.java:1028
-#: build/trans_presets.java:1037
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:326 build/trans_presets.java:650
+#: build/trans_presets.java:857 build/trans_presets.java:876
+#: build/trans_presets.java:890 build/trans_presets.java:912
+#: build/trans_presets.java:949 build/trans_presets.java:962
+#: build/trans_presets.java:974 build/trans_presets.java:986
+#: build/trans_presets.java:998 build/trans_presets.java:1010
+#: build/trans_presets.java:1020 build/trans_presets.java:1029
+#: build/trans_presets.java:1038
 msgid "Foot"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Joonista suuna nooled"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr ""
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
-msgid "Only interesting direction hints (e.g. with oneway tag)."
-msgstr ""
-
-#. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+msgid "Only interesting direction hints (e.g. with oneway tag)."
+msgstr ""
+
+#. only on the head of a way
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Only on the head of a way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:82
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -7776,34 +7986,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length (meters)"
 msgstr ""
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:129
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:135
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:141
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -7811,13 +8021,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:144
 msgid "Minimum distance (pixels)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Draw larger dots for the GPS points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -7825,9 +8035,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -7835,46 +8045,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202
 msgid "GPS Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:237
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257
 msgid "Draw the inactive data layers in a different color."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "OSM Data"
 msgstr ""
@@ -7953,45 +8163,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Configure available plugins."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50
+#. buttons at the bottom
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
 msgid "Download List"
 msgstr "Lae nimekiri alla"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:100
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 msgid "Update"
 msgstr "Uuenda"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Configure Sites..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:125
 msgid "Add JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:126
 msgid "Enter URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:162
 msgid "Please select an entry."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:147
 msgid "Edit JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:148
 msgid "JOSM Plugin description URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:175
 msgid "Configure Plugin Sites"
 msgstr ""
@@ -8319,6 +8530,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:369
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341
 #, java-format
 msgid "Remove old keys from up to {0} object"
@@ -8327,9 +8538,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135
 msgid "Add a new tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160
 msgid "Delete the selection in the tag table"
 msgstr ""
@@ -8364,7 +8575,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:68
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:75
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -8408,4 +8619,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24
+#, fuzzy, java-format
+msgid "Preset group ''{0}'' of group ''{1}''"
+msgstr "Kasuta eelseadet ''{0}'' grupist ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
 #, java-format
 msgid "Preset group ''{0}''"
@@ -8426,4 +8642,10 @@
 msgstr "Laen alla punkte alates {0} kuni {1}..."
 
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, fuzzy, java-format
+msgid "parameter ''{0}'' > 0 expected. Got {1}"
+msgstr "parameeter ''{0}'' ei tohi olla null"
+
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8530,5 +8752,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "Parse error: vigane gpx dokumendi struktuur"
@@ -8648,10 +8870,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -8659,75 +8882,79 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315
 msgid "Creating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
 #, java-format
 msgid "Successfully opened changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#, java-format
+msgid "id of changeset > 0 required. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
-#, java-format
-msgid "Changeset {0} is unchanged. Skipping update."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
 #, java-format
 msgid "Updating changeset {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
-msgid ""
-"Failed to update changeset. Either there is no current changeset or the id "
-"of the current changeset is 0"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
 msgid "Closing changeset..."
 msgstr "Sulgen muutustekogumit..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
-#, java-format
-msgid "Closing changeset {0}..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
-#, java-format
-msgid "Leaving changeset {0} open..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
 msgid "No changeset present for diff upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414
 msgid "Preparing..."
 msgstr "Ettevalmistus..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419
 msgid "Uploading..."
 msgstr "Üleslaadimine..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438
 msgid "Waiting 10 seconds ... "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449
 msgid "OK - trying again."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:485
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517
 #, java-format
 msgid "Starting retry {0} of {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
+msgid "current changeset is null. Can't upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
+#, java-format
+msgid "id of current changeset > required. Current id is {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
+#, java-format
+msgid "Open changeset expected. Got closed changeset with id {0}"
 msgstr ""
 
@@ -8753,50 +8980,109 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
+#, java-format
+msgid "missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:128
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:134
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
+#, java-format
+msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
+#, java-format
+msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
+#, java-format
+msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#, java-format
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#, java-format
+msgid "Unsupported version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:176
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Aborting."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#, java-format
+msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
+#, fuzzy
+msgid "Parsing list of changesets..."
+msgstr "Sulgen muutustekogumit..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
 msgid "Incorrect password or username."
 msgstr "Vale salasõna või kasutajanimi."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:168
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Ettevaatust: Salasõna saadetakse krüpteerimata."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Save user and password (unencrypted)"
 msgstr "Salvesta kasutaja ja salasõna (krüpteerimata)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
 msgid "Enter Password"
 msgstr "Sisesta salasõna"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 msgid "Login"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:242
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
 msgid "The base URL for the OSM server (REST API)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
 msgid "Base Server URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
 msgid "OSM password"
 msgstr "OSM parool"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -8805,5 +9091,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:51
+#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #, java-format
 msgid "(at line {0}, column {1})"
@@ -8893,20 +9179,5 @@
 msgstr "Viga sõelumisel."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124
-#, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
-#, fuzzy, java-format
-msgid "Missing mandatory attribute ''{0}''"
-msgstr "Puudub vajalik atribuut \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
-#, fuzzy, java-format
-msgid "Unsupported version: {0}"
-msgstr "Muudetud sellest: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:155
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -8915,38 +9186,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
 msgid "found XML element <nd> element not as direct child of element <way>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
 msgid "Found XML element <member> not as direct child of element <relation>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
 #, java-format
 msgid ""
@@ -8954,24 +9225,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Puudulik <member> määratlus ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
-#, java-format
-msgid "Warning: Undefined element ''{0}'' found in input stream. Skipping."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
-#, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Skipping."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
 msgid "Illegal object with id=0"
 msgstr "Keelatud objekti number id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #, java-format
 msgid ""
@@ -8979,5 +9245,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:303
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
 #, java-format
 msgid ""
@@ -8986,5 +9252,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
 #, java-format
 msgid ""
@@ -8993,5 +9259,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
@@ -9001,25 +9267,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:316
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with id {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#, java-format
 msgid "Missing required attribute ''{0}''."
-msgstr "Puudub vajalik atribuut \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
 #, java-format
 msgid ""
@@ -9027,5 +9293,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
 #, java-format
 msgid ""
@@ -9034,5 +9300,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
 #, java-format
 msgid ""
@@ -9040,5 +9306,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
 #, java-format
 msgid ""
@@ -9047,17 +9313,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
 msgid "Prepare OSM data..."
 msgstr "Valmistan ette OSM andmeid..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 msgid "Parsing OSM data..."
-msgstr "Valmistan ette OSM andmeid..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
 msgid "Preparing data set..."
-msgstr "Valmistan andmeid ette..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
@@ -9078,4 +9342,24 @@
 msgid "Downloading referring relations ..."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51
+#, fuzzy
+msgid "Reading changesets..."
+msgstr "Sulgen muutustekogumit..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
+#, fuzzy
+msgid "Downloading changesets ..."
+msgstr "Sulgen muutustekogumit..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85
+#, fuzzy, java-format
+msgid "Reading changeset {0} ..."
+msgstr "Sulgen muutustekogumit..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91
+#, fuzzy, java-format
+msgid "Downloading changeset {0} ..."
+msgstr "Sulgen muutustekogumit..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
@@ -9092,43 +9376,66 @@
 msgstr "Ühendun serveriga..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
 msgid "Failed to open connection to API {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
+msgid "Error: failed to add authentication credentials to the connection."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 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/OsmServerWriter.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+msgid "XML tag <user> is missing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
+#, fuzzy, java-format
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgstr "Kasuta eelseadet ''{0}'' grupist ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
+#, java-format
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
 msgid "Starting to upload with one request per primitive ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
 msgid "Starting to upload in one request ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:171
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135
 msgid "Uploading data ..."
-msgstr "Üleslaadimine..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:178
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
 msgid ""
 "WARNING: no API version defined for data to upload. Falling back to version "
@@ -9136,5 +9443,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147
 #, java-format
 msgid ""
@@ -9144,10 +9451,10 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
 msgid "Update Plugins"
 msgstr "Pistikrakenduste uuendamine"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 msgid "Download Plugins"
 msgstr ""
@@ -9300,5 +9607,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -9307,18 +9614,18 @@
 msgstr[1] "Laadisin alla pluginate info {0} saidilt"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
 msgid "No plugin information found."
 msgstr "Pluginate infot ei leitud"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:93
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
 msgid "All installed plugins are up to date."
 msgstr "Kõik installeeritud pluginad on uuendatud."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
 #, java-format
 msgid ""
@@ -9331,9 +9638,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
 msgid "Download missing plugins"
 msgstr "Lae puuduvad pistikrakendused alla"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
 #, java-format
 msgid ""
@@ -9348,43 +9655,43 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
 msgid "unknown"
 msgstr "tundmatu"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Versioon {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 msgid "Plugin bundled with JOSM"
 msgstr "Plugin kaasatud JOSMi"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:357
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -9694,10 +10001,4 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:140
 msgid "(What does that mean?)"
-msgstr ""
-
-#. item "Relations/Route" text "Symbol description"
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3148
-msgid "Description"
 msgstr ""
 
@@ -10448,6 +10749,7 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
-msgid "Set "
-msgstr ""
+#, fuzzy, java-format
+msgid "Set {0} Lambert coordinates"
+msgstr "Null koordinaadid: "
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -11065,6 +11367,6 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 #: build/trans_style.java:990 build/trans_style.java:1007
-#: build/trans_style.java:1023 build/trans_style.java:3392
-#: build/trans_style.java:3400
+#: build/trans_style.java:1023 build/trans_style.java:3400
+#: build/trans_style.java:3408
 msgid "water"
 msgstr ""
@@ -11349,4 +11651,55 @@
 msgstr ""
 
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Michigan Left"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Adds no left turn for sets of 4 or 5 ways."
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45
+#, fuzzy
+msgid "Please select 4 or 5 ways to assign no left turns."
+msgstr "Palun vali üks või rohkem suletud, vähemalt nelja sõlmega teed."
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61
+#, fuzzy, java-format
+msgid "{0} extrem nodes."
+msgstr "{0} punkt"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69
+#, java-format
+msgid "Via node {0}, {1}"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75
+#, fuzzy, java-format
+msgid "{0} via nodes."
+msgstr "{0} punkt"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78
+msgid "Unable to find via nodes. Please check your selection"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98
+#, fuzzy, java-format
+msgid "MIddle way: {0}"
+msgstr "Režiim: {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121
+msgid "Create Michigan left turn restriction"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129
+#, fuzzy, java-format
+msgid "Processing {0}"
+msgstr "Versioon {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142
+#, java-format
+msgid "Relation: from {0} to {1} via {2}"
+msgstr ""
+
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
 msgid "OpenLayers"
@@ -11492,7 +11845,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
-#, fuzzy
 msgid "create new objects"
-msgstr "Loo uus sõlm."
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
@@ -11812,5 +12164,5 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:158
 msgid "JOSM Tag Editor Plugin"
 msgstr ""
@@ -11820,5 +12172,5 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:370
 #, java-format
 msgid "Updating properties of up to {0} object"
@@ -11827,18 +12179,4 @@
 msgstr[1] ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44
-msgid "INFO: entering compatibilty mode for JOSM with Main.ds"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47
-msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49
-msgid ""
-"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-"found."
-msgstr ""
-
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
 msgid "Group"
@@ -11847,9 +12185,4 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
 msgid "Item"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-msgid "Filter"
 msgstr ""
 
@@ -11936,5 +12269,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2272
 msgid "Street name"
 msgstr ""
@@ -12095,8 +12428,4 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88
 msgid "Zoom (in metres)"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
-msgid "URL"
 msgstr ""
 
@@ -12302,7 +12631,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501
-#, fuzzy
 msgid "Updating map ..."
-msgstr "Andmete värskendamine"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69
@@ -12786,7 +13114,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
-#: build/trans_style.java:4179
+#: build/trans_style.java:4159 build/trans_style.java:4166
+#: build/trans_style.java:4173 build/trans_style.java:4180
+#: build/trans_style.java:4187
 msgid "building"
 msgstr ""
@@ -12800,5 +13128,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4186
+#: build/trans_style.java:4194
 msgid "area"
 msgstr ""
@@ -12925,10 +13253,10 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:148
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:155
 msgid "Reached a junction"
 msgstr ""
@@ -13216,7 +13544,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
-#, fuzzy
 msgid "Overlap tiles"
-msgstr "Kattuvad alad"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
@@ -13369,6 +13696,11 @@
 msgstr ""
 
+#. Plugin michigan_left
+#: build/trans_plugins.java:35
+msgid "Adds no left turn for sets of 4 or 5 ways"
+msgstr ""
+
 #. Plugin nearclick
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid ""
 "Simulates a click when you do a small and short drag. This is usefull for "
@@ -13378,15 +13710,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13394,5 +13726,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13400,5 +13732,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13407,15 +13739,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13424,10 +13756,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13436,15 +13768,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -13454,10 +13786,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin usertools
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -13466,5 +13798,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -13473,5 +13805,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -13480,5 +13812,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -13487,10 +13819,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -13546,4 +13878,9 @@
 #. <annotations>
 #: build/trans_presets.java:57
+msgid "Highways"
+msgstr ""
+
+#. group "Highways"
+#: build/trans_presets.java:58
 msgid "Streets"
 msgstr "Tänavad"
@@ -13554,5 +13891,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:58 build/trans_surveyor.java:72
+#: build/trans_presets.java:59 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr ""
@@ -13561,5 +13898,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:61
+#: build/trans_presets.java:62
 msgid "Edit Motorway"
 msgstr ""
@@ -13586,8 +13923,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:120 build/trans_presets.java:140
-#: build/trans_presets.java:177 build/trans_presets.java:197
-#: build/trans_presets.java:1557 build/trans_presets.java:3146
+#: build/trans_presets.java:65 build/trans_presets.java:101
+#: build/trans_presets.java:121 build/trans_presets.java:141
+#: build/trans_presets.java:178 build/trans_presets.java:198
+#: build/trans_presets.java:1560 build/trans_presets.java:3158
 msgid "Reference"
 msgstr ""
@@ -13601,8 +13938,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:358
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:359
 msgid "Lanes"
 msgstr "Rajad"
@@ -13619,15 +13956,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:224 build/trans_presets.java:280
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:373 build/trans_presets.java:388
-#: build/trans_presets.java:412 build/trans_presets.java:431
-#: build/trans_presets.java:452 build/trans_presets.java:472
-#: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1307
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:225 build/trans_presets.java:281
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:374 build/trans_presets.java:389
+#: build/trans_presets.java:413 build/trans_presets.java:432
+#: build/trans_presets.java:453 build/trans_presets.java:473
+#: build/trans_presets.java:511 build/trans_presets.java:667
+#: build/trans_presets.java:1310
 msgid "Max. speed (km/h)"
 msgstr ""
@@ -13664,16 +14001,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:293 build/trans_presets.java:306
-#: build/trans_presets.java:320 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:464
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:659 build/trans_presets.java:1300
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:294 build/trans_presets.java:307
+#: build/trans_presets.java:321 build/trans_presets.java:353
+#: build/trans_presets.java:405 build/trans_presets.java:425
+#: build/trans_presets.java:445 build/trans_presets.java:465
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:660 build/trans_presets.java:1303
 msgid "Oneway"
 msgstr "Ühesuunaline"
@@ -13715,19 +14052,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:353
-#: build/trans_presets.java:362 build/trans_presets.java:405
-#: build/trans_presets.java:425 build/trans_presets.java:445
-#: build/trans_presets.java:465 build/trans_presets.java:485
-#: build/trans_presets.java:504 build/trans_presets.java:523
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:586 build/trans_presets.java:607
-#: build/trans_presets.java:628 build/trans_presets.java:660
-#: build/trans_presets.java:1301 build/trans_surveyor.java:12
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:354
+#: build/trans_presets.java:363 build/trans_presets.java:406
+#: build/trans_presets.java:426 build/trans_presets.java:446
+#: build/trans_presets.java:466 build/trans_presets.java:486
+#: build/trans_presets.java:505 build/trans_presets.java:524
+#: build/trans_presets.java:545 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629 build/trans_presets.java:661
+#: build/trans_presets.java:1304 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Sild"
@@ -13763,19 +14100,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:354
-#: build/trans_presets.java:378 build/trans_presets.java:406
-#: build/trans_presets.java:426 build/trans_presets.java:446
-#: build/trans_presets.java:466 build/trans_presets.java:486
-#: build/trans_presets.java:505 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629 build/trans_presets.java:661
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:355
+#: build/trans_presets.java:379 build/trans_presets.java:407
+#: build/trans_presets.java:427 build/trans_presets.java:447
+#: build/trans_presets.java:467 build/trans_presets.java:487
+#: build/trans_presets.java:506 build/trans_presets.java:525
+#: build/trans_presets.java:546 build/trans_presets.java:567
+#: build/trans_presets.java:588 build/trans_presets.java:609
+#: build/trans_presets.java:630 build/trans_presets.java:662
+#: build/trans_presets.java:1305
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -13809,18 +14146,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:73 build/trans_presets.java:90
-#: build/trans_presets.java:110 build/trans_presets.java:129
-#: build/trans_presets.java:150 build/trans_presets.java:166
-#: build/trans_presets.java:186 build/trans_presets.java:205
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:355
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:467
-#: build/trans_presets.java:487 build/trans_presets.java:506
-#: build/trans_presets.java:525 build/trans_presets.java:546
-#: build/trans_presets.java:567 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:630
-#: build/trans_presets.java:662 build/trans_presets.java:1303
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:356
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:468
+#: build/trans_presets.java:488 build/trans_presets.java:507
+#: build/trans_presets.java:526 build/trans_presets.java:547
+#: build/trans_presets.java:568 build/trans_presets.java:589
+#: build/trans_presets.java:610 build/trans_presets.java:631
+#: build/trans_presets.java:663 build/trans_presets.java:1306
 msgid "Cutting"
 msgstr ""
@@ -13854,18 +14191,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:74 build/trans_presets.java:91
-#: build/trans_presets.java:111 build/trans_presets.java:130
-#: build/trans_presets.java:151 build/trans_presets.java:167
-#: build/trans_presets.java:187 build/trans_presets.java:206
-#: build/trans_presets.java:222 build/trans_presets.java:240
-#: build/trans_presets.java:258 build/trans_presets.java:277
-#: build/trans_presets.java:310 build/trans_presets.java:356
-#: build/trans_presets.java:408 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:468
-#: build/trans_presets.java:488 build/trans_presets.java:507
-#: build/trans_presets.java:526 build/trans_presets.java:547
-#: build/trans_presets.java:568 build/trans_presets.java:589
-#: build/trans_presets.java:610 build/trans_presets.java:631
-#: build/trans_presets.java:663 build/trans_presets.java:1304
+#: build/trans_presets.java:75 build/trans_presets.java:92
+#: build/trans_presets.java:112 build/trans_presets.java:131
+#: build/trans_presets.java:152 build/trans_presets.java:168
+#: build/trans_presets.java:188 build/trans_presets.java:207
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:357
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:469
+#: build/trans_presets.java:489 build/trans_presets.java:508
+#: build/trans_presets.java:527 build/trans_presets.java:548
+#: build/trans_presets.java:569 build/trans_presets.java:590
+#: build/trans_presets.java:611 build/trans_presets.java:632
+#: build/trans_presets.java:664 build/trans_presets.java:1307
 msgid "Embankment"
 msgstr ""
@@ -13873,5 +14210,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Motorway Link"
 msgstr ""
@@ -13880,5 +14217,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:80
+#: build/trans_presets.java:81
 msgid "Edit Motorway Link"
 msgstr ""
@@ -13886,5 +14223,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:94
+#: build/trans_presets.java:95
 msgid "Trunk"
 msgstr ""
@@ -13893,5 +14230,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:97
+#: build/trans_presets.java:98
 msgid "Edit Trunk"
 msgstr ""
@@ -13901,6 +14238,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
 msgid "Motorroad"
 msgstr ""
@@ -13908,5 +14245,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:114
+#: build/trans_presets.java:115
 msgid "Trunk Link"
 msgstr ""
@@ -13915,5 +14252,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:117
+#: build/trans_presets.java:118
 msgid "Edit Trunk Link"
 msgstr ""
@@ -13926,5 +14263,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:134 build/trans_surveyor.java:76
+#: build/trans_presets.java:135 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr ""
@@ -13933,5 +14270,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:137
+#: build/trans_presets.java:138
 msgid "Edit Primary Road"
 msgstr ""
@@ -13939,10 +14276,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:154
+#: build/trans_presets.java:155
 msgid "Primary Link"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:155
+#: build/trans_presets.java:156
 msgid "Edit Primary Link"
 msgstr ""
@@ -13954,5 +14291,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:170 build/trans_surveyor.java:80
+#: build/trans_presets.java:171 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr ""
@@ -13962,5 +14299,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:174
+#: build/trans_presets.java:175
 msgid "Edit Secondary Road"
 msgstr ""
@@ -13968,5 +14305,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:190
+#: build/trans_presets.java:191
 msgid "Tertiary"
 msgstr ""
@@ -13976,5 +14313,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:194
+#: build/trans_presets.java:195
 msgid "Edit Tertiary Road"
 msgstr ""
@@ -13986,5 +14323,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:209 build/trans_surveyor.java:84
+#: build/trans_presets.java:210 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr ""
@@ -13994,5 +14331,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:213
+#: build/trans_presets.java:214
 msgid "Edit Unclassified Road"
 msgstr ""
@@ -14019,19 +14356,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:225 build/trans_presets.java:243
-#: build/trans_presets.java:261 build/trans_presets.java:281
-#: build/trans_presets.java:314 build/trans_presets.java:359
-#: build/trans_presets.java:375 build/trans_presets.java:389
-#: build/trans_presets.java:413 build/trans_presets.java:432
-#: build/trans_presets.java:453 build/trans_presets.java:473
-#: build/trans_presets.java:491 build/trans_presets.java:511
-#: build/trans_presets.java:532 build/trans_presets.java:553
-#: build/trans_presets.java:574 build/trans_presets.java:595
-#: build/trans_presets.java:616 build/trans_presets.java:637
-#: build/trans_presets.java:667 build/trans_presets.java:680
-#: build/trans_presets.java:693 build/trans_presets.java:706
-#: build/trans_presets.java:719 build/trans_presets.java:732
-#: build/trans_presets.java:745 build/trans_presets.java:1308
-#: build/trans_presets.java:1498 build/trans_presets.java:1540
+#: build/trans_presets.java:226 build/trans_presets.java:244
+#: build/trans_presets.java:262 build/trans_presets.java:282
+#: build/trans_presets.java:315 build/trans_presets.java:360
+#: build/trans_presets.java:376 build/trans_presets.java:390
+#: build/trans_presets.java:414 build/trans_presets.java:433
+#: build/trans_presets.java:454 build/trans_presets.java:474
+#: build/trans_presets.java:492 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:554
+#: build/trans_presets.java:575 build/trans_presets.java:596
+#: build/trans_presets.java:617 build/trans_presets.java:638
+#: build/trans_presets.java:668 build/trans_presets.java:681
+#: build/trans_presets.java:694 build/trans_presets.java:707
+#: build/trans_presets.java:720 build/trans_presets.java:733
+#: build/trans_presets.java:746 build/trans_presets.java:1311
+#: build/trans_presets.java:1501 build/trans_presets.java:1543
 msgid "Width (meters)"
 msgstr ""
@@ -14043,5 +14380,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:228 build/trans_surveyor.java:88
+#: build/trans_presets.java:229 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Tänav"
@@ -14050,5 +14387,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:231
+#: build/trans_presets.java:232
 msgid "Edit Residential Street"
 msgstr ""
@@ -14073,14 +14410,14 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:611
-#: build/trans_presets.java:632 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "Surface"
 msgstr ""
@@ -14101,53 +14438,53 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paved"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "unpaved"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
 msgid "metal"
 msgstr ""
@@ -14161,22 +14498,22 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
-#: build/trans_style.java:3367
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
+#: build/trans_style.java:3375
 msgid "wood"
 msgstr "mets"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paving_stones"
 msgstr ""
@@ -14184,77 +14521,77 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "cobblestone"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "gravel"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "grass"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "sand"
 msgstr ""
@@ -14262,13 +14599,13 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "ground"
 msgstr ""
@@ -14276,5 +14613,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:246
+#: build/trans_presets.java:247
 msgid "Living Street"
 msgstr ""
@@ -14283,5 +14620,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:249
+#: build/trans_presets.java:250
 msgid "Edit Living Street"
 msgstr ""
@@ -14289,5 +14626,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:264
+#: build/trans_presets.java:265
 msgid "Service"
 msgstr "Teenindus"
@@ -14296,5 +14633,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:267
+#: build/trans_presets.java:268
 msgid "Edit Serviceway"
 msgstr ""
@@ -14304,18 +14641,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "parking_aisle"
 msgstr ""
@@ -14323,5 +14660,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:284
+#: build/trans_presets.java:285
 msgid "Parking Aisle"
 msgstr ""
@@ -14331,5 +14668,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:288
+#: build/trans_presets.java:289
 msgid "Edit Parking Aisle"
 msgstr ""
@@ -14337,5 +14674,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:298
+#: build/trans_presets.java:299
 msgid "Road (Unknown Type)"
 msgstr ""
@@ -14344,5 +14681,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Edit Road of unknown type"
 msgstr ""
@@ -14351,20 +14688,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:318
+#: build/trans_presets.java:319
 msgid "Road Restrictions"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:319
+#: build/trans_presets.java:320
 msgid "Edit Road Restrictions"
 msgstr ""
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:321
+#: build/trans_presets.java:322
 msgid "Toll"
 msgstr ""
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:322
+#: build/trans_presets.java:323
 msgid "No exit (cul-de-sac)"
 msgstr ""
@@ -14377,8 +14714,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:323 build/trans_presets.java:529
-#: build/trans_presets.java:550 build/trans_presets.java:571
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:634
+#: build/trans_presets.java:324 build/trans_presets.java:530
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:593 build/trans_presets.java:614
+#: build/trans_presets.java:635
 msgid "Access"
 msgstr ""
@@ -14432,29 +14769,29 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1397
-#: build/trans_presets.java:1398 build/trans_presets.java:1399
-#: build/trans_presets.java:1763 build/trans_presets.java:1773
-#: build/trans_presets.java:2397 build/trans_presets.java:2433
-#: build/trans_presets.java:2442 build/trans_presets.java:2443
-#: build/trans_presets.java:2444 build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:1396
+#: build/trans_presets.java:1397 build/trans_presets.java:1400
+#: build/trans_presets.java:1401 build/trans_presets.java:1402
+#: build/trans_presets.java:1767 build/trans_presets.java:1777
+#: build/trans_presets.java:2408 build/trans_presets.java:2444
+#: build/trans_presets.java:2453 build/trans_presets.java:2454
+#: build/trans_presets.java:2455 build/trans_presets.java:2725
 msgid "yes"
 msgstr ""
@@ -14467,40 +14804,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:212
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:212
 msgid "private"
 msgstr ""
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655
 msgid "designated"
 msgstr ""
@@ -14513,19 +14850,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:219
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:219
 msgid "destination"
 msgstr ""
@@ -14548,71 +14885,71 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:205
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:205
 msgid "permissive"
 msgstr ""
 
-#: build/trans_presets.java:323 build/trans_presets.java:327
-#: build/trans_presets.java:330 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636
+#: build/trans_presets.java:324 build/trans_presets.java:328
+#: build/trans_presets.java:331 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637
 msgid "agricultural"
 msgstr ""
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
-#: build/trans_presets.java:2433 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1396 build/trans_presets.java:1397
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
+#: build/trans_presets.java:2444 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
+#: build/trans_presets.java:2725
 msgid "no"
 msgstr ""
 
-#: build/trans_presets.java:326
+#: build/trans_presets.java:327
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:327
+#: build/trans_presets.java:328
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -14627,10 +14964,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:328 build/trans_presets.java:651
-#: build/trans_presets.java:858 build/trans_presets.java:891
-#: build/trans_presets.java:913 build/trans_presets.java:950
-#: build/trans_presets.java:963 build/trans_presets.java:975
-#: build/trans_presets.java:987 build/trans_presets.java:999
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:329 build/trans_presets.java:652
+#: build/trans_presets.java:859 build/trans_presets.java:892
+#: build/trans_presets.java:914 build/trans_presets.java:951
+#: build/trans_presets.java:964 build/trans_presets.java:976
+#: build/trans_presets.java:988 build/trans_presets.java:1000
+#: build/trans_presets.java:1040
 msgid "Horse"
 msgstr ""
@@ -14646,13 +14983,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:329 build/trans_presets.java:530
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:635 build/trans_presets.java:859
-#: build/trans_presets.java:877 build/trans_presets.java:892
-#: build/trans_presets.java:914 build/trans_presets.java:951
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:330 build/trans_presets.java:531
+#: build/trans_presets.java:552 build/trans_presets.java:573
+#: build/trans_presets.java:594 build/trans_presets.java:615
+#: build/trans_presets.java:636 build/trans_presets.java:860
+#: build/trans_presets.java:878 build/trans_presets.java:893
+#: build/trans_presets.java:915 build/trans_presets.java:952
+#: build/trans_presets.java:965 build/trans_presets.java:977
+#: build/trans_presets.java:989 build/trans_presets.java:1001
+#: build/trans_presets.java:1041
 msgid "Motorcycle"
 msgstr ""
@@ -14667,30 +15004,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:330 build/trans_presets.java:531
-#: build/trans_presets.java:552 build/trans_presets.java:573
-#: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:636 build/trans_presets.java:654
-#: build/trans_presets.java:878 build/trans_presets.java:893
-#: build/trans_presets.java:915 build/trans_presets.java:952
-#: build/trans_presets.java:965 build/trans_presets.java:977
-#: build/trans_presets.java:989 build/trans_presets.java:1001
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:331 build/trans_presets.java:532
+#: build/trans_presets.java:553 build/trans_presets.java:574
+#: build/trans_presets.java:595 build/trans_presets.java:616
+#: build/trans_presets.java:637 build/trans_presets.java:655
+#: build/trans_presets.java:879 build/trans_presets.java:894
+#: build/trans_presets.java:916 build/trans_presets.java:953
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1042
 msgid "Motorcar"
 msgstr ""
 
-#: build/trans_presets.java:331
+#: build/trans_presets.java:332
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
-#: build/trans_presets.java:332
+#: build/trans_presets.java:333
 msgid "Motorboat"
 msgstr ""
 
-#: build/trans_presets.java:333
+#: build/trans_presets.java:334
 msgid "Boat"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:336
 msgid "Min. speed (km/h)"
 msgstr ""
@@ -14698,25 +15035,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:336 build/trans_presets.java:374
+#: build/trans_presets.java:337 build/trans_presets.java:375
 msgid "Max. weight (tonnes)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:337
+#: build/trans_presets.java:338
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:339
+#: build/trans_presets.java:340
 msgid "Max. Length (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:341
+#: build/trans_presets.java:342
 msgid "Roundabout"
 msgstr ""
@@ -14727,5 +15064,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:346
+#: build/trans_presets.java:347
 msgid "Edit Junction"
 msgstr ""
@@ -14747,9 +15084,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:349 build/trans_presets.java:648
-#: build/trans_presets.java:788 build/trans_presets.java:1135
-#: build/trans_presets.java:1392 build/trans_presets.java:2353
-#: build/trans_presets.java:2901 build/trans_presets.java:2911
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:350 build/trans_presets.java:649
+#: build/trans_presets.java:789 build/trans_presets.java:1137
+#: build/trans_presets.java:1395 build/trans_presets.java:2364
+#: build/trans_presets.java:2913 build/trans_presets.java:2923
+#: build/trans_presets.java:2932
 msgid "Type"
 msgstr ""
@@ -14769,10 +15106,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:547
+#: build/trans_presets.java:350 build/trans_style.java:547
 #: build/trans_style.java:555
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "motorway_link"
 msgstr ""
@@ -14794,10 +15131,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:563
+#: build/trans_presets.java:350 build/trans_style.java:563
 #: build/trans_style.java:571
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "trunk_link"
 msgstr ""
@@ -14819,10 +15156,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:579
+#: build/trans_presets.java:350 build/trans_style.java:579
 #: build/trans_style.java:587
 msgid "primary"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "primary_link"
 msgstr ""
@@ -14844,5 +15181,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:595
+#: build/trans_presets.java:350 build/trans_style.java:595
 #: build/trans_style.java:603
 msgid "secondary"
@@ -14857,9 +15194,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:349 build/trans_style.java:611
+#: build/trans_presets.java:350 build/trans_style.java:611
 msgid "tertiary"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "unclassified"
 msgstr ""
@@ -14873,9 +15210,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:349 build/trans_style.java:3143
+#: build/trans_presets.java:350 build/trans_style.java:3151
 msgid "residential"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "living_street"
 msgstr ""
@@ -14905,10 +15242,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:349 build/trans_style.java:667
-#: build/trans_style.java:4244
+#: build/trans_presets.java:350 build/trans_style.java:667
+#: build/trans_style.java:4252
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "bus_guideway"
 msgstr ""
@@ -14938,6 +15275,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:349 build/trans_style.java:877
-#: build/trans_style.java:3208 build/trans_style.java:3209
+#: build/trans_presets.java:350 build/trans_style.java:877
+#: build/trans_style.java:3216 build/trans_style.java:3217
 msgid "construction"
 msgstr ""
@@ -14948,10 +15285,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Edit Bridge"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "Edit Tunnel"
 msgstr ""
@@ -14959,19 +15296,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:393
+#: build/trans_presets.java:394
 msgid "Ways"
 msgstr "Teed"
 
 #. group "Ways"
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Construction"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:395
+#: build/trans_presets.java:396
 msgid "Edit Highway Under Construction"
 msgstr ""
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "Junction"
 msgstr ""
@@ -14987,5 +15324,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:411 build/trans_style.java:895
+#: build/trans_presets.java:412 build/trans_style.java:895
 msgid "roundabout"
 msgstr ""
@@ -14994,5 +15331,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:417
+#: build/trans_presets.java:418
 msgid "Bridleway"
 msgstr ""
@@ -15000,5 +15337,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:419
+#: build/trans_presets.java:420
 msgid "Edit Bridleway"
 msgstr ""
@@ -15006,5 +15343,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:435
+#: build/trans_presets.java:436
 msgid "Cycleway"
 msgstr "Jalgrattatee"
@@ -15014,10 +15351,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:439
+#: build/trans_presets.java:440
 msgid "Edit Cycleway"
 msgstr ""
 
 #. item "Ways/Cycleway" check "Embankment"
-#: build/trans_presets.java:449
+#: build/trans_presets.java:450
 msgid "Pedestrians"
 msgstr ""
@@ -15025,5 +15362,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Footway"
 msgstr "Jalgtee"
@@ -15032,10 +15369,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Footway"
 msgstr ""
 
 #. item "Ways/Footway" check "Embankment"
-#: build/trans_presets.java:469
+#: build/trans_presets.java:470
 msgid "Bikes"
 msgstr ""
@@ -15043,5 +15380,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:476
+#: build/trans_presets.java:477
 msgid "Pedestrian"
 msgstr ""
@@ -15050,5 +15387,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Edit Pedestrian Street"
 msgstr ""
@@ -15056,5 +15393,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:494
+#: build/trans_presets.java:495
 msgid "Steps"
 msgstr ""
@@ -15064,5 +15401,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:498
+#: build/trans_presets.java:499
 msgid "Edit Flight of Steps"
 msgstr ""
@@ -15071,5 +15408,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:515
+#: build/trans_presets.java:516
 msgid "Track"
 msgstr ""
@@ -15078,5 +15415,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:518
+#: build/trans_presets.java:519
 msgid "Edit Track"
 msgstr ""
@@ -15084,5 +15421,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:535
+#: build/trans_presets.java:536
 msgid "Track Grade 1"
 msgstr ""
@@ -15091,5 +15428,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:538
+#: build/trans_presets.java:539
 msgid "Edit Track of grade 1"
 msgstr ""
@@ -15097,5 +15434,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:556
+#: build/trans_presets.java:557
 msgid "Track Grade 2"
 msgstr ""
@@ -15104,5 +15441,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:559
+#: build/trans_presets.java:560
 msgid "Edit Track of grade 2"
 msgstr ""
@@ -15110,5 +15447,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:577
+#: build/trans_presets.java:578
 msgid "Track Grade 3"
 msgstr ""
@@ -15117,5 +15454,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:580
+#: build/trans_presets.java:581
 msgid "Edit Track of grade 3"
 msgstr ""
@@ -15123,5 +15460,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:598
+#: build/trans_presets.java:599
 msgid "Track Grade 4"
 msgstr ""
@@ -15130,5 +15467,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:601
+#: build/trans_presets.java:602
 msgid "Edit Track of grade 4"
 msgstr ""
@@ -15136,5 +15473,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:619
+#: build/trans_presets.java:620
 msgid "Track Grade 5"
 msgstr ""
@@ -15143,5 +15480,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:622
+#: build/trans_presets.java:623
 msgid "Edit Track of grade 5"
 msgstr ""
@@ -15150,5 +15487,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:641
+#: build/trans_presets.java:642
 msgid "Path"
 msgstr ""
@@ -15157,13 +15494,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:644
+#: build/trans_presets.java:645
 msgid "Edit Path"
 msgstr ""
 
-#: build/trans_presets.java:652
+#: build/trans_presets.java:653
 msgid "Ski"
 msgstr ""
 
-#: build/trans_presets.java:653
+#: build/trans_presets.java:654
 msgid "Snowmobile"
 msgstr ""
@@ -15173,6 +15510,6 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:670 build/trans_presets.java:1725
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:671 build/trans_presets.java:1729
+#: build/trans_presets.java:1752
 msgid "Hiking"
 msgstr "Matkamine"
@@ -15182,5 +15519,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:674
+#: build/trans_presets.java:675
 msgid "Edit Hiking"
 msgstr ""
@@ -15188,5 +15525,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:683
+#: build/trans_presets.java:684
 msgid "Mountain Hiking"
 msgstr ""
@@ -15196,5 +15533,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:687
+#: build/trans_presets.java:688
 msgid "Edit Mountain Hiking"
 msgstr ""
@@ -15202,5 +15539,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:696
+#: build/trans_presets.java:697
 msgid "Demanding Mountain Hiking"
 msgstr ""
@@ -15210,5 +15547,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:700
+#: build/trans_presets.java:701
 msgid "Edit Demanding Mountain Hiking"
 msgstr ""
@@ -15216,5 +15553,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:709
+#: build/trans_presets.java:710
 msgid "Alpine Hiking"
 msgstr ""
@@ -15224,5 +15561,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:713
+#: build/trans_presets.java:714
 msgid "Edit Alpine Hiking"
 msgstr ""
@@ -15230,5 +15567,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:723
 msgid "Demanding Alpine Hiking"
 msgstr ""
@@ -15238,5 +15575,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:726
+#: build/trans_presets.java:727
 msgid "Edit Demanding Alpine Hiking"
 msgstr ""
@@ -15244,5 +15581,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:735
+#: build/trans_presets.java:736
 msgid "Difficult Alpine Hiking"
 msgstr ""
@@ -15252,5 +15589,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:739
+#: build/trans_presets.java:740
 msgid "Edit Difficult Alpine Hiking"
 msgstr ""
@@ -15258,10 +15595,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:749
+#: build/trans_presets.java:750
 msgid "Waypoints"
 msgstr ""
 
 #. group "Waypoints"
-#: build/trans_presets.java:750
+#: build/trans_presets.java:751
 msgid "Motorway Junction"
 msgstr ""
@@ -15269,15 +15606,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:752
+#: build/trans_presets.java:753
 msgid "Edit Motorway Junction"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:757
 msgid "Number"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:759
 msgid "Services"
 msgstr ""
@@ -15285,5 +15622,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:761
 msgid "Edit Service Station"
 msgstr ""
@@ -15321,15 +15658,15 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:765 build/trans_presets.java:902
-#: build/trans_presets.java:1382 build/trans_presets.java:1406
-#: build/trans_presets.java:1413 build/trans_presets.java:1419
-#: build/trans_presets.java:1427 build/trans_presets.java:1434
-#: build/trans_presets.java:1761 build/trans_presets.java:1771
-#: build/trans_presets.java:2361 build/trans_presets.java:2368
-#: build/trans_presets.java:2384 build/trans_presets.java:2395
-#: build/trans_presets.java:2403 build/trans_presets.java:2410
-#: build/trans_presets.java:2464 build/trans_presets.java:2512
-#: build/trans_presets.java:2678 build/trans_presets.java:2693
-#: build/trans_presets.java:2732 build/trans_presets.java:3151
+#: build/trans_presets.java:766 build/trans_presets.java:903
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
+#: build/trans_presets.java:1416 build/trans_presets.java:1422
+#: build/trans_presets.java:1430 build/trans_presets.java:1437
+#: build/trans_presets.java:1765 build/trans_presets.java:1775
+#: build/trans_presets.java:2372 build/trans_presets.java:2379
+#: build/trans_presets.java:2395 build/trans_presets.java:2406
+#: build/trans_presets.java:2414 build/trans_presets.java:2421
+#: build/trans_presets.java:2475 build/trans_presets.java:2523
+#: build/trans_presets.java:2689 build/trans_presets.java:2704
+#: build/trans_presets.java:2743 build/trans_presets.java:3163
 msgid "Operator"
 msgstr "Operaatorfirma"
@@ -15338,5 +15675,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:769
+#: build/trans_presets.java:770
 msgid "Traffic Signal"
 msgstr ""
@@ -15346,5 +15683,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:774
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -15353,27 +15690,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "island"
 msgstr ""
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:774 build/trans_presets.java:790
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:775 build/trans_presets.java:791
+#: build/trans_presets.java:1334
 msgid "Cross on horseback"
 msgstr ""
@@ -15381,6 +15718,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:775 build/trans_presets.java:789
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:776 build/trans_presets.java:790
+#: build/trans_presets.java:1335
 msgid "Cross by bicycle"
 msgstr ""
@@ -15389,11 +15726,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:776 build/trans_presets.java:791
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:1336
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:778
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -15401,30 +15738,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:780
+#: build/trans_presets.java:781
 msgid "Stop"
 msgstr ""
@@ -15432,5 +15769,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:783
+#: build/trans_presets.java:784
 msgid "Pedestrian Crossing"
 msgstr ""
@@ -15439,14 +15776,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:786
+#: build/trans_presets.java:787
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:793
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:795
 msgid "Mini-roundabout"
 msgstr ""
@@ -15457,14 +15794,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:801
+#: build/trans_presets.java:802
 msgid "Turning Circle"
 msgstr ""
@@ -15474,20 +15811,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:806
+#: build/trans_presets.java:807
 msgid "City Limit"
 msgstr "Linnapiiri märk"
 
 #. item
-#: build/trans_presets.java:807
+#: build/trans_presets.java:808
 msgid "Edit City Limit Sign"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:812
+#: build/trans_presets.java:813
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:814
+#: build/trans_presets.java:815
 msgid "Speed Camera"
 msgstr ""
@@ -15495,5 +15832,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:817
+#: build/trans_presets.java:818
 msgid "Emergency Phone"
 msgstr ""
@@ -15501,5 +15838,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:820
+#: build/trans_presets.java:821
 msgid "Incline"
 msgstr ""
@@ -15507,5 +15844,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:823
+#: build/trans_presets.java:824
 msgid "Incline Steep"
 msgstr ""
@@ -15514,10 +15851,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:827
+#: build/trans_presets.java:828
 msgid "Ford"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:828
+#: build/trans_presets.java:829
 msgid "Edit Ford"
 msgstr ""
@@ -15525,5 +15862,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:835
+#: build/trans_presets.java:836
 msgid "Mountain Pass"
 msgstr ""
@@ -15531,5 +15868,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:837
+#: build/trans_presets.java:838
 msgid "Edit Mountain Pass"
 msgstr ""
@@ -15541,7 +15878,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:842 build/trans_presets.java:1600
-#: build/trans_presets.java:1745 build/trans_presets.java:2845
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:843 build/trans_presets.java:1604
+#: build/trans_presets.java:1749 build/trans_presets.java:2857
+#: build/trans_presets.java:2864 build/trans_presets.java:2871
 msgid "Elevation"
 msgstr ""
@@ -15549,5 +15886,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:846
+#: build/trans_presets.java:847
 msgid "Barriers"
 msgstr ""
@@ -15555,5 +15892,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:849
+#: build/trans_presets.java:850
 msgid "Bollard"
 msgstr ""
@@ -15561,5 +15898,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:852
 msgid "Edit Bollard"
 msgstr ""
@@ -15604,16 +15941,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:854 build/trans_presets.java:873
-#: build/trans_presets.java:887 build/trans_presets.java:909
-#: build/trans_presets.java:946 build/trans_presets.java:959
-#: build/trans_presets.java:971 build/trans_presets.java:983
-#: build/trans_presets.java:995 build/trans_presets.java:1007
-#: build/trans_presets.java:1017 build/trans_presets.java:1026
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:855 build/trans_presets.java:874
+#: build/trans_presets.java:888 build/trans_presets.java:910
+#: build/trans_presets.java:947 build/trans_presets.java:960
+#: build/trans_presets.java:972 build/trans_presets.java:984
+#: build/trans_presets.java:996 build/trans_presets.java:1008
+#: build/trans_presets.java:1018 build/trans_presets.java:1027
+#: build/trans_presets.java:1036
 msgid "Allowed traffic:"
 msgstr ""
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:861
+#: build/trans_presets.java:862
 msgid "Cycle Barrier"
 msgstr ""
@@ -15622,5 +15959,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:865
+#: build/trans_presets.java:866
 msgid "Block"
 msgstr ""
@@ -15628,5 +15965,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:868
+#: build/trans_presets.java:869
 msgid "Cattle Grid"
 msgstr ""
@@ -15634,10 +15971,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:870
+#: build/trans_presets.java:871
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:880
+#: build/trans_presets.java:881
 msgid "Bus Trap"
 msgstr ""
@@ -15645,15 +15982,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:883
+#: build/trans_presets.java:884
 msgid "Spikes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:884
+#: build/trans_presets.java:885
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:896
 msgid "Toll Booth"
 msgstr ""
@@ -15661,5 +15998,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:897
+#: build/trans_presets.java:898
 msgid "Edit Toll Booth"
 msgstr ""
@@ -15667,10 +16004,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:905
+#: build/trans_presets.java:906
 msgid "Border Control"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:906
+#: build/trans_presets.java:907
 msgid "Edit Border Control"
 msgstr ""
@@ -15680,5 +16017,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:920
+#: build/trans_presets.java:921
 msgid "Hedge"
 msgstr ""
@@ -15687,5 +16024,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:925
 msgid "Fence"
 msgstr ""
@@ -15694,5 +16031,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:929
 msgid "Wall"
 msgstr ""
@@ -15700,5 +16037,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:931
+#: build/trans_presets.java:932
 msgid "City Wall"
 msgstr ""
@@ -15707,5 +16044,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:935
+#: build/trans_presets.java:936
 msgid "Retaining Wall"
 msgstr ""
@@ -15717,15 +16054,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:942
+#: build/trans_presets.java:943
 msgid "Entrance"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:943
+#: build/trans_presets.java:944
 msgid "Edit Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:954
+#: build/trans_presets.java:955
 msgid "Gate"
 msgstr ""
@@ -15733,50 +16070,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:956
+#: build/trans_presets.java:957
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:967
+#: build/trans_presets.java:968
 msgid "Lift Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:968
+#: build/trans_presets.java:969
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:979
+#: build/trans_presets.java:980
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:980
+#: build/trans_presets.java:981
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:991
+#: build/trans_presets.java:992
 msgid "Bump Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:992
+#: build/trans_presets.java:993
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:1003
+#: build/trans_presets.java:1004
 msgid "Kissing Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1004
+#: build/trans_presets.java:1005
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1013
 msgid "Stile"
 msgstr ""
@@ -15784,25 +16121,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1014
+#: build/trans_presets.java:1015
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1023
 msgid "Turnstile"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1024
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1032
 msgid "Sally Port"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1033
 msgid "Edit Sally Port"
 msgstr ""
@@ -15810,13 +16147,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #.
-#. <separator/>
+#. group "Water"
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1046 build/trans_presets.java:1089
+#: build/trans_presets.java:1047 build/trans_presets.java:1048
+#: build/trans_presets.java:1091
 msgid "Water"
 msgstr ""
 
 #. group "Water"
-#: build/trans_presets.java:1047
+#: build/trans_presets.java:1049
 msgid "Spring"
 msgstr ""
@@ -15824,5 +16162,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1049
+#: build/trans_presets.java:1051
 msgid "Edit Spring"
 msgstr ""
@@ -15830,5 +16168,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1056
 msgid "Drain"
 msgstr ""
@@ -15836,10 +16174,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1058
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1064
 msgid "Stream"
 msgstr ""
@@ -15847,10 +16185,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1066
 msgid "Edit Stream"
 msgstr ""
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1072
 msgid "Canal"
 msgstr ""
@@ -15858,10 +16196,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1074
 msgid "Edit Canal"
 msgstr ""
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1080
 msgid "River"
 msgstr ""
@@ -15871,5 +16209,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1084
 msgid "Edit River"
 msgstr ""
@@ -15877,15 +16215,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1093
 msgid "Edit Water"
 msgstr ""
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1097
 msgid "Land"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1098
 msgid "Edit Land"
 msgstr ""
@@ -15893,15 +16231,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1103
 msgid "Basin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1104
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1109
 msgid "Reservoir"
 msgstr ""
@@ -15909,15 +16247,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1109
+#: build/trans_presets.java:1111
 msgid "Edit Reservoir Landuse"
 msgstr ""
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1116
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1117
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -15925,5 +16263,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1120
+#: build/trans_presets.java:1122
 msgid "Riverbank"
 msgstr ""
@@ -15932,10 +16270,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1125
 msgid "Edit Riverbank"
 msgstr ""
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1127
+#: build/trans_presets.java:1129
 msgid "Wetland"
 msgstr ""
@@ -15946,14 +16284,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1134
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "swamp"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "bog"
 msgstr ""
@@ -15967,35 +16305,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1135 build/trans_style.java:3384
+#: build/trans_presets.java:1137 build/trans_style.java:3392
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1139
 msgid "Mud"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1140
 msgid "Edit Mud"
 msgstr ""
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1144
 msgid "Beach"
 msgstr ""
@@ -16003,20 +16341,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1144
+#: build/trans_presets.java:1146
 msgid "Edit Beach"
 msgstr ""
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1150
 msgid "Bay"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1149
+#: build/trans_presets.java:1151
 msgid "Edit Bay"
 msgstr ""
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1155
 msgid "Cliff"
 msgstr ""
@@ -16024,10 +16362,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1157
 msgid "Edit Cliff"
 msgstr ""
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1159
+#: build/trans_presets.java:1161
 msgid "Coastline"
 msgstr ""
@@ -16035,5 +16373,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1163
 msgid "Edit Coastline"
 msgstr ""
@@ -16041,5 +16379,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1168
 msgid "Ferry Route"
 msgstr ""
@@ -16047,5 +16385,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1170
 msgid "Edit Ferry"
 msgstr ""
@@ -16054,5 +16392,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1176
+#: build/trans_presets.java:1178
 msgid "Boatyard"
 msgstr ""
@@ -16060,10 +16398,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:1180
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1185
 msgid "Dock"
 msgstr ""
@@ -16071,5 +16409,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1187
 msgid "Edit Dock"
 msgstr ""
@@ -16077,5 +16415,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1193
 msgid "Dam"
 msgstr ""
@@ -16083,15 +16421,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1195
 msgid "Edit Dam"
 msgstr ""
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1199
+#: build/trans_presets.java:1201
 msgid "Waterway Point"
 msgstr ""
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1202
 msgid "Lock Gate"
 msgstr ""
@@ -16100,5 +16438,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1206
 msgid "Weir"
 msgstr ""
@@ -16106,20 +16444,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1208
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1213
 msgid "Waterfall"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1214
 msgid "Edit Waterfall"
 msgstr ""
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1219
 msgid "Turning Point"
 msgstr ""
@@ -16128,15 +16466,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1221
+#: build/trans_presets.java:1223
 msgid "Marina"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1224
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1228
 msgid "Pier"
 msgstr ""
@@ -16144,10 +16482,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1230
 msgid "Edit Pier"
 msgstr ""
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1234
 msgid "Ferry Terminal"
 msgstr ""
@@ -16155,10 +16493,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1236
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1240
 msgid "Slipway"
 msgstr ""
@@ -16168,16 +16506,21 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1244
 msgid "Edit Slipway"
 msgstr ""
 
 #. item "Waterway Point/Slipway" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1250
+#, fuzzy
+msgid "Transport"
+msgstr "Avalik transport"
+
+#. group "Transport"
+#: build/trans_presets.java:1251
 msgid "Railway"
 msgstr ""
 
 #. group "Railway"
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1252
 msgid "Rail"
 msgstr ""
@@ -16185,5 +16528,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:1254
 msgid "Edit Rail"
 msgstr ""
@@ -16213,8 +16556,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "Optional Types"
 msgstr ""
@@ -16228,35 +16571,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1259
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1257
+#: build/trans_presets.java:1260
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1265
 msgid "Monorail"
 msgstr ""
@@ -16264,45 +16607,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1267
 msgid "Edit Monorail"
 msgstr ""
 
-#: build/trans_presets.java:1269
+#: build/trans_presets.java:1272
 msgid "Preserved"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1273
 msgid "Edit Preserved Railway"
 msgstr ""
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1278
 msgid "Light Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1279
 msgid "Edit Light Rail"
 msgstr ""
 
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1284
 msgid "Subway"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1285
 msgid "Edit Subway"
 msgstr ""
 
-#: build/trans_presets.java:1287
+#: build/trans_presets.java:1290
 msgid "Tram"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1291
 msgid "Edit Tram"
 msgstr ""
 
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1296
 msgid "Bus Guideway"
 msgstr ""
@@ -16310,5 +16653,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1295
+#: build/trans_presets.java:1298
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -16317,14 +16660,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1315
 msgid "Disused Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1313
+#: build/trans_presets.java:1316
 msgid "Edit Disused Railway"
 msgstr ""
 
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1321
 msgid "Abandoned Rail"
 msgstr ""
@@ -16333,5 +16676,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1325
 msgid "Level Crossing"
 msgstr ""
@@ -16340,5 +16683,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1329
 msgid "Crossing"
 msgstr ""
@@ -16348,5 +16691,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1333
 msgid "Crossing type"
 msgstr ""
@@ -16354,5 +16697,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1339
 msgid "Turntable"
 msgstr ""
@@ -16361,10 +16704,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1344
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1345
 msgid "Chair Lift"
 msgstr ""
@@ -16372,10 +16715,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1347
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1351
 msgid "Drag Lift"
 msgstr ""
@@ -16383,10 +16726,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1353
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1357
 msgid "Cable Car"
 msgstr ""
@@ -16394,10 +16737,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1359
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1360
+#: build/trans_presets.java:1363
 msgid "Gondola"
 msgstr ""
@@ -16405,5 +16748,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1365
 msgid "Edit Gondola"
 msgstr ""
@@ -16411,5 +16754,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1366 build/trans_presets.java:1461
+#: build/trans_presets.java:1369 build/trans_presets.java:1464
 msgid "Station"
 msgstr ""
@@ -16420,10 +16763,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1368 build/trans_presets.java:1464
+#: build/trans_presets.java:1371 build/trans_presets.java:1467
 msgid "Edit Station"
 msgstr ""
 
 #. group "Car"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1378
 msgid "Fuel"
 msgstr ""
@@ -16433,5 +16776,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1382
 msgid "Edit Fuel"
 msgstr ""
@@ -16489,32 +16832,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1671 build/trans_presets.java:1678
-#: build/trans_presets.java:1686 build/trans_presets.java:1699
-#: build/trans_presets.java:1713 build/trans_presets.java:1810
-#: build/trans_presets.java:1818 build/trans_presets.java:1909
-#: build/trans_presets.java:1915 build/trans_presets.java:2226
-#: build/trans_presets.java:2250 build/trans_presets.java:2465
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1703
+#: build/trans_presets.java:1717 build/trans_presets.java:1814
+#: build/trans_presets.java:1822 build/trans_presets.java:1919
+#: build/trans_presets.java:1925 build/trans_presets.java:2237
+#: build/trans_presets.java:2261 build/trans_presets.java:2476
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Opening Hours"
 msgstr "Avatud"
@@ -16573,91 +16916,91 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -16672,5 +17015,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1385 build/trans_presets.java:1438
+#: build/trans_presets.java:1388 build/trans_presets.java:1441
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -16680,5 +17023,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1391
 msgid "Edit Parking"
 msgstr ""
@@ -16689,24 +17032,24 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1391 build/trans_presets.java:1762
-#: build/trans_presets.java:1772 build/trans_presets.java:2396
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:1394 build/trans_presets.java:1766
+#: build/trans_presets.java:1776 build/trans_presets.java:2407
+#: build/trans_presets.java:2524
 msgid "Reference number"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "surface"
 msgstr ""
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1396
 msgid "Park and Ride"
 msgstr ""
@@ -16715,38 +17058,38 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1394 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
+#: build/trans_presets.java:1397 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
 msgid "Fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1396
+#: build/trans_presets.java:1399
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1400
 msgid "Spaces for Disabled"
 msgstr ""
 
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1401
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1402
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1403
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1405
 msgid "Wash"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1406
 msgid "Edit Car Wash"
 msgstr ""
@@ -16754,5 +17097,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1408 build/trans_presets.java:1452
+#: build/trans_presets.java:1411 build/trans_presets.java:1455
 msgid "Shop"
 msgstr "Pood"
@@ -16760,15 +17103,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1413
 msgid "Edit Car Shop"
 msgstr ""
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1418
 msgid "Repair"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1419
 msgid "Edit Car Repair"
 msgstr ""
@@ -16776,5 +17119,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1421 build/trans_presets.java:1445
+#: build/trans_presets.java:1424 build/trans_presets.java:1448
 msgid "Rental"
 msgstr ""
@@ -16783,10 +17126,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1427
 msgid "Edit Car Rental"
 msgstr ""
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1432
 msgid "Sharing"
 msgstr ""
@@ -16794,5 +17137,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1434
 msgid "Edit Car Sharing"
 msgstr ""
@@ -16800,10 +17143,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Parking"
 msgstr ""
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1446
 msgid "Capacity"
 msgstr ""
@@ -16812,5 +17155,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1448
+#: build/trans_presets.java:1451
 msgid "Edit Bicycle Rental"
 msgstr ""
@@ -16819,15 +17162,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1458
 msgid "Edit Bicycle Shop"
 msgstr ""
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1463
 msgid "Public Transport"
 msgstr "Avalik transport"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:1472
 msgid "UIC-Reference"
 msgstr ""
@@ -16835,5 +17178,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1475
 msgid "Railway Halt"
 msgstr ""
@@ -16841,5 +17184,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1477
 msgid "Edit Halt"
 msgstr ""
@@ -16847,5 +17190,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1484
 msgid "Tram Stop"
 msgstr ""
@@ -16854,5 +17197,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1484
+#: build/trans_presets.java:1487
 msgid "Edit Tram Stop"
 msgstr ""
@@ -16860,5 +17203,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1494
 msgid "Railway Platform"
 msgstr ""
@@ -16867,5 +17210,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1497
 msgid "Edit Railway Platform"
 msgstr ""
@@ -16877,5 +17220,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1497 build/trans_presets.java:1539
+#: build/trans_presets.java:1500 build/trans_presets.java:1542
 msgid "Reference (track number)"
 msgstr ""
@@ -16883,10 +17226,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1499 build/trans_presets.java:1541
+#: build/trans_presets.java:1502 build/trans_presets.java:1544
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1504
 msgid "Subway Entrance"
 msgstr ""
@@ -16895,10 +17238,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1507
 msgid "Edit Subway Entrance"
 msgstr ""
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1512
 msgid "Wheelchair"
 msgstr ""
@@ -16907,5 +17250,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1517
 msgid "Bus Station"
 msgstr ""
@@ -16914,5 +17257,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1520
 msgid "Edit Bus Station"
 msgstr ""
@@ -16920,5 +17263,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1526
 msgid "Bus Stop"
 msgstr ""
@@ -16928,5 +17271,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1530
 msgid "Edit Bus Stop"
 msgstr ""
@@ -16935,6 +17278,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1532 build/trans_presets.java:1785
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:1535 build/trans_presets.java:1789
+#: build/trans_presets.java:2453
 msgid "Shelter"
 msgstr ""
@@ -16942,10 +17285,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1538
 msgid "Bus Platform"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1539
 msgid "Edit Bus Platform"
 msgstr ""
@@ -16953,5 +17296,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1547
 msgid "Taxi"
 msgstr ""
@@ -16959,5 +17302,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1549
 msgid "Edit Taxi station"
 msgstr ""
@@ -16965,5 +17308,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1554
 msgid "Airport"
 msgstr ""
@@ -16971,15 +17314,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1556
 msgid "Edit Airport"
 msgstr ""
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1561
 msgid "IATA"
 msgstr ""
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1559
+#: build/trans_presets.java:1562
 msgid "ICAO"
 msgstr ""
@@ -16987,6 +17330,11 @@
 #. item "Public Transport/Airport" text "ICAO"
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1567
+#, fuzzy
+msgid "Travel"
+msgstr "Salvesta"
+
+#. group "Travel"
+#: build/trans_presets.java:1568
 msgid "Accomodation"
 msgstr "Majutus"
@@ -16998,5 +17346,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1565 build/trans_surveyor.java:43
+#: build/trans_presets.java:1569 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr ""
@@ -17005,15 +17353,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:1568
+#: build/trans_presets.java:1572
 msgid "Edit Hotel"
 msgstr ""
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1575
 msgid "Stars"
 msgstr ""
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1577
 msgid "Motel"
 msgstr ""
@@ -17021,20 +17369,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1579
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1583
 msgid "Guest House"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1584
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1588
 msgid "Chalet"
 msgstr ""
@@ -17042,10 +17390,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1590
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1594
 msgid "Hostel"
 msgstr ""
@@ -17053,30 +17401,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1592
+#: build/trans_presets.java:1596
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1600
 msgid "Alpine Hut"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1601
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1606
 msgid "Caravan Site"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1607
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1611
 msgid "Camping Site"
 msgstr ""
@@ -17084,10 +17432,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1613
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1618
 msgid "Food+Drinks"
 msgstr "Toit ja jook"
@@ -17098,5 +17446,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1615 build/trans_surveyor.java:47
+#: build/trans_presets.java:1619 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restoran"
@@ -17104,5 +17452,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1621
 msgid "Edit Restaurant"
 msgstr ""
@@ -17110,5 +17458,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "Cuisine"
 msgstr ""
@@ -17116,61 +17464,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "regional"
 msgstr "kohalik"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "turkish"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "asian"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "thai"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "mexican"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "japanese"
 msgstr ""
 
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1627
 msgid "Fast Food"
 msgstr "Kiirtoit"
@@ -17178,9 +17526,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1629
 msgid "Edit Fast Food Restaurant"
 msgstr ""
 
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1635
 msgid "Cafe"
 msgstr "Kohvik"
@@ -17188,9 +17536,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1633
+#: build/trans_presets.java:1637
 msgid "Edit Cafe"
 msgstr ""
 
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1642
 msgid "Pub"
 msgstr "Pubi"
@@ -17198,18 +17546,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1644
 msgid "Edit Pub"
 msgstr ""
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1649
 msgid "Biergarten"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1646
+#: build/trans_presets.java:1650
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1655
 msgid "Bar"
 msgstr "Baar"
@@ -17217,9 +17565,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1657
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1662
 msgid "Nightclub"
 msgstr "Ööklubi"
@@ -17227,24 +17575,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1664
 msgid "Edit Nightclub"
 msgstr ""
 
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1670
 msgid "Tourism"
 msgstr "Turism"
 
 #. group "Tourism"
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1671
 msgid "Attraction"
 msgstr "Vaatamisväärsus"
 
 #. item
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1672
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1677
 msgid "Museum"
 msgstr "Muuseum"
@@ -17252,9 +17600,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1679
 msgid "Edit Museum"
 msgstr ""
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1684
 msgid "Zoo"
 msgstr "Loomaaed"
@@ -17263,9 +17611,9 @@
 #. <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:1683
+#: build/trans_presets.java:1687
 msgid "Edit Zoo"
 msgstr ""
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1692
 msgid "Viewpoint"
 msgstr ""
@@ -17273,24 +17621,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1694
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1697
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1699
 msgid "Theme Park"
 msgstr "Teemapark"
 
 #. item
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1700
 msgid "Edit Theme Park"
 msgstr ""
 
-#: build/trans_presets.java:1701
+#: build/trans_presets.java:1705
 msgid "Artwork"
 msgstr ""
@@ -17298,5 +17646,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1707
 msgid "Edit Artwork"
 msgstr ""
@@ -17304,19 +17652,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1712
 msgid "Information Office"
 msgstr "Infopunkt"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1719
 msgid "Map"
 msgstr "Kaart"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "topo"
 msgstr ""
@@ -17354,5 +17702,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1720 build/trans_style.java:619
+#: build/trans_presets.java:1724 build/trans_style.java:619
 #: build/trans_style.java:635 build/trans_style.java:651
 #: build/trans_style.java:659
@@ -17360,28 +17708,28 @@
 msgstr "tänav"
 
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1722 build/trans_presets.java:1738
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1726 build/trans_presets.java:1742
+#: build/trans_presets.java:1786
 msgid "Closer Description"
 msgstr ""
@@ -17391,5 +17739,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1724 build/trans_presets.java:1747
+#: build/trans_presets.java:1728 build/trans_presets.java:1751
 msgid "Routes shown for:"
 msgstr ""
@@ -17397,6 +17745,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1726 build/trans_presets.java:1749
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1965
 msgid "Cycling"
 msgstr ""
@@ -17404,5 +17752,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1727 build/trans_presets.java:1750
+#: build/trans_presets.java:1731 build/trans_presets.java:1754
 msgid "Mountainbiking"
 msgstr ""
@@ -17410,6 +17758,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1728 build/trans_presets.java:1751
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:1732 build/trans_presets.java:1755
+#: build/trans_presets.java:2019
 msgid "Skiing"
 msgstr "Suusatamine"
@@ -17417,5 +17765,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1729 build/trans_presets.java:1752
+#: build/trans_presets.java:1733 build/trans_presets.java:1756
 msgid "Riding"
 msgstr ""
@@ -17423,46 +17771,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1734 build/trans_presets.java:1757
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1736
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "history"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1744
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1759
 msgid "Information Terminal"
 msgstr ""
@@ -17470,29 +17818,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1760 build/trans_presets.java:1770
+#: build/trans_presets.java:1764 build/trans_presets.java:1774
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1769
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1779
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1780
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1778
+#: build/trans_presets.java:1782
 msgid "Other Information Points"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1790
 msgid "Edit Shelter"
 msgstr ""
@@ -17500,25 +17848,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1789 build/trans_presets.java:1795
+#: build/trans_presets.java:1793 build/trans_presets.java:1799
 msgid "Fireplace"
 msgstr "Lõkkease"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1791
+#: build/trans_presets.java:1795
 msgid "Picnic Site"
 msgstr "Piknikuplats"
 
 #. item
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1796
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1802
 msgid "Historic Places"
 msgstr "Ajaloolised kohad"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1799
+#: build/trans_presets.java:1803
 msgid "Castle"
 msgstr "Loss"
@@ -17527,19 +17875,19 @@
 #. <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:1802
+#: build/trans_presets.java:1806
 msgid "Edit Castle"
 msgstr ""
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1810
 msgid "Ruins"
 msgstr "Varemed"
 
 #. item
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1811
 msgid "Edit Ruins"
 msgstr ""
 
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1816
 msgid "Archaeological Site"
 msgstr ""
@@ -17548,9 +17896,9 @@
 #. <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:1815
+#: build/trans_presets.java:1819
 msgid "Edit Archaeological Site"
 msgstr ""
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1824
 msgid "Battlefield"
 msgstr ""
@@ -17558,5 +17906,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1826
 msgid "Edit Battlefield"
 msgstr ""
@@ -17564,15 +17912,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1831
 msgid "Monument"
 msgstr "Monument"
 
 #. item
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1832
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1836
 msgid "Memorial"
 msgstr "Mälestusmärk"
@@ -17580,45 +17928,57 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1838
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1842
 msgid "Wayside Cross"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1843
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1847
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1848
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1852
+#, fuzzy
+msgid "Boundary Stone"
+msgstr "Piirid"
+
+#. item
+#: build/trans_presets.java:1853
+#, fuzzy
+msgid "Edit Boundary Stone"
+msgstr "Vali riistvara pood"
+
+#. item "Historic Places/Boundary Stone" text "Name"
+#: build/trans_presets.java:1858
 msgid "Leisure"
 msgstr "Puhkus"
 
 #. group "Leisure"
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1859
 msgid "Water Park"
 msgstr "Veepark"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1860
 msgid "Edit Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1864
 msgid "Playground"
 msgstr "Mänguväljak"
@@ -17626,31 +17986,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1866
 msgid "Edit Playground"
 msgstr ""
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1870
 msgid "Fishing"
 msgstr "Kalapüük"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1871
 msgid "Edit Fishing"
 msgstr ""
 
 #. item "Leisure/Fishing" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1877 build/trans_presets.java:2669
+msgid "Sports"
+msgstr "Sport"
+
+#. group "Sports"
+#: build/trans_presets.java:1878
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1879
 msgid "Stadium"
 msgstr "Staadion"
 
 #. item
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1880
 msgid "Edit Stadium"
 msgstr ""
@@ -17664,6 +18028,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1874 build/trans_presets.java:1883
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1902 build/trans_presets.java:1911
 msgid "select sport:"
 msgstr "vali spordiala:"
@@ -18055,30 +18419,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884 build/trans_style.java:3892
-#: build/trans_style.java:3900 build/trans_style.java:3908
-#: build/trans_style.java:3916 build/trans_style.java:3924
-#: build/trans_style.java:3932
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_style.java:3572 build/trans_style.java:3580
+#: build/trans_style.java:3588 build/trans_style.java:3596
+#: build/trans_style.java:3604 build/trans_style.java:3612
+#: build/trans_style.java:3620 build/trans_style.java:3628
+#: build/trans_style.java:3636 build/trans_style.java:3644
+#: build/trans_style.java:3652 build/trans_style.java:3660
+#: build/trans_style.java:3668 build/trans_style.java:3676
+#: build/trans_style.java:3684 build/trans_style.java:3692
+#: build/trans_style.java:3700 build/trans_style.java:3708
+#: build/trans_style.java:3716 build/trans_style.java:3724
+#: build/trans_style.java:3732 build/trans_style.java:3740
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3764 build/trans_style.java:3772
+#: build/trans_style.java:3780 build/trans_style.java:3788
+#: build/trans_style.java:3796 build/trans_style.java:3804
+#: build/trans_style.java:3812 build/trans_style.java:3820
+#: build/trans_style.java:3828 build/trans_style.java:3836
+#: build/trans_style.java:3844 build/trans_style.java:3852
+#: build/trans_style.java:3860 build/trans_style.java:3868
+#: build/trans_style.java:3876 build/trans_style.java:3884
+#: build/trans_style.java:3892 build/trans_style.java:3900
+#: build/trans_style.java:3908 build/trans_style.java:3916
+#: build/trans_style.java:3924 build/trans_style.java:3932
+#: build/trans_style.java:3940
 msgid "sport"
 msgstr ""
@@ -18088,225 +18452,225 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "archery"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "baseball"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "basketball"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "canoe"
 msgstr "kanuu"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "climbing"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "football"
 msgstr "ameerika_jalgpall"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "rugby"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skiing"
 msgstr "suusatamine"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "soccer"
 msgstr "jalgpall"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "swimming"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "table_tennis"
 msgstr "lauatennis"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1888
 msgid "Sports Centre"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1889
 msgid "Edit Sports Centre"
 msgstr ""
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1897
 msgid "Pitch"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1898
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1906
 msgid "Racetrack"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1907
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1915
 msgid "Golf Course"
 msgstr "Golfiväljak"
 
 #. item
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1916
 msgid "Edit Golf Course"
 msgstr ""
 
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1921
 msgid "Miniature Golf"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1922
 msgid "Edit Miniature Golf"
 msgstr ""
 
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1928
 msgid "Sport"
 msgstr ""
 
 #. group "Sport"
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1929
 msgid "Multi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1930
 msgid "Edit Multi"
 msgstr ""
@@ -18345,183 +18709,183 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "stadium"
 msgstr ""
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1935
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1936
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1941
 msgid "Athletics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1942
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1947
 msgid "Archery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1948
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1953
 msgid "Climbing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:1954
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1959
 msgid "Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1960
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1966
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1971
 msgid "Dog Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1972
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1977
 msgid "Equestrian"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1978
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1983
 msgid "Horse Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1984
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1989
 msgid "Gymnastics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1990
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1995
 msgid "Motor Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1996
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2001
 msgid "Skating"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2002
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2007
 msgid "Skateboard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2008
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2013
 msgid "Swimming"
 msgstr "Ujumine"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2014
 msgid "Edit Swimming"
 msgstr ""
@@ -18529,56 +18893,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2021
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "downhill"
 msgstr "mägi"
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "nordic"
 msgstr "murdmaa"
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "snow_park"
 msgstr "lumepark"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "Difficulty"
 msgstr "Raskusaste"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "easy"
 msgstr "kerge"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "expert"
 msgstr "ekspert"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2028
 msgid "Shooting"
 msgstr "Lasketiir"
@@ -18586,178 +18950,183 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2030
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2036
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2037
 msgid "Soccer"
 msgstr "Jalgpall"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2038
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2043
 msgid "Football"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2044
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2049
 msgid "Australian Football"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2050
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2055
 msgid "Baseball"
 msgstr "Pesapall"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2056
 msgid "Edit Baseball"
 msgstr "Vali pesapall"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2061
 msgid "Basketball"
 msgstr "Korvpall"
 
 #. item
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2062
 msgid "Edit Basketball"
 msgstr "Vali korvpall"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2067
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2068
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2071
 msgid "golf_course"
 msgstr "Golfiväljak"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2073
 msgid "Boule"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2074
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2079
 msgid "Bowls"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2080
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2085
 msgid "Cricket"
 msgstr "Kriket"
 
 #. item
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2086
 msgid "Edit Cricket"
 msgstr "Vali kriket"
 
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2091
 msgid "Cricket Nets"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2092
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2097
 msgid "Croquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2098
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2103
 msgid "Hockey"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2104
 msgid "Edit Hockey"
 msgstr ""
 
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2109
 msgid "Pelota"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2110
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2105
+#: build/trans_presets.java:2115
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2116
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2121
 msgid "Rugby"
 msgstr "Ragbi"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2122
 msgid "Edit Rugby"
 msgstr "Vali ragbi"
 
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2127
 msgid "Table Tennis"
 msgstr "Laua tennis"
 
 #. item
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2128
 msgid "Edit Table Tennis"
 msgstr "Vali laua tennis"
 
-#: build/trans_presets.java:2123
+#: build/trans_presets.java:2133
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2134
 msgid "Edit Tennis"
 msgstr "Vali tennis"
 
-#. <separator/>
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2141
+#, fuzzy
+msgid "Man-Made"
+msgstr "Inimtekkeline"
+
+#. group "Man-Made"
+#: build/trans_presets.java:2142
 msgid "Buildings"
 msgstr "Ehitised"
 
 #. group "Buildings"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2143
 msgid "Building"
 msgstr "Ehirus"
@@ -18765,5 +19134,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Public Building"
 msgstr "Avalik hoone"
@@ -18771,10 +19140,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2148
 msgid "Edit Public Building"
 msgstr ""
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2152
 msgid "Town hall"
 msgstr "Raekoda"
@@ -18782,10 +19151,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2154
 msgid "Edit Town hall"
 msgstr "Vali raekoda"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:2158
 msgid "Embassy"
 msgstr "Saatkond"
@@ -18793,10 +19162,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Edit Embassy"
 msgstr "Vali saatkond"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2164
 msgid "Courthouse"
 msgstr "Kohtumaja"
@@ -18805,10 +19174,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:2156
+#: build/trans_presets.java:2167
 msgid "Edit Courthouse"
 msgstr "Vali kohtumaja"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2171
 msgid "Prison"
 msgstr "Vangla"
@@ -18817,10 +19186,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:2163
+#: build/trans_presets.java:2174
 msgid "Edit Prison"
 msgstr "Vali vangla"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2178
 msgid "Police"
 msgstr "Politsei"
@@ -18830,10 +19199,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:2171
+#: build/trans_presets.java:2182
 msgid "Edit Police"
 msgstr "Vali politsei"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2186
 msgid "Fire Station"
 msgstr "Tuletõrjedepoo"
@@ -18842,10 +19211,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:2178
+#: build/trans_presets.java:2189
 msgid "Edit Fire Station"
 msgstr "Vali tuletõrjedepoo"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "Post Office"
 msgstr "Postkontor"
@@ -18853,5 +19222,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Edit Post Office"
 msgstr ""
@@ -18859,15 +19228,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2200
 msgid "Kindergarten"
 msgstr "Lasteaed"
 
 #. item
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Kindergarten"
 msgstr "Vali lasteaed"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2205
 msgid "School"
 msgstr "Kool"
@@ -18875,10 +19244,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Edit School"
 msgstr "Vali kool"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2211
 msgid "University"
 msgstr "Ülikool"
@@ -18886,10 +19255,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit University"
 msgstr "Vali ülikool"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "College"
 msgstr "Kolledž"
@@ -18897,5 +19266,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2219
 msgid "Edit College"
 msgstr "Vali kolledž"
@@ -18903,5 +19272,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2224
 msgid "Cinema"
 msgstr "Kino"
@@ -18910,10 +19279,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:2216
+#: build/trans_presets.java:2227
 msgid "Edit Cinema"
 msgstr "Vali kino"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2231
 msgid "Library"
 msgstr "Raamatukogu"
@@ -18922,9 +19291,9 @@
 #. <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:2223
+#: build/trans_presets.java:2234
 msgid "Edit Library"
 msgstr "Vali raamatukogu"
 
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Arts Centre"
 msgstr ""
@@ -18932,10 +19301,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Theatre"
 msgstr "Teater"
@@ -18944,10 +19313,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:2237
+#: build/trans_presets.java:2248
 msgid "Edit Theatre"
 msgstr "Vali teater"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2252
 msgid "Place of Worship"
 msgstr "Palvekoht"
@@ -18957,5 +19326,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:2245
+#: build/trans_presets.java:2256
 msgid "Edit Place of Worship"
 msgstr "Vali palvekoht"
@@ -18964,6 +19333,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "Religion"
 msgstr "Religioon"
@@ -18972,66 +19341,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "buddhist"
 msgstr "budist"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "christian"
 msgstr "kristlane"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jewish"
 msgstr "juudi"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "muslim"
 msgstr "moslem"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "zoroastrian"
 msgstr "zoroastrism (pärsia)"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "Denomination"
 msgstr "Usutunnistus"
@@ -19040,81 +19409,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "anglican"
 msgstr "anglikaan"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "catholic"
 msgstr "katoliku"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "evangelical"
 msgstr "evangeelne"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "jehovahs_witness"
 msgstr "jehoovatunnistajad"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "lutheran"
 msgstr "luterlane"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "methodist"
 msgstr "metodist"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "mormon"
 msgstr "mormoon"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "orthodox"
 msgstr "ortodoksne"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "pentecostal"
 msgstr "nelipühalane"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "presbyterian"
 msgstr "presbüterlane"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "protestant"
 msgstr "protestantlik"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "quaker"
 msgstr "kveeker"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "shia"
 msgstr "šiia"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2264
 msgid "Addresses"
 msgstr "Aadressid"
@@ -19123,5 +19492,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:2256
+#: build/trans_presets.java:2267
 msgid "Edit Address Information"
 msgstr "Vali aadressi infot"
@@ -19129,5 +19498,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2269
 msgid "House number"
 msgstr "Maja number"
@@ -19135,20 +19504,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "House name"
 msgstr "Maja nimi"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "City name"
 msgstr "Linna nimi"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2274
 msgid "Post code"
 msgstr "Posti kood"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2275
 msgid "Country code"
 msgstr "Riigi kood"
@@ -19156,5 +19525,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Address Interpolation"
 msgstr ""
@@ -19163,5 +19532,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:2270
+#: build/trans_presets.java:2281
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -19169,67 +19538,67 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "odd"
 msgstr "paaritu"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "even"
 msgstr "paaris"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2286
 msgid "Man Made"
 msgstr "Inimtekkeline"
 
 #. group "Man Made"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Works"
 msgstr "Töökojad"
 
 #. item
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2288
 msgid "Edit Works"
 msgstr "Vali töökojad"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2292
 msgid "Tower"
 msgstr "Torn"
 
 #. item
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2293
 msgid "Edit Tower"
 msgstr "Vali torn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Water Tower"
 msgstr "Veetorn"
 
 #. item
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2298
 msgid "Edit Water Tower"
 msgstr "Vali veetorn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Gasometer"
 msgstr "Gaasimahuti"
 
 #. item
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2303
 msgid "Edit Gasometer"
 msgstr "Vali gaasimahuti"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Lighthouse"
 msgstr "Majakas"
@@ -19237,10 +19606,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2309
 msgid "Edit Lighthouse"
 msgstr "Vali majakas"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Windmill"
 msgstr "Tuuleveski"
@@ -19248,10 +19617,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2315
 msgid "Edit Windmill"
 msgstr "Vali tuuleveski"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2319
 msgid "Pipeline"
 msgstr "Torustik"
@@ -19259,10 +19628,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Edit Pipeline"
 msgstr "Vali torustik"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2325
 msgid "Wastewater Plant"
 msgstr ""
@@ -19272,10 +19641,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:2318
+#: build/trans_presets.java:2329
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2333
 msgid "Crane"
 msgstr "Kraana"
@@ -19283,10 +19652,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2335
 msgid "Edit Crane"
 msgstr "Vali kraana"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Beacon"
 msgstr "Tuletorn"
@@ -19294,10 +19663,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2341
 msgid "Edit Beacon"
 msgstr "Vali tuletorn"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2345
 msgid "Survey Point"
 msgstr "Geodeetiline punkt"
@@ -19305,10 +19674,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Edit Survey Point"
 msgstr "Vali ülevaatlus punkt"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2351
 msgid "Surveillance"
 msgstr "järelvalve"
@@ -19316,5 +19685,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2353
 msgid "Edit Surveillance Camera"
 msgstr "Vali järelvalve kaamera"
@@ -19322,5 +19691,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Power Generator"
 msgstr "Elektri generaator"
@@ -19330,39 +19699,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:2351
+#: build/trans_presets.java:2362
 msgid "Edit Power Generator"
 msgstr "Vali elektri generaator"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "wind"
 msgstr "tuul"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "hydro"
 msgstr "hüdro"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "fossil"
 msgstr "fosiil"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "nuclear"
 msgstr "tuuma"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "coal"
 msgstr "süsi"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "photovoltaic"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "gas"
 msgstr "gaas"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2367
 msgid "Power Station"
 msgstr "Elektrijaam"
@@ -19371,10 +19740,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:2359
+#: build/trans_presets.java:2370
 msgid "Edit Power Station"
 msgstr "Vali elektrijaam"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2374
 msgid "Power Sub Station"
 msgstr "Elektrialajaam"
@@ -19383,5 +19752,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:2366
+#: build/trans_presets.java:2377
 msgid "Edit Power Sub Station"
 msgstr "Vali elektri alajaam"
@@ -19389,10 +19758,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2369 build/trans_presets.java:2385
+#: build/trans_presets.java:2380 build/trans_presets.java:2396
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2382
 msgid "Power Tower"
 msgstr ""
@@ -19403,5 +19772,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:2376
+#: build/trans_presets.java:2387
 msgid "Edit Power Tower"
 msgstr ""
@@ -19409,5 +19778,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2390
 msgid "Power Line"
 msgstr ""
@@ -19416,40 +19785,40 @@
 #. <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:2382
+#: build/trans_presets.java:2393
 msgid "Edit Power Line"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Voltage"
 msgstr "Pinge"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2398
 msgid "Amount of Wires"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Amenities"
 msgstr "Teenused"
 
 #. group "Amenities"
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2402
 msgid "Toilets"
 msgstr "Tualetid"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2398 build/trans_presets.java:2514
+#: build/trans_presets.java:2409 build/trans_presets.java:2525
 msgid "Note"
 msgstr "Märkus"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2411
 msgid "Post Box"
 msgstr ""
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2416
 msgid "Telephone"
 msgstr "Telefon"
@@ -19458,5 +19827,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:2408
+#: build/trans_presets.java:2419
 msgid "Edit Telephone"
 msgstr ""
@@ -19464,5 +19833,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2411 build/trans_presets.java:2515
+#: build/trans_presets.java:2422 build/trans_presets.java:2526
 msgid "Coins"
 msgstr "Mündid"
@@ -19470,5 +19839,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2412 build/trans_presets.java:2516
+#: build/trans_presets.java:2423 build/trans_presets.java:2527
 msgid "Notes"
 msgstr "Märkused"
@@ -19476,5 +19845,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2413 build/trans_presets.java:2517
+#: build/trans_presets.java:2424 build/trans_presets.java:2528
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -19482,5 +19851,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2414 build/trans_presets.java:2518
+#: build/trans_presets.java:2425 build/trans_presets.java:2529
 msgid "Debit cards"
 msgstr "Deebetkaart"
@@ -19488,15 +19857,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2415 build/trans_presets.java:2519
+#: build/trans_presets.java:2426 build/trans_presets.java:2530
 msgid "Credit cards"
 msgstr "Krediitkaart"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2427
 msgid "Telephone cards"
 msgstr "Telefoni kaart"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2429
 msgid "Recycling"
 msgstr "Jäätmekäitlus"
@@ -19505,5 +19874,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:2421
+#: build/trans_presets.java:2432
 msgid "Edit Recycling station"
 msgstr "Muuda jäätmekäitlusjaam"
@@ -19511,35 +19880,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Batteries"
 msgstr "Battareid"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2435
 msgid "Cans"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Clothes"
 msgstr "Riided"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2437
 msgid "Glass"
 msgstr "Klaas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2438
 msgid "Paper"
 msgstr "Paber"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2439
 msgid "Scrap Metal"
 msgstr "Vanaraud"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2441
 msgid "Bench"
 msgstr ""
@@ -19548,40 +19917,33 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2433
-#, fuzzy
+#: build/trans_presets.java:2444
 msgid "Backrest"
-msgstr "Tagasi"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "Material"
-msgstr "Mälestusmärk"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2434
-#, fuzzy
+#: build/trans_presets.java:2445
 msgid "stone"
-msgstr "Kleebi"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "plastic"
-msgstr "koht"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "Colour"
-msgstr "Värv"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "black"
-msgstr "Tagasi"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "brown"
-msgstr "Alla"
+msgstr ""
 
 #. color historic
@@ -19650,37 +20012,35 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2435 build/trans_style.java:3055
-#: build/trans_style.java:3063 build/trans_style.java:3071
-#: build/trans_style.java:3079 build/trans_style.java:3127
-#: build/trans_style.java:3135 build/trans_style.java:3233
-#: build/trans_style.java:3241
+#: build/trans_presets.java:2446 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3135
+#: build/trans_style.java:3143 build/trans_style.java:3241
+#: build/trans_style.java:3249
 msgid "green"
 msgstr "roheala"
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2446
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "blue"
-msgstr "Väärtus"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "white"
-msgstr "hotell"
-
-#: build/trans_presets.java:2436
+msgstr ""
+
+#: build/trans_presets.java:2447
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2449
 msgid "Hunting Stand"
 msgstr "Jahikantsel"
 
 #. item
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2450
 msgid "Edit Hunting Stand"
 msgstr "Muuda jahiala"
@@ -19689,30 +20049,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2441 build/trans_presets.java:2902
+#: build/trans_presets.java:2452 build/trans_presets.java:2914
 msgid "Height"
 msgstr "Kõrgus"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "low"
 msgstr "madal"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "half"
 msgstr "pool"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "full"
 msgstr "täis"
 
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2454
 msgid "Hide"
 msgstr "Peida"
 
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2455
 msgid "Lock"
 msgstr "Lukusta"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Fountain"
 msgstr "Purskaev"
@@ -19721,10 +20081,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:2449
+#: build/trans_presets.java:2460
 msgid "Edit Fountain"
 msgstr "Vali purskaev"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2464
 msgid "Drinking Water"
 msgstr "Joogi vesi"
@@ -19733,10 +20093,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:2456
+#: build/trans_presets.java:2467
 msgid "Edit Drinking Water"
 msgstr "Vali joogivee asukoht"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2471
 msgid "Baby Hatch"
 msgstr ""
@@ -19744,33 +20104,33 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2479
 msgid "Shops"
 msgstr "Poed"
 
 #. group "Shops"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2480
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2481
 msgid "Edit Supermarket"
 msgstr "Vali Supermarket"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2486
 msgid "Chemist"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2487
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2492
 msgid "Convenience Store"
 msgstr "Nurgakauplus"
@@ -19778,9 +20138,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Edit Convenience Store"
 msgstr "Vali nurgakauplus"
 
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2499
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -19788,27 +20148,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Kiosk"
 msgstr "Vali kiosk"
 
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Book Store"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2507
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2512
 msgid "Travel Agency"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2513
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2518
 msgid "Vending machine"
 msgstr ""
@@ -19816,5 +20176,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Edit Vending machine"
 msgstr ""
@@ -19822,88 +20182,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_tickets"
 msgstr "ühistranspordi_piletid"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_plans"
 msgstr "ühistranspordi_plaanid"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "parking_tickets"
 msgstr "parkimis_pilet"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "food"
 msgstr "toit"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "drinks"
 msgstr "joogid"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "sweets"
 msgstr "maiustused"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "cigarettes"
 msgstr "suitsud"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "photos"
 msgstr "fotod"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "animal_food"
 msgstr "looma_toit"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "news_papers"
 msgstr "ajalehed"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "toys"
 msgstr "mänguasjad"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "stamps"
 msgstr "templid"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "SIM-cards"
 msgstr "SIM-kaardid"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "telephone_vouchers"
 msgstr "telefoni_kaardid"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "condoms"
 msgstr "kondoomid"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "tampons"
 msgstr "tampoonid"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Butcher"
 msgstr "Lihunik"
@@ -19911,9 +20271,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2535
 msgid "Edit Butcher"
 msgstr "Vali lihunik"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2540
 msgid "Baker"
 msgstr "Pagar"
@@ -19921,9 +20281,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2542
 msgid "Edit Baker"
 msgstr "Vali pagar"
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2547
 msgid "Florist"
 msgstr "Lilleseadja"
@@ -19931,18 +20291,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Florist"
 msgstr "Vali lilleseadja"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2554
 msgid "Organic"
 msgstr "Ökokaubad"
 
 #. item
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Edit Organic Shop"
 msgstr "Redigeeri ökopoodi"
 
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2560
 msgid "Alcohol"
 msgstr "Alkohol"
@@ -19950,54 +20310,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2562
 msgid "Edit Alcohol Shop"
 msgstr "Redigeeri alkoholi poode"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2567
 msgid "Beverages"
 msgstr "Joogipood"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2568
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2573
 msgid "Computer"
 msgstr "Arvuti"
 
 #. item
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2574
 msgid "Edit Computer Shop"
 msgstr "Vali arvutipood"
 
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Electronics"
 msgstr "Elektroonika"
 
 #. item
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2580
 msgid "Edit Electronics Shop"
 msgstr "Vali elektroonika pood"
 
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2585
 msgid "Hifi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2586
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2591
 msgid "Furniture"
 msgstr "Mööbel"
 
 #. item
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Edit Furniture Shop"
 msgstr "Vali mööblipood"
 
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Garden Centre"
 msgstr "Aiakeskus"
@@ -20005,9 +20365,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2599
 msgid "Edit Garden Centre"
 msgstr "Vali aiakeskus"
 
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Hardware"
 msgstr "Riistvara"
@@ -20015,9 +20375,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2606
 msgid "Edit Hardware Store"
 msgstr "Vali riistvara pood"
 
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -20025,54 +20385,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2613
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2618
 msgid "Stationery"
 msgstr "Kirjatarbed"
 
 #. item
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2619
 msgid "Edit Stationery Shop"
 msgstr "Vali kirjatarvete pood"
 
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Hairdresser"
 msgstr "Juuksur"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Hairdresser"
 msgstr "Vali juuksur"
 
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Shoes"
 msgstr "Jalatsid"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Shoe Shop"
 msgstr "Vali jalatsi pood"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2636
 msgid "Toys"
 msgstr "Mänguasjad"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit Toy Shop"
 msgstr "Vali mänguasja pood"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Video"
 msgstr "Video"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Video Shop"
 msgstr "Vali video pood"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "Dry Cleaning"
 msgstr "Kuiir puhastus"
@@ -20080,9 +20440,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2650
 msgid "Edit Dry Cleaning"
 msgstr "Vali kiirpuhastus"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "Laundry"
 msgstr "Pesumaja"
@@ -20090,9 +20450,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2657
 msgid "Edit Laundry"
 msgstr "Vali pesumaja"
 
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2662
 msgid "Outdoor"
 msgstr "Välisuks"
@@ -20100,32 +20460,28 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2664
 msgid "Edit Outdoor Shop"
 msgstr "Vali välisukse pood"
 
-#: build/trans_presets.java:2658
-msgid "Sports"
-msgstr "Sport"
-
-#. item
-#: build/trans_presets.java:2659
+#. item
+#: build/trans_presets.java:2670
 msgid "Edit Sports Shop"
 msgstr "Vali spordi pood"
 
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Optician"
 msgstr "Optik"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Optician"
 msgstr "Vali optika"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2683
 msgid "Cash"
 msgstr "Sularaha"
 
 #. group "Cash"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2684
 msgid "Bank"
 msgstr "Pank"
@@ -20133,14 +20489,14 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2686
 msgid "Edit Bank"
 msgstr "Vali Pank"
 
-#: build/trans_presets.java:2680 build/trans_presets.java:2689
+#: build/trans_presets.java:2691 build/trans_presets.java:2700
 msgid "Automated Teller Machine"
 msgstr "Sularaha automaat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2693
 msgid "Money Exchange"
 msgstr "Raha vahetus"
@@ -20148,5 +20504,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Edit Money Exchange"
 msgstr "Vali rahavahetus punkt"
@@ -20154,15 +20510,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2691
+#: build/trans_presets.java:2702
 msgid "Edit Automated Teller Machine"
 msgstr "Vali sularaha automaat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2707
 msgid "Health"
 msgstr "Tervis"
 
 #. group "Health"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2708
 msgid "Doctors"
 msgstr "Arstid"
@@ -20170,18 +20526,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2710
 msgid "Edit Doctors"
 msgstr "Vali arstid"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2715
 msgid "Dentist"
 msgstr "Hambaarst"
 
 #. item
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Edit Dentist"
 msgstr "Vali hambaarst"
 
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2721
 msgid "Pharmacy"
 msgstr "Apteek"
@@ -20189,5 +20545,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Edit Pharmacy"
 msgstr "Vali Apteek"
@@ -20195,9 +20551,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Dispensing"
 msgstr "Retseptuur"
 
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2729
 msgid "Hospital"
 msgstr "Haigla"
@@ -20205,10 +20561,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Edit Hospital"
 msgstr "Vali haigla"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2735
 msgid "Emergency Access Point"
 msgstr "Hädaabi tugijaam"
@@ -20217,5 +20573,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:2727
+#: build/trans_presets.java:2738
 msgid "Edit Emergency Access Point"
 msgstr "Vali hädaabi tugijaam"
@@ -20224,20 +20580,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2741
 msgid "Point Number"
 msgstr "Punkti number"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2742
 msgid "Point Name"
 msgstr "Punkti nimi"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Phone Number"
 msgstr "Telefoninumber"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -20245,5 +20601,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2748
 msgid "Veterinary"
 msgstr "Loomaarst"
@@ -20252,55 +20608,59 @@
 #. <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:2740
+#: build/trans_presets.java:2751
 msgid "Edit Veterinary"
 msgstr "Vali loomaarst"
 
+#: build/trans_presets.java:2758
+msgid "Geography"
+msgstr ""
+
 #. group "Places"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2760
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2761
 msgid "Edit Continent"
 msgstr "Vali kontinent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2766
 msgid "Country"
 msgstr "Maa"
 
 #. item
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2767
 msgid "Edit Country"
 msgstr "Vali maa"
 
 #. item "Places/Country" text "Name"
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2772
 msgid "State"
 msgstr "Riik"
 
 #. item
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2773
 msgid "Edit State"
 msgstr "Vali riik"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2778
 msgid "Region"
 msgstr "Regioon"
 
 #. item
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2779
 msgid "Edit Region"
 msgstr "Vali regioon"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2784
 msgid "County"
 msgstr "Maakond"
 
 #. item
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2785
 msgid "Edit County"
 msgstr "Vali maakond"
@@ -20308,15 +20668,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2791
 msgid "City"
 msgstr "Linn"
 
 #. item
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2792
 msgid "Edit City"
 msgstr "Vali linn"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2797
 msgid "Town"
 msgstr "Linn"
@@ -20324,10 +20684,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2799
 msgid "Edit Town"
 msgstr "Muuda linna"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2804
 msgid "Suburb"
 msgstr "Linnaosa"
@@ -20335,25 +20695,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2806
 msgid "Edit Suburb"
 msgstr "Muuda linnaosa"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2811
 msgid "Village"
 msgstr "Küla/Alevik/Alev"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2812
 msgid "Edit Village"
 msgstr "Muuda küla/alevik/alev"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2817
 msgid "Hamlet"
 msgstr "Küla"
 
 #. item
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2818
 msgid "Edit Hamlet"
 msgstr "Muuda küla"
@@ -20361,5 +20721,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2824
 msgid "Locality"
 msgstr "Asustamata koht"
@@ -20367,10 +20727,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2826
 msgid "Edit Locality"
 msgstr "Muuda asustamata kohta"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2831
 msgid "Island"
 msgstr "Saar"
@@ -20378,10 +20738,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2833
 msgid "Edit Island"
 msgstr "Muuda saart"
 
 #. item "Places/Island" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2838
 msgid "Islet"
 msgstr ""
@@ -20389,5 +20749,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2840
 msgid "Edit Islet"
 msgstr ""
@@ -20395,5 +20755,5 @@
 #. item "Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2846
 msgid "Cave Entrance"
 msgstr "Koobas"
@@ -20401,10 +20761,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2848
 msgid "Edit Cave Entrance"
 msgstr "Muuda koobast"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2852
 msgid "Peak"
 msgstr "Mäetipp"
@@ -20412,10 +20772,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2854
 msgid "Edit Peak"
 msgstr "Muuda mäetippu"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2859
 msgid "Glacier"
 msgstr "Liustik"
@@ -20423,10 +20783,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2861
 msgid "Edit Glacier"
 msgstr "Muuda liustikku"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2854
+#: build/trans_presets.java:2866
 msgid "Volcano"
 msgstr "Vulkaan"
@@ -20434,70 +20794,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2868
 msgid "Edit Volcano"
 msgstr "Muuda vulkaani"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2874
 msgid "Boundaries"
 msgstr "Piirid"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2875
 msgid "National"
 msgstr "Riiklikud"
 
 #. item
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2876
 msgid "Edit National Boundary"
 msgstr "Muuda riiklikke piire"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2881
 msgid "Administrative"
 msgstr "Administratiivpiir"
 
 #. item
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2882
 msgid "Edit Administrative Boundary"
 msgstr "Muuda administratiivpiire"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:2887
 msgid "Civil"
 msgstr "Omavalitsus"
 
 #. item
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2888
 msgid "Edit Civil Boundary"
 msgstr "Muuda omavalitsuse piire"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2893
 msgid "Political"
 msgstr "Valimisringkond"
 
 #. item
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2894
 msgid "Edit Political Boundary"
 msgstr "Muuda valimisringkonda"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2899
 msgid "National park"
 msgstr "Rahvuspark"
 
 #. item
-#: build/trans_presets.java:2888
+#: build/trans_presets.java:2900
 msgid "Edit National Park Boundary"
 msgstr "Muuda rahvuspargi piire"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2906
 msgid "Land use"
 msgstr "Maakasutus"
 
 #. group "Land use"
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2907
 msgid "Tree"
 msgstr "Üksik puu"
@@ -20506,15 +20866,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:2898
+#: build/trans_presets.java:2910
 msgid "Edit Tree"
 msgstr "Muuda puud"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2915
 msgid "Botanical Name"
 msgstr "Botaaniline nimi"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2917
 msgid "Wood"
 msgstr "Mets"
@@ -20523,5 +20883,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:2908
+#: build/trans_presets.java:2920
 msgid "Edit Wood"
 msgstr "Muuda metsa"
@@ -20529,17 +20889,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "coniferous"
 msgstr "okasmets"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "deciduous"
 msgstr "lehtmets"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "mixed"
 msgstr "segamets"
 
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2925
 msgid "Forest"
 msgstr "Kultuurmets"
@@ -20548,14 +20908,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:2916
+#: build/trans_presets.java:2928
 msgid "Edit Forest Landuse"
 msgstr "Muuda kultuurmetsa"
 
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2934
 msgid "Nature Reserve"
 msgstr "Looduskaitseala"
 
 #. item
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2935
 msgid "Edit Nature Reserve"
 msgstr "Muuda looduskaitseala"
@@ -20563,25 +20923,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2940
 msgid "Scree"
 msgstr "klibu, rusukalle"
 
 #. item
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2941
 msgid "Edit Scree"
 msgstr "Muuda rusukallet"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2945
 msgid "Scrub"
 msgstr "Võsa"
 
 #. item
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2946
 msgid "Edit Scrub"
 msgstr "Muuda võsa"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2950
 msgid "Fell"
 msgstr "Langus"
@@ -20589,10 +20949,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2952
 msgid "Edit Fell"
 msgstr "Muuda langust"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2956
 msgid "Heath"
 msgstr "Nõmm"
@@ -20600,5 +20960,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2958
 msgid "Edit Heath"
 msgstr "Muuda nõmme"
@@ -20606,5 +20966,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2963
 msgid "Farmyard"
 msgstr "Taluõu"
@@ -20613,45 +20973,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:2954
+#: build/trans_presets.java:2966
 msgid "Edit Farmyard Landuse"
 msgstr "Muuda taluõue"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2971
 msgid "Farmland"
 msgstr "Talumaa"
 
 #. item
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2972
 msgid "Edit Farmland Landuse"
 msgstr "Muuda talumaad"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2977
 msgid "Meadow"
 msgstr "Niit/Karjamaa"
 
 #. item
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2978
 msgid "Edit Meadow Landuse"
 msgstr "Muuta niitu"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2983
 msgid "Vineyard"
 msgstr "Viinapuuistandus"
 
 #. item
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2984
 msgid "Edit Vineyard Landuse"
 msgstr "Muuda viinapuuistandust"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:2989
 msgid "Allotments"
 msgstr "Eraldised"
 
 #. item
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2990
 msgid "Edit Allotments Landuse"
 msgstr "Muuda eraldisi"
@@ -20659,25 +21019,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2996
 msgid "Garden"
 msgstr "Aed"
 
 #. item
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2997
 msgid "Edit Garden"
 msgstr "Muuda aeda"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3001
 msgid "Grass"
 msgstr "Muru"
 
 #. item
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3002
 msgid "Edit Grass Landuse"
 msgstr "Muuda muru"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3007
 msgid "Village Green"
 msgstr "Külatanum"
@@ -20685,10 +21045,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3009
 msgid "Edit Village Green Landuse"
 msgstr "Muuda külatanumat"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3014
 msgid "Common"
 msgstr "Avalik maa"
@@ -20696,20 +21056,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3004
+#: build/trans_presets.java:3016
 msgid "Edit Common"
 msgstr "Muuda avalikku maad"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3020
 msgid "Park"
 msgstr "Park"
 
 #. item
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3021
 msgid "Edit Park"
 msgstr "Muuda parki"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3025
 msgid "Recreation Ground"
 msgstr "Puhkeala"
@@ -20717,5 +21077,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3027
 msgid "Edit Recreation Ground Landuse"
 msgstr "Muuda puhkeala"
@@ -20723,15 +21083,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3033
 msgid "Residential area"
 msgstr "Elamurajoon"
 
 #. item
-#: build/trans_presets.java:3022
+#: build/trans_presets.java:3034
 msgid "Edit Residential Landuse"
 msgstr "Muuda elamurajooni"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3039
 msgid "Graveyard"
 msgstr "Matmispaik"
@@ -20739,9 +21099,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3029
+#: build/trans_presets.java:3041
 msgid "Edit Graveyard"
 msgstr "Muuda matmispaika"
 
-#: build/trans_presets.java:3035
+#: build/trans_presets.java:3047
 msgid "Cemetery"
 msgstr "Kalmistu"
@@ -20749,39 +21109,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3049
 msgid "Edit Cemetery Landuse"
 msgstr "Muuda kalmistut"
 
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3056
 msgid "Retail"
 msgstr "Kaubandus"
 
 #. item
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3057
 msgid "Edit Retail Landuse"
 msgstr "Muuda kaubandust"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3062
 msgid "Commercial"
 msgstr "Kommerts"
 
 #. item
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3063
 msgid "Edit Commercial Landuse"
 msgstr "Muuda kommertspiirkonda"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3056
+#: build/trans_presets.java:3068
 msgid "Industrial"
 msgstr "Tööstus"
 
 #. item
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3069
 msgid "Edit Industrial Landuse"
 msgstr "Muuda tööstuspiirkonda"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3074
 msgid "Railway land"
 msgstr "Raudtee"
@@ -20789,15 +21149,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3076
 msgid "Edit Railway Landuse"
 msgstr "Muuda raudteed"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3081
 msgid "Military"
 msgstr "Militaarala"
 
 #. item
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3082
 msgid "Edit Military Landuse"
 msgstr "Muuda militaarala"
@@ -20805,55 +21165,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3088
 msgid "Construction area"
 msgstr "Ehitustanner"
 
 #. item
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3089
 msgid "Edit Construction Landuse"
 msgstr "Muuda ehitustandrit"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3094
 msgid "Brownfield"
 msgstr "Jäätmaa"
 
 #. item
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3095
 msgid "Edit Brownfield Landuse"
 msgstr "Muuda jäätmaad"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3100
 msgid "Greenfield"
 msgstr "Roheala"
 
 #. item
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3101
 msgid "Edit Greenfield Landuse"
 msgstr "Muuda roheala"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3106
 msgid "Landfill"
 msgstr "Prügimägi"
 
 #. item
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3107
 msgid "Edit Landfill Landuse"
 msgstr "Muuda prügimäge"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3112
 msgid "Quarry"
 msgstr "Kivimurd"
 
 #. item
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3113
 msgid "Edit Quarry Landuse"
 msgstr "Muuda kivimurdu"
 
 #. group "Relations"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3122
 msgid "Multipolygon"
 msgstr "Hulknurk"
@@ -20863,5 +21223,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:3114
+#: build/trans_presets.java:3126
 msgid "Edit Multipolygon"
 msgstr "Muuda hulknurka"
@@ -20870,10 +21230,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3132
 msgid "outer segment"
 msgstr "väline osa"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3133
 msgid "inner segment"
 msgstr "siseosa"
@@ -20881,5 +21241,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3136
 msgid "Turn restriction"
 msgstr "Pöördekeelud"
@@ -20888,5 +21248,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3139
 msgid "Edit Turn Restriction"
 msgstr "Muuda pöördekeelde"
@@ -20894,34 +21254,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "Restriction"
 msgstr "Keelud"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_left_turn"
 msgstr "vasakpöörde keeld"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_right_turn"
 msgstr "parempöörde keeld"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_straight_on"
 msgstr "ei tohi otse sõita"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_u_turn"
 msgstr "ei tohi tagasi pöörata"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_right_turn"
 msgstr "ainult parempööre"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_left_turn"
 msgstr "ainult vaskpööre"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_straight_on"
 msgstr "ainult otsesõit"
@@ -20930,15 +21290,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3146
 msgid "from way"
 msgstr "teelt"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3147
 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:3136
+#: build/trans_presets.java:3148
 msgid "to way"
 msgstr "teele"
@@ -20946,5 +21306,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3151
 msgid "Route"
 msgstr "Teekond"
@@ -20953,5 +21313,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3154
 msgid "Edit Route"
 msgstr "Muuda teekonda"
@@ -20959,5 +21319,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "Route type"
 msgstr "teekonna tüüp"
@@ -21029,5 +21389,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3144 build/trans_style.java:233
+#: build/trans_presets.java:3156 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -21036,17 +21396,17 @@
 msgstr "jalgrattaga"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "bus"
 msgstr "buss"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "road"
 msgstr "tee"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ferry"
 msgstr "praam"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ski"
 msgstr "suusad"
@@ -21099,5 +21459,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3144 build/trans_style.java:247
+#: build/trans_presets.java:3156 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -21106,13 +21466,13 @@
 msgstr "jalgsi"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "hiking"
 msgstr "matkamine"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "tram"
 msgstr "tramm"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "detour"
 msgstr "ümbersõit"
@@ -21126,10 +21486,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3144 build/trans_style.java:1206
+#: build/trans_presets.java:3156 build/trans_style.java:1206
 msgid "subway"
 msgstr "metroo"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3159
 msgid "Symbol description"
 msgstr "sümboolne kirjeldus"
@@ -21137,31 +21497,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3162
 msgid "Network"
 msgstr "Võrk"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "proposed"
 msgstr "planeeritud"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "alternate"
 msgstr "täiendav"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "temporary"
 msgstr "ajutine"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "connection"
 msgstr "ühendus"
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "Color (hex)"
 msgstr "Värv (hex)"
@@ -21170,30 +21530,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3168
 msgid "route segment"
 msgstr "teekonna osa"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3169
 msgid "forward segment"
 msgstr "edasisuunaline osa"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3170
 msgid "backward segment"
 msgstr "tagasisuunaline osa"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3171
 msgid "halt point"
 msgstr "peatuspunkt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3172
 msgid "forward halt point"
 msgstr "edasisuunaline peatuspunkt"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3173
 msgid "backward halt point"
 msgstr "tagasisuunaline peatuspunkt"
@@ -21631,11 +21991,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3375 build/trans_style.java:3376
-#: build/trans_style.java:3946 build/trans_style.java:4254
-#: build/trans_style.java:4263 build/trans_style.java:4272
-#: build/trans_style.java:4281 build/trans_style.java:4290
-#: build/trans_style.java:4299 build/trans_style.java:4308
-#: build/trans_style.java:4309 build/trans_style.java:4318
-#: build/trans_style.java:4327
+#: build/trans_style.java:3383 build/trans_style.java:3384
+#: build/trans_style.java:3954 build/trans_style.java:4262
+#: build/trans_style.java:4271 build/trans_style.java:4280
+#: build/trans_style.java:4289 build/trans_style.java:4298
+#: build/trans_style.java:4307 build/trans_style.java:4316
+#: build/trans_style.java:4317 build/trans_style.java:4326
+#: build/trans_style.java:4335
 msgid "deprecated"
 msgstr "kasutusest väljas"
@@ -23659,5 +24019,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3294
+#: build/trans_style.java:3302
 msgid "light_water"
 msgstr "vesi"
@@ -24339,8 +24699,17 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="boundary_stone"/>
+#. <icon annotate="true" src="historic/boundary_stone.png"/>
 #: build/trans_style.java:2990 build/trans_style.java:2998
 #: build/trans_style.java:3006 build/trans_style.java:3014
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
+#: build/trans_style.java:3054
 msgid "historic"
 msgstr "alalooline"
@@ -24354,5 +24723,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3095
 msgid "quarry"
 msgstr "kivimurd"
@@ -24366,5 +24735,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "landfill"
 msgstr "prügimägi"
@@ -24386,5 +24755,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3103 build/trans_style.java:3111
+#: build/trans_style.java:3111 build/trans_style.java:3119
 msgid "basin"
 msgstr "tehisjärv"
@@ -24398,5 +24767,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3127
 msgid "forest"
 msgstr "kultuurmets"
@@ -24410,5 +24779,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3159
 msgid "farmyard"
 msgstr "taluõu"
@@ -24431,5 +24800,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3160 build/trans_style.java:3168
+#: build/trans_style.java:3168 build/trans_style.java:3176
 msgid "retail"
 msgstr "kaubandus"
@@ -24443,5 +24812,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3176
+#: build/trans_style.java:3184
 msgid "industrial"
 msgstr "tööstus"
@@ -24455,5 +24824,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "brownfield"
 msgstr "jäätmaa"
@@ -24467,5 +24836,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "greenfield"
 msgstr "rohepiirkond"
@@ -24479,5 +24848,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "railland"
 msgstr "raudteede piirkond"
@@ -24534,7 +24903,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3217 build/trans_style.java:3252
-#: build/trans_style.java:3260 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3225 build/trans_style.java:3260
+#: build/trans_style.java:3268 build/trans_style.java:3276
+#: build/trans_style.java:3284 build/trans_style.java:3292
 msgid "military"
 msgstr "militaarala"
@@ -24548,5 +24917,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3225
+#: build/trans_style.java:3233
 msgid "cemetery"
 msgstr "kalmistu"
@@ -24559,5 +24928,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3301
+#: build/trans_style.java:3309
 msgid "peak"
 msgstr "mäetipp"
@@ -24572,5 +24941,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3310
+#: build/trans_style.java:3318
 msgid "glacier"
 msgstr "liustik"
@@ -24584,5 +24953,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "volcano"
 msgstr "vulkaan"
@@ -24637,8 +25006,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3326 build/trans_style.java:3327
-#: build/trans_style.java:3335 build/trans_style.java:3351
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440
+#: build/trans_style.java:3334 build/trans_style.java:3335
+#: build/trans_style.java:3343 build/trans_style.java:3359
+#: build/trans_style.java:3432 build/trans_style.java:3440
+#: build/trans_style.java:3448
 msgid "natural"
 msgstr "looduslik"
@@ -24652,5 +25021,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3343
+#: build/trans_style.java:3351
 msgid "scrub"
 msgstr "põõsastik"
@@ -24664,5 +25033,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3359
+#: build/trans_style.java:3367
 msgid "heath"
 msgstr "nõmm"
@@ -24676,5 +25045,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3408
+#: build/trans_style.java:3416
 msgid "mud"
 msgstr "muda"
@@ -24688,5 +25057,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "beach"
 msgstr "rand"
@@ -24764,8 +25133,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
-#: build/trans_style.java:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496 build/trans_style.java:3504
+#: build/trans_style.java:3512 build/trans_style.java:3520
 msgid "route"
 msgstr "teekond"
@@ -24813,7 +25182,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3522 build/trans_style.java:3530
-#: build/trans_style.java:3538 build/trans_style.java:3546
-#: build/trans_style.java:3554
+#: build/trans_style.java:3530 build/trans_style.java:3538
+#: build/trans_style.java:3546 build/trans_style.java:3554
+#: build/trans_style.java:3562
 msgid "boundary"
 msgstr "piir"
@@ -24963,11 +25332,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090
+#: build/trans_style.java:4002 build/trans_style.java:4010
+#: build/trans_style.java:4018 build/trans_style.java:4026
+#: build/trans_style.java:4034 build/trans_style.java:4042
+#: build/trans_style.java:4050 build/trans_style.java:4058
+#: build/trans_style.java:4066 build/trans_style.java:4074
+#: build/trans_style.java:4082 build/trans_style.java:4090
+#: build/trans_style.java:4098
 msgid "place"
 msgstr "koht"
@@ -25015,6 +25384,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4207 build/trans_style.java:4214
-#: build/trans_style.java:4221 build/trans_style.java:4228
+#: build/trans_style.java:4215 build/trans_style.java:4222
+#: build/trans_style.java:4229 build/trans_style.java:4236
 msgid "address"
 msgstr "aadress"
@@ -25322,30 +25691,4 @@
 msgstr ""
 
-#~ msgid "All the ways were empty"
-#~ msgstr "Kõik teed olid tühjad."
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Liida erineva kuuluvusega sõlmed?"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Liida igal juhul."
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr "Valitud sõlmedel on erinevad seosed. Liida need ikkagi?"
-
-#~ msgid "Unknown version"
-#~ msgstr "Tundmatu versioon"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "<nd> element võib olla vaid way-s."
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> ei oma ref"
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Leidub <member> element, mis ei ole seotud"
-
 #~ msgid "Move"
 #~ msgstr "Liiguta"
@@ -25385,4 +25728,10 @@
 #~ "uuesti ."
 
+#~ msgid "<nd> has zero ref"
+#~ msgstr "<nd> ei oma ref"
+
+#~ msgid "Unknown version"
+#~ msgstr "Tundmatu versioon"
+
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr "Jätan tee vahele kuna see sisaldab mitte eksisteerivat : {0}\n"
@@ -25409,7 +25758,4 @@
 #~ msgid "Add all currently selected objects as members"
 #~ msgstr "Lisa kõik hetkel valitud objektid liikmetena"
-
-#~ msgid "Add Selected"
-#~ msgstr "Lisa valitud"
 
 #~ msgid "Click Reload to refresh list"
@@ -25457,4 +25803,7 @@
 #~ msgstr "Mõned sõlmed on enam-vähem ühel joonel."
 
+#~ msgid "All the ways were empty"
+#~ msgstr "Kõik teed olid tühjad."
+
 #~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
 #~ msgstr "Abileht puudub. Loo see <A HREF=\"{0}\">english</A>."
@@ -25474,4 +25823,15 @@
 #~ "laetud elementidel on ajalugu."
 
+#~ msgid "Merge Anyway"
+#~ msgstr "Liida igal juhul."
+
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "Liida erineva kuuluvusega sõlmed?"
+
+#~ msgid ""
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
+#~ msgstr "Valitud sõlmedel on erinevad seosed. Liida need ikkagi?"
+
 #~ msgid "unnamed"
 #~ msgstr "Nimetu"
@@ -25502,4 +25862,7 @@
 #~ "teata sellest veast arendajaid."
 
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "Leidub <member> element, mis ei ole seotud"
+
 #~ msgid "Could not download plugin: {0} from {1}"
 #~ msgstr "Ei saa pistikut alla laadida: {0} kohast: {1}"
@@ -25540,2 +25903,5 @@
 #~ msgid "Update failed"
 #~ msgstr "Uuendamine ebaõnnestus"
+
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "<nd> element võib olla vaid way-s."
Index: applications/editors/josm/i18n/po/fi.po
===================================================================
--- applications/editors/josm/i18n/po/fi.po	(revision 17655)
+++ applications/editors/josm/i18n/po/fi.po	(revision 17697)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-12 18:11+0200\n"
-"PO-Revision-Date: 2009-09-07 23:07+0000\n"
-"Last-Translator: Teemu Koskinen <Unknown>\n"
+"POT-Creation-Date: 2009-09-19 13:00+0200\n"
+"PO-Revision-Date: 2009-09-15 05:24+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Finnish <fi@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-09-12 16:05+0000\n"
+"X-Launchpad-Export-Date: 2009-09-19 10:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -42,10 +42,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:543
 #: ../core/src/org/openstreetmap/josm/Main.java:551
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -70,5 +70,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -86,6 +86,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:358
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
@@ -101,6 +101,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
@@ -124,10 +124,10 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
 msgid "Save and Exit"
 msgstr "Tallenna ja poistu"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
 msgid "Discard and Exit"
 msgstr "Poistu tallentamatta"
@@ -138,4 +138,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
@@ -143,27 +144,28 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:296
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:258
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:613
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
@@ -171,5 +173,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -189,6 +191,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
@@ -205,17 +207,17 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:654
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1528
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -226,6 +228,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
@@ -278,9 +280,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:607
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:609
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -340,5 +342,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
 msgid "Plugins"
@@ -388,5 +390,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Yhdistä"
@@ -474,5 +476,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -485,4 +487,5 @@
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -518,6 +521,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
@@ -526,6 +529,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:346
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
@@ -635,4 +638,46 @@
 msgstr "Ei ristiriitoja"
 
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#, fuzzy
+msgid "Close open changesets"
+msgstr "Suljetaan muutoskokoelma..."
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#, fuzzy
+msgid "Closes open changesets"
+msgstr "Suljetaan muutoskokoelma..."
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
+#: ../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:114
+#, java-format
+msgid "File: {0}"
+msgstr "Tiedosto: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
+#, fuzzy
+msgid "There are no open changesets"
+msgstr "Palvelin ei tue muutoskokoelmia"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
+#, fuzzy
+msgid "No open changesets"
+msgstr "Suljetaan muutoskokoelma..."
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
+#, fuzzy
+msgid "Downloading open changesets ..."
+msgstr "Suljetaan muutoskokoelma..."
+
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
@@ -729,10 +774,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:123
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
@@ -775,31 +821,30 @@
 msgstr "Jakaa valitut pisteet tasaisin välein viivalle."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
 msgid "Download from OSM..."
 msgstr "Lataa OSM:sta..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
 msgid "Download map data from the OSM server."
 msgstr "Lataa karttadataa OSM-palvelimelta."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
-#, java-format
-msgid "File: {0}"
-msgstr "Tiedosto: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
 msgid "Download"
 msgstr "Lataa"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
 msgid "Please select at least one task to download"
 msgstr "Valitse vähintään yksi ladattava tietolaji."
@@ -820,5 +865,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1527
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307
@@ -838,6 +883,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:376
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1415
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
 msgid "Duplicate"
 msgstr "Monista"
@@ -909,10 +954,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
@@ -996,25 +1042,26 @@
 msgstr "Liitä nykyinen taso toiseen tasoon"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 msgid "Merge Nodes"
 msgstr "Yhdistä pisteet"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
 msgid "Merge nodes into the oldest one."
 msgstr "Yhdistää pisteet vanhimpaan."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
 msgid "Please select at least two nodes to merge."
 msgstr "Valitse vähintään kaksi yhdistettävää pistettä."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:394
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
@@ -1030,8 +1077,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -1057,6 +1104,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
@@ -1065,9 +1116,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr "Pisteitä ei voitu yhdistää. Käytössä oleva polku tulisi poistaa ensin."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283
 #, java-format
 msgid "Merge {0} nodes"
@@ -1139,5 +1190,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "New"
 msgstr "Uusi"
@@ -1412,14 +1463,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
 msgid "Status Report"
 msgstr "Raportti"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 msgid "Copy to clipboard and close"
 msgstr "Kopioi leikepöydälle ja sulje"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
@@ -1500,25 +1552,4 @@
 msgstr "Katkaise polku {0} {1} osaksi"
 
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24
-msgid "Close current changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-msgid "Close the current changeset ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41
-msgid "There is currently no changeset open."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42
-msgid "No open changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60
-msgid "Closing changeset"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
@@ -1686,14 +1717,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Lähetä OSM-palvelimelle..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 msgid "Upload all changes to the OSM server."
 msgstr "Lähetä kaikki muutokset OSM-palvelimelle..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
 #, java-format
 msgid ""
@@ -1702,23 +1733,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
 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:166
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 msgid "No changes to upload."
 msgstr "Ei lähetettäviä muutoksia."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
 msgid "Synchronize entire dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
 #, java-format
 msgid ""
@@ -1732,17 +1763,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
 msgid "Conflict detected"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:267
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
 #, java-format
 msgid ""
@@ -1753,28 +1784,40 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
+msgid ""
+"<html>Uploading <strong>failed</strong> because you've been "
+"using<br>changeset {0} which was already closed at {1}.<br>Please upload "
+"again with a new or an existing open changeset."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+#, fuzzy
+msgid "Changeset closed"
+msgstr "Muutetaanko arvot?"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
 msgid "Upload to OSM API failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1994,14 +2037,14 @@
 msgstr "Lisää piste polkuun ja yhdistä"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:930
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:932
 msgid "Create new node."
 msgstr "Luo uusi piste."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
 msgid "Select node under cursor."
 msgstr "Valitse kursorin alla oleva piste."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939
 #, java-format
 msgid "Insert new node into way."
@@ -2010,14 +2053,14 @@
 msgstr[1] "Lisää uusi piste {0} polkuun."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
 msgid "Start new way from last node."
 msgstr "Aloita uusi polku viimeisestä pisteestä."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951
 msgid "Continue way from last node."
 msgstr "Jatka polkua viimeisestä pisteestä."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:972
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:974
 msgid "Finish drawing."
 msgstr "Lopeta piirtäminen."
@@ -2133,60 +2176,70 @@
 "Siirrä aluetta Ctrl+nuolinäppäimillä tai raahaa hiiren oikealla napilla."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Etsi..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Etsi objekteja."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
 msgid "Can't search because there is no loaded data."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
+#, fuzzy
+msgid "Please enter a filter string."
+msgstr "Anna hakusana."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
 msgid "Please enter a search string."
 msgstr "Anna hakusana."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
 msgid "replace selection"
 msgstr "korvaa valinta"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72
 msgid "add to selection"
 msgstr "lisää valintaan"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73
 msgid "remove from selection"
 msgstr "poista valinnasta"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
+#, fuzzy
+msgid "find in selection"
+msgstr "lisää valintaan"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81
 msgid "case sensitive"
 msgstr "kirjainkoko merkitsee"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82
 msgid "regular expression"
 msgstr "säännöllinen lauseke"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid ""
 "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
@@ -2194,109 +2247,126 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
 msgid "<u>Special targets:</u>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 msgid "<b>nodes:</b>... - object with given number of nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
 msgid "<b>modified</b> - all changed objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
 msgid "<b>selected</b> - all selected objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "<b>untagged</b> - all untagged objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
+msgid "Filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Etsi"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
+msgid "Submit filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "Start Search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Hakusanalla \"{0}\" ei löytynyt mitään"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Valintaan ei lisätty mitään haulla \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Valinnasta ei poistettu mitään haulla \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#, fuzzy, java-format
+msgid "Nothing find in selection by searching for ''{0}''"
+msgstr "Valintaan ei lisätty mitään haulla \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262
 #, java-format
 msgid "Found {0} matches"
 msgstr "Löytyi {0} osumaa"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CS"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CI"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283
 msgid "RX"
 msgstr ""
@@ -2481,5 +2551,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
 msgid "Double conflict"
 msgstr ""
@@ -2724,4 +2794,5 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:134
 msgid "Old value"
 msgstr "Vanha arvo"
@@ -2885,27 +2956,57 @@
 
 #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
 msgid "E"
 msgstr "I"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:59
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:203
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
 msgid "Changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:323
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:325
-#, fuzzy, java-format
-msgid "paramete''{0}'' must not be null"
-msgstr "parametri ''{0}'' ei saa olla tyhjä"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331
-#, fuzzy, java-format
-msgid "unsupported value ''{0}'' or parameter ''{1}''"
-msgstr "Käytä esivalintaa \"{0}\" ryhmästä \"{1}\""
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "H"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "Text"
+msgstr "teksti"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "C"
+msgstr "WC"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "I"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "M"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+msgid "R"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+msgid "A"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+msgid "D"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+msgid "F"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
@@ -2919,29 +3020,29 @@
 msgstr "Varoitus: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
 #, java-format
 msgid "expected id >= 0. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:257
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
 msgid "a primitive with id=0 can't be invisible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:293
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
 #, java-format
 msgid "id > 0 expected. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
 msgid "version > 0 expected. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
 msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
 msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
@@ -3008,9 +3109,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:247
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:249
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:478
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:482
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
@@ -3019,119 +3120,119 @@
 #. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
 #. TODO Remove useless nullcheck when RelationMember.member is encalupsed
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:851
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855
 msgid "Empty member in relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:853
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Poistettu jäsen \"{0}\" relaatiossa."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:864
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Polussa \"{0}\" on vähemmän kuin kaksi pistettä."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "More than one \"from\" way found."
 msgstr "Löytyi enemmän kuin yksi \"from\" -polku"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "More than one \"to\" way found."
 msgstr "Löytyi enemmän kuin yksi \"to\" -polku"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "More than one \"via\" found."
 msgstr "Useita \"via\" -jäseniä."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Tuntematon rooli \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"from\" way found."
 msgstr "Ei \"from\"-roolin tietä."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"to\" way found."
 msgstr "Ei \"to\"-roolin tietä."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652
 msgid "No \"via\" node or way found."
 msgstr "Ei löytynyt pistettä tai tietä \"via\"-roolissa."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 "\"via\" -roolin piste ei ole \"from\" -tien ensimmäinen eikä viimeinen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "\"via\" -roolin piste ei ole \"to\" -tien ensimmäinen eikä viimeinen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Kiellolle {0} ei löydy piirtotyyliä."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:885
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Multipolygonissa jäsenenä muu kuin tie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:943
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Multipolygonilta \"{0}\" puuttuu jäsen \"outer\"-roolista."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1032
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1044
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Inner-roolin tie \"{0}\" relaation teistä uloimpana."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1097
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1123
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1327
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331
 msgid "untagged"
 msgstr "ei tageja"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1328
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332
 msgid "text"
 msgstr "teksti"
@@ -3152,5 +3253,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
@@ -3171,5 +3272,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
@@ -3218,5 +3319,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
 msgid "Lambert Zone (Estonia)"
 msgstr ""
@@ -3258,9 +3359,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:38
 msgid "Do not show again"
 msgstr "Älä näytä uudelleen"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
 #, java-format
@@ -3268,31 +3369,31 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:91
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:116
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154
 msgid "incomplete"
 msgstr "keskeneräinen"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
 msgid "highway"
 msgstr "tie"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
-#: build/trans_presets.java:3144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: build/trans_presets.java:3156
 msgid "railway"
 msgstr "rata"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
 msgid "waterway"
 msgstr "vesiväylä"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "landuse"
 msgstr "maankäyttö"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:474
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
@@ -3302,5 +3403,5 @@
 msgstr[1] "{0} pistettä"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
 #, java-format
 msgid "{0} member"
@@ -3345,10 +3446,5 @@
 msgstr "Päivän viestiä ei ole saatavilla"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67
-#, java-format
-msgid "- running version is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:95
 msgid "Downloading \"Message of the day\""
 msgstr "Ladataan \"Päivän viestiä\""
@@ -3414,10 +3510,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:162
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
 msgid "Username"
 msgstr "Käyttäjänimi"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
 msgid "Password"
 msgstr "Salasana"
@@ -3538,5 +3634,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226
 msgid "Presets"
 msgstr "Esivalinnat"
@@ -3610,38 +3706,49 @@
 msgstr "skaalaus"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Pituusaste osoittimen kohdalla."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The name of the object at the mouse pointer."
 msgstr "Osoittmen kohdalla olevan objektin nimi."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Leveysaste osoittimen kohdalla."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The angle between the previous and the current way segment."
 msgstr "Edellisen ja tämänhetkisen segmentin välinen kulma."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "Piirrettävän segmentin suuntima."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The length of the new way segment being drawn."
 msgstr "Piirrettävän segmentin pituus."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199
+msgid ""
+"Middle click again to cycle through.<br>Hold CTRL to select directly from "
+"this list with the mouse.<hr>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290
 msgid "(no object)"
 msgstr "(ei objektia)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:301
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418
+#, fuzzy
+msgid "User:"
+msgstr "Käytä"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
 msgid "layer not in list."
 msgstr "taso ei ole listassa."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:488
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3711,7 +3818,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:224
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Tags"
 msgstr "Tagit"
@@ -3726,5 +3833,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
@@ -3905,4 +4012,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
 msgid "Up"
 msgstr ""
@@ -3913,4 +4021,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Down"
 msgstr ""
@@ -3923,5 +4032,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
@@ -4344,23 +4453,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:236
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239
 msgid "No conflicts to resolve"
-msgstr "Ei ristiriitoja"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:295
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254
 msgid "Cancel conflict resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:310
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269
 msgid "Apply resolved conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Apply"
 msgstr ""
@@ -4372,5 +4480,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "all"
 msgstr "kaikki"
@@ -4414,7 +4522,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
-msgid "not yet decided"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:213
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
@@ -4441,7 +4546,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
@@ -4451,7 +4556,7 @@
 msgstr[1] "{0} polkua"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:152
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
@@ -4461,20 +4566,20 @@
 msgstr[1] "{0} relaatiota"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "Paste ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "From ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:372
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "To ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:428
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
 #, java-format
 msgid "{0} tag"
@@ -4490,13 +4595,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
-#, fuzzy
 msgid "Remove this relation member from the relation"
-msgstr "Poista taulukon aktiivisella rivillä oleva jäsen relaatiosta"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-#, fuzzy
 msgid "Replace"
-msgstr "Oikea nimi"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
@@ -4512,5 +4615,5 @@
 #. --- role editing
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:56
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510
 msgid "Role:"
 msgstr ""
@@ -4526,7 +4629,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70
-#, fuzzy
 msgid "Value:"
-msgstr "Arvo"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86
@@ -4543,7 +4645,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
-#, fuzzy
 msgid "Decision"
-msgstr "Versio"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -4560,6 +4661,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
@@ -4648,169 +4750,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-msgid "History"
-msgstr "Historia"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-msgid "Display the history of all selected items."
-msgstr "Näytä valittujen kohteiden historia."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
-#, java-format
-msgid "index out of bounds Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
-msgid "History item"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Lataa kaikki valitut objektit uudelleen ja päivitä lista."
-
-#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
-msgid "Show"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
-msgid "Dialog not created yet. Invoke createInstance() first"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
-msgid "Layers"
-msgstr "Tasot"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-msgid "Open a list of all loaded layers."
-msgstr "Avaa lista kaikista ladatuista tasoista."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:297
-msgid "Delete the selected layer."
-msgstr "Poista valittu taso."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:367
-msgid "Show/Hide"
-msgstr "Näytä/piilota"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:378
-msgid "Toggle visible state of the selected layer."
-msgstr "Näytä/piilota valittu taso."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:420
-msgid "Activate the selected layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:475
-msgid "Merge this layer into another layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:581
-msgid "Move the selected layer one row up."
-msgstr "Siirrä valittu taso rivi ylöspäin."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:600
-msgid "Move the selected layer one row down."
-msgstr "Siirrä valittu taso rivi alaspäin."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
-msgid "Information about layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
-#, java-format
-msgid "This will change up to {0} object."
-msgid_plural "This will change up to {0} objects."
-msgstr[0] "Olet muuttamassa {0} kohdetta."
-msgstr[1] "Olet muuttamassa {0} kohdetta."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
-msgid "An empty value deletes the key."
-msgstr "Tyhjä arvo poistaa avaimen."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
-msgid "<different>"
-msgstr "<eri>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
-msgid "Change values?"
-msgstr "Muutetaanko arvot?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
-#, java-format
-msgid "Change properties of up to {0} object"
-msgid_plural "Change properties of up to {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
-msgid "Please select a key"
-msgstr "Valitse avain"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
-msgid "Please select a value"
-msgstr "Valitse arvo"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
-msgid "Please select the objects you want to change properties for."
-msgstr "Valitse objektit, joiden ominaisuuksia haluat muokata."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
-msgid "Properties/Memberships"
-msgstr "Ominaisuudet/jäsenyydet"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-msgid "Properties for selected objects."
-msgstr "Valittujen objektien ominaisuudet."
-
-#. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-msgid "Member Of"
-msgstr "Jäsenyydet"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
-msgid "Add Properties"
-msgstr "Lisää ominaisuuksia"
-
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+msgid "Filter objects and hide/disable them."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
@@ -4824,4 +4770,212 @@
 msgstr "Lisää"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#, fuzzy
+msgid "Add filter."
+msgstr "Lisää valitut"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
+#, fuzzy
+msgid "Edit filter."
+msgstr "Muokkaa laiturin ominaisuuksia"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#, fuzzy
+msgid "Delete filter."
+msgstr "Poista taso"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
+#, fuzzy
+msgid "Move filter up."
+msgstr "Siirrä ylös"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
+#, fuzzy
+msgid "Move filter down."
+msgstr "Siirrä alas"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128
+msgid "Enable filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
+#, fuzzy
+msgid "Hide elements"
+msgstr "Yksittäiset elementit"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
+msgid "Apply also for children"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
+msgid "Inverse filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
+#, fuzzy
+msgid "Filter mode"
+msgstr "Poistotila"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
+msgid "History"
+msgstr "Historia"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+msgid "Display the history of all selected items."
+msgstr "Näytä valittujen kohteiden historia."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
+msgid "History item"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
+msgid "Reload all currently selected objects and refresh the list."
+msgstr "Lataa kaikki valitut objektit uudelleen ja päivitä lista."
+
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
+msgid "Show"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
+msgid "Display the history of the selected primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84
+msgid "Dialog not created yet. Invoke createInstance() first"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
+msgid "Layers"
+msgstr "Tasot"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+msgid "Open a list of all loaded layers."
+msgstr "Avaa lista kaikista ladatuista tasoista."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294
+msgid "Delete the selected layer."
+msgstr "Poista valittu taso."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364
+msgid "Show/Hide"
+msgstr "Näytä/piilota"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375
+msgid "Toggle visible state of the selected layer."
+msgstr "Näytä/piilota valittu taso."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgid "Activate"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417
+msgid "Activate the selected layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472
+msgid "Merge this layer into another layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578
+msgid "Move the selected layer one row up."
+msgstr "Siirrä valittu taso rivi ylöspäin."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597
+msgid "Move the selected layer one row down."
+msgstr "Siirrä valittu taso rivi alaspäin."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+msgid "Information about layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+#, java-format
+msgid "This will change up to {0} object."
+msgid_plural "This will change up to {0} objects."
+msgstr[0] "Olet muuttamassa {0} kohdetta."
+msgstr[1] "Olet muuttamassa {0} kohdetta."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+msgid "An empty value deletes the key."
+msgstr "Tyhjä arvo poistaa avaimen."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+msgid "<different>"
+msgstr "<eri>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+msgid "Change values?"
+msgstr "Muutetaanko arvot?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#, java-format
+msgid "Change properties of up to {0} object"
+msgid_plural "Change properties of up to {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+msgid "Please select a key"
+msgstr "Valitse avain"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+msgid "Please select a value"
+msgstr "Valitse arvo"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
+msgid "Please select the objects you want to change properties for."
+msgstr "Valitse objektit, joiden ominaisuuksia haluat muokata."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
+msgid "Properties/Memberships"
+msgstr "Ominaisuudet/jäsenyydet"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+msgid "Properties for selected objects."
+msgstr "Valittujen objektien ominaisuudet."
+
+#. setting up the membership table
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+msgid "Member Of"
+msgstr "Jäsenyydet"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
+msgid "Add Properties"
+msgstr "Lisää ominaisuuksia"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574
 msgid "Add a new key/value pair to all objects"
@@ -4863,10 +5017,9 @@
 
 #. item "Land use/Quarry" text "Name"
-#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
-#: build/trans_presets.java:3109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168
+#: build/trans_presets.java:3121
 msgid "Relations"
 msgstr "Relaatiot"
@@ -4876,23 +5029,23 @@
 msgstr "Avaa lista kaikista relaatioista."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relaatiot: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276
 msgid "Open an editor for the selected relation"
 msgstr "Avaa valittu relaatio muokkaimeen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
 msgid "Delete the selected relation"
 msgstr "Poista valittu relaatio"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349
 msgid "Create a new relation"
 msgstr "Luo uusi relaatio"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:373
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1412
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
@@ -4925,5 +5078,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4935,9 +5088,9 @@
 msgstr "Valinta: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441
 msgid "Undock the panel"
 msgstr "Irroita paneeli"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -4946,5 +5099,5 @@
 "työkalupalkin napista."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:457
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Napsauta pienentääksesi/suurentaaksesi paneelin sisällön"
@@ -5005,5 +5158,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5027,5 +5180,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1502
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1370
 msgid "Download relation members"
 msgstr ""
@@ -5055,5 +5208,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -5061,18 +5214,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
 msgid "Tags and Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:167
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5081,14 +5234,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613
 #, java-format
 msgid ""
@@ -5098,9 +5251,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid ""
@@ -5110,15 +5263,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5126,5 +5279,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5132,20 +5285,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849
 #, java-format
 msgid ""
@@ -5154,57 +5307,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:961
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909
 msgid "Move the currently selected members up"
 msgstr "Siirrä valittuja jäseniä ylöspäin"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:979
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:912
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928
 msgid "Move the currently selected members down"
 msgstr "Siirrä valittuja jäseniä alaspäin"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:998
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:931
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5213,9 +5366,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1058
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
 #, java-format
 msgid ""
@@ -5224,56 +5377,41 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090
+msgid "Apply the current updates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123
+msgid "Apply the updates and close the dialog"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
-msgid "Apply the current updates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
-msgid "Apply the updates and close the dialog"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
-msgid "Delete the currently selected tags"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Lataa kaikki keskeneräiset polut ja pisteet relaatiossa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 msgid "Download Members"
 msgstr "Lataa jäsenet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1208
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1211
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1356
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 #, java-format
 msgid ""
@@ -5283,13 +5421,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1229
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1367
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
 msgid "Confirm empty role"
 msgstr ""
@@ -5376,37 +5514,37 @@
 msgstr "Kirjanmerkit"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:82
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
 msgid "Please enter the desired coordinates first."
 msgstr "Ole hyvä ja lisää halutut koordinaatit ensin."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
 msgid "Please enter a name for the location."
 msgstr "Ole hyvä ja anna nimi sijainnille."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:107
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
 msgid "Select a bookmark first."
 msgstr "Valitse ensin kirjanmerkki."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
 msgid "min lat"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
 msgid "min lon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid "max lat"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
 msgid "max lon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5416,26 +5554,26 @@
 "tähän ladataksesi alueen)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
 msgid "Bounding Box"
 msgstr "Rajoittava alue"
 
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
 msgid "Data Sources and Types"
 msgstr "Datalähteet ja -tyypit"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
 msgid "Download as new layer"
 msgstr "Lataa uutena tasona"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
 msgid "Download Area"
 msgstr "Lataa alue"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
 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:219
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
 msgid "Download area ok, size probably acceptable to server"
 msgstr ""
@@ -5461,7 +5599,7 @@
 msgstr "Syötä haettavan paikan nimi:"
 
-#. <separator/>
+#. group "Geography"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2759
 msgid "Places"
 msgstr "Paikat"
@@ -5508,21 +5646,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "type"
 msgstr "tyyppi"
@@ -5539,5 +5677,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-#, fuzzy
 msgid ""
 "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
@@ -5545,6 +5682,4 @@
 "Hold left mousebutton and draw a frame."
 msgstr ""
-"Zoomaa hiiren rullalla tai kaksoisnapautuksella. Siirrä karttaa raahaamalla "
-"oikealla napilla, valitse alue vetämällä vasemmalla napilla."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
@@ -6005,4 +6140,6 @@
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
 #. <key key="historic" value="wayside_shrine" />
+#. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
+#. <key key="historic" value="boundary_stone" />
 #. item "Leisure/Water Park" label "Edit Water Park"
 #. <key key="leisure" value="water_park" />
@@ -6374,153 +6511,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/trans_presets.java:66 build/trans_presets.java:102
-#: build/trans_presets.java:142 build/trans_presets.java:179
-#: build/trans_presets.java:199 build/trans_presets.java:217
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:272 build/trans_presets.java:305
-#: build/trans_presets.java:351 build/trans_presets.java:371
-#: build/trans_presets.java:386 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:463 build/trans_presets.java:482
-#: build/trans_presets.java:502 build/trans_presets.java:522
-#: build/trans_presets.java:543 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627 build/trans_presets.java:658
-#: build/trans_presets.java:679 build/trans_presets.java:692
-#: build/trans_presets.java:705 build/trans_presets.java:718
-#: build/trans_presets.java:731 build/trans_presets.java:744
-#: build/trans_presets.java:755 build/trans_presets.java:764
-#: build/trans_presets.java:811 build/trans_presets.java:832
-#: build/trans_presets.java:841 build/trans_presets.java:901
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1067 build/trans_presets.java:1075
-#: build/trans_presets.java:1085 build/trans_presets.java:1093
-#: build/trans_presets.java:1098 build/trans_presets.java:1105
-#: build/trans_presets.java:1112 build/trans_presets.java:1117
-#: build/trans_presets.java:1125 build/trans_presets.java:1134
-#: build/trans_presets.java:1140 build/trans_presets.java:1146
-#: build/trans_presets.java:1151 build/trans_presets.java:1157
-#: build/trans_presets.java:1163 build/trans_presets.java:1172
-#: build/trans_presets.java:1181 build/trans_presets.java:1188
-#: build/trans_presets.java:1196 build/trans_presets.java:1209
-#: build/trans_presets.java:1215 build/trans_presets.java:1224
-#: build/trans_presets.java:1230 build/trans_presets.java:1236
-#: build/trans_presets.java:1244 build/trans_presets.java:1299
-#: build/trans_presets.java:1346 build/trans_presets.java:1352
-#: build/trans_presets.java:1358 build/trans_presets.java:1364
-#: build/trans_presets.java:1370 build/trans_presets.java:1381
-#: build/trans_presets.java:1390 build/trans_presets.java:1405
-#: build/trans_presets.java:1412 build/trans_presets.java:1418
-#: build/trans_presets.java:1426 build/trans_presets.java:1433
-#: build/trans_presets.java:1442 build/trans_presets.java:1450
-#: build/trans_presets.java:1457 build/trans_presets.java:1468
-#: build/trans_presets.java:1478 build/trans_presets.java:1488
-#: build/trans_presets.java:1508 build/trans_presets.java:1520
-#: build/trans_presets.java:1531 build/trans_presets.java:1548
-#: build/trans_presets.java:1555 build/trans_presets.java:1570
-#: build/trans_presets.java:1577 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1594
-#: build/trans_presets.java:1599 build/trans_presets.java:1605
-#: build/trans_presets.java:1611 build/trans_presets.java:1619
-#: build/trans_presets.java:1627 build/trans_presets.java:1635
-#: build/trans_presets.java:1642 build/trans_presets.java:1648
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1670 build/trans_presets.java:1677
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1712 build/trans_presets.java:1719
-#: build/trans_presets.java:1736 build/trans_presets.java:1744
-#: build/trans_presets.java:1759 build/trans_presets.java:1769
-#: build/trans_presets.java:1781 build/trans_presets.java:1788
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:1809 build/trans_presets.java:1817
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1841
-#: build/trans_presets.java:1846 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1864
-#: build/trans_presets.java:1872 build/trans_presets.java:1881
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1908 build/trans_presets.java:1914
-#: build/trans_presets.java:1922 build/trans_presets.java:1928
-#: build/trans_presets.java:1934 build/trans_presets.java:1940
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2013
-#: build/trans_presets.java:2022 build/trans_presets.java:2030
-#: build/trans_presets.java:2036 build/trans_presets.java:2042
-#: build/trans_presets.java:2048 build/trans_presets.java:2054
-#: build/trans_presets.java:2060 build/trans_presets.java:2066
-#: build/trans_presets.java:2072 build/trans_presets.java:2078
-#: build/trans_presets.java:2084 build/trans_presets.java:2090
-#: build/trans_presets.java:2096 build/trans_presets.java:2102
-#: build/trans_presets.java:2108 build/trans_presets.java:2114
-#: build/trans_presets.java:2120 build/trans_presets.java:2126
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2158
-#: build/trans_presets.java:2165 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2186
-#: build/trans_presets.java:2192 build/trans_presets.java:2198
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2218 build/trans_presets.java:2225
-#: build/trans_presets.java:2232 build/trans_presets.java:2239
-#: build/trans_presets.java:2247 build/trans_presets.java:2279
-#: build/trans_presets.java:2284 build/trans_presets.java:2289
-#: build/trans_presets.java:2294 build/trans_presets.java:2300
-#: build/trans_presets.java:2306 build/trans_presets.java:2312
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2354
-#: build/trans_presets.java:2451 build/trans_presets.java:2458
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2485 build/trans_presets.java:2492
-#: build/trans_presets.java:2498 build/trans_presets.java:2504
-#: build/trans_presets.java:2526 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2553 build/trans_presets.java:2559
-#: build/trans_presets.java:2565 build/trans_presets.java:2571
-#: build/trans_presets.java:2577 build/trans_presets.java:2583
-#: build/trans_presets.java:2590 build/trans_presets.java:2597
-#: build/trans_presets.java:2604 build/trans_presets.java:2610
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2661
-#: build/trans_presets.java:2667 build/trans_presets.java:2677
-#: build/trans_presets.java:2686 build/trans_presets.java:2701
-#: build/trans_presets.java:2707 build/trans_presets.java:2715
-#: build/trans_presets.java:2722 build/trans_presets.java:2742
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2783
-#: build/trans_presets.java:2790 build/trans_presets.java:2797
-#: build/trans_presets.java:2803 build/trans_presets.java:2809
-#: build/trans_presets.java:2817 build/trans_presets.java:2824
-#: build/trans_presets.java:2831 build/trans_presets.java:2838
-#: build/trans_presets.java:2844 build/trans_presets.java:2851
-#: build/trans_presets.java:2858 build/trans_presets.java:2867
-#: build/trans_presets.java:2873 build/trans_presets.java:2879
-#: build/trans_presets.java:2885 build/trans_presets.java:2891
-#: build/trans_presets.java:2900 build/trans_presets.java:2910
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2948
-#: build/trans_presets.java:2957 build/trans_presets.java:2963
-#: build/trans_presets.java:2969 build/trans_presets.java:2975
-#: build/trans_presets.java:2981 build/trans_presets.java:2987
-#: build/trans_presets.java:2993 build/trans_presets.java:3000
-#: build/trans_presets.java:3006 build/trans_presets.java:3011
-#: build/trans_presets.java:3018 build/trans_presets.java:3025
-#: build/trans_presets.java:3031 build/trans_presets.java:3040
-#: build/trans_presets.java:3048 build/trans_presets.java:3054
-#: build/trans_presets.java:3060 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3080
-#: build/trans_presets.java:3086 build/trans_presets.java:3092
-#: build/trans_presets.java:3098 build/trans_presets.java:3104
-#: build/trans_presets.java:3117 build/trans_presets.java:3131
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:67 build/trans_presets.java:103
+#: build/trans_presets.java:143 build/trans_presets.java:180
+#: build/trans_presets.java:200 build/trans_presets.java:218
+#: build/trans_presets.java:235 build/trans_presets.java:253
+#: build/trans_presets.java:273 build/trans_presets.java:306
+#: build/trans_presets.java:352 build/trans_presets.java:372
+#: build/trans_presets.java:387 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:503 build/trans_presets.java:523
+#: build/trans_presets.java:544 build/trans_presets.java:565
+#: build/trans_presets.java:586 build/trans_presets.java:607
+#: build/trans_presets.java:628 build/trans_presets.java:659
+#: build/trans_presets.java:680 build/trans_presets.java:693
+#: build/trans_presets.java:706 build/trans_presets.java:719
+#: build/trans_presets.java:732 build/trans_presets.java:745
+#: build/trans_presets.java:756 build/trans_presets.java:765
+#: build/trans_presets.java:812 build/trans_presets.java:833
+#: build/trans_presets.java:842 build/trans_presets.java:902
+#: build/trans_presets.java:1053 build/trans_presets.java:1061
+#: build/trans_presets.java:1069 build/trans_presets.java:1077
+#: build/trans_presets.java:1087 build/trans_presets.java:1095
+#: build/trans_presets.java:1100 build/trans_presets.java:1107
+#: build/trans_presets.java:1114 build/trans_presets.java:1119
+#: build/trans_presets.java:1127 build/trans_presets.java:1136
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1153 build/trans_presets.java:1159
+#: build/trans_presets.java:1165 build/trans_presets.java:1174
+#: build/trans_presets.java:1183 build/trans_presets.java:1190
+#: build/trans_presets.java:1198 build/trans_presets.java:1211
+#: build/trans_presets.java:1217 build/trans_presets.java:1226
+#: build/trans_presets.java:1232 build/trans_presets.java:1238
+#: build/trans_presets.java:1246 build/trans_presets.java:1302
+#: build/trans_presets.java:1349 build/trans_presets.java:1355
+#: build/trans_presets.java:1361 build/trans_presets.java:1367
+#: build/trans_presets.java:1373 build/trans_presets.java:1384
+#: build/trans_presets.java:1393 build/trans_presets.java:1408
+#: build/trans_presets.java:1415 build/trans_presets.java:1421
+#: build/trans_presets.java:1429 build/trans_presets.java:1436
+#: build/trans_presets.java:1445 build/trans_presets.java:1453
+#: build/trans_presets.java:1460 build/trans_presets.java:1471
+#: build/trans_presets.java:1481 build/trans_presets.java:1491
+#: build/trans_presets.java:1511 build/trans_presets.java:1523
+#: build/trans_presets.java:1534 build/trans_presets.java:1551
+#: build/trans_presets.java:1558 build/trans_presets.java:1574
+#: build/trans_presets.java:1581 build/trans_presets.java:1586
+#: build/trans_presets.java:1592 build/trans_presets.java:1598
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1646 build/trans_presets.java:1652
+#: build/trans_presets.java:1659 build/trans_presets.java:1666
+#: build/trans_presets.java:1674 build/trans_presets.java:1681
+#: build/trans_presets.java:1689 build/trans_presets.java:1696
+#: build/trans_presets.java:1702 build/trans_presets.java:1709
+#: build/trans_presets.java:1716 build/trans_presets.java:1723
+#: build/trans_presets.java:1740 build/trans_presets.java:1748
+#: build/trans_presets.java:1763 build/trans_presets.java:1773
+#: build/trans_presets.java:1785 build/trans_presets.java:1792
+#: build/trans_presets.java:1798 build/trans_presets.java:1808
+#: build/trans_presets.java:1813 build/trans_presets.java:1821
+#: build/trans_presets.java:1828 build/trans_presets.java:1834
+#: build/trans_presets.java:1840 build/trans_presets.java:1845
+#: build/trans_presets.java:1850 build/trans_presets.java:1855
+#: build/trans_presets.java:1862 build/trans_presets.java:1868
+#: build/trans_presets.java:1873 build/trans_presets.java:1882
+#: build/trans_presets.java:1891 build/trans_presets.java:1900
+#: build/trans_presets.java:1909 build/trans_presets.java:1918
+#: build/trans_presets.java:1924 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 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:2023 build/trans_presets.java:2032
+#: build/trans_presets.java:2040 build/trans_presets.java:2046
+#: build/trans_presets.java:2052 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 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:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2150
+#: build/trans_presets.java:2156 build/trans_presets.java:2162
+#: build/trans_presets.java:2169 build/trans_presets.java:2176
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2197 build/trans_presets.java:2203
+#: build/trans_presets.java:2209 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2229
+#: build/trans_presets.java:2236 build/trans_presets.java:2243
+#: build/trans_presets.java:2250 build/trans_presets.java:2258
+#: build/trans_presets.java:2290 build/trans_presets.java:2295
+#: build/trans_presets.java:2300 build/trans_presets.java:2305
+#: build/trans_presets.java:2311 build/trans_presets.java:2317
+#: build/trans_presets.java:2323 build/trans_presets.java:2331
+#: build/trans_presets.java:2337 build/trans_presets.java:2343
+#: build/trans_presets.java:2349 build/trans_presets.java:2355
+#: build/trans_presets.java:2365 build/trans_presets.java:2462
+#: build/trans_presets.java:2469 build/trans_presets.java:2483
+#: build/trans_presets.java:2489 build/trans_presets.java:2496
+#: build/trans_presets.java:2503 build/trans_presets.java:2509
+#: build/trans_presets.java:2515 build/trans_presets.java:2537
+#: build/trans_presets.java:2544 build/trans_presets.java:2551
+#: build/trans_presets.java:2557 build/trans_presets.java:2564
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2594 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2615
+#: build/trans_presets.java:2621 build/trans_presets.java:2627
+#: build/trans_presets.java:2633 build/trans_presets.java:2639
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2672 build/trans_presets.java:2678
+#: build/trans_presets.java:2688 build/trans_presets.java:2697
+#: build/trans_presets.java:2712 build/trans_presets.java:2718
+#: build/trans_presets.java:2726 build/trans_presets.java:2733
+#: build/trans_presets.java:2753 build/trans_presets.java:2764
+#: build/trans_presets.java:2770 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2788
+#: build/trans_presets.java:2795 build/trans_presets.java:2802
+#: build/trans_presets.java:2809 build/trans_presets.java:2815
+#: build/trans_presets.java:2821 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2912
+#: build/trans_presets.java:2922 build/trans_presets.java:2931
+#: build/trans_presets.java:2937 build/trans_presets.java:2943
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 build/trans_presets.java:2981
+#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:2999 build/trans_presets.java:3005
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3023 build/trans_presets.java:3030
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3066 build/trans_presets.java:3072
+#: build/trans_presets.java:3079 build/trans_presets.java:3085
+#: build/trans_presets.java:3092 build/trans_presets.java:3098
+#: build/trans_presets.java:3104 build/trans_presets.java:3110
+#: build/trans_presets.java:3116 build/trans_presets.java:3129
+#: build/trans_presets.java:3143 build/trans_presets.java:3157
 msgid "Name"
 msgstr "Nimi"
@@ -6554,4 +6692,58 @@
 msgid "Version"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
+#, fuzzy
+msgid "Changeset id:"
+msgstr "Muuta relaatiota"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
+#, fuzzy
+msgid "Created at:"
+msgstr "Luo alueita"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
+#, fuzzy
+msgid "Changeset comment:"
+msgstr "Lähetä kommentti"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
+msgid "No open changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48
+#, fuzzy
+msgid "<html>Please select the changesets you want to close</html>"
+msgstr "Valitse, minkä ominaisuuden muutoksen haluat toteuttaa."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
+#, fuzzy
+msgid "Open changesets"
+msgstr "Suljetaan muutoskokoelma..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101
+#, fuzzy
+msgid "Close changesets"
+msgstr "Suljetaan muutoskokoelma..."
+
+#. putValue(SMALL_ICON, ImageProvider.get("cancel"));
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
+#, fuzzy
+msgid "Close the selected open changesets"
+msgstr "Poista valitut objektit."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126
+#, fuzzy
+msgid "Cancel closeing of changesets"
+msgstr "Suljetaan muutoskokoelma..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37
+msgid "Closing changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77
+#, fuzzy, java-format
+msgid "Closing changeset {0}"
+msgstr "Suljetaan muutoskokoelma..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
@@ -6580,5 +6772,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be uploaded"
+msgid "Layer ''{0}'' has no modifications to be uploaded."
 msgstr ""
 
@@ -6586,5 +6778,5 @@
 #, java-format
 msgid ""
-"Layer ''{0}'' has modifications which should be saved to its assoicated file "
+"Layer ''{0}'' has modifications which should be saved to its associated file "
 "''{1}''."
 msgstr ""
@@ -6592,5 +6784,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be saved"
+msgid "Layer ''{0}'' has no modifications to be saved."
 msgstr ""
 
@@ -6624,17 +6816,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113
 msgid "Unsaved changes - Save/Upload before exiting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194
 #, java-format
 msgid ""
@@ -6647,9 +6839,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205
 msgid "Unsaved data and conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212
 #, java-format
 msgid ""
@@ -6663,9 +6855,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223
 msgid "Unsaved data and missing associated file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230
 #, java-format
 msgid ""
@@ -6680,42 +6872,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243
 msgid "Unsaved data non-writable files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
 msgid "Close this dialog and resume editing in JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322
+msgid "Discard and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
-msgid "Discard and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354
+msgid "Save and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
-msgid "Save and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
 msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402
 #, java-format
 msgid "Preparing layer ''{0}'' for upload ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
@@ -6723,5 +6915,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491
 msgid "Incomplete upload and/or save"
 msgstr ""
@@ -6761,21 +6953,21 @@
 #. item "Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:200
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:278
-#: build/trans_presets.java:311 build/trans_presets.java:357
-#: build/trans_presets.java:372 build/trans_presets.java:387
-#: build/trans_presets.java:409 build/trans_presets.java:429
-#: build/trans_presets.java:450 build/trans_presets.java:470
-#: build/trans_presets.java:489 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:549
-#: build/trans_presets.java:570 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:633
-#: build/trans_presets.java:664 build/trans_presets.java:1060
-#: build/trans_presets.java:1068 build/trans_presets.java:1076
-#: build/trans_presets.java:1086 build/trans_presets.java:1305
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:242
+#: build/trans_presets.java:260 build/trans_presets.java:279
+#: build/trans_presets.java:312 build/trans_presets.java:358
+#: build/trans_presets.java:373 build/trans_presets.java:388
+#: build/trans_presets.java:410 build/trans_presets.java:430
+#: build/trans_presets.java:451 build/trans_presets.java:471
+#: build/trans_presets.java:490 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:665 build/trans_presets.java:1062
+#: build/trans_presets.java:1070 build/trans_presets.java:1078
+#: build/trans_presets.java:1088 build/trans_presets.java:1308
 msgid "Layer"
 msgstr "Taso"
@@ -6794,67 +6986,32 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:200
 msgid "Upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-msgid "Use a new changeset and close it"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
-msgid ""
-"Select to upload the data using a new changeset and to close the changeset "
-"after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
-msgid "Use a new changeset and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
-msgid ""
-"Select to upload the data using a new changeset and to leave the changeset "
-"open after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
-msgid "Upload to a new or to an existing changeset?"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
-msgid "upload all changes in one request"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
-msgid ""
-"Enable to upload all changes in one request, disable to use one request per "
-"changed primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "Anna lyhyt kuvaus lähetettävistä muutoksista:"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:216
 msgid "Settings"
 msgstr "Asetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908
 msgid "Tags of new changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:221
 msgid "Objects to add:"
 msgstr "Lisättävät objektit:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:227
 msgid "Objects to modify:"
 msgstr "Muokattavat objektit:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:233
 msgid "Objects to delete:"
 msgstr "Poistettavat objektit:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
 #, java-format
 msgid "{0} object to add:"
@@ -6863,5 +7020,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:277
 #, java-format
 msgid "{0} object to modifiy:"
@@ -6870,5 +7027,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:286
 #, java-format
 msgid "{0} object to delete:"
@@ -6877,53 +7034,86 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422
-#, java-format
-msgid "Use the existing changeset {0} and close it after upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:423
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to close the changeset "
-"after this upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426
-#, java-format
-msgid "Use the existing changeset {0} and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:427
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to leave the changeset "
-"open for further uploads"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
-#, java-format
-msgid "Tags of changeset {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:470
 msgid "Upload Changes"
 msgstr "Lähetä muutokset"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472
+msgid "Upload the changed primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
+msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:479
+msgid "Illegal upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
+msgid "Cancel the upload and resume editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606
 #, fuzzy
-msgid "Upload the changed primitives"
-msgstr "Lähetetäänkö nämä muutokset?"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592
+msgid "Upload all changes in one request"
+msgstr "Lähetä kaikki muutokset OSM-palvelimelle..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607
+msgid ""
+"Enable to upload all changes in one request, disable to use one request per "
+"changed primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:617
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "Anna lyhyt kuvaus lähetettävistä muutoksista:"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672
+msgid "Open a new changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
+msgid "Open a new changeset and use it in the next upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
 #, fuzzy
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "Ole hyvä ja anna nimi sijainnille."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:593
-msgid "Illegal upload comment"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
-msgid "Cancel the upload and resume editing"
+msgid "Use an open changeset"
+msgstr "Tallentamattomia muutoksia"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
+msgid "Upload data to an already opened changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
+#, fuzzy
+msgid "Close changeset after upload"
+msgstr "Ei lähetettäviä muutoksia."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
+msgid "Select to close the changeset after the next upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922
+#, java-format
+msgid "Tags of changeset {0}"
+msgstr ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
+#, fuzzy
+msgid "Load the list of your open changesets from the server"
+msgstr "Lähetä nykyiset asetukset palvelimelle"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
+#, fuzzy
+msgid "Close the currently selected open changeset"
+msgstr "Siirrä valittuja jäseniä ylöspäin"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
+#, java-format
+msgid "changeset id > 0 expected. Got {1}"
 msgstr ""
 
@@ -7002,5 +7192,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
@@ -7038,5 +7228,5 @@
 msgstr "Syötettyä aikaa ei voitu tulkita oikein."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
@@ -7044,30 +7234,30 @@
 msgstr "gps-piste"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
 msgid "Customize line drawing"
 msgstr "Muokkaa viivanpiirtotyyliä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
 msgid "Use global settings."
 msgstr "Käytä globaaleja asetuksia."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Draw lines between points for this layer."
 msgstr "Piirrä viivat pisteiden välillä tällä tasolla."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Do not draw lines between points for this layer."
 msgstr "Älä piirrä viivoja pisteiden välillä tällä tasolla."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 msgid "Select line drawing options"
 msgstr "Viivanpiirtoasetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7075,5 +7265,5 @@
 msgstr "Muokkaa väriä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7082,5 +7272,5 @@
 msgstr "Oletusarvo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7089,38 +7279,75 @@
 msgstr "Valitse väri"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
 msgid "Import Audio"
 msgstr "Tuo äänitiedosto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
 msgid "Wave Audio files (*.wav)"
 msgstr "Ääniaaltotiedostot (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #, java-format
 msgid "Audio markers from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
 msgid "Import images"
 msgstr "Tuo kuvia"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#, java-format
+msgid "Name: {0}"
+msgstr "Nimi: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#, java-format
+msgid "Description: {0}"
+msgstr "Kuvaus: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#, fuzzy, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
 msgstr[0] "{0} jälki, "
 msgstr[1] "{0} jälkeä, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
+#: build/trans_presets.java:3160
+msgid "Description"
+msgstr "Kuvaus"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#, fuzzy
+msgid "Timespan"
+msgstr "Ajanjakso: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#, fuzzy
+msgid "Length"
+msgstr "Pituus: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
+msgid "URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+msgid "Length: "
+msgstr "Pituus: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
 #, java-format
 msgid "{0} route, "
@@ -7129,5 +7356,5 @@
 msgstr[1] "{0} reittiä, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 #, java-format
 msgid "{0} waypoint"
@@ -7136,29 +7363,10 @@
 msgstr[1] "{0} reittipistettä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
-#, java-format
-msgid "Name: {0}"
-msgstr "Nimi: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
-#, java-format
-msgid "Description: {0}"
-msgstr "Kuvaus: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
-msgid "Timespan: "
-msgstr "Ajanjakso: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
-msgid "Length: "
-msgstr "Pituus: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Muuta datatasoksi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7168,10 +7376,10 @@
 "haitallisena.<br>Jos haluat lähettää jälkiä, katso:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -7182,29 +7390,29 @@
 msgstr "Muutettu jäljestä {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
 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:769
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
 msgid "Download everything within:"
 msgstr "Lataa kaikki  alueella:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metriä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 msgid "Maximum area per request:"
 msgstr "Yhden pyynnön enimmäisalue:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} neliökilometriä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
 #, java-format
 msgid ""
@@ -7213,13 +7421,13 @@
 msgstr "<html>Tämä vaatii {0} erillistä latauspyyntöä.<br>Jatketaanko?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
 msgid "Download data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
 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:1143
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7227,5 +7435,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7276,30 +7484,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
-#, fuzzy
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
 "<br>If you want to upload traces, look here:</html>"
 msgstr ""
-"<html>Käsittelemättömän GPS-datan lähettämistä karttadatana pidetään "
-"haitallisena.<br>Jos haluat lähettää jälkiä, katso:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "track"
 msgid_plural "tracks"
@@ -7430,4 +7635,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
@@ -7656,13 +7862,18 @@
 msgstr "Piirrä isot GPS-pisteet."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+msgid "Draw a circle form HDOP value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Nopeus (punainen = hidas, vihreä = nopea)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Paikannuksen tarkkuus (punainen = huono, vihreä = hyvä)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Valittu väri (muutettavissa tasokohtaisesti)"
@@ -7670,6 +7881,6 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1374
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:1377
 msgid "Car"
 msgstr "Auto"
@@ -7690,14 +7901,14 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:324 build/trans_presets.java:650
-#: build/trans_presets.java:857 build/trans_presets.java:876
-#: build/trans_presets.java:890 build/trans_presets.java:912
-#: build/trans_presets.java:949 build/trans_presets.java:962
-#: build/trans_presets.java:974 build/trans_presets.java:986
-#: build/trans_presets.java:998 build/trans_presets.java:1010
-#: build/trans_presets.java:1020 build/trans_presets.java:1029
-#: build/trans_presets.java:1038 build/trans_presets.java:1437
-#: build/trans_presets.java:1510
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:325 build/trans_presets.java:651
+#: build/trans_presets.java:858 build/trans_presets.java:877
+#: build/trans_presets.java:891 build/trans_presets.java:913
+#: build/trans_presets.java:950 build/trans_presets.java:963
+#: build/trans_presets.java:975 build/trans_presets.java:987
+#: build/trans_presets.java:999 build/trans_presets.java:1011
+#: build/trans_presets.java:1021 build/trans_presets.java:1030
+#: build/trans_presets.java:1039 build/trans_presets.java:1440
+#: build/trans_presets.java:1513
 msgid "Bicycle"
 msgstr "Polkupyörä"
@@ -7730,62 +7941,62 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:325 build/trans_presets.java:649
-#: build/trans_presets.java:856 build/trans_presets.java:875
-#: build/trans_presets.java:889 build/trans_presets.java:911
-#: build/trans_presets.java:948 build/trans_presets.java:961
-#: build/trans_presets.java:973 build/trans_presets.java:985
-#: build/trans_presets.java:997 build/trans_presets.java:1009
-#: build/trans_presets.java:1019 build/trans_presets.java:1028
-#: build/trans_presets.java:1037
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:326 build/trans_presets.java:650
+#: build/trans_presets.java:857 build/trans_presets.java:876
+#: build/trans_presets.java:890 build/trans_presets.java:912
+#: build/trans_presets.java:949 build/trans_presets.java:962
+#: build/trans_presets.java:974 build/trans_presets.java:986
+#: build/trans_presets.java:998 build/trans_presets.java:1010
+#: build/trans_presets.java:1020 build/trans_presets.java:1029
+#: build/trans_presets.java:1038
 msgid "Foot"
 msgstr "Jalankulku (foot)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Piirrä suuntanuolet"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Nopea piirto (näyttää rumemmalta)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Vain kiinnostavat suuntatiedot (esim. yksisuuntaiset kadut)."
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Only on the head of a way."
 msgstr "Vain polun päähän."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Piirrä segmenttien järjestysnumerot"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Piirrä ladatun alueen rajat"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Piirrä virtuaalipisteet valintatilassa"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Piirrä epäaktiiviset tasot eri värillä"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Pehmeä karttagrafiikka (antialisointi)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:82
 msgid "Draw lines between raw GPS points"
 msgstr "Piirrä viivat GPS-pisteiden välille."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -7793,9 +8004,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
@@ -7804,20 +8015,20 @@
 "piirretään aina peräkkäisten pisteiden välit."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length (meters)"
 msgstr "Enimmäispituus (metreinä)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:129
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Piirrä GPS-pisteitä yhdistäviin viivoihin suuntanuolet"
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:135
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -7825,5 +8036,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:141
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -7831,13 +8042,13 @@
 msgstr "Älä piirrä nuolta, jos se on tätä lähempänä edellistä."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:144
 msgid "Minimum distance (pixels)"
 msgstr "Vähimmäisetäisyys (pikseleinä)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Draw larger dots for the GPS points."
 msgstr "Piirrä isommat pisteet GPS-pisteille"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -7845,9 +8056,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Colors points and track segments by velocity."
 msgstr "Värittää pisteet ja jäljen segmentit nopeuden mukaan."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -7857,37 +8068,37 @@
 "(HDOP). Toimii vain jos tarvittava tieto on saatavilla."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid "Track and Point Coloring"
 msgstr "Jäljen ja pisteiden väritys"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202
 msgid "GPS Points"
 msgstr "GPS-pisteet"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "Draw direction hints for way segments."
 msgstr "Piirrä suuntanuolet polkujen segmenteille."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:237
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Piirrä polkujen segmenteille järjestysnumerot."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Käytä antialisointia, joka antaa pehmeämmän ulkoasun."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Piirrä palvelimelta ladatun datan alueen reunat."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -7895,9 +8106,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257
 msgid "Draw the inactive data layers in a different color."
 msgstr "Piirrä epäaktiiviset tasot eri värillä."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "OSM Data"
 msgstr "OSM-data"
@@ -7976,45 +8187,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Configure available plugins."
 msgstr "Muokkaa käytettävien liitännäisten asetuksia."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50
+#. buttons at the bottom
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
 msgid "Download List"
 msgstr "Lataa lista"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:100
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 msgid "Update"
 msgstr "Päivitä"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Configure Sites..."
 msgstr "Muokkaa sivustoja..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:125
 msgid "Add JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:126
 msgid "Enter URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:162
 msgid "Please select an entry."
 msgstr "Valitse kohta."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:147
 msgid "Edit JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:148
 msgid "JOSM Plugin description URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:175
 msgid "Configure Plugin Sites"
 msgstr "Muokkaa liitännäissivustoja"
@@ -8356,6 +8568,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:369
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341
 #, java-format
 msgid "Remove old keys from up to {0} object"
@@ -8364,9 +8576,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135
 msgid "Add a new tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160
 msgid "Delete the selection in the tag table"
 msgstr ""
@@ -8401,7 +8613,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:68
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:75
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -8445,4 +8657,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24
+#, fuzzy, java-format
+msgid "Preset group ''{0}'' of group ''{1}''"
+msgstr "Käytä esivalintaa \"{0}\" ryhmästä \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
 #, java-format
 msgid "Preset group ''{0}''"
@@ -8463,4 +8680,10 @@
 msgstr "Ladataan pisteet {0}-{1}..."
 
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, fuzzy, java-format
+msgid "parameter ''{0}'' > 0 expected. Got {1}"
+msgstr "parametri ''{0}'' ei saa olla tyhjä"
+
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8569,5 +8792,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "Virhe luettaessa gpx-tiedostoa: tiedoston rakenne virheellinen."
@@ -8687,10 +8910,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -8698,75 +8922,79 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315
 msgid "Creating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
 #, java-format
 msgid "Successfully opened changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#, java-format
+msgid "id of changeset > 0 required. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
-#, java-format
-msgid "Changeset {0} is unchanged. Skipping update."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
 #, java-format
 msgid "Updating changeset {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
-msgid ""
-"Failed to update changeset. Either there is no current changeset or the id "
-"of the current changeset is 0"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
 msgid "Closing changeset..."
 msgstr "Suljetaan muutoskokoelma..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
-#, java-format
-msgid "Closing changeset {0}..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
-#, java-format
-msgid "Leaving changeset {0} open..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
 msgid "No changeset present for diff upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414
 msgid "Preparing..."
 msgstr "Valmistellaan..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419
 msgid "Uploading..."
 msgstr "Lähetetään..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438
 msgid "Waiting 10 seconds ... "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449
 msgid "OK - trying again."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:485
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517
 #, java-format
 msgid "Starting retry {0} of {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
+msgid "current changeset is null. Can't upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
+#, java-format
+msgid "id of current changeset > required. Current id is {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
+#, java-format
+msgid "Open changeset expected. Got closed changeset with id {0}"
 msgstr ""
 
@@ -8792,50 +9020,109 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
+#, java-format
+msgid "missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:128
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:134
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
+#, java-format
+msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
+#, java-format
+msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
+#, java-format
+msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#, java-format
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#, java-format
+msgid "Unsupported version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:176
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Aborting."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#, java-format
+msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
+#, fuzzy
+msgid "Parsing list of changesets..."
+msgstr "Suljetaan muutoskokoelma..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
 msgid "Incorrect password or username."
 msgstr "Virheellinen salasana tai käyttäjänimi."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:168
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Varoitus: salasana lähetetään salaamattomana."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Save user and password (unencrypted)"
 msgstr "Tallenna käyttäjänimi ja salasana (salaamattomana)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
 msgid "Enter Password"
 msgstr "Anna salasana"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:242
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
 msgid "The base URL for the OSM server (REST API)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr "OSM-tilin salasana. Jätä tyhjäksi, jos et halua tallentaa salasanaa."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
 msgid "Base Server URL"
 msgstr "Karttatietokantapalvelun URL"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
 msgid "OSM password"
 msgstr "OSM-salasana"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -8844,5 +9131,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:51
+#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #, java-format
 msgid "(at line {0}, column {1})"
@@ -8932,20 +9219,5 @@
 msgstr "Virhe jäsennettäessä."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124
-#, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
-#, fuzzy, java-format
-msgid "Missing mandatory attribute ''{0}''"
-msgstr "Puuttuva pakollinen attribuutti \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
-#, fuzzy, java-format
-msgid "Unsupported version: {0}"
-msgstr "Ristiriidan ratkaisuksi valittu versio:"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:155
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -8954,38 +9226,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
 msgid "found XML element <nd> element not as direct child of element <way>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
 msgid "Found XML element <member> not as direct child of element <relation>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
 #, java-format
 msgid ""
@@ -8993,24 +9265,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Relaation jäsenen määrittely puutteellinen: ei voi olla ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
-#, java-format
-msgid "Warning: Undefined element ''{0}'' found in input stream. Skipping."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
-#, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Skipping."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
 msgid "Illegal object with id=0"
 msgstr "Virheellinen objekti (id=0)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #, java-format
 msgid ""
@@ -9018,5 +9285,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:303
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
 #, java-format
 msgid ""
@@ -9025,5 +9292,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
 #, java-format
 msgid ""
@@ -9032,5 +9299,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
@@ -9040,25 +9307,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:316
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with id {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#, java-format
 msgid "Missing required attribute ''{0}''."
-msgstr "Puuttuva pakollinen attribuutti \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
 #, java-format
 msgid ""
@@ -9066,5 +9333,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
 #, java-format
 msgid ""
@@ -9073,5 +9340,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
 #, java-format
 msgid ""
@@ -9079,5 +9346,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
 #, java-format
 msgid ""
@@ -9086,17 +9353,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
 msgid "Prepare OSM data..."
 msgstr "Valmistellaan OSM-karttatietoja..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 msgid "Parsing OSM data..."
-msgstr "Valmistellaan OSM-karttatietoja..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
 msgid "Preparing data set..."
-msgstr "Valmistellaan karttatietoja..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
@@ -9117,4 +9382,24 @@
 msgid "Downloading referring relations ..."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51
+#, fuzzy
+msgid "Reading changesets..."
+msgstr "Suljetaan muutoskokoelma..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
+#, fuzzy
+msgid "Downloading changesets ..."
+msgstr "Suljetaan muutoskokoelma..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85
+#, fuzzy, java-format
+msgid "Reading changeset {0} ..."
+msgstr "Luetaan {0}..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91
+#, fuzzy, java-format
+msgid "Downloading changeset {0} ..."
+msgstr "Suljetaan muutoskokoelma..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
@@ -9131,43 +9416,66 @@
 msgstr "Yhdistetään palvelimeen..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
 msgid "Failed to open connection to API {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
+msgid "Error: failed to add authentication credentials to the connection."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 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/OsmServerWriter.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+msgid "XML tag <user> is missing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
+#, fuzzy, java-format
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgstr "Käytä esivalintaa \"{0}\" ryhmästä \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
+#, java-format
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
 msgid "Starting to upload with one request per primitive ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
 msgid "Starting to upload in one request ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:171
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135
 msgid "Uploading data ..."
-msgstr "Lähetetään..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:178
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
 msgid ""
 "WARNING: no API version defined for data to upload. Falling back to version "
@@ -9175,5 +9483,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147
 #, java-format
 msgid ""
@@ -9183,10 +9491,10 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
 msgid "Update Plugins"
 msgstr "Päivitä liitännäiset"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 msgid "Download Plugins"
 msgstr "Lataa liitännäiset"
@@ -9345,5 +9653,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -9352,18 +9660,18 @@
 msgstr[1] "Ladattiin liitännäistiedot {0} sivustolta"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
 msgid "No plugin information found."
 msgstr "Liitännäistietoja ei löytynyt."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:93
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
 msgid "All installed plugins are up to date."
 msgstr "Kaikki asennetut liitännäiset ovat ajantasalla."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
 #, java-format
 msgid ""
@@ -9376,9 +9684,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
 msgid "Download missing plugins"
 msgstr "Lataa puuttuvat liitännäiset"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
 #, java-format
 msgid ""
@@ -9393,43 +9701,43 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
 msgid "unknown"
 msgstr "tuntematon"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Versio {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 msgid "Plugin bundled with JOSM"
 msgstr "Liitännäinen tulee JOSM:n mukana"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:357
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -9746,10 +10054,4 @@
 msgid "(What does that mean?)"
 msgstr ""
-
-#. item "Relations/Route" text "Symbol description"
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3148
-msgid "Description"
-msgstr "Kuvaus"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
@@ -10507,5 +10809,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
-msgid "Set "
+#, java-format
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
@@ -11124,6 +11427,6 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 #: build/trans_style.java:990 build/trans_style.java:1007
-#: build/trans_style.java:1023 build/trans_style.java:3392
-#: build/trans_style.java:3400
+#: build/trans_style.java:1023 build/trans_style.java:3400
+#: build/trans_style.java:3408
 msgid "water"
 msgstr "vesi"
@@ -11418,4 +11721,56 @@
 msgstr "Mittaukset"
 
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Michigan Left"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Adds no left turn for sets of 4 or 5 ways."
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45
+#, fuzzy
+msgid "Please select 4 or 5 ways to assign no left turns."
+msgstr ""
+"Valitse yksi tai useampi suljettu polku, joissa on vähintään neljä pistettä."
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61
+#, fuzzy, java-format
+msgid "{0} extrem nodes."
+msgstr "{0} piste"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69
+#, fuzzy, java-format
+msgid "Via node {0}, {1}"
+msgstr "Muuta pistettä {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75
+#, fuzzy, java-format
+msgid "{0} via nodes."
+msgstr "{0} piste"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78
+msgid "Unable to find via nodes. Please check your selection"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98
+#, fuzzy, java-format
+msgid "MIddle way: {0}"
+msgstr "Lisää polku {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121
+msgid "Create Michigan left turn restriction"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129
+#, fuzzy, java-format
+msgid "Processing {0}"
+msgstr "Versio {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142
+#, java-format
+msgid "Relation: from {0} to {1} via {2}"
+msgstr ""
+
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
 msgid "OpenLayers"
@@ -11567,7 +11922,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
-#, fuzzy
 msgid "create new objects"
-msgstr "Luo uusi piste."
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
@@ -11630,7 +11984,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
-#, fuzzy
 msgid "Remote Control has been asked to create a new node."
-msgstr "Etähallinta on pyytänyt datan lataamista API:sta."
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
@@ -11890,5 +12243,5 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:158
 msgid "JOSM Tag Editor Plugin"
 msgstr ""
@@ -11898,5 +12251,5 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:370
 #, java-format
 msgid "Updating properties of up to {0} object"
@@ -11905,18 +12258,4 @@
 msgstr[1] ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44
-msgid "INFO: entering compatibilty mode for JOSM with Main.ds"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47
-msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49
-msgid ""
-"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-"found."
-msgstr ""
-
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
 msgid "Group"
@@ -11925,9 +12264,4 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
 msgid "Item"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-msgid "Filter"
 msgstr ""
 
@@ -12014,5 +12348,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2272
 msgid "Street name"
 msgstr "Kadunnimi"
@@ -12177,8 +12511,4 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88
 msgid "Zoom (in metres)"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
-msgid "URL"
 msgstr ""
 
@@ -12389,7 +12719,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501
-#, fuzzy
 msgid "Updating map ..."
-msgstr "Lähetetään..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69
@@ -12887,7 +13216,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
-#: build/trans_style.java:4179
+#: build/trans_style.java:4159 build/trans_style.java:4166
+#: build/trans_style.java:4173 build/trans_style.java:4180
+#: build/trans_style.java:4187
 msgid "building"
 msgstr "rakennus"
@@ -12901,5 +13230,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4186
+#: build/trans_style.java:4194
 msgid "area"
 msgstr "alue"
@@ -13030,10 +13359,10 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:148
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:155
 msgid "Reached a junction"
 msgstr ""
@@ -13323,7 +13652,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
-#, fuzzy
 msgid "Overlap tiles"
-msgstr "Päällekkäiset alueet"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
@@ -13332,7 +13660,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
-#, fuzzy
 msgid "% of north:"
-msgstr "pohjoinen"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -13479,6 +13806,11 @@
 msgstr ""
 
+#. Plugin michigan_left
+#: build/trans_plugins.java:35
+msgid "Adds no left turn for sets of 4 or 5 ways"
+msgstr ""
+
 #. Plugin nearclick
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid ""
 "Simulates a click when you do a small and short drag. This is usefull for "
@@ -13488,15 +13820,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13504,5 +13836,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13510,5 +13842,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13517,15 +13849,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13534,10 +13866,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13546,15 +13878,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -13564,10 +13896,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin usertools
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -13576,5 +13908,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -13583,5 +13915,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -13590,5 +13922,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -13597,10 +13929,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -13656,4 +13988,10 @@
 #. <annotations>
 #: build/trans_presets.java:57
+#, fuzzy
+msgid "Highways"
+msgstr "tie"
+
+#. group "Highways"
+#: build/trans_presets.java:58
 msgid "Streets"
 msgstr "Tiet"
@@ -13664,5 +14002,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:58 build/trans_surveyor.java:72
+#: build/trans_presets.java:59 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Moottoritie"
@@ -13671,5 +14009,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:61
+#: build/trans_presets.java:62
 msgid "Edit Motorway"
 msgstr "Muokkaa moottoritien ominaisuuksia"
@@ -13696,8 +14034,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:120 build/trans_presets.java:140
-#: build/trans_presets.java:177 build/trans_presets.java:197
-#: build/trans_presets.java:1557 build/trans_presets.java:3146
+#: build/trans_presets.java:65 build/trans_presets.java:101
+#: build/trans_presets.java:121 build/trans_presets.java:141
+#: build/trans_presets.java:178 build/trans_presets.java:198
+#: build/trans_presets.java:1560 build/trans_presets.java:3158
 msgid "Reference"
 msgstr "Numero"
@@ -13711,8 +14049,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:358
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:359
 msgid "Lanes"
 msgstr "Kaistat"
@@ -13729,15 +14067,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:224 build/trans_presets.java:280
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:373 build/trans_presets.java:388
-#: build/trans_presets.java:412 build/trans_presets.java:431
-#: build/trans_presets.java:452 build/trans_presets.java:472
-#: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1307
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:225 build/trans_presets.java:281
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:374 build/trans_presets.java:389
+#: build/trans_presets.java:413 build/trans_presets.java:432
+#: build/trans_presets.java:453 build/trans_presets.java:473
+#: build/trans_presets.java:511 build/trans_presets.java:667
+#: build/trans_presets.java:1310
 msgid "Max. speed (km/h)"
 msgstr "Maksiminopeus (km/h)"
@@ -13774,16 +14112,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:293 build/trans_presets.java:306
-#: build/trans_presets.java:320 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:464
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:659 build/trans_presets.java:1300
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:294 build/trans_presets.java:307
+#: build/trans_presets.java:321 build/trans_presets.java:353
+#: build/trans_presets.java:405 build/trans_presets.java:425
+#: build/trans_presets.java:445 build/trans_presets.java:465
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:660 build/trans_presets.java:1303
 msgid "Oneway"
 msgstr "Yksisuuntainen"
@@ -13825,19 +14163,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:353
-#: build/trans_presets.java:362 build/trans_presets.java:405
-#: build/trans_presets.java:425 build/trans_presets.java:445
-#: build/trans_presets.java:465 build/trans_presets.java:485
-#: build/trans_presets.java:504 build/trans_presets.java:523
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:586 build/trans_presets.java:607
-#: build/trans_presets.java:628 build/trans_presets.java:660
-#: build/trans_presets.java:1301 build/trans_surveyor.java:12
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:354
+#: build/trans_presets.java:363 build/trans_presets.java:406
+#: build/trans_presets.java:426 build/trans_presets.java:446
+#: build/trans_presets.java:466 build/trans_presets.java:486
+#: build/trans_presets.java:505 build/trans_presets.java:524
+#: build/trans_presets.java:545 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629 build/trans_presets.java:661
+#: build/trans_presets.java:1304 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Silta"
@@ -13873,19 +14211,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:354
-#: build/trans_presets.java:378 build/trans_presets.java:406
-#: build/trans_presets.java:426 build/trans_presets.java:446
-#: build/trans_presets.java:466 build/trans_presets.java:486
-#: build/trans_presets.java:505 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629 build/trans_presets.java:661
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:355
+#: build/trans_presets.java:379 build/trans_presets.java:407
+#: build/trans_presets.java:427 build/trans_presets.java:447
+#: build/trans_presets.java:467 build/trans_presets.java:487
+#: build/trans_presets.java:506 build/trans_presets.java:525
+#: build/trans_presets.java:546 build/trans_presets.java:567
+#: build/trans_presets.java:588 build/trans_presets.java:609
+#: build/trans_presets.java:630 build/trans_presets.java:662
+#: build/trans_presets.java:1305
 msgid "Tunnel"
 msgstr "Tunneli"
@@ -13919,18 +14257,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:73 build/trans_presets.java:90
-#: build/trans_presets.java:110 build/trans_presets.java:129
-#: build/trans_presets.java:150 build/trans_presets.java:166
-#: build/trans_presets.java:186 build/trans_presets.java:205
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:355
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:467
-#: build/trans_presets.java:487 build/trans_presets.java:506
-#: build/trans_presets.java:525 build/trans_presets.java:546
-#: build/trans_presets.java:567 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:630
-#: build/trans_presets.java:662 build/trans_presets.java:1303
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:356
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:468
+#: build/trans_presets.java:488 build/trans_presets.java:507
+#: build/trans_presets.java:526 build/trans_presets.java:547
+#: build/trans_presets.java:568 build/trans_presets.java:589
+#: build/trans_presets.java:610 build/trans_presets.java:631
+#: build/trans_presets.java:663 build/trans_presets.java:1306
 msgid "Cutting"
 msgstr "Maaleikkaus"
@@ -13964,18 +14302,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:74 build/trans_presets.java:91
-#: build/trans_presets.java:111 build/trans_presets.java:130
-#: build/trans_presets.java:151 build/trans_presets.java:167
-#: build/trans_presets.java:187 build/trans_presets.java:206
-#: build/trans_presets.java:222 build/trans_presets.java:240
-#: build/trans_presets.java:258 build/trans_presets.java:277
-#: build/trans_presets.java:310 build/trans_presets.java:356
-#: build/trans_presets.java:408 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:468
-#: build/trans_presets.java:488 build/trans_presets.java:507
-#: build/trans_presets.java:526 build/trans_presets.java:547
-#: build/trans_presets.java:568 build/trans_presets.java:589
-#: build/trans_presets.java:610 build/trans_presets.java:631
-#: build/trans_presets.java:663 build/trans_presets.java:1304
+#: build/trans_presets.java:75 build/trans_presets.java:92
+#: build/trans_presets.java:112 build/trans_presets.java:131
+#: build/trans_presets.java:152 build/trans_presets.java:168
+#: build/trans_presets.java:188 build/trans_presets.java:207
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:357
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:469
+#: build/trans_presets.java:489 build/trans_presets.java:508
+#: build/trans_presets.java:527 build/trans_presets.java:548
+#: build/trans_presets.java:569 build/trans_presets.java:590
+#: build/trans_presets.java:611 build/trans_presets.java:632
+#: build/trans_presets.java:664 build/trans_presets.java:1307
 msgid "Embankment"
 msgstr "Penger"
@@ -13983,5 +14321,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Motorway Link"
 msgstr "Moottoritien ramppi"
@@ -13990,5 +14328,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:80
+#: build/trans_presets.java:81
 msgid "Edit Motorway Link"
 msgstr "Muokkaa rampin ominaisuuksia"
@@ -13996,5 +14334,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:94
+#: build/trans_presets.java:95
 msgid "Trunk"
 msgstr "Valtatie/moottoriliikennetie (trunk)"
@@ -14003,5 +14341,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:97
+#: build/trans_presets.java:98
 msgid "Edit Trunk"
 msgstr "Muokkaa valtatien ominaisuuksia"
@@ -14011,6 +14349,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
 msgid "Motorroad"
 msgstr ""
@@ -14018,5 +14356,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:114
+#: build/trans_presets.java:115
 msgid "Trunk Link"
 msgstr "Valtatien/moottoriliikennetien ramppi (trunk_link)"
@@ -14025,5 +14363,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:117
+#: build/trans_presets.java:118
 msgid "Edit Trunk Link"
 msgstr "Muokkaa rampin ominaisuuksia"
@@ -14036,5 +14374,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:134 build/trans_surveyor.java:76
+#: build/trans_presets.java:135 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Kantatie (primary)"
@@ -14043,5 +14381,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:137
+#: build/trans_presets.java:138
 msgid "Edit Primary Road"
 msgstr "Muokkaa kantatien ominaisuuksia"
@@ -14049,10 +14387,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:154
+#: build/trans_presets.java:155
 msgid "Primary Link"
 msgstr "Kantatien ramppi (primary_link)"
 
 #. item
-#: build/trans_presets.java:155
+#: build/trans_presets.java:156
 msgid "Edit Primary Link"
 msgstr "Muokkaa rampin ominaisuuksia"
@@ -14064,5 +14402,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:170 build/trans_surveyor.java:80
+#: build/trans_presets.java:171 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Seututie (secondary)"
@@ -14072,5 +14410,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:174
+#: build/trans_presets.java:175
 msgid "Edit Secondary Road"
 msgstr "Muokkaa seututien ominaisuuksia"
@@ -14078,5 +14416,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:190
+#: build/trans_presets.java:191
 msgid "Tertiary"
 msgstr "Yhdystie/paikallistie"
@@ -14086,5 +14424,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:194
+#: build/trans_presets.java:195
 msgid "Edit Tertiary Road"
 msgstr "Muokkaa yhdystien/paikallistien ominaisuuksia"
@@ -14096,5 +14434,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:209 build/trans_surveyor.java:84
+#: build/trans_presets.java:210 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Tie (ei asuinkatu)"
@@ -14104,5 +14442,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:213
+#: build/trans_presets.java:214
 msgid "Edit Unclassified Road"
 msgstr "Muokkaa tien ominaisuuksia"
@@ -14129,19 +14467,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:225 build/trans_presets.java:243
-#: build/trans_presets.java:261 build/trans_presets.java:281
-#: build/trans_presets.java:314 build/trans_presets.java:359
-#: build/trans_presets.java:375 build/trans_presets.java:389
-#: build/trans_presets.java:413 build/trans_presets.java:432
-#: build/trans_presets.java:453 build/trans_presets.java:473
-#: build/trans_presets.java:491 build/trans_presets.java:511
-#: build/trans_presets.java:532 build/trans_presets.java:553
-#: build/trans_presets.java:574 build/trans_presets.java:595
-#: build/trans_presets.java:616 build/trans_presets.java:637
-#: build/trans_presets.java:667 build/trans_presets.java:680
-#: build/trans_presets.java:693 build/trans_presets.java:706
-#: build/trans_presets.java:719 build/trans_presets.java:732
-#: build/trans_presets.java:745 build/trans_presets.java:1308
-#: build/trans_presets.java:1498 build/trans_presets.java:1540
+#: build/trans_presets.java:226 build/trans_presets.java:244
+#: build/trans_presets.java:262 build/trans_presets.java:282
+#: build/trans_presets.java:315 build/trans_presets.java:360
+#: build/trans_presets.java:376 build/trans_presets.java:390
+#: build/trans_presets.java:414 build/trans_presets.java:433
+#: build/trans_presets.java:454 build/trans_presets.java:474
+#: build/trans_presets.java:492 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:554
+#: build/trans_presets.java:575 build/trans_presets.java:596
+#: build/trans_presets.java:617 build/trans_presets.java:638
+#: build/trans_presets.java:668 build/trans_presets.java:681
+#: build/trans_presets.java:694 build/trans_presets.java:707
+#: build/trans_presets.java:720 build/trans_presets.java:733
+#: build/trans_presets.java:746 build/trans_presets.java:1311
+#: build/trans_presets.java:1501 build/trans_presets.java:1543
 msgid "Width (meters)"
 msgstr ""
@@ -14153,5 +14491,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:228 build/trans_surveyor.java:88
+#: build/trans_presets.java:229 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Asuinkatu"
@@ -14160,5 +14498,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:231
+#: build/trans_presets.java:232
 msgid "Edit Residential Street"
 msgstr "Muokkaa asuinkadun ominaisuuksia"
@@ -14183,14 +14521,14 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:611
-#: build/trans_presets.java:632 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "Surface"
 msgstr "Pinta"
@@ -14211,53 +14549,53 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paved"
 msgstr "päällystetty"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "unpaved"
 msgstr "päällystämätön"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
 msgid "metal"
 msgstr ""
@@ -14271,22 +14609,22 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
-#: build/trans_style.java:3367
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
+#: build/trans_style.java:3375
 msgid "wood"
 msgstr "metsä"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paving_stones"
 msgstr ""
@@ -14294,77 +14632,77 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "cobblestone"
 msgstr "mukulakivi"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "gravel"
 msgstr "sora"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "grass"
 msgstr "ruoho"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "sand"
 msgstr "hiekka"
@@ -14372,13 +14710,13 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "ground"
 msgstr "maa"
@@ -14386,5 +14724,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:246
+#: build/trans_presets.java:247
 msgid "Living Street"
 msgstr "Pihakatu"
@@ -14393,5 +14731,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:249
+#: build/trans_presets.java:250
 msgid "Edit Living Street"
 msgstr "Muokkaa pihakadun ominaisuuksia"
@@ -14399,5 +14737,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:264
+#: build/trans_presets.java:265
 msgid "Service"
 msgstr ""
@@ -14406,5 +14744,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:267
+#: build/trans_presets.java:268
 msgid "Edit Serviceway"
 msgstr ""
@@ -14414,18 +14752,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "parking_aisle"
 msgstr ""
@@ -14433,5 +14771,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:284
+#: build/trans_presets.java:285
 msgid "Parking Aisle"
 msgstr "Pysäköintialueen ajoväylä"
@@ -14441,5 +14779,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:288
+#: build/trans_presets.java:289
 msgid "Edit Parking Aisle"
 msgstr "Muokkaa pysäköintialueen ajoväylän ominaisuuksia"
@@ -14447,5 +14785,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:298
+#: build/trans_presets.java:299
 msgid "Road (Unknown Type)"
 msgstr "Tuntemattoman luokituksen tie"
@@ -14454,5 +14792,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Edit Road of unknown type"
 msgstr "Muokkaa tietä jonka luokitusta ei vielä tiedetä"
@@ -14461,20 +14799,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:318
+#: build/trans_presets.java:319
 msgid "Road Restrictions"
 msgstr "Liikennöintirajoitukset"
 
 #. item
-#: build/trans_presets.java:319
+#: build/trans_presets.java:320
 msgid "Edit Road Restrictions"
 msgstr "Muokkaa tietä koskevia rajoituksia"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:321
+#: build/trans_presets.java:322
 msgid "Toll"
 msgstr "Tietulli"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:322
+#: build/trans_presets.java:323
 msgid "No exit (cul-de-sac)"
 msgstr "Umpikuja"
@@ -14487,8 +14825,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:323 build/trans_presets.java:529
-#: build/trans_presets.java:550 build/trans_presets.java:571
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:634
+#: build/trans_presets.java:324 build/trans_presets.java:530
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:593 build/trans_presets.java:614
+#: build/trans_presets.java:635
 msgid "Access"
 msgstr "Pääsy (access)"
@@ -14542,29 +14880,29 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1397
-#: build/trans_presets.java:1398 build/trans_presets.java:1399
-#: build/trans_presets.java:1763 build/trans_presets.java:1773
-#: build/trans_presets.java:2397 build/trans_presets.java:2433
-#: build/trans_presets.java:2442 build/trans_presets.java:2443
-#: build/trans_presets.java:2444 build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:1396
+#: build/trans_presets.java:1397 build/trans_presets.java:1400
+#: build/trans_presets.java:1401 build/trans_presets.java:1402
+#: build/trans_presets.java:1767 build/trans_presets.java:1777
+#: build/trans_presets.java:2408 build/trans_presets.java:2444
+#: build/trans_presets.java:2453 build/trans_presets.java:2454
+#: build/trans_presets.java:2455 build/trans_presets.java:2725
 msgid "yes"
 msgstr "kyllä"
@@ -14577,40 +14915,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:212
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:212
 msgid "private"
 msgstr "yksityinen"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655
 msgid "designated"
 msgstr ""
@@ -14623,19 +14961,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:219
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:219
 msgid "destination"
 msgstr "määränpää"
@@ -14658,71 +14996,71 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:205
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:205
 msgid "permissive"
 msgstr ""
 
-#: build/trans_presets.java:323 build/trans_presets.java:327
-#: build/trans_presets.java:330 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636
+#: build/trans_presets.java:324 build/trans_presets.java:328
+#: build/trans_presets.java:331 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637
 msgid "agricultural"
 msgstr ""
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
-#: build/trans_presets.java:2433 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1396 build/trans_presets.java:1397
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
+#: build/trans_presets.java:2444 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
+#: build/trans_presets.java:2725
 msgid "no"
 msgstr "ei"
 
-#: build/trans_presets.java:326
+#: build/trans_presets.java:327
 msgid "Goods"
 msgstr "Pakettiautot (goods)"
 
-#: build/trans_presets.java:327
+#: build/trans_presets.java:328
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Raskaat ajoneuvot (3.5 tonnia) (hgv)"
@@ -14737,10 +15075,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:328 build/trans_presets.java:651
-#: build/trans_presets.java:858 build/trans_presets.java:891
-#: build/trans_presets.java:913 build/trans_presets.java:950
-#: build/trans_presets.java:963 build/trans_presets.java:975
-#: build/trans_presets.java:987 build/trans_presets.java:999
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:329 build/trans_presets.java:652
+#: build/trans_presets.java:859 build/trans_presets.java:892
+#: build/trans_presets.java:914 build/trans_presets.java:951
+#: build/trans_presets.java:964 build/trans_presets.java:976
+#: build/trans_presets.java:988 build/trans_presets.java:1000
+#: build/trans_presets.java:1040
 msgid "Horse"
 msgstr "Hevonen"
@@ -14756,13 +15094,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:329 build/trans_presets.java:530
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:635 build/trans_presets.java:859
-#: build/trans_presets.java:877 build/trans_presets.java:892
-#: build/trans_presets.java:914 build/trans_presets.java:951
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:330 build/trans_presets.java:531
+#: build/trans_presets.java:552 build/trans_presets.java:573
+#: build/trans_presets.java:594 build/trans_presets.java:615
+#: build/trans_presets.java:636 build/trans_presets.java:860
+#: build/trans_presets.java:878 build/trans_presets.java:893
+#: build/trans_presets.java:915 build/trans_presets.java:952
+#: build/trans_presets.java:965 build/trans_presets.java:977
+#: build/trans_presets.java:989 build/trans_presets.java:1001
+#: build/trans_presets.java:1041
 msgid "Motorcycle"
 msgstr "Moottoripyörä"
@@ -14777,30 +15115,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:330 build/trans_presets.java:531
-#: build/trans_presets.java:552 build/trans_presets.java:573
-#: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:636 build/trans_presets.java:654
-#: build/trans_presets.java:878 build/trans_presets.java:893
-#: build/trans_presets.java:915 build/trans_presets.java:952
-#: build/trans_presets.java:965 build/trans_presets.java:977
-#: build/trans_presets.java:989 build/trans_presets.java:1001
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:331 build/trans_presets.java:532
+#: build/trans_presets.java:553 build/trans_presets.java:574
+#: build/trans_presets.java:595 build/trans_presets.java:616
+#: build/trans_presets.java:637 build/trans_presets.java:655
+#: build/trans_presets.java:879 build/trans_presets.java:894
+#: build/trans_presets.java:916 build/trans_presets.java:953
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1042
 msgid "Motorcar"
 msgstr "Auto"
 
-#: build/trans_presets.java:331
+#: build/trans_presets.java:332
 msgid "Public Service Vehicles (psv)"
 msgstr "Julkinen liikenne (psv)"
 
-#: build/trans_presets.java:332
+#: build/trans_presets.java:333
 msgid "Motorboat"
 msgstr "Moottorivene"
 
-#: build/trans_presets.java:333
+#: build/trans_presets.java:334
 msgid "Boat"
 msgstr "Vene"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:336
 msgid "Min. speed (km/h)"
 msgstr "Miniminopeus (km/h)"
@@ -14808,25 +15146,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:336 build/trans_presets.java:374
+#: build/trans_presets.java:337 build/trans_presets.java:375
 msgid "Max. weight (tonnes)"
 msgstr "Maksimipaino (tonnia)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:337
+#: build/trans_presets.java:338
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:339
+#: build/trans_presets.java:340
 msgid "Max. Length (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:341
+#: build/trans_presets.java:342
 msgid "Roundabout"
 msgstr "Kiertoliittymä"
@@ -14837,5 +15175,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:346
+#: build/trans_presets.java:347
 msgid "Edit Junction"
 msgstr "Muokkaa kiertoliittymän/risteyksen ominaisuuksia"
@@ -14857,9 +15195,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:349 build/trans_presets.java:648
-#: build/trans_presets.java:788 build/trans_presets.java:1135
-#: build/trans_presets.java:1392 build/trans_presets.java:2353
-#: build/trans_presets.java:2901 build/trans_presets.java:2911
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:350 build/trans_presets.java:649
+#: build/trans_presets.java:789 build/trans_presets.java:1137
+#: build/trans_presets.java:1395 build/trans_presets.java:2364
+#: build/trans_presets.java:2913 build/trans_presets.java:2923
+#: build/trans_presets.java:2932
 msgid "Type"
 msgstr "Tyyppi"
@@ -14879,10 +15217,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:547
+#: build/trans_presets.java:350 build/trans_style.java:547
 #: build/trans_style.java:555
 msgid "motorway"
 msgstr "moottoritie"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "motorway_link"
 msgstr "moottoritien_ramppi"
@@ -14904,10 +15242,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:563
+#: build/trans_presets.java:350 build/trans_style.java:563
 #: build/trans_style.java:571
 msgid "trunk"
 msgstr "valtatie"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "trunk_link"
 msgstr "valtatien_ramppi"
@@ -14929,10 +15267,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:579
+#: build/trans_presets.java:350 build/trans_style.java:579
 #: build/trans_style.java:587
 msgid "primary"
 msgstr "kantatie"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "primary_link"
 msgstr "kantatien_ramppi"
@@ -14954,5 +15292,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:595
+#: build/trans_presets.java:350 build/trans_style.java:595
 #: build/trans_style.java:603
 msgid "secondary"
@@ -14967,9 +15305,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:349 build/trans_style.java:611
+#: build/trans_presets.java:350 build/trans_style.java:611
 msgid "tertiary"
 msgstr "yhdystie"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "unclassified"
 msgstr "tie"
@@ -14983,9 +15321,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:349 build/trans_style.java:3143
+#: build/trans_presets.java:350 build/trans_style.java:3151
 msgid "residential"
 msgstr "asuinkatu"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "living_street"
 msgstr "pihakatu"
@@ -15015,10 +15353,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:349 build/trans_style.java:667
-#: build/trans_style.java:4244
+#: build/trans_presets.java:350 build/trans_style.java:667
+#: build/trans_style.java:4252
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "bus_guideway"
 msgstr ""
@@ -15048,6 +15386,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:349 build/trans_style.java:877
-#: build/trans_style.java:3208 build/trans_style.java:3209
+#: build/trans_presets.java:350 build/trans_style.java:877
+#: build/trans_style.java:3216 build/trans_style.java:3217
 msgid "construction"
 msgstr ""
@@ -15058,10 +15396,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Edit Bridge"
 msgstr "Muokkaa sillan ominaisuuksia"
 
 #. item
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "Edit Tunnel"
 msgstr ""
@@ -15069,19 +15407,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:393
+#: build/trans_presets.java:394
 msgid "Ways"
 msgstr "Polut"
 
 #. group "Ways"
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Construction"
 msgstr "Rakennettava tie"
 
 #. item
-#: build/trans_presets.java:395
+#: build/trans_presets.java:396
 msgid "Edit Highway Under Construction"
 msgstr "Muokkaa rakennettavan tien ominaisuuksia"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "Junction"
 msgstr "Liittymä"
@@ -15097,5 +15435,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:411 build/trans_style.java:895
+#: build/trans_presets.java:412 build/trans_style.java:895
 msgid "roundabout"
 msgstr "kiertoliittymä"
@@ -15104,5 +15442,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:417
+#: build/trans_presets.java:418
 msgid "Bridleway"
 msgstr "Ratsastustie"
@@ -15110,5 +15448,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:419
+#: build/trans_presets.java:420
 msgid "Edit Bridleway"
 msgstr "Muokkaa ratsastustien ominaisuuksia"
@@ -15116,5 +15454,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:435
+#: build/trans_presets.java:436
 msgid "Cycleway"
 msgstr "Pyörätie"
@@ -15124,10 +15462,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:439
+#: build/trans_presets.java:440
 msgid "Edit Cycleway"
 msgstr "Muokkaa pyörätietä/kevyen liikenteen väylää"
 
 #. item "Ways/Cycleway" check "Embankment"
-#: build/trans_presets.java:449
+#: build/trans_presets.java:450
 msgid "Pedestrians"
 msgstr ""
@@ -15135,5 +15473,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Footway"
 msgstr "Jalankulkutie"
@@ -15142,10 +15480,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Footway"
 msgstr "Muokkaa jalkakäytävän ominaisuuksia"
 
 #. item "Ways/Footway" check "Embankment"
-#: build/trans_presets.java:469
+#: build/trans_presets.java:470
 msgid "Bikes"
 msgstr ""
@@ -15153,5 +15491,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:476
+#: build/trans_presets.java:477
 msgid "Pedestrian"
 msgstr "Kävelykatu"
@@ -15160,5 +15498,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Edit Pedestrian Street"
 msgstr "Muokkaa kävelykadun ominaisuuksia"
@@ -15166,5 +15504,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:494
+#: build/trans_presets.java:495
 msgid "Steps"
 msgstr "Portaat"
@@ -15174,5 +15512,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:498
+#: build/trans_presets.java:499
 msgid "Edit Flight of Steps"
 msgstr "Muokkaa portaiden ominaisuuksia"
@@ -15181,5 +15519,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:515
+#: build/trans_presets.java:516
 msgid "Track"
 msgstr "Metsätie (track)"
@@ -15188,5 +15526,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:518
+#: build/trans_presets.java:519
 msgid "Edit Track"
 msgstr "Muokkaa metsätien ominaisuuksia"
@@ -15194,5 +15532,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:535
+#: build/trans_presets.java:536
 msgid "Track Grade 1"
 msgstr ""
@@ -15201,5 +15539,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:538
+#: build/trans_presets.java:539
 msgid "Edit Track of grade 1"
 msgstr ""
@@ -15207,5 +15545,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:556
+#: build/trans_presets.java:557
 msgid "Track Grade 2"
 msgstr ""
@@ -15214,5 +15552,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:559
+#: build/trans_presets.java:560
 msgid "Edit Track of grade 2"
 msgstr ""
@@ -15220,5 +15558,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:577
+#: build/trans_presets.java:578
 msgid "Track Grade 3"
 msgstr ""
@@ -15227,5 +15565,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:580
+#: build/trans_presets.java:581
 msgid "Edit Track of grade 3"
 msgstr ""
@@ -15233,5 +15571,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:598
+#: build/trans_presets.java:599
 msgid "Track Grade 4"
 msgstr ""
@@ -15240,5 +15578,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:601
+#: build/trans_presets.java:602
 msgid "Edit Track of grade 4"
 msgstr ""
@@ -15246,5 +15584,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:619
+#: build/trans_presets.java:620
 msgid "Track Grade 5"
 msgstr ""
@@ -15253,5 +15591,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:622
+#: build/trans_presets.java:623
 msgid "Edit Track of grade 5"
 msgstr ""
@@ -15260,5 +15598,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:641
+#: build/trans_presets.java:642
 msgid "Path"
 msgstr "Polku"
@@ -15267,13 +15605,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:644
+#: build/trans_presets.java:645
 msgid "Edit Path"
 msgstr ""
 
-#: build/trans_presets.java:652
+#: build/trans_presets.java:653
 msgid "Ski"
 msgstr ""
 
-#: build/trans_presets.java:653
+#: build/trans_presets.java:654
 msgid "Snowmobile"
 msgstr "Moottorikelkka"
@@ -15283,6 +15621,6 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:670 build/trans_presets.java:1725
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:671 build/trans_presets.java:1729
+#: build/trans_presets.java:1752
 msgid "Hiking"
 msgstr ""
@@ -15292,5 +15630,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:674
+#: build/trans_presets.java:675
 msgid "Edit Hiking"
 msgstr ""
@@ -15298,5 +15636,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:683
+#: build/trans_presets.java:684
 msgid "Mountain Hiking"
 msgstr ""
@@ -15306,5 +15644,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:687
+#: build/trans_presets.java:688
 msgid "Edit Mountain Hiking"
 msgstr ""
@@ -15312,5 +15650,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:696
+#: build/trans_presets.java:697
 msgid "Demanding Mountain Hiking"
 msgstr ""
@@ -15320,5 +15658,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:700
+#: build/trans_presets.java:701
 msgid "Edit Demanding Mountain Hiking"
 msgstr ""
@@ -15326,5 +15664,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:709
+#: build/trans_presets.java:710
 msgid "Alpine Hiking"
 msgstr ""
@@ -15334,5 +15672,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:713
+#: build/trans_presets.java:714
 msgid "Edit Alpine Hiking"
 msgstr ""
@@ -15340,5 +15678,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:723
 msgid "Demanding Alpine Hiking"
 msgstr ""
@@ -15348,5 +15686,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:726
+#: build/trans_presets.java:727
 msgid "Edit Demanding Alpine Hiking"
 msgstr ""
@@ -15354,5 +15692,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:735
+#: build/trans_presets.java:736
 msgid "Difficult Alpine Hiking"
 msgstr ""
@@ -15362,5 +15700,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:739
+#: build/trans_presets.java:740
 msgid "Edit Difficult Alpine Hiking"
 msgstr ""
@@ -15368,10 +15706,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:749
+#: build/trans_presets.java:750
 msgid "Waypoints"
 msgstr ""
 
 #. group "Waypoints"
-#: build/trans_presets.java:750
+#: build/trans_presets.java:751
 msgid "Motorway Junction"
 msgstr "Moottoritien liittymä"
@@ -15379,15 +15717,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:752
+#: build/trans_presets.java:753
 msgid "Edit Motorway Junction"
 msgstr "Muokkaa moottoritien liittymää"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:757
 msgid "Number"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:759
 msgid "Services"
 msgstr ""
@@ -15395,5 +15733,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:761
 msgid "Edit Service Station"
 msgstr ""
@@ -15431,15 +15769,15 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:765 build/trans_presets.java:902
-#: build/trans_presets.java:1382 build/trans_presets.java:1406
-#: build/trans_presets.java:1413 build/trans_presets.java:1419
-#: build/trans_presets.java:1427 build/trans_presets.java:1434
-#: build/trans_presets.java:1761 build/trans_presets.java:1771
-#: build/trans_presets.java:2361 build/trans_presets.java:2368
-#: build/trans_presets.java:2384 build/trans_presets.java:2395
-#: build/trans_presets.java:2403 build/trans_presets.java:2410
-#: build/trans_presets.java:2464 build/trans_presets.java:2512
-#: build/trans_presets.java:2678 build/trans_presets.java:2693
-#: build/trans_presets.java:2732 build/trans_presets.java:3151
+#: build/trans_presets.java:766 build/trans_presets.java:903
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
+#: build/trans_presets.java:1416 build/trans_presets.java:1422
+#: build/trans_presets.java:1430 build/trans_presets.java:1437
+#: build/trans_presets.java:1765 build/trans_presets.java:1775
+#: build/trans_presets.java:2372 build/trans_presets.java:2379
+#: build/trans_presets.java:2395 build/trans_presets.java:2406
+#: build/trans_presets.java:2414 build/trans_presets.java:2421
+#: build/trans_presets.java:2475 build/trans_presets.java:2523
+#: build/trans_presets.java:2689 build/trans_presets.java:2704
+#: build/trans_presets.java:2743 build/trans_presets.java:3163
 msgid "Operator"
 msgstr "Operaattori"
@@ -15448,5 +15786,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:769
+#: build/trans_presets.java:770
 msgid "Traffic Signal"
 msgstr "Liikennevalot"
@@ -15456,5 +15794,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:774
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -15463,27 +15801,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "island"
 msgstr "saari"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:774 build/trans_presets.java:790
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:775 build/trans_presets.java:791
+#: build/trans_presets.java:1334
 msgid "Cross on horseback"
 msgstr ""
@@ -15491,6 +15829,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:775 build/trans_presets.java:789
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:776 build/trans_presets.java:790
+#: build/trans_presets.java:1335
 msgid "Cross by bicycle"
 msgstr ""
@@ -15499,11 +15837,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:776 build/trans_presets.java:791
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:1336
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:778
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -15511,30 +15849,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:780
+#: build/trans_presets.java:781
 msgid "Stop"
 msgstr ""
@@ -15542,5 +15880,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:783
+#: build/trans_presets.java:784
 msgid "Pedestrian Crossing"
 msgstr ""
@@ -15549,14 +15887,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:786
+#: build/trans_presets.java:787
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:793
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:795
 msgid "Mini-roundabout"
 msgstr ""
@@ -15567,14 +15905,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:801
+#: build/trans_presets.java:802
 msgid "Turning Circle"
 msgstr "Kääntöympyrä"
@@ -15584,20 +15922,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:806
+#: build/trans_presets.java:807
 msgid "City Limit"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:807
+#: build/trans_presets.java:808
 msgid "Edit City Limit Sign"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:812
+#: build/trans_presets.java:813
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:814
+#: build/trans_presets.java:815
 msgid "Speed Camera"
 msgstr "Nopeuskamera"
@@ -15605,5 +15943,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:817
+#: build/trans_presets.java:818
 msgid "Emergency Phone"
 msgstr "Hätäpuhelin"
@@ -15611,5 +15949,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:820
+#: build/trans_presets.java:821
 msgid "Incline"
 msgstr ""
@@ -15617,5 +15955,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:823
+#: build/trans_presets.java:824
 msgid "Incline Steep"
 msgstr ""
@@ -15624,10 +15962,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:827
+#: build/trans_presets.java:828
 msgid "Ford"
 msgstr "Kahluupaikka"
 
 #. item
-#: build/trans_presets.java:828
+#: build/trans_presets.java:829
 msgid "Edit Ford"
 msgstr ""
@@ -15635,5 +15973,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:835
+#: build/trans_presets.java:836
 msgid "Mountain Pass"
 msgstr ""
@@ -15641,5 +15979,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:837
+#: build/trans_presets.java:838
 msgid "Edit Mountain Pass"
 msgstr ""
@@ -15651,7 +15989,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:842 build/trans_presets.java:1600
-#: build/trans_presets.java:1745 build/trans_presets.java:2845
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:843 build/trans_presets.java:1604
+#: build/trans_presets.java:1749 build/trans_presets.java:2857
+#: build/trans_presets.java:2864 build/trans_presets.java:2871
 msgid "Elevation"
 msgstr ""
@@ -15659,5 +15997,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:846
+#: build/trans_presets.java:847
 msgid "Barriers"
 msgstr "Esteet"
@@ -15665,5 +16003,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:849
+#: build/trans_presets.java:850
 msgid "Bollard"
 msgstr ""
@@ -15671,5 +16009,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:852
 msgid "Edit Bollard"
 msgstr ""
@@ -15714,16 +16052,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:854 build/trans_presets.java:873
-#: build/trans_presets.java:887 build/trans_presets.java:909
-#: build/trans_presets.java:946 build/trans_presets.java:959
-#: build/trans_presets.java:971 build/trans_presets.java:983
-#: build/trans_presets.java:995 build/trans_presets.java:1007
-#: build/trans_presets.java:1017 build/trans_presets.java:1026
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:855 build/trans_presets.java:874
+#: build/trans_presets.java:888 build/trans_presets.java:910
+#: build/trans_presets.java:947 build/trans_presets.java:960
+#: build/trans_presets.java:972 build/trans_presets.java:984
+#: build/trans_presets.java:996 build/trans_presets.java:1008
+#: build/trans_presets.java:1018 build/trans_presets.java:1027
+#: build/trans_presets.java:1036
 msgid "Allowed traffic:"
 msgstr "Sallitut kulkumuodot:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:861
+#: build/trans_presets.java:862
 msgid "Cycle Barrier"
 msgstr ""
@@ -15732,5 +16070,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:865
+#: build/trans_presets.java:866
 msgid "Block"
 msgstr ""
@@ -15738,5 +16076,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:868
+#: build/trans_presets.java:869
 msgid "Cattle Grid"
 msgstr ""
@@ -15744,10 +16082,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:870
+#: build/trans_presets.java:871
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:880
+#: build/trans_presets.java:881
 msgid "Bus Trap"
 msgstr ""
@@ -15755,15 +16093,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:883
+#: build/trans_presets.java:884
 msgid "Spikes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:884
+#: build/trans_presets.java:885
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:896
 msgid "Toll Booth"
 msgstr ""
@@ -15771,5 +16109,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:897
+#: build/trans_presets.java:898
 msgid "Edit Toll Booth"
 msgstr ""
@@ -15777,10 +16115,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:905
+#: build/trans_presets.java:906
 msgid "Border Control"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:906
+#: build/trans_presets.java:907
 msgid "Edit Border Control"
 msgstr ""
@@ -15790,5 +16128,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:920
+#: build/trans_presets.java:921
 msgid "Hedge"
 msgstr "Pensasaita"
@@ -15797,5 +16135,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:925
 msgid "Fence"
 msgstr "Aita"
@@ -15804,5 +16142,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:929
 msgid "Wall"
 msgstr "Muuri"
@@ -15810,5 +16148,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:931
+#: build/trans_presets.java:932
 msgid "City Wall"
 msgstr "Kaupunginmuuri"
@@ -15817,5 +16155,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:935
+#: build/trans_presets.java:936
 msgid "Retaining Wall"
 msgstr ""
@@ -15827,15 +16165,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:942
+#: build/trans_presets.java:943
 msgid "Entrance"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:943
+#: build/trans_presets.java:944
 msgid "Edit Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:954
+#: build/trans_presets.java:955
 msgid "Gate"
 msgstr "Portti"
@@ -15843,50 +16181,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:956
+#: build/trans_presets.java:957
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:967
+#: build/trans_presets.java:968
 msgid "Lift Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:968
+#: build/trans_presets.java:969
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:979
+#: build/trans_presets.java:980
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:980
+#: build/trans_presets.java:981
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:991
+#: build/trans_presets.java:992
 msgid "Bump Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:992
+#: build/trans_presets.java:993
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:1003
+#: build/trans_presets.java:1004
 msgid "Kissing Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1004
+#: build/trans_presets.java:1005
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1013
 msgid "Stile"
 msgstr ""
@@ -15894,25 +16232,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1014
+#: build/trans_presets.java:1015
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1023
 msgid "Turnstile"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1024
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1032
 msgid "Sally Port"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1033
 msgid "Edit Sally Port"
 msgstr ""
@@ -15920,13 +16258,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #.
-#. <separator/>
+#. group "Water"
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1046 build/trans_presets.java:1089
+#: build/trans_presets.java:1047 build/trans_presets.java:1048
+#: build/trans_presets.java:1091
 msgid "Water"
 msgstr "Vesi"
 
 #. group "Water"
-#: build/trans_presets.java:1047
+#: build/trans_presets.java:1049
 msgid "Spring"
 msgstr "Lähde"
@@ -15934,5 +16273,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1049
+#: build/trans_presets.java:1051
 msgid "Edit Spring"
 msgstr "Muokkaa lähteen ominaisuuksia"
@@ -15940,5 +16279,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1056
 msgid "Drain"
 msgstr ""
@@ -15946,10 +16285,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1058
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1064
 msgid "Stream"
 msgstr ""
@@ -15957,10 +16296,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1066
 msgid "Edit Stream"
 msgstr ""
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1072
 msgid "Canal"
 msgstr "Kanava"
@@ -15968,10 +16307,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1074
 msgid "Edit Canal"
 msgstr ""
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1080
 msgid "River"
 msgstr "Joki"
@@ -15981,5 +16320,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1084
 msgid "Edit River"
 msgstr "Muokkaa joen ominaisuuksia"
@@ -15987,15 +16326,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1093
 msgid "Edit Water"
 msgstr "Muokkaa veden ominaisuuksia"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1097
 msgid "Land"
 msgstr "Maa"
 
 #. item
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1098
 msgid "Edit Land"
 msgstr "Muokkaa maan ominaisuuksia"
@@ -16003,15 +16342,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1103
 msgid "Basin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1104
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1109
 msgid "Reservoir"
 msgstr "Tekojärvi"
@@ -16019,15 +16358,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1109
+#: build/trans_presets.java:1111
 msgid "Edit Reservoir Landuse"
 msgstr "Muokkaa tekojärven ominaisuuksia"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1116
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1117
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -16035,5 +16374,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1120
+#: build/trans_presets.java:1122
 msgid "Riverbank"
 msgstr "Joentörmä"
@@ -16042,10 +16381,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1125
 msgid "Edit Riverbank"
 msgstr "Muokkaa joentörmän ominaisuuksia"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1127
+#: build/trans_presets.java:1129
 msgid "Wetland"
 msgstr "Kosteikko"
@@ -16056,14 +16395,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1134
 msgid "Edit Wetland"
 msgstr "Muokkaa kosteikon ominaisuuksia"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "swamp"
 msgstr "suo"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "bog"
 msgstr "räme"
@@ -16077,35 +16416,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1135 build/trans_style.java:3384
+#: build/trans_presets.java:1137 build/trans_style.java:3392
 msgid "marsh"
 msgstr "suo"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1139
 msgid "Mud"
 msgstr "Muta"
 
 #. item
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1140
 msgid "Edit Mud"
 msgstr "Muokkaa mudan ominaisuuksia"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1144
 msgid "Beach"
 msgstr "Ranta"
@@ -16113,20 +16452,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1144
+#: build/trans_presets.java:1146
 msgid "Edit Beach"
 msgstr "Muokkaa rannan ominaisuuksia"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1150
 msgid "Bay"
 msgstr "Lahti"
 
 #. item
-#: build/trans_presets.java:1149
+#: build/trans_presets.java:1151
 msgid "Edit Bay"
 msgstr "Muokkaa lahden ominaisuuksia"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1155
 msgid "Cliff"
 msgstr "Kallio"
@@ -16134,10 +16473,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1157
 msgid "Edit Cliff"
 msgstr "Muokkaa kallion ominaisuuksia"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1159
+#: build/trans_presets.java:1161
 msgid "Coastline"
 msgstr "Rantaviiva"
@@ -16145,5 +16484,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1163
 msgid "Edit Coastline"
 msgstr "Muokkaa rantaviivan ominaisuuksia"
@@ -16151,5 +16490,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1168
 msgid "Ferry Route"
 msgstr "Lauttareitti"
@@ -16157,5 +16496,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1170
 msgid "Edit Ferry"
 msgstr ""
@@ -16164,5 +16503,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1176
+#: build/trans_presets.java:1178
 msgid "Boatyard"
 msgstr ""
@@ -16170,10 +16509,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:1180
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1185
 msgid "Dock"
 msgstr "Telakka"
@@ -16181,5 +16520,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1187
 msgid "Edit Dock"
 msgstr ""
@@ -16187,5 +16526,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1193
 msgid "Dam"
 msgstr "Pato"
@@ -16193,15 +16532,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1195
 msgid "Edit Dam"
 msgstr ""
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1199
+#: build/trans_presets.java:1201
 msgid "Waterway Point"
 msgstr ""
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1202
 msgid "Lock Gate"
 msgstr "Sulkuportti"
@@ -16210,5 +16549,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1206
 msgid "Weir"
 msgstr ""
@@ -16216,20 +16555,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1208
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1213
 msgid "Waterfall"
 msgstr "Vesiputous"
 
 #. item
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1214
 msgid "Edit Waterfall"
 msgstr "Muokkaa vesiputouksen ominaisuuksia"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1219
 msgid "Turning Point"
 msgstr ""
@@ -16238,15 +16577,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1221
+#: build/trans_presets.java:1223
 msgid "Marina"
 msgstr "Venesatama"
 
 #. item
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1224
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1228
 msgid "Pier"
 msgstr "Laituri"
@@ -16254,10 +16593,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1230
 msgid "Edit Pier"
 msgstr "Muokkaa laiturin ominaisuuksia"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1234
 msgid "Ferry Terminal"
 msgstr "Lauttaterminaali"
@@ -16265,10 +16604,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1236
 msgid "Edit Ferry Terminal"
 msgstr "Muokkaa lauttaterminaalin ominaisuuksia"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1240
 msgid "Slipway"
 msgstr ""
@@ -16278,16 +16617,21 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1244
 msgid "Edit Slipway"
 msgstr ""
 
 #. item "Waterway Point/Slipway" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1250
+#, fuzzy
+msgid "Transport"
+msgstr "Julkinen liikenne"
+
+#. group "Transport"
+#: build/trans_presets.java:1251
 msgid "Railway"
 msgstr "Rata"
 
 #. group "Railway"
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1252
 msgid "Rail"
 msgstr "Rata"
@@ -16295,5 +16639,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:1254
 msgid "Edit Rail"
 msgstr ""
@@ -16323,8 +16667,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "Optional Types"
 msgstr ""
@@ -16338,35 +16682,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "siding"
 msgstr "sivuraide"
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1259
 msgid "Narrow Gauge Rail"
 msgstr "Kapean raideleveyden rata"
 
 #. item
-#: build/trans_presets.java:1257
+#: build/trans_presets.java:1260
 msgid "Edit Narrow Gauge Rail"
 msgstr "Muokkaa kapean raideleveyden rataa"
 
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1265
 msgid "Monorail"
 msgstr "Monorail"
@@ -16374,45 +16718,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1267
 msgid "Edit Monorail"
 msgstr ""
 
-#: build/trans_presets.java:1269
+#: build/trans_presets.java:1272
 msgid "Preserved"
 msgstr "Säilytetty"
 
 #. item
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1273
 msgid "Edit Preserved Railway"
 msgstr "Muokkaa museroradan ominaisuuksia"
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1278
 msgid "Light Rail"
 msgstr "Pikaraitiotie"
 
 #. item
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1279
 msgid "Edit Light Rail"
 msgstr ""
 
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1284
 msgid "Subway"
 msgstr "Metro"
 
 #. item
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1285
 msgid "Edit Subway"
 msgstr "Muokkaa metron ominaisuuksia"
 
-#: build/trans_presets.java:1287
+#: build/trans_presets.java:1290
 msgid "Tram"
 msgstr "Raitiotie"
 
 #. item
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1291
 msgid "Edit Tram"
 msgstr ""
 
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1296
 msgid "Bus Guideway"
 msgstr ""
@@ -16420,5 +16764,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1295
+#: build/trans_presets.java:1298
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -16427,14 +16771,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1315
 msgid "Disused Rail"
 msgstr "Käytöstä poistettu rata"
 
 #. item
-#: build/trans_presets.java:1313
+#: build/trans_presets.java:1316
 msgid "Edit Disused Railway"
 msgstr "Muokkaa käytöstä poistetun radan ominaisuuksia"
 
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1321
 msgid "Abandoned Rail"
 msgstr "Purettu rata"
@@ -16443,5 +16787,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1325
 msgid "Level Crossing"
 msgstr "Tasoristeys"
@@ -16450,5 +16794,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1329
 msgid "Crossing"
 msgstr "Risteys"
@@ -16458,5 +16802,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1333
 msgid "Crossing type"
 msgstr ""
@@ -16464,5 +16808,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1339
 msgid "Turntable"
 msgstr "Kääntöpöytä"
@@ -16471,10 +16815,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1344
 msgid "Aerialway"
 msgstr "Köysiradat"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1345
 msgid "Chair Lift"
 msgstr "Tuolihissi"
@@ -16482,10 +16826,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1347
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1351
 msgid "Drag Lift"
 msgstr "Hiihtohissi"
@@ -16493,10 +16837,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1353
 msgid "Edit Drag Lift"
 msgstr "Muokkaa hiihtohissin ominaisuuksia"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1357
 msgid "Cable Car"
 msgstr "Köysirata"
@@ -16504,10 +16848,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1359
 msgid "Edit Cable Car"
 msgstr "Muokkaa köysiradan ominaisuuksia"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1360
+#: build/trans_presets.java:1363
 msgid "Gondola"
 msgstr ""
@@ -16515,5 +16859,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1365
 msgid "Edit Gondola"
 msgstr ""
@@ -16521,5 +16865,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1366 build/trans_presets.java:1461
+#: build/trans_presets.java:1369 build/trans_presets.java:1464
 msgid "Station"
 msgstr "Asema"
@@ -16530,10 +16874,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1368 build/trans_presets.java:1464
+#: build/trans_presets.java:1371 build/trans_presets.java:1467
 msgid "Edit Station"
 msgstr ""
 
 #. group "Car"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1378
 msgid "Fuel"
 msgstr "Polttoaine"
@@ -16543,5 +16887,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1382
 msgid "Edit Fuel"
 msgstr "Muokkaa huoltoaseman ominaisuuksia"
@@ -16599,32 +16943,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1671 build/trans_presets.java:1678
-#: build/trans_presets.java:1686 build/trans_presets.java:1699
-#: build/trans_presets.java:1713 build/trans_presets.java:1810
-#: build/trans_presets.java:1818 build/trans_presets.java:1909
-#: build/trans_presets.java:1915 build/trans_presets.java:2226
-#: build/trans_presets.java:2250 build/trans_presets.java:2465
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1703
+#: build/trans_presets.java:1717 build/trans_presets.java:1814
+#: build/trans_presets.java:1822 build/trans_presets.java:1919
+#: build/trans_presets.java:1925 build/trans_presets.java:2237
+#: build/trans_presets.java:2261 build/trans_presets.java:2476
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Opening Hours"
 msgstr "Aukioloajat"
@@ -16683,91 +17027,91 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -16782,5 +17126,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1385 build/trans_presets.java:1438
+#: build/trans_presets.java:1388 build/trans_presets.java:1441
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -16790,5 +17134,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1391
 msgid "Edit Parking"
 msgstr "Muokkaa pysäköinnin ominaisuuksia"
@@ -16799,24 +17143,24 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1391 build/trans_presets.java:1762
-#: build/trans_presets.java:1772 build/trans_presets.java:2396
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:1394 build/trans_presets.java:1766
+#: build/trans_presets.java:1776 build/trans_presets.java:2407
+#: build/trans_presets.java:2524
 msgid "Reference number"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "multi-storey"
 msgstr "monikerroksinen"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "surface"
 msgstr ""
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "underground"
 msgstr "maanalainen"
 
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1396
 msgid "Park and Ride"
 msgstr ""
@@ -16825,38 +17169,38 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1394 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
+#: build/trans_presets.java:1397 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
 msgid "Fee"
 msgstr "Maksu"
 
 #. <space />
-#: build/trans_presets.java:1396
+#: build/trans_presets.java:1399
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1400
 msgid "Spaces for Disabled"
 msgstr "Invapaikkojen lukumäärä"
 
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1401
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1402
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1403
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1405
 msgid "Wash"
 msgstr "Autopesula"
 
 #. item
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1406
 msgid "Edit Car Wash"
 msgstr "Muokkaa autopesulan ominaisuuksia"
@@ -16864,5 +17208,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1408 build/trans_presets.java:1452
+#: build/trans_presets.java:1411 build/trans_presets.java:1455
 msgid "Shop"
 msgstr "Kauppa"
@@ -16870,15 +17214,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1413
 msgid "Edit Car Shop"
 msgstr "Muokkaa autokaupan ominaisuuksia"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1418
 msgid "Repair"
 msgstr "Korjaamo"
 
 #. item
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1419
 msgid "Edit Car Repair"
 msgstr "Muokkaa autokorjaamon ominaisuuksia"
@@ -16886,5 +17230,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1421 build/trans_presets.java:1445
+#: build/trans_presets.java:1424 build/trans_presets.java:1448
 msgid "Rental"
 msgstr "Vuokraamo"
@@ -16893,10 +17237,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1427
 msgid "Edit Car Rental"
 msgstr "Muokkaa autovuokraamon ominaisuuksia"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1432
 msgid "Sharing"
 msgstr ""
@@ -16904,5 +17248,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1434
 msgid "Edit Car Sharing"
 msgstr ""
@@ -16910,10 +17254,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Parking"
 msgstr "Muokkaa pyörätelineen ominaisuuksia"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1446
 msgid "Capacity"
 msgstr "Paikkojen lukumäärä"
@@ -16922,5 +17266,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1448
+#: build/trans_presets.java:1451
 msgid "Edit Bicycle Rental"
 msgstr "Muokkaa polkupyörävuokraamon ominaisuuksia"
@@ -16929,15 +17273,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1458
 msgid "Edit Bicycle Shop"
 msgstr "Pyöräkauppa"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1463
 msgid "Public Transport"
 msgstr "Julkinen liikenne"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:1472
 msgid "UIC-Reference"
 msgstr ""
@@ -16945,5 +17289,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1475
 msgid "Railway Halt"
 msgstr "Rautatien seisake"
@@ -16951,5 +17295,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1477
 msgid "Edit Halt"
 msgstr "Muokkaa rautatien seisaketta"
@@ -16957,5 +17301,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1484
 msgid "Tram Stop"
 msgstr "Raitiovaunupysäkki"
@@ -16964,5 +17308,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1484
+#: build/trans_presets.java:1487
 msgid "Edit Tram Stop"
 msgstr "Muokkaa raitiovaunupysäkkiä"
@@ -16970,5 +17314,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1494
 msgid "Railway Platform"
 msgstr "Asemalaituri"
@@ -16977,5 +17321,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1497
 msgid "Edit Railway Platform"
 msgstr "Muokkaa laiturin asetuksia"
@@ -16987,5 +17331,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1497 build/trans_presets.java:1539
+#: build/trans_presets.java:1500 build/trans_presets.java:1542
 msgid "Reference (track number)"
 msgstr ""
@@ -16993,10 +17337,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1499 build/trans_presets.java:1541
+#: build/trans_presets.java:1502 build/trans_presets.java:1544
 msgid "Area"
 msgstr "Alue"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1504
 msgid "Subway Entrance"
 msgstr "Metron sisäänkäynti"
@@ -17005,10 +17349,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1507
 msgid "Edit Subway Entrance"
 msgstr "Muokkaa sisäänkäynnin ominaisuuksia"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1512
 msgid "Wheelchair"
 msgstr "Pyörätuoli"
@@ -17017,5 +17361,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1517
 msgid "Bus Station"
 msgstr "Linja-autoasema"
@@ -17024,5 +17368,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1520
 msgid "Edit Bus Station"
 msgstr "Muokkaa linja-autoaseman ominaisuuksia"
@@ -17030,5 +17374,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1526
 msgid "Bus Stop"
 msgstr "Linja-autopysäkki"
@@ -17038,5 +17382,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1530
 msgid "Edit Bus Stop"
 msgstr "Muokkaa linja-autopysäkin ominaisuuksia"
@@ -17045,6 +17389,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1532 build/trans_presets.java:1785
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:1535 build/trans_presets.java:1789
+#: build/trans_presets.java:2453
 msgid "Shelter"
 msgstr ""
@@ -17052,10 +17396,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1538
 msgid "Bus Platform"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1539
 msgid "Edit Bus Platform"
 msgstr ""
@@ -17063,5 +17407,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1547
 msgid "Taxi"
 msgstr "Taksi"
@@ -17069,5 +17413,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1549
 msgid "Edit Taxi station"
 msgstr "Muokkaa taksitolppaa"
@@ -17075,5 +17419,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1554
 msgid "Airport"
 msgstr "Lentokenttä"
@@ -17081,15 +17425,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1556
 msgid "Edit Airport"
 msgstr ""
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1561
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1559
+#: build/trans_presets.java:1562
 msgid "ICAO"
 msgstr "ICAO"
@@ -17097,6 +17441,11 @@
 #. item "Public Transport/Airport" text "ICAO"
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1567
+#, fuzzy
+msgid "Travel"
+msgstr "sora"
+
+#. group "Travel"
+#: build/trans_presets.java:1568
 msgid "Accomodation"
 msgstr "Majoittuminen"
@@ -17108,5 +17457,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1565 build/trans_surveyor.java:43
+#: build/trans_presets.java:1569 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotelli"
@@ -17115,15 +17464,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:1568
+#: build/trans_presets.java:1572
 msgid "Edit Hotel"
 msgstr "Muokkaa hotellia"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1575
 msgid "Stars"
 msgstr "Tähdet"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1577
 msgid "Motel"
 msgstr "Motelli"
@@ -17131,20 +17480,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1579
 msgid "Edit Motel"
 msgstr "Muokkaa motellin ominaisuuksia"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1583
 msgid "Guest House"
 msgstr "Vierasmaja"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1584
 msgid "Edit Guest House"
 msgstr "Muokkaa vierasmajan ominaisuuksia"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1588
 msgid "Chalet"
 msgstr "Alppimaja"
@@ -17152,10 +17501,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1590
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1594
 msgid "Hostel"
 msgstr "Hostelli"
@@ -17163,30 +17512,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1592
+#: build/trans_presets.java:1596
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1600
 msgid "Alpine Hut"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1601
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1606
 msgid "Caravan Site"
 msgstr "Matkailuvaunualue"
 
 #. item
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1607
 msgid "Edit Caravan Site"
 msgstr "Muokkaa matkailuvaunualueen ominaisuuksia"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1611
 msgid "Camping Site"
 msgstr "Leirintäalue"
@@ -17194,10 +17543,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1613
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1618
 msgid "Food+Drinks"
 msgstr "Ruoka ja juoma"
@@ -17208,5 +17557,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1615 build/trans_surveyor.java:47
+#: build/trans_presets.java:1619 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Ravintola"
@@ -17214,5 +17563,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1621
 msgid "Edit Restaurant"
 msgstr "Muokkaa ravintolan ominaisuuksia"
@@ -17220,5 +17569,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "Cuisine"
 msgstr ""
@@ -17226,61 +17575,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "italian"
 msgstr "italialainen"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "chinese"
 msgstr "kiinalainen"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "burger"
 msgstr "hampurilainen"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "greek"
 msgstr "kreikkalainen"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "german"
 msgstr "saksalainen"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "indian"
 msgstr "intialainen"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "regional"
 msgstr "paikallinen"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "turkish"
 msgstr "turkkilainen"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "asian"
 msgstr "aasialainen"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "thai"
 msgstr "thaimaalainen"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "mexican"
 msgstr "meksikolainen"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "japanese"
 msgstr "japanilainen"
 
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1627
 msgid "Fast Food"
 msgstr "Pikaruoka"
@@ -17288,9 +17637,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1629
 msgid "Edit Fast Food Restaurant"
 msgstr "Muokkaa pikaruokalan ominaisuuksia"
 
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1635
 msgid "Cafe"
 msgstr "Kahvila"
@@ -17298,9 +17647,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1633
+#: build/trans_presets.java:1637
 msgid "Edit Cafe"
 msgstr "Muokkaa kahvilan ominaisuuksia"
 
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1642
 msgid "Pub"
 msgstr ""
@@ -17308,18 +17657,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1644
 msgid "Edit Pub"
 msgstr ""
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1649
 msgid "Biergarten"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1646
+#: build/trans_presets.java:1650
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1655
 msgid "Bar"
 msgstr ""
@@ -17327,9 +17676,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1657
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1662
 msgid "Nightclub"
 msgstr "Yökerho"
@@ -17337,24 +17686,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1664
 msgid "Edit Nightclub"
 msgstr "Muokkaa yökerhon ominaisuuksia"
 
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1670
 msgid "Tourism"
 msgstr "Turismi"
 
 #. group "Tourism"
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1671
 msgid "Attraction"
 msgstr "Nähtävyys"
 
 #. item
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1672
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1677
 msgid "Museum"
 msgstr "Museo"
@@ -17362,9 +17711,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1679
 msgid "Edit Museum"
 msgstr "Muokkaa museon ominaisuuksia"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1684
 msgid "Zoo"
 msgstr "Eläintarha"
@@ -17373,9 +17722,9 @@
 #. <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:1683
+#: build/trans_presets.java:1687
 msgid "Edit Zoo"
 msgstr "Muokkaa eläintarhan ominaisuuksia"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1692
 msgid "Viewpoint"
 msgstr "Näköalapaikka"
@@ -17383,24 +17732,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1694
 msgid "Edit Viewpoint"
 msgstr "Muokkaa näköalapaikan ominaisuuksia"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1697
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1699
 msgid "Theme Park"
 msgstr "Teemapuisto"
 
 #. item
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1700
 msgid "Edit Theme Park"
 msgstr ""
 
-#: build/trans_presets.java:1701
+#: build/trans_presets.java:1705
 msgid "Artwork"
 msgstr "Taideteos"
@@ -17408,5 +17757,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1707
 msgid "Edit Artwork"
 msgstr ""
@@ -17414,19 +17763,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1712
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1719
 msgid "Map"
 msgstr "Kartta"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "topo"
 msgstr ""
@@ -17464,5 +17813,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1720 build/trans_style.java:619
+#: build/trans_presets.java:1724 build/trans_style.java:619
 #: build/trans_style.java:635 build/trans_style.java:651
 #: build/trans_style.java:659
@@ -17470,28 +17819,28 @@
 msgstr ""
 
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1722 build/trans_presets.java:1738
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1726 build/trans_presets.java:1742
+#: build/trans_presets.java:1786
 msgid "Closer Description"
 msgstr ""
@@ -17501,5 +17850,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1724 build/trans_presets.java:1747
+#: build/trans_presets.java:1728 build/trans_presets.java:1751
 msgid "Routes shown for:"
 msgstr ""
@@ -17507,6 +17856,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1726 build/trans_presets.java:1749
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1965
 msgid "Cycling"
 msgstr "Pyöräily"
@@ -17514,5 +17863,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1727 build/trans_presets.java:1750
+#: build/trans_presets.java:1731 build/trans_presets.java:1754
 msgid "Mountainbiking"
 msgstr ""
@@ -17520,6 +17869,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1728 build/trans_presets.java:1751
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:1732 build/trans_presets.java:1755
+#: build/trans_presets.java:2019
 msgid "Skiing"
 msgstr ""
@@ -17527,5 +17876,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1729 build/trans_presets.java:1752
+#: build/trans_presets.java:1733 build/trans_presets.java:1756
 msgid "Riding"
 msgstr ""
@@ -17533,46 +17882,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1734 build/trans_presets.java:1757
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1736
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "history"
 msgstr "historia"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1744
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1759
 msgid "Information Terminal"
 msgstr ""
@@ -17580,29 +17929,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1760 build/trans_presets.java:1770
+#: build/trans_presets.java:1764 build/trans_presets.java:1774
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1769
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1779
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1780
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1778
+#: build/trans_presets.java:1782
 msgid "Other Information Points"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1790
 msgid "Edit Shelter"
 msgstr ""
@@ -17610,25 +17959,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1789 build/trans_presets.java:1795
+#: build/trans_presets.java:1793 build/trans_presets.java:1799
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1791
+#: build/trans_presets.java:1795
 msgid "Picnic Site"
 msgstr "Piknik-paikka"
 
 #. item
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1796
 msgid "Edit Picnic Site"
 msgstr "Muokkaa piknik-paikan ominaisuuksia"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1802
 msgid "Historic Places"
 msgstr "Historialliset paikat"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1799
+#: build/trans_presets.java:1803
 msgid "Castle"
 msgstr "Linna"
@@ -17637,19 +17986,19 @@
 #. <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:1802
+#: build/trans_presets.java:1806
 msgid "Edit Castle"
 msgstr "Muokkaa linnan ominaisuuksia"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1810
 msgid "Ruins"
 msgstr "Rauniot"
 
 #. item
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1811
 msgid "Edit Ruins"
 msgstr "Muokkaa raunioiden ominaisuuksia"
 
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1816
 msgid "Archaeological Site"
 msgstr "Arkeologinen kaivaus"
@@ -17658,9 +18007,9 @@
 #. <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:1815
+#: build/trans_presets.java:1819
 msgid "Edit Archaeological Site"
 msgstr ""
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1824
 msgid "Battlefield"
 msgstr "Taistelukenttä"
@@ -17668,5 +18017,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1826
 msgid "Edit Battlefield"
 msgstr ""
@@ -17674,15 +18023,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1831
 msgid "Monument"
 msgstr "Monumentti"
 
 #. item
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1832
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1836
 msgid "Memorial"
 msgstr "Muistomerkki"
@@ -17690,45 +18039,57 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1838
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1842
 msgid "Wayside Cross"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1843
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1847
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1848
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1852
+#, fuzzy
+msgid "Boundary Stone"
+msgstr "Rajat"
+
+#. item
+#: build/trans_presets.java:1853
+#, fuzzy
+msgid "Edit Boundary Stone"
+msgstr "Muokkaa linja-autopysäkin ominaisuuksia"
+
+#. item "Historic Places/Boundary Stone" text "Name"
+#: build/trans_presets.java:1858
 msgid "Leisure"
 msgstr "Vapaa-ajanviete"
 
 #. group "Leisure"
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1859
 msgid "Water Park"
 msgstr "Vesipuisto"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1860
 msgid "Edit Water Park"
 msgstr "Muokkaa vesipuiston ominaisuuksia"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1864
 msgid "Playground"
 msgstr "Leikkipuisto"
@@ -17736,31 +18097,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1866
 msgid "Edit Playground"
 msgstr "Muokkaa leikkipuiston ominaisuuksia"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1870
 msgid "Fishing"
 msgstr "Kalastus"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1871
 msgid "Edit Fishing"
 msgstr ""
 
 #. item "Leisure/Fishing" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1877 build/trans_presets.java:2669
+msgid "Sports"
+msgstr ""
+
+#. group "Sports"
+#: build/trans_presets.java:1878
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1879
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1880
 msgid "Edit Stadium"
 msgstr "Muokkaa stadionin ominaisuuksia"
@@ -17774,6 +18139,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1874 build/trans_presets.java:1883
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1902 build/trans_presets.java:1911
 msgid "select sport:"
 msgstr "Valitse urheilulaji:"
@@ -18165,30 +18530,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884 build/trans_style.java:3892
-#: build/trans_style.java:3900 build/trans_style.java:3908
-#: build/trans_style.java:3916 build/trans_style.java:3924
-#: build/trans_style.java:3932
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_style.java:3572 build/trans_style.java:3580
+#: build/trans_style.java:3588 build/trans_style.java:3596
+#: build/trans_style.java:3604 build/trans_style.java:3612
+#: build/trans_style.java:3620 build/trans_style.java:3628
+#: build/trans_style.java:3636 build/trans_style.java:3644
+#: build/trans_style.java:3652 build/trans_style.java:3660
+#: build/trans_style.java:3668 build/trans_style.java:3676
+#: build/trans_style.java:3684 build/trans_style.java:3692
+#: build/trans_style.java:3700 build/trans_style.java:3708
+#: build/trans_style.java:3716 build/trans_style.java:3724
+#: build/trans_style.java:3732 build/trans_style.java:3740
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3764 build/trans_style.java:3772
+#: build/trans_style.java:3780 build/trans_style.java:3788
+#: build/trans_style.java:3796 build/trans_style.java:3804
+#: build/trans_style.java:3812 build/trans_style.java:3820
+#: build/trans_style.java:3828 build/trans_style.java:3836
+#: build/trans_style.java:3844 build/trans_style.java:3852
+#: build/trans_style.java:3860 build/trans_style.java:3868
+#: build/trans_style.java:3876 build/trans_style.java:3884
+#: build/trans_style.java:3892 build/trans_style.java:3900
+#: build/trans_style.java:3908 build/trans_style.java:3916
+#: build/trans_style.java:3924 build/trans_style.java:3932
+#: build/trans_style.java:3940
 msgid "sport"
 msgstr "urheilu"
@@ -18198,225 +18563,225 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "archery"
 msgstr "jousiammunta"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "australian_football"
 msgstr "australialainen jalkapallo"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "basketball"
 msgstr "koripallo"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "boules"
 msgstr "kuulapelit"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "climbing"
 msgstr "kiipeily"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket"
 msgstr "kriketti"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket_nets"
 msgstr "krikettiverkko"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "croquet"
 msgstr "kroketti"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cycling"
 msgstr "pyöräily"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "equestrian"
 msgstr "ratsastus"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "football"
 msgstr "amerikkalainen jalkapallo"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "gymnastics"
 msgstr "voimistelu"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "hockey"
 msgstr "jääkiekko"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "shooting"
 msgstr "ammunta"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skiing"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "soccer"
 msgstr "jalkapallo"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "swimming"
 msgstr "uinti"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "table_tennis"
 msgstr "pöytätennis"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1888
 msgid "Sports Centre"
 msgstr "Urheilukeskus"
 
 #. item
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1889
 msgid "Edit Sports Centre"
 msgstr "Muokkaa urheilukeskuksen ominaisuuksia"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1897
 msgid "Pitch"
 msgstr "Kenttä"
 
 #. item
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1898
 msgid "Edit Pitch"
 msgstr "Muokkaa kentän ominaisuuksia"
 
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1906
 msgid "Racetrack"
 msgstr "Kilparata"
 
 #. item
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1907
 msgid "Edit Racetrack"
 msgstr "Muokkaa kilparadan ominaisuuksia"
 
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1915
 msgid "Golf Course"
 msgstr "Golfkenttä"
 
 #. item
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1916
 msgid "Edit Golf Course"
 msgstr "Muokkaa golf-kentän ominaisuuksia"
 
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1921
 msgid "Miniature Golf"
 msgstr "Pienoisgolf"
 
 #. item
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1922
 msgid "Edit Miniature Golf"
 msgstr "Muokkaa minigolfin ominaisuuksia"
 
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1928
 msgid "Sport"
 msgstr "Urheilu"
 
 #. group "Sport"
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1929
 msgid "Multi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1930
 msgid "Edit Multi"
 msgstr ""
@@ -18455,183 +18820,183 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "pitch"
 msgstr "kenttä"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "sports_centre"
 msgstr "urheilukeskus"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1935
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1936
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1941
 msgid "Athletics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1942
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1947
 msgid "Archery"
 msgstr "Jousiammunta"
 
 #. item
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1948
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1953
 msgid "Climbing"
 msgstr "Kiipeily"
 
 #. item
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:1954
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1959
 msgid "Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1960
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1966
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1971
 msgid "Dog Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1972
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1977
 msgid "Equestrian"
 msgstr "Ratsastus"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1978
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1983
 msgid "Horse Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1984
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1989
 msgid "Gymnastics"
 msgstr "Voimistelu"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1990
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1995
 msgid "Motor Sports"
 msgstr "Moottoriurheilu"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1996
 msgid "Edit Motor Sports"
 msgstr "Muokkaa moottoriurheilun ominaisuuksia"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2001
 msgid "Skating"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2002
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2007
 msgid "Skateboard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2008
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2013
 msgid "Swimming"
 msgstr "Unti"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2014
 msgid "Edit Swimming"
 msgstr ""
@@ -18639,56 +19004,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2021
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2028
 msgid "Shooting"
 msgstr "Ammunta"
@@ -18696,178 +19061,182 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2030
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2036
 msgid "Sport (Ball)"
 msgstr "Pallopelit"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2037
 msgid "Soccer"
 msgstr "Jalkapallo"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2038
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2043
 msgid "Football"
 msgstr "Amerikkalainen jalkapallo"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2044
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2049
 msgid "Australian Football"
 msgstr "Australialainen jalkapallo"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2050
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2055
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2056
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2061
 msgid "Basketball"
 msgstr "Koripallo"
 
 #. item
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2062
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2067
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2068
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2071
 msgid "golf_course"
 msgstr "golfkenttä"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2073
 msgid "Boule"
 msgstr "Kuulapeli"
 
 #. item
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2074
 msgid "Edit Boule"
 msgstr "Muokkaa kuulapelin ominaisuuksia"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2079
 msgid "Bowls"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2080
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2085
 msgid "Cricket"
 msgstr "Kriketti"
 
 #. item
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2086
 msgid "Edit Cricket"
 msgstr "Muokkaa kriketin ominaisuuksia"
 
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2091
 msgid "Cricket Nets"
 msgstr "Krikettiverkko"
 
 #. item
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2092
 msgid "Edit Cricket Nets"
 msgstr "Muokkaa krikettiverkon ominaisuuksia"
 
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2097
 msgid "Croquet"
 msgstr "Kroketti"
 
 #. item
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2098
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2103
 msgid "Hockey"
 msgstr "Jääkiekko"
 
 #. item
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2104
 msgid "Edit Hockey"
 msgstr "Muokkaa jääkiekkopaikan ominaisuuksia"
 
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2109
 msgid "Pelota"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2110
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2105
+#: build/trans_presets.java:2115
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2116
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2121
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2122
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2127
 msgid "Table Tennis"
 msgstr "Pöytätennis"
 
 #. item
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2128
 msgid "Edit Table Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2123
+#: build/trans_presets.java:2133
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2134
 msgid "Edit Tennis"
 msgstr ""
 
-#. <separator/>
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2141
+msgid "Man-Made"
+msgstr ""
+
+#. group "Man-Made"
+#: build/trans_presets.java:2142
 msgid "Buildings"
 msgstr "Rakennukset"
 
 #. group "Buildings"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2143
 msgid "Building"
 msgstr "Rakennus"
@@ -18875,5 +19244,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Public Building"
 msgstr "Julkinen rakennus"
@@ -18881,10 +19250,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2148
 msgid "Edit Public Building"
 msgstr "Muokkaa julkisen rakennuksen ominaisuuksia"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2152
 msgid "Town hall"
 msgstr "Kaupungintalo"
@@ -18892,10 +19261,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2154
 msgid "Edit Town hall"
 msgstr "Muokkaa kaupungintalon ominaisuuksia"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:2158
 msgid "Embassy"
 msgstr "Suurlähetystö"
@@ -18903,10 +19272,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Edit Embassy"
 msgstr "Muokkaa suurlähetystön ominaisuuksia"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2164
 msgid "Courthouse"
 msgstr "Oikeustalo"
@@ -18915,10 +19284,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:2156
+#: build/trans_presets.java:2167
 msgid "Edit Courthouse"
 msgstr "Muokkaa oikeustalon ominaisuuksia"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2171
 msgid "Prison"
 msgstr "Vankila"
@@ -18927,10 +19296,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:2163
+#: build/trans_presets.java:2174
 msgid "Edit Prison"
 msgstr "Muokkaa vankilan ominaisuuksia"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2178
 msgid "Police"
 msgstr "Poliisiasema"
@@ -18940,10 +19309,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:2171
+#: build/trans_presets.java:2182
 msgid "Edit Police"
 msgstr "Muokkaa poliisiaseman ominaisuuksia"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2186
 msgid "Fire Station"
 msgstr "Paloasema"
@@ -18952,10 +19321,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:2178
+#: build/trans_presets.java:2189
 msgid "Edit Fire Station"
 msgstr "Muokkaa paloaseman ominaisuuksia"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "Post Office"
 msgstr "Postitoimisto"
@@ -18963,5 +19332,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Edit Post Office"
 msgstr "Muokkaa postitoimiston ominaisuuksia"
@@ -18969,15 +19338,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2200
 msgid "Kindergarten"
 msgstr "Lastentarha"
 
 #. item
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Kindergarten"
 msgstr "Muokkaa lastentarhan ominaisuuksia"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2205
 msgid "School"
 msgstr "Koulu"
@@ -18985,10 +19354,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Edit School"
 msgstr "Muokkaa koulun ominaisuuksia"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2211
 msgid "University"
 msgstr "Yliopisto"
@@ -18996,10 +19365,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit University"
 msgstr "Muokkaa yliopiston ominaisuuksia"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "College"
 msgstr "Korkeakoulu"
@@ -19007,5 +19376,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2219
 msgid "Edit College"
 msgstr "Muokkaa korkeakoulun ominaisuuksia"
@@ -19013,5 +19382,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2224
 msgid "Cinema"
 msgstr "Elokuvateatteri"
@@ -19020,10 +19389,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:2216
+#: build/trans_presets.java:2227
 msgid "Edit Cinema"
 msgstr "Muokkaa elokuvateatterin ominaisuuksia"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2231
 msgid "Library"
 msgstr "Kirjasto"
@@ -19032,9 +19401,9 @@
 #. <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:2223
+#: build/trans_presets.java:2234
 msgid "Edit Library"
 msgstr "Muokkaa kirjaston ominaisuuksia"
 
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Arts Centre"
 msgstr "Taidekeskus"
@@ -19042,10 +19411,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Arts Centre"
 msgstr "Muokkaa taidekeskuksen ominaisuuksia"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Theatre"
 msgstr "Teatteri"
@@ -19054,10 +19423,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:2237
+#: build/trans_presets.java:2248
 msgid "Edit Theatre"
 msgstr "Muokkaa teatterin ominaisuuksia"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2252
 msgid "Place of Worship"
 msgstr ""
@@ -19067,5 +19436,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:2245
+#: build/trans_presets.java:2256
 msgid "Edit Place of Worship"
 msgstr ""
@@ -19074,6 +19443,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "Religion"
 msgstr "Uskonto"
@@ -19082,66 +19451,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "Denomination"
 msgstr ""
@@ -19150,81 +19519,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2264
 msgid "Addresses"
 msgstr "Osoitteet"
@@ -19233,5 +19602,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:2256
+#: build/trans_presets.java:2267
 msgid "Edit Address Information"
 msgstr "Muokkaa osoitetietoja"
@@ -19239,5 +19608,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2269
 msgid "House number"
 msgstr "Talon numero"
@@ -19245,20 +19614,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "House name"
 msgstr "Talon nimi"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "City name"
 msgstr "Kaupungin nimi"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2274
 msgid "Post code"
 msgstr "Postinumero"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2275
 msgid "Country code"
 msgstr "Maakoodi"
@@ -19266,5 +19635,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Address Interpolation"
 msgstr "Talonumeroiden interpolointilinja"
@@ -19273,5 +19642,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:2270
+#: build/trans_presets.java:2281
 msgid "Edit Address Interpolation"
 msgstr "Muokkaa interpolointilinjaa"
@@ -19279,67 +19648,67 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "odd"
 msgstr "pariton"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "even"
 msgstr "parillinen"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2286
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Works"
 msgstr "Tehdas"
 
 #. item
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2288
 msgid "Edit Works"
 msgstr "Muokkaa tehtaan ominaisuuksia"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2292
 msgid "Tower"
 msgstr "Torni"
 
 #. item
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2293
 msgid "Edit Tower"
 msgstr "Muokkaa tornin ominaisuuksia"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Water Tower"
 msgstr "Vesitorni"
 
 #. item
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2298
 msgid "Edit Water Tower"
 msgstr "Muokkaa vesitornin ominaisuuksia"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Gasometer"
 msgstr "Kaasukello"
 
 #. item
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2303
 msgid "Edit Gasometer"
 msgstr "Muokkaa kaasukellon ominaisuuksia"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Lighthouse"
 msgstr "Majakka"
@@ -19347,10 +19716,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2309
 msgid "Edit Lighthouse"
 msgstr "Muokkaa majakan ominaisuuksia"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Windmill"
 msgstr "Tuulimylly"
@@ -19358,10 +19727,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2315
 msgid "Edit Windmill"
 msgstr "Muokkaa tuulimyllyn ominaisuuksia"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2319
 msgid "Pipeline"
 msgstr "Putki"
@@ -19369,10 +19738,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Edit Pipeline"
 msgstr "Muokkaa putken ominaisuuksia"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2325
 msgid "Wastewater Plant"
 msgstr "Vedenpuhdistuslaitos"
@@ -19382,10 +19751,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:2318
+#: build/trans_presets.java:2329
 msgid "Edit Wastewater Plant"
 msgstr "Muokkaa vedenpuhdistuslaitoksen ominaisuuksia"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2333
 msgid "Crane"
 msgstr "Nosturi"
@@ -19393,10 +19762,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2335
 msgid "Edit Crane"
 msgstr "Muokkaa nosturin ominaisuuksia"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Beacon"
 msgstr "Loisto"
@@ -19404,10 +19773,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2341
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2345
 msgid "Survey Point"
 msgstr ""
@@ -19415,10 +19784,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2351
 msgid "Surveillance"
 msgstr "Valvontakamera"
@@ -19426,5 +19795,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2353
 msgid "Edit Surveillance Camera"
 msgstr "Muokkaa valvontakameran ominaisuuksia"
@@ -19432,5 +19801,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Power Generator"
 msgstr ""
@@ -19440,39 +19809,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:2351
+#: build/trans_presets.java:2362
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "wind"
 msgstr "tuuli"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "hydro"
 msgstr "vesivoima"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "fossil"
 msgstr "fossiilinen polttoaine"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "nuclear"
 msgstr "ydinvoima"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "coal"
 msgstr "kivihiili"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "photovoltaic"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "gas"
 msgstr "kaasu"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2367
 msgid "Power Station"
 msgstr ""
@@ -19481,10 +19850,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:2359
+#: build/trans_presets.java:2370
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2374
 msgid "Power Sub Station"
 msgstr "Muuntamoasema"
@@ -19493,5 +19862,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:2366
+#: build/trans_presets.java:2377
 msgid "Edit Power Sub Station"
 msgstr "Muokkaa muuntamoaseman ominaisuuksia"
@@ -19499,10 +19868,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2369 build/trans_presets.java:2385
+#: build/trans_presets.java:2380 build/trans_presets.java:2396
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2382
 msgid "Power Tower"
 msgstr "Korkeajännitelinjan torni"
@@ -19513,5 +19882,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:2376
+#: build/trans_presets.java:2387
 msgid "Edit Power Tower"
 msgstr "Muokkaa korkeajännitelinjan tornin ominaisuuksia"
@@ -19519,5 +19888,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2390
 msgid "Power Line"
 msgstr "Sähkölinja"
@@ -19526,40 +19895,40 @@
 #. <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:2382
+#: build/trans_presets.java:2393
 msgid "Edit Power Line"
 msgstr "Muokkaa sähkölinjan ominaisuuksia"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Voltage"
 msgstr "Jännite"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2398
 msgid "Amount of Wires"
 msgstr "Johtojen määrä"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2402
 msgid "Toilets"
 msgstr "Käymälä"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2398 build/trans_presets.java:2514
+#: build/trans_presets.java:2409 build/trans_presets.java:2525
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2411
 msgid "Post Box"
 msgstr "Postilaatikko"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2416
 msgid "Telephone"
 msgstr "Puhelin"
@@ -19568,5 +19937,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:2408
+#: build/trans_presets.java:2419
 msgid "Edit Telephone"
 msgstr "Muokkaa puhelimen ominaisuuksia"
@@ -19574,5 +19943,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2411 build/trans_presets.java:2515
+#: build/trans_presets.java:2422 build/trans_presets.java:2526
 msgid "Coins"
 msgstr "Kolikot"
@@ -19580,5 +19949,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2412 build/trans_presets.java:2516
+#: build/trans_presets.java:2423 build/trans_presets.java:2527
 msgid "Notes"
 msgstr ""
@@ -19586,5 +19955,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2413 build/trans_presets.java:2517
+#: build/trans_presets.java:2424 build/trans_presets.java:2528
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -19592,5 +19961,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2414 build/trans_presets.java:2518
+#: build/trans_presets.java:2425 build/trans_presets.java:2529
 msgid "Debit cards"
 msgstr ""
@@ -19598,15 +19967,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2415 build/trans_presets.java:2519
+#: build/trans_presets.java:2426 build/trans_presets.java:2530
 msgid "Credit cards"
 msgstr "Luottokortit"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2427
 msgid "Telephone cards"
 msgstr "Puhelinkortit"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2429
 msgid "Recycling"
 msgstr "Kierrätys"
@@ -19615,5 +19984,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:2421
+#: build/trans_presets.java:2432
 msgid "Edit Recycling station"
 msgstr "Muokkaa kierrätyspisteen ominaisuuksia"
@@ -19621,35 +19990,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Batteries"
 msgstr "Paristot"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2435
 msgid "Cans"
 msgstr "Peltitölkit"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Clothes"
 msgstr "Vaatteet"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2437
 msgid "Glass"
 msgstr "Lasi"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2438
 msgid "Paper"
 msgstr "Paperi"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2439
 msgid "Scrap Metal"
 msgstr "Romumetalli"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2441
 msgid "Bench"
 msgstr "Penkki"
@@ -19658,40 +20027,33 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2433
-#, fuzzy
+#: build/trans_presets.java:2444
 msgid "Backrest"
-msgstr "Takaisin"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "Material"
-msgstr "Muistomerkki"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2434
-#, fuzzy
+#: build/trans_presets.java:2445
 msgid "stone"
-msgstr "ei mitään"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "plastic"
-msgstr "Perus"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "Colour"
-msgstr "Väri"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "black"
-msgstr "Takaisin"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "brown"
-msgstr "alas"
+msgstr ""
 
 #. color historic
@@ -19760,38 +20122,35 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2435 build/trans_style.java:3055
-#: build/trans_style.java:3063 build/trans_style.java:3071
-#: build/trans_style.java:3079 build/trans_style.java:3127
-#: build/trans_style.java:3135 build/trans_style.java:3233
-#: build/trans_style.java:3241
+#: build/trans_presets.java:2446 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3135
+#: build/trans_style.java:3143 build/trans_style.java:3241
+#: build/trans_style.java:3249
 msgid "green"
 msgstr ""
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2446
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "blue"
-msgstr "Arvo"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "white"
-msgstr "vesi"
-
-#: build/trans_presets.java:2436
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2447
 msgid "Amount of Seats"
-msgstr "Johtojen määrä"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2449
 msgid "Hunting Stand"
 msgstr "Metsästyslava"
 
 #. item
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2450
 msgid "Edit Hunting Stand"
 msgstr "Muokkaa metsästyslavan ominaisuuksia"
@@ -19800,30 +20159,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2441 build/trans_presets.java:2902
+#: build/trans_presets.java:2452 build/trans_presets.java:2914
 msgid "Height"
 msgstr "Korkeus"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "full"
 msgstr "täysi"
 
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2454
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2455
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Fountain"
 msgstr "Lähde"
@@ -19832,10 +20191,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:2449
+#: build/trans_presets.java:2460
 msgid "Edit Fountain"
 msgstr "Muokkaa lähteen ominaisuuksia"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2464
 msgid "Drinking Water"
 msgstr "Juomavesi"
@@ -19844,10 +20203,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:2456
+#: build/trans_presets.java:2467
 msgid "Edit Drinking Water"
 msgstr "Muokkaa juomaveden ominaisuuksia"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2471
 msgid "Baby Hatch"
 msgstr ""
@@ -19855,33 +20214,33 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2479
 msgid "Shops"
 msgstr "Kaupat"
 
 #. group "Shops"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2480
 msgid "Supermarket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2481
 msgid "Edit Supermarket"
 msgstr ""
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2486
 msgid "Chemist"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2487
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2492
 msgid "Convenience Store"
 msgstr "Lähikauppa"
@@ -19889,9 +20248,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Edit Convenience Store"
 msgstr "Muokkaa lähikaupan tietoja"
 
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2499
 msgid "Kiosk"
 msgstr "Kioski"
@@ -19899,27 +20258,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Kiosk"
 msgstr "Muokkaa kioskin ominaisuuksia"
 
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Book Store"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2507
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2512
 msgid "Travel Agency"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2513
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2518
 msgid "Vending machine"
 msgstr "Automaatti"
@@ -19927,5 +20286,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Edit Vending machine"
 msgstr "Muokkaa automaatin tietoja"
@@ -19933,88 +20292,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "Vending products"
 msgstr "Automaatin tuotteet"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "drinks"
 msgstr "juomat"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "SIM-cards"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Butcher"
 msgstr "Lihakauppa"
@@ -20022,9 +20381,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2535
 msgid "Edit Butcher"
 msgstr "Muokkaa lihakaupan ominaisuuksia"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2540
 msgid "Baker"
 msgstr "Leipomo"
@@ -20032,9 +20391,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2542
 msgid "Edit Baker"
 msgstr "Muokkaa leipomon ominaisuuksia"
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2547
 msgid "Florist"
 msgstr ""
@@ -20042,18 +20401,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Florist"
 msgstr ""
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2554
 msgid "Organic"
 msgstr "Luomukauppa"
 
 #. item
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Edit Organic Shop"
 msgstr "Muokkaa luomukaupan ominaisuuksia"
 
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2560
 msgid "Alcohol"
 msgstr ""
@@ -20061,54 +20420,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2562
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2567
 msgid "Beverages"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2568
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2573
 msgid "Computer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2574
 msgid "Edit Computer Shop"
 msgstr ""
 
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Electronics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2580
 msgid "Edit Electronics Shop"
 msgstr ""
 
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2585
 msgid "Hifi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2586
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2591
 msgid "Furniture"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Edit Furniture Shop"
 msgstr ""
 
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Garden Centre"
 msgstr ""
@@ -20116,9 +20475,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2599
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Hardware"
 msgstr ""
@@ -20126,9 +20485,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2606
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "Do-it-yourself-store"
 msgstr "Tee-se-itse-kauppa"
@@ -20136,54 +20495,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2613
 msgid "Edit Do-it-yourself-store"
 msgstr "Muokkaa tee-se-itse-kaupan ominaisuuksia"
 
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2618
 msgid "Stationery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2619
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Hairdresser"
 msgstr "Kampaamo"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Hairdresser"
 msgstr "Muokkaa kampaamon ominaisuuksia"
 
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Shoes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Shoe Shop"
 msgstr ""
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2636
 msgid "Toys"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit Toy Shop"
 msgstr ""
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "Dry Cleaning"
 msgstr "Kuivapesula"
@@ -20191,9 +20550,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2650
 msgid "Edit Dry Cleaning"
 msgstr "Muokkaa kuivapesulan ominaisuuksia"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "Laundry"
 msgstr "Pesula"
@@ -20201,9 +20560,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2657
 msgid "Edit Laundry"
 msgstr "Muokkaa pesulan ominaisuuksia"
 
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2662
 msgid "Outdoor"
 msgstr ""
@@ -20211,32 +20570,28 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2664
 msgid "Edit Outdoor Shop"
 msgstr ""
 
-#: build/trans_presets.java:2658
-msgid "Sports"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2659
+#. item
+#: build/trans_presets.java:2670
 msgid "Edit Sports Shop"
 msgstr ""
 
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Optician"
 msgstr "Muokkaa optikon ominaisuuksia"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2683
 msgid "Cash"
 msgstr "Raha"
 
 #. group "Cash"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2684
 msgid "Bank"
 msgstr "Pankki"
@@ -20244,14 +20599,14 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2686
 msgid "Edit Bank"
 msgstr "Muokkaa pankin ominaisuuksia"
 
-#: build/trans_presets.java:2680 build/trans_presets.java:2689
+#: build/trans_presets.java:2691 build/trans_presets.java:2700
 msgid "Automated Teller Machine"
 msgstr "Pankkiautomaatti"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2693
 msgid "Money Exchange"
 msgstr "Rahanvaihto"
@@ -20259,5 +20614,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Edit Money Exchange"
 msgstr "Muokkaa rahanvaihdon ominaisuuksia"
@@ -20265,15 +20620,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2691
+#: build/trans_presets.java:2702
 msgid "Edit Automated Teller Machine"
 msgstr "Muokkaa pankkiautomaatin ominaisuuksia"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2707
 msgid "Health"
 msgstr "Terveys"
 
 #. group "Health"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2708
 msgid "Doctors"
 msgstr "Lääkäri"
@@ -20281,18 +20636,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2710
 msgid "Edit Doctors"
 msgstr "Muokkaa lääkärin ominaisuuksia"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2715
 msgid "Dentist"
 msgstr "Hammaslääkäri"
 
 #. item
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Edit Dentist"
 msgstr "Muokkaa hammaslääkärin ominaisuuksia"
 
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2721
 msgid "Pharmacy"
 msgstr "Apteekki"
@@ -20300,5 +20655,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Edit Pharmacy"
 msgstr "Muokkaa apteekin ominaisuuksia"
@@ -20306,9 +20661,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2729
 msgid "Hospital"
 msgstr "Sairaala"
@@ -20316,10 +20671,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Edit Hospital"
 msgstr "Muokkaa sairaalan ominaisuuksia"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2735
 msgid "Emergency Access Point"
 msgstr ""
@@ -20328,5 +20683,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:2727
+#: build/trans_presets.java:2738
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -20335,20 +20690,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2741
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2742
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Phone Number"
 msgstr "Puhelinnumero"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -20356,5 +20711,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2748
 msgid "Veterinary"
 msgstr "Eläinlääkäri"
@@ -20363,55 +20718,59 @@
 #. <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:2740
+#: build/trans_presets.java:2751
 msgid "Edit Veterinary"
 msgstr "Muokkaa eläinlääkärin ominaisuuksia"
 
+#: build/trans_presets.java:2758
+msgid "Geography"
+msgstr ""
+
 #. group "Places"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2760
 msgid "Continent"
 msgstr "Maanosa"
 
 #. item
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2761
 msgid "Edit Continent"
 msgstr "Muokkaa maanosan ominaisuuksia"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2766
 msgid "Country"
 msgstr "Maa"
 
 #. item
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2767
 msgid "Edit Country"
 msgstr "Muokkaa maan ominaisuuksia"
 
 #. item "Places/Country" text "Name"
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2772
 msgid "State"
 msgstr "Osavaltio"
 
 #. item
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2773
 msgid "Edit State"
 msgstr "Muokkaa osavaltion ominaisuuksia"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2778
 msgid "Region"
 msgstr "Seutu"
 
 #. item
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2779
 msgid "Edit Region"
 msgstr ""
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2784
 msgid "County"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2785
 msgid "Edit County"
 msgstr ""
@@ -20419,15 +20778,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2791
 msgid "City"
 msgstr "Iso kaupunki"
 
 #. item
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2792
 msgid "Edit City"
 msgstr "Muokkaa kaupungin ominaisuuksia"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2797
 msgid "Town"
 msgstr "Kaupunki"
@@ -20435,10 +20794,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2799
 msgid "Edit Town"
 msgstr "Muokkaa kaupungin ominaisuuksia"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2804
 msgid "Suburb"
 msgstr "Kaupunginosa"
@@ -20446,25 +20805,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2806
 msgid "Edit Suburb"
 msgstr "Muokkaa kaupunginosan ominaisuuksia"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2811
 msgid "Village"
 msgstr "Kunta"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2812
 msgid "Edit Village"
 msgstr "Muokkaa kunnan ominaisuuksia"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2817
 msgid "Hamlet"
 msgstr "Kylä"
 
 #. item
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2818
 msgid "Edit Hamlet"
 msgstr "Muokkaa kylän ominaisuuksia"
@@ -20472,5 +20831,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2824
 msgid "Locality"
 msgstr ""
@@ -20478,10 +20837,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2826
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2831
 msgid "Island"
 msgstr "Saari"
@@ -20489,10 +20848,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2833
 msgid "Edit Island"
 msgstr "Muokkaa saaren ominaisuuksia"
 
 #. item "Places/Island" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2838
 msgid "Islet"
 msgstr ""
@@ -20500,5 +20859,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2840
 msgid "Edit Islet"
 msgstr ""
@@ -20506,5 +20865,5 @@
 #. item "Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2846
 msgid "Cave Entrance"
 msgstr "Luolan suuaukko"
@@ -20512,10 +20871,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2848
 msgid "Edit Cave Entrance"
 msgstr "Muokkaa luolan suuaukon ominaisuuksia"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2852
 msgid "Peak"
 msgstr "Huippu"
@@ -20523,10 +20882,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2854
 msgid "Edit Peak"
 msgstr "Muokkaa huipun ominaisuuksia"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2859
 msgid "Glacier"
 msgstr "Jäätikkö"
@@ -20534,10 +20893,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2861
 msgid "Edit Glacier"
 msgstr "Muokkaa jäätikön ominaisuuksia"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2854
+#: build/trans_presets.java:2866
 msgid "Volcano"
 msgstr "Tulivuori"
@@ -20545,70 +20904,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2868
 msgid "Edit Volcano"
 msgstr "Muokkaa tulivuoren ominaisuuksia"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2874
 msgid "Boundaries"
 msgstr "Rajat"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2875
 msgid "National"
 msgstr "Kansallinen"
 
 #. item
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2876
 msgid "Edit National Boundary"
 msgstr "Muokkaa kansallisen rajan ominaisuuksia"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2881
 msgid "Administrative"
 msgstr "Hallinnollinen"
 
 #. item
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2882
 msgid "Edit Administrative Boundary"
 msgstr "Muokkaa hallinnollisen rajan ominaisuuksia"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:2887
 msgid "Civil"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2888
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2893
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2894
 msgid "Edit Political Boundary"
 msgstr "Muokkaa poliittisen rajan ominaisuuksia"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2899
 msgid "National park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2888
+#: build/trans_presets.java:2900
 msgid "Edit National Park Boundary"
 msgstr "Muokkaa kansallispuiston rajan ominaisuuksia"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2906
 msgid "Land use"
 msgstr "Maankäyttö"
 
 #. group "Land use"
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2907
 msgid "Tree"
 msgstr "Puu"
@@ -20617,15 +20976,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:2898
+#: build/trans_presets.java:2910
 msgid "Edit Tree"
 msgstr "Muokkaa puun ominaisuuksia"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2915
 msgid "Botanical Name"
 msgstr "Kasvitieteellinen nimi"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2917
 msgid "Wood"
 msgstr "Metsä"
@@ -20634,5 +20993,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:2908
+#: build/trans_presets.java:2920
 msgid "Edit Wood"
 msgstr "Muokkaa metsän ominaisuuksia"
@@ -20640,17 +20999,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "coniferous"
 msgstr "havumetsä"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "deciduous"
 msgstr "lehtimetsä"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "mixed"
 msgstr "sekametsä"
 
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2925
 msgid "Forest"
 msgstr "Talousmetsä"
@@ -20659,14 +21018,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:2916
+#: build/trans_presets.java:2928
 msgid "Edit Forest Landuse"
 msgstr "Muokkaa talousmetsän ominaisuuksia"
 
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2934
 msgid "Nature Reserve"
 msgstr "Luonnonsuojelualue"
 
 #. item
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2935
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -20674,25 +21033,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2940
 msgid "Scree"
 msgstr "Kivikko, rakka"
 
 #. item
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2941
 msgid "Edit Scree"
 msgstr "Muokkaa kivikon ominaisuuksia"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2945
 msgid "Scrub"
 msgstr "Pusikko"
 
 #. item
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2946
 msgid "Edit Scrub"
 msgstr "Muokkaa pusikon ominaisuuksia"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2950
 msgid "Fell"
 msgstr "Tunturi"
@@ -20700,10 +21059,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2952
 msgid "Edit Fell"
 msgstr "Muokkaa tunturin ominaisuuksia"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2956
 msgid "Heath"
 msgstr "Nummi"
@@ -20711,5 +21070,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2958
 msgid "Edit Heath"
 msgstr "Muokkaa nummen ominaisuuksia"
@@ -20717,5 +21076,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2963
 msgid "Farmyard"
 msgstr "Maatilan piha/työskentelyalue (muu kuin pelto)"
@@ -20724,45 +21083,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:2954
+#: build/trans_presets.java:2966
 msgid "Edit Farmyard Landuse"
 msgstr "Muokkaa maatilan pihan ominaisuuksia"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2971
 msgid "Farmland"
 msgstr "Peltoalueet"
 
 #. item
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2972
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2977
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2978
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2983
 msgid "Vineyard"
 msgstr "Viinitarha"
 
 #. item
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2984
 msgid "Edit Vineyard Landuse"
 msgstr "Muokkaa viinitarhan ominaisuuksia"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:2989
 msgid "Allotments"
 msgstr "Siirtolapuutarha"
 
 #. item
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2990
 msgid "Edit Allotments Landuse"
 msgstr "Muokkaa siirtolapuutarhan ominaisuuksia"
@@ -20770,25 +21129,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2996
 msgid "Garden"
 msgstr "Puutarha"
 
 #. item
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2997
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3001
 msgid "Grass"
 msgstr "Ruoho"
 
 #. item
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3002
 msgid "Edit Grass Landuse"
 msgstr "Muokkaa ruohon ominaisuuksia"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3007
 msgid "Village Green"
 msgstr ""
@@ -20796,10 +21155,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3009
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3014
 msgid "Common"
 msgstr ""
@@ -20807,20 +21166,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3004
+#: build/trans_presets.java:3016
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3020
 msgid "Park"
 msgstr "Puisto"
 
 #. item
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3021
 msgid "Edit Park"
 msgstr "Muokkaa puiston ominaisuuksia"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3025
 msgid "Recreation Ground"
 msgstr ""
@@ -20828,5 +21187,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3027
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -20834,15 +21193,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3033
 msgid "Residential area"
 msgstr "Asuinalue"
 
 #. item
-#: build/trans_presets.java:3022
+#: build/trans_presets.java:3034
 msgid "Edit Residential Landuse"
 msgstr "Muokkaa asuinalueen ominaisuuksia"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3039
 msgid "Graveyard"
 msgstr "Hautausmaa (pieni)"
@@ -20850,9 +21209,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3029
+#: build/trans_presets.java:3041
 msgid "Edit Graveyard"
 msgstr "Muokkaa pienen hautausmaan ominaisuuksia"
 
-#: build/trans_presets.java:3035
+#: build/trans_presets.java:3047
 msgid "Cemetery"
 msgstr "Hautausmaa"
@@ -20860,39 +21219,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3049
 msgid "Edit Cemetery Landuse"
 msgstr "Muokkaa hautausmaan ominaisuuksia"
 
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3056
 msgid "Retail"
 msgstr "Kaupallinen"
 
 #. item
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3057
 msgid "Edit Retail Landuse"
 msgstr "Muokkaa kaupallisen alueen ominaisuuksia"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3062
 msgid "Commercial"
 msgstr "Toimistoalue"
 
 #. item
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3063
 msgid "Edit Commercial Landuse"
 msgstr "Muokkaa toimistoalueen ominaisuuksia"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3056
+#: build/trans_presets.java:3068
 msgid "Industrial"
 msgstr "Teollisuusalue"
 
 #. item
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3069
 msgid "Edit Industrial Landuse"
 msgstr "Muokkaa teollisuusalueen ominaisuuksia"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3074
 msgid "Railway land"
 msgstr "Rata-alue"
@@ -20900,15 +21259,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3076
 msgid "Edit Railway Landuse"
 msgstr "Muokkaa rata-alueen ominaisuuksia"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3081
 msgid "Military"
 msgstr "Sotilasvoimat"
 
 #. item
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3082
 msgid "Edit Military Landuse"
 msgstr "Muokkaa sotilasvoimien maa-alueen ominaisuuksia"
@@ -20916,55 +21275,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3088
 msgid "Construction area"
 msgstr "Rakennustyömaa"
 
 #. item
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3089
 msgid "Edit Construction Landuse"
 msgstr "Muokkaa rakennustyömaan ominaisuuksia"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3094
 msgid "Brownfield"
 msgstr "Purettuja rakennuksia"
 
 #. item
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3095
 msgid "Edit Brownfield Landuse"
 msgstr "Muokkaa purettujen rakennusten alueen ominaisuuksia"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3100
 msgid "Greenfield"
 msgstr "Rakentamiselle raivattu alue"
 
 #. item
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3101
 msgid "Edit Greenfield Landuse"
 msgstr "Muokkaa rakentamiselle raivatun alueen ominaisuuksia"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3106
 msgid "Landfill"
 msgstr "Kaatopaikka"
 
 #. item
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3107
 msgid "Edit Landfill Landuse"
 msgstr "Muokkaa kaatopaikan ominaisuuksia"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3112
 msgid "Quarry"
 msgstr "Louhos"
 
 #. item
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3113
 msgid "Edit Quarry Landuse"
 msgstr "Muokkaa louhoksen ominaisuuksia"
 
 #. group "Relations"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3122
 msgid "Multipolygon"
 msgstr ""
@@ -20974,5 +21333,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:3114
+#: build/trans_presets.java:3126
 msgid "Edit Multipolygon"
 msgstr ""
@@ -20981,10 +21340,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3132
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3133
 msgid "inner segment"
 msgstr ""
@@ -20992,5 +21351,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3136
 msgid "Turn restriction"
 msgstr ""
@@ -20999,5 +21358,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3139
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -21005,34 +21364,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "Restriction"
 msgstr "Kielto"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_straight_on"
 msgstr ""
@@ -21041,15 +21400,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3146
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3147
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3148
 msgid "to way"
 msgstr ""
@@ -21057,5 +21416,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3151
 msgid "Route"
 msgstr ""
@@ -21064,5 +21423,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3154
 msgid "Edit Route"
 msgstr ""
@@ -21070,5 +21429,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "Route type"
 msgstr ""
@@ -21140,5 +21499,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3144 build/trans_style.java:233
+#: build/trans_presets.java:3156 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -21147,17 +21506,17 @@
 msgstr "polkupyörä"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ski"
 msgstr ""
@@ -21210,5 +21569,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3144 build/trans_style.java:247
+#: build/trans_presets.java:3156 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -21217,13 +21576,13 @@
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "detour"
 msgstr ""
@@ -21237,10 +21596,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3144 build/trans_style.java:1206
+#: build/trans_presets.java:3156 build/trans_style.java:1206
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3159
 msgid "Symbol description"
 msgstr ""
@@ -21248,31 +21607,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3162
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "Color (hex)"
 msgstr ""
@@ -21281,30 +21640,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3168
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3169
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3170
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3171
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3172
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3173
 msgid "backward halt point"
 msgstr ""
@@ -21742,11 +22101,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3375 build/trans_style.java:3376
-#: build/trans_style.java:3946 build/trans_style.java:4254
-#: build/trans_style.java:4263 build/trans_style.java:4272
-#: build/trans_style.java:4281 build/trans_style.java:4290
-#: build/trans_style.java:4299 build/trans_style.java:4308
-#: build/trans_style.java:4309 build/trans_style.java:4318
-#: build/trans_style.java:4327
+#: build/trans_style.java:3383 build/trans_style.java:3384
+#: build/trans_style.java:3954 build/trans_style.java:4262
+#: build/trans_style.java:4271 build/trans_style.java:4280
+#: build/trans_style.java:4289 build/trans_style.java:4298
+#: build/trans_style.java:4307 build/trans_style.java:4316
+#: build/trans_style.java:4317 build/trans_style.java:4326
+#: build/trans_style.java:4335
 msgid "deprecated"
 msgstr ""
@@ -23770,5 +24129,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3294
+#: build/trans_style.java:3302
 msgid "light_water"
 msgstr ""
@@ -24450,8 +24809,17 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="boundary_stone"/>
+#. <icon annotate="true" src="historic/boundary_stone.png"/>
 #: build/trans_style.java:2990 build/trans_style.java:2998
 #: build/trans_style.java:3006 build/trans_style.java:3014
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
+#: build/trans_style.java:3054
 msgid "historic"
 msgstr "historiallinen"
@@ -24465,5 +24833,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3095
 msgid "quarry"
 msgstr "louhos"
@@ -24477,5 +24845,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "landfill"
 msgstr "kaatopaikka"
@@ -24497,5 +24865,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3103 build/trans_style.java:3111
+#: build/trans_style.java:3111 build/trans_style.java:3119
 msgid "basin"
 msgstr "valuma-alue"
@@ -24509,5 +24877,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3127
 msgid "forest"
 msgstr "talousmetsä"
@@ -24521,5 +24889,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3159
 msgid "farmyard"
 msgstr ""
@@ -24542,5 +24910,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3160 build/trans_style.java:3168
+#: build/trans_style.java:3168 build/trans_style.java:3176
 msgid "retail"
 msgstr ""
@@ -24554,5 +24922,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3176
+#: build/trans_style.java:3184
 msgid "industrial"
 msgstr ""
@@ -24566,5 +24934,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "brownfield"
 msgstr ""
@@ -24578,5 +24946,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "greenfield"
 msgstr ""
@@ -24590,5 +24958,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "railland"
 msgstr ""
@@ -24645,7 +25013,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3217 build/trans_style.java:3252
-#: build/trans_style.java:3260 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3225 build/trans_style.java:3260
+#: build/trans_style.java:3268 build/trans_style.java:3276
+#: build/trans_style.java:3284 build/trans_style.java:3292
 msgid "military"
 msgstr ""
@@ -24659,5 +25027,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3225
+#: build/trans_style.java:3233
 msgid "cemetery"
 msgstr "hautausmaa"
@@ -24670,5 +25038,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3301
+#: build/trans_style.java:3309
 msgid "peak"
 msgstr "huippu"
@@ -24683,5 +25051,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3310
+#: build/trans_style.java:3318
 msgid "glacier"
 msgstr "jäätikkö"
@@ -24695,5 +25063,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "volcano"
 msgstr "tulivuori"
@@ -24748,8 +25116,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3326 build/trans_style.java:3327
-#: build/trans_style.java:3335 build/trans_style.java:3351
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440
+#: build/trans_style.java:3334 build/trans_style.java:3335
+#: build/trans_style.java:3343 build/trans_style.java:3359
+#: build/trans_style.java:3432 build/trans_style.java:3440
+#: build/trans_style.java:3448
 msgid "natural"
 msgstr ""
@@ -24763,5 +25131,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3343
+#: build/trans_style.java:3351
 msgid "scrub"
 msgstr "pusikko"
@@ -24775,5 +25143,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3359
+#: build/trans_style.java:3367
 msgid "heath"
 msgstr "nummi"
@@ -24787,5 +25155,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3408
+#: build/trans_style.java:3416
 msgid "mud"
 msgstr "muta"
@@ -24799,5 +25167,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "beach"
 msgstr "ranta"
@@ -24875,8 +25243,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
-#: build/trans_style.java:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496 build/trans_style.java:3504
+#: build/trans_style.java:3512 build/trans_style.java:3520
 msgid "route"
 msgstr "reitti"
@@ -24924,7 +25292,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3522 build/trans_style.java:3530
-#: build/trans_style.java:3538 build/trans_style.java:3546
-#: build/trans_style.java:3554
+#: build/trans_style.java:3530 build/trans_style.java:3538
+#: build/trans_style.java:3546 build/trans_style.java:3554
+#: build/trans_style.java:3562
 msgid "boundary"
 msgstr "raja"
@@ -25074,11 +25442,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090
+#: build/trans_style.java:4002 build/trans_style.java:4010
+#: build/trans_style.java:4018 build/trans_style.java:4026
+#: build/trans_style.java:4034 build/trans_style.java:4042
+#: build/trans_style.java:4050 build/trans_style.java:4058
+#: build/trans_style.java:4066 build/trans_style.java:4074
+#: build/trans_style.java:4082 build/trans_style.java:4090
+#: build/trans_style.java:4098
 msgid "place"
 msgstr ""
@@ -25126,6 +25494,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4207 build/trans_style.java:4214
-#: build/trans_style.java:4221 build/trans_style.java:4228
+#: build/trans_style.java:4215 build/trans_style.java:4222
+#: build/trans_style.java:4229 build/trans_style.java:4236
 msgid "address"
 msgstr "osoite"
@@ -25433,12 +25801,81 @@
 msgstr ""
 
-#~ msgid "All the ways were empty"
-#~ msgstr "Kaikki polut olivat tyhjiä"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Yhdistetäänkö pisteet, joilla on eriävät relaatiojäsenyydet?"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Yhdistä silti"
+#~ msgid "Unknown version"
+#~ msgstr "Tuntematon versio"
+
+#~ msgid "Aborting..."
+#~ msgstr "Keskeytetään..."
+
+#~ msgid "Add all currently selected objects as members"
+#~ msgstr "Lisää valitut objektit jäseniksi"
+
+#~ msgid "Revert"
+#~ msgstr "Palauta"
+
+#~ msgid "Date"
+#~ msgstr "Päivämäärä"
+
+#~ msgid "Object"
+#~ msgstr "Objekti"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "OSM-tilin kirjautumisnimi (sähköpostiosoite)."
+
+#~ msgid "Email"
+#~ msgstr "Sähköpostiosoite"
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Tuntematon tiedostopääte."
+
+#~ msgid "Error parsing server response."
+#~ msgstr "Virhe palvelimen vastauksen käsittelyssä."
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM-käyttäjänimi (sähköpostiosoite)"
+
+#~ msgid "my version:"
+#~ msgstr "minun versioni:"
+
+#~ msgid "their version:"
+#~ msgstr "palvelimen versio:"
+
+#~ msgid "Change"
+#~ msgstr "Muokkaa"
+
+#~ msgid "Delete {1} {0}"
+#~ msgstr "Poista {1} {0}"
+
+#~ msgid "Move"
+#~ msgstr "Siirrä"
+
+#~ msgid "position"
+#~ msgstr "sijainti"
+
+#~ msgid "false"
+#~ msgstr "epätosi"
+
+#~ msgid "true"
+#~ msgstr "tosi"
+
+#~ msgid "different"
+#~ msgstr "eri"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
+#~ msgid "unnamed"
+#~ msgstr "nimetön"
+
+#~ msgid "Data Layer"
+#~ msgstr "Datataso"
+
+#~ msgid "Import TCX file as GPS track"
+#~ msgstr "Tuo TCX-tiedosto GPS-jälkenä"
+
+#~ msgid "Import TCX File..."
+#~ msgstr "Tuo TCX-tiedosto..."
+
+#~ msgid "Validate"
+#~ msgstr "Tarkista"
 
 #~ msgid ""
@@ -25449,96 +25886,12 @@
 #~ "yhdistää ne?"
 
-#~ msgid "Unknown version"
-#~ msgstr "Tuntematon versio"
+#~ msgid "All the ways were empty"
+#~ msgstr "Kaikki polut olivat tyhjiä"
+
+#~ msgid "Some of the nodes are (almost) in the line"
+#~ msgstr "Jotkin pisteet ovat (melkein) viivalla"
 
 #~ msgid "Found <nd> element in non-way."
 #~ msgstr "<nd>-elementti muussa kuin polussa."
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "<member>-tagi muussa kuin relaatiossa."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Vääränlainen pisteen id"
-
-#~ msgid "Aborting..."
-#~ msgstr "Keskeytetään..."
-
-#~ msgid "Add Selected"
-#~ msgstr "Lisää valitut"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Lisää valitut objektit jäseniksi"
-
-#~ msgid "Revert"
-#~ msgstr "Palauta"
-
-#~ msgid "Date"
-#~ msgstr "Päivämäärä"
-
-#~ msgid "Object"
-#~ msgstr "Objekti"
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "OSM-tilin kirjautumisnimi (sähköpostiosoite)."
-
-#~ msgid "Email"
-#~ msgstr "Sähköpostiosoite"
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Tuntematon tiedostopääte."
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Virhe palvelimen vastauksen käsittelyssä."
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM-käyttäjänimi (sähköpostiosoite)"
-
-#~ msgid "my version:"
-#~ msgstr "minun versioni:"
-
-#~ msgid "their version:"
-#~ msgstr "palvelimen versio:"
-
-#~ msgid "Change"
-#~ msgstr "Muokkaa"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Poista {1} {0}"
-
-#~ msgid "Move"
-#~ msgstr "Siirrä"
-
-#~ msgid "position"
-#~ msgstr "sijainti"
-
-#~ msgid "false"
-#~ msgstr "epätosi"
-
-#~ msgid "true"
-#~ msgstr "tosi"
-
-#~ msgid "different"
-#~ msgstr "eri"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "unnamed"
-#~ msgstr "nimetön"
-
-#~ msgid "Data Layer"
-#~ msgstr "Datataso"
-
-#~ msgid "Import TCX file as GPS track"
-#~ msgstr "Tuo TCX-tiedosto GPS-jälkenä"
-
-#~ msgid "Import TCX File..."
-#~ msgstr "Tuo TCX-tiedosto..."
-
-#~ msgid "Validate"
-#~ msgstr "Tarkista"
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Jotkin pisteet ovat (melkein) viivalla"
 
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
@@ -25549,7 +25902,4 @@
 #~ msgid "Click Reload to refresh list"
 #~ msgstr "Napsauta ”Päivitä” päivittääksesi listan."
-
-#~ msgid "Commit comment"
-#~ msgstr "Lähetä kommentti"
 
 #~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
@@ -25608,4 +25958,7 @@
 #~ msgstr "Valitse polkuja, joiden segmenttien välillä on melkein suora kulma."
 
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "Yhdistetäänkö pisteet, joilla on eriävät relaatiojäsenyydet?"
+
 #~ msgid "Really mark this issue as ''done''?"
 #~ msgstr "Merkataanko tämä ongelma todella \"valmiiksi\"?"
@@ -25627,4 +25980,10 @@
 #~ msgstr[0] "{0} objektilla on ristiriita:"
 #~ msgstr[1] "{0} objektilla on ristiriitoja:"
+
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "<member>-tagi muussa kuin relaatiossa."
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "Vääränlainen pisteen id"
 
 #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
@@ -25724,7 +26083,4 @@
 #~ msgstr "Poista valitut"
 
-#~ msgid "Delete Layer"
-#~ msgstr "Poista taso"
-
 #~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
 #~ msgstr ""
@@ -25744,7 +26100,4 @@
 #~ msgstr "Relaatioeditori: {0}"
 
-#~ msgid "Server does not support changesets"
-#~ msgstr "Palvelin ei tue muutoskokoelmia"
-
 #~ msgid "Edit Drawbridge"
 #~ msgstr "Muokkaa laskusillan ominaisuuksia"
@@ -25752,4 +26105,7 @@
 #~ msgid "Edit Portcullis"
 #~ msgstr "Muokkaa laskuristikkoa"
+
+#~ msgid "Merge Anyway"
+#~ msgstr "Yhdistä silti"
 
 #~ msgid ""
Index: applications/editors/josm/i18n/po/fr.po
===================================================================
--- applications/editors/josm/i18n/po/fr.po	(revision 17655)
+++ applications/editors/josm/i18n/po/fr.po	(revision 17697)
@@ -6,6 +6,6 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-12 18:11+0200\n"
-"PO-Revision-Date: 2009-09-08 17:55+0000\n"
+"POT-Creation-Date: 2009-09-19 13:00+0200\n"
+"PO-Revision-Date: 2009-09-18 16:55+0000\n"
 "Last-Translator: François Blondel <Unknown>\n"
 "Language-Team: Fr\n"
@@ -14,5 +14,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2009-09-12 16:05+0000\n"
+"X-Launchpad-Export-Date: 2009-09-19 10:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -40,10 +40,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:543
 #: ../core/src/org/openstreetmap/josm/Main.java:551
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -68,5 +68,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -84,6 +84,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:358
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
@@ -99,6 +99,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
@@ -126,10 +126,10 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
 msgid "Save and Exit"
 msgstr "Enregistrer et quitter"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
 msgid "Discard and Exit"
 msgstr "Annuler et quitter"
@@ -140,4 +140,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
@@ -145,27 +146,28 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:296
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:258
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:613
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
@@ -173,5 +175,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -191,6 +193,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
@@ -207,17 +209,17 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:654
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1528
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -228,6 +230,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
@@ -280,9 +282,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:607
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:609
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -342,5 +344,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
 msgid "Plugins"
@@ -396,5 +398,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Fusionner"
@@ -484,5 +486,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -495,4 +497,5 @@
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -528,6 +531,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
@@ -536,6 +539,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:346
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
@@ -651,4 +654,46 @@
 msgstr "Aucun conflit sur lequel zoomer"
 
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#, fuzzy
+msgid "Close open changesets"
+msgstr "Aucun ensemble de changements ouvert"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#, fuzzy
+msgid "Closes open changesets"
+msgstr "Aucun ensemble de changements ouvert"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
+#: ../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:114
+#, java-format
+msgid "File: {0}"
+msgstr "Fichier : {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
+#, fuzzy
+msgid "There are no open changesets"
+msgstr "Aucun ensemble de changements ouvert"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
+#, fuzzy
+msgid "No open changesets"
+msgstr "Aucun ensemble de changements ouvert"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
+#, fuzzy
+msgid "Downloading open changesets ..."
+msgstr "Fermeture de la révision..."
+
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
@@ -749,10 +794,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:123
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
@@ -795,31 +841,30 @@
 msgstr "Distribue les nœuds sélectionnés à égale distance le long d'une ligne."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
 msgid "Download from OSM..."
 msgstr "Téléchargement depuis OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
 msgid "Download map data from the OSM server."
 msgstr "Télécharger des données depuis le serveur OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
-#, java-format
-msgid "File: {0}"
-msgstr "Fichier : {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
 msgid "Download"
 msgstr "Téléchargement"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
 msgid "Please select at least one task to download"
 msgstr "Veuillez sélectionner au moins une tâche à télécharger"
@@ -842,5 +887,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1527
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307
@@ -860,6 +905,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:376
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1415
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
 msgid "Duplicate"
 msgstr "Dupliquer"
@@ -931,10 +976,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
@@ -1021,25 +1067,26 @@
 msgstr "Fusionne le calque courant avec un autre calque"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 msgid "Merge Nodes"
 msgstr "Fusionner les nœuds"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
 msgid "Merge nodes into the oldest one."
 msgstr "Fusionner les nœuds sur le plus ancien"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
 msgid "Please select at least two nodes to merge."
 msgstr "Veuillez sélectionner au moins deux nœuds à fusionner."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:394
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
@@ -1055,8 +1102,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -1082,6 +1129,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
@@ -1090,5 +1141,5 @@
 msgstr "le paramètre \"{0}\" ne doit pas être vide"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
@@ -1096,5 +1147,5 @@
 "encore utilisé"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283
 #, java-format
 msgid "Merge {0} nodes"
@@ -1166,5 +1217,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "New"
 msgstr "Nouveau"
@@ -1447,14 +1498,15 @@
 msgstr "Aide : {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
 msgid "Status Report"
 msgstr "Rapport d'état"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 msgid "Copy to clipboard and close"
 msgstr "Copier vers le presse-papier et fermer"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
@@ -1541,25 +1593,4 @@
 msgstr "Couper le chemin {0} en {1} parties"
 
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24
-msgid "Close current changeset"
-msgstr "Fermer ensemble de changements actuel"
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-msgid "Close the current changeset ..."
-msgstr "Fermer l'ensemble de changements actuel..."
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41
-msgid "There is currently no changeset open."
-msgstr "Aucun ensemble de changements n'est actuellement ouvert."
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42
-msgid "No open changeset"
-msgstr "Aucun ensemble de changements ouvert"
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60
-msgid "Closing changeset"
-msgstr "Fermeture de l'ensemble de changements"
-
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
@@ -1726,41 +1757,41 @@
 msgstr "La sélection est vide"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Chargement vers OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 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:133
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#, java-format
 msgid ""
 "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
 "resolve them first.</html>"
 msgstr ""
-"<html>Il y a des conflits non résolus dans le calque ''{0}''.<br>Vous devez "
-"d'abord les résoudre.<html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155
+"<html>Il y a des conflist non résolus dans le calque ''{0}''.<br>Vous devez "
+"les résoudre d'abord.</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
 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:166
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 msgid "No changes to upload."
 msgstr "Aucun changement à envoyer."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Synchroniser {0} {1} seulement"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
 msgid "Synchronize entire dataset"
 msgstr "Synchroniser tout le jeu de données"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
 #, java-format
 msgid ""
@@ -1782,17 +1813,17 @@
 "<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
 msgid "Conflict detected"
 msgstr "Conflit détecté"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr "valeur inattendue retournée. Reçue {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:267
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
 #, java-format
 msgid ""
@@ -1808,5 +1839,17 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
+msgid ""
+"<html>Uploading <strong>failed</strong> because you've been "
+"using<br>changeset {0} which was already closed at {1}.<br>Please upload "
+"again with a new or an existing open changeset."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+#, fuzzy
+msgid "Changeset closed"
+msgstr "jeux de données"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
@@ -1814,26 +1857,26 @@
 "Attention : erreur d’en-tête \"{0}\" ne correspond pas à la forme \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr "Erreur : l’en-tête \"{0}\" ne correspond pas au modèle \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr "<html>L’envoi a <strong>échoué</strong>.<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
 msgid "Upload to OSM API failed"
 msgstr "L’envoi vers l’API OSM a échoué"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
 msgid "Updating primitive"
 msgstr "Mise à jour des primitives"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
 #, java-format
 msgid "Uploading data for layer ''{0}''"
-msgstr "Envoie des données pour le calque ''{0}''"
+msgstr "Envoi des données pour le calque ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/actions/ZoomInAction.java:15
@@ -2059,14 +2102,14 @@
 msgstr "Ajouter un nœud sur le chemin et le connecter"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:930
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:932
 msgid "Create new node."
 msgstr "Créer un nouveau nœud."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
 msgid "Select node under cursor."
 msgstr "Sélectionner le nœud sous le curseur."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939
 #, java-format
 msgid "Insert new node into way."
@@ -2075,14 +2118,14 @@
 msgstr[1] "Ajouter un nouveau nœud aux {0} chemins."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
 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:949
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951
 msgid "Continue way from last node."
 msgstr "Continuer le chemin à partir du dernier nœud."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:972
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:974
 msgid "Finish drawing."
 msgstr "Terminer le tracé."
@@ -2212,62 +2255,72 @@
 "droit de la souris"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Recherche..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Rechercher des objets."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
 msgid "Can't search because there is no loaded data."
 msgstr "Impossible de rechercher car il n’y a pas de données chargées."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
+#, fuzzy
+msgid "Please enter a filter string."
+msgstr "Entrer le texte à rechercher."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
 msgid "Please enter a search string."
 msgstr "Entrer le texte à rechercher."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
 msgid "replace selection"
 msgstr "remplacer la sélection"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72
 msgid "add to selection"
 msgstr "ajouter à la sélection"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73
 msgid "remove from selection"
 msgstr "supprimer de la sélection"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
+#, fuzzy
+msgid "find in selection"
+msgstr "ajouter à la sélection"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81
 msgid "case sensitive"
 msgstr "respecter la casse"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82
 msgid "regular expression"
 msgstr "expression régulière"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
 msgstr ""
 "<b>Baker Street</b> - 'Baker' et 'Street' dans n'importe quelle clé ou nom."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
 msgstr ""
 "<b>\"Baker Street\"</b> - 'Baker Street' dans n'importe quelle clé ou nom."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
 msgstr "<b>name:Bak</b> - 'Bak'  n'importe où dans le nom."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
 msgstr "<b>type=route</b> - clé 'type' avec la valeur exacte 'route'."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid ""
 "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
@@ -2277,17 +2330,17 @@
 "<b>*=valeur</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
 msgstr "<b>-name:Bak</b> - pas 'Bak' dans le nom."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - key=foot avec n'importe quelle valeur."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
 msgid "<u>Special targets:</u>"
 msgstr "<u>Options spéciales :</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
@@ -2295,33 +2348,33 @@
 "<b>type:</b> - type de l'objet (<b>node</b>, <b>way</b>, <b>relation</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - tous les objets modifiés par l'utilisateur"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr "<b>id :</b>... - objet avec l'ID indiqué (0 pour les nouveaux objets)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 msgid "<b>nodes:</b>... - object with given number of nodes"
 msgstr "<b>nodes:</b>... - objet avec le nombre de nœuds spécifié"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - tous les objets modifiés"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - tous les objets sélectionnés"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - tous les objets incomplets"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - tous les objets non étiquetés"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2330,5 +2383,5 @@
 "l'expression"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2337,55 +2390,72 @@
 "l'expression"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Utilisez <b>|</b> ou <b>OR</b> pour combiner avec le OU logique"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
 "Utilisez <b>\"</b> pour citer des opérateurs (i.e. si la clé contient :)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Utilisez <b>(</b> et <b>)</b> pour grouper des expressions"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
+msgid "Filter"
+msgstr "Filtrez"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Chercher"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
+msgid "Submit filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "Start Search"
 msgstr "Commencer la recherche"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Aucun résultat trouvé pour \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Rien n’a été ajouté à la sélection en recherchant \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Rien n’a été enlevé à la sélection en recherchant \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#, fuzzy, java-format
+msgid "Nothing find in selection by searching for ''{0}''"
+msgstr "Rien n’a été ajouté à la sélection en recherchant \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262
 #, java-format
 msgid "Found {0} matches"
 msgstr "{0} résultats trouvés"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283
 msgid "RX"
 msgstr "RX"
@@ -2578,5 +2648,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
 msgid "Double conflict"
 msgstr "Double conflit"
@@ -2831,4 +2901,5 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:134
 msgid "Old value"
 msgstr "Ancienne valeur"
@@ -2935,4 +3006,7 @@
 "<br> and creating a new default preference file.</html>"
 msgstr ""
+"<html>Le fichier des préférences a des erreurs.<br> Création d'une "
+"sauvegarde de l'ancien vers <br>{0}<br> et création d'un nouveau fichier de "
+"préférences par défaut.</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
@@ -2996,27 +3070,59 @@
 
 #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
 msgid "E"
 msgstr "E"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:59
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:203
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
 msgid "Changeset {0}"
 msgstr "Ensemble de changements {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:323
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
 msgstr "paramètre {0} > 0 requis. Reçu {1}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:325
-#, fuzzy, java-format
-msgid "paramete''{0}'' must not be null"
-msgstr "le paramètre \"{0}\" ne doit pas être vide"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331
-#, fuzzy, java-format
-msgid "unsupported value ''{0}'' or parameter ''{1}''"
-msgstr "Pas de rôle utile \"{0}\" pour le chemin \"{1}\"."
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "H"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "Text"
+msgstr "texte"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "C"
+msgstr "CS"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "I"
+msgstr "CI"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "M"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#, fuzzy
+msgid "R"
+msgstr "RX"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+msgid "A"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+msgid "D"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+msgid "F"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
@@ -3030,29 +3136,29 @@
 msgstr "Attention : {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
+#, java-format
 msgid "expected id >= 0. Got {0}"
-msgstr "index de colonne inattendu. Reçu {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:257
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
 msgid "a primitive with id=0 can't be invisible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:293
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
+#, java-format
 msgid "id > 0 expected. Got {0}"
-msgstr "Jeton inattendu : {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
+#, java-format
 msgid "version > 0 expected. Got {0}"
-msgstr "Jeton inattendu : {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
 msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
 msgstr "le paramètre \"{0}\" n’a pas un nom valide, reçu \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
 msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
@@ -3071,5 +3177,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
 msgid "can't add node {0} to incomplete way {1}"
-msgstr ""
+msgstr "Impossible d'ajouter le nœud {0} au chemin incomplet {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154
@@ -3122,9 +3228,9 @@
 "le paramètre {0} n’est pas dans la plage 0...{1}, il est actuellement de {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:247
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:249
 msgid "Area style way is not closed."
 msgstr "La zone n'est pas fermée."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:478
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:482
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
@@ -3133,105 +3239,105 @@
 #. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
 #. TODO Remove useless nullcheck when RelationMember.member is encalupsed
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:851
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855
 msgid "Empty member in relation."
 msgstr "Membre vide dans la relation."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:853
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Membre \"{0}\" supprimé de la relation."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:864
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Chemin \"{0}\" comporte moins de deux points."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "More than one \"from\" way found."
 msgstr "Plus d'un chemin d'origine trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "More than one \"to\" way found."
 msgstr "Plus d'un chemin \"destination\" trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "More than one \"via\" found."
 msgstr "Plus d'un \"via\" trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Rôle inconnu \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Type de membre inconnu pour \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"from\" way found."
 msgstr "Pas de chemin d'origine trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"to\" way found."
 msgstr "Pas de chemin \"destination\" trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652
 msgid "No \"via\" node or way found."
 msgstr "Pas de noeud ou de chemin \"via\" trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 "Le chemin d'origine ne commence ou fini pas par un nœud \"de passage\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "Le chemin \"to\" ne commence ou ne fini pas à un noeud \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "Le chemin \"from\" ne commence ou ne fini pas par le chemin \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "Le chemin \"to\" ne commence ou ne fini pas par le chemin \"via\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Le style de la restriction {0} n'a pas été trouvé."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Pas de rôle utile \"{0}\" pour le chemin \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:885
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Non-chemin \"{0}\" dans le multipolygone."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:943
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Pas de chemin extérieur pour le multipolygone \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1032
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Intersection entre les chemins \"{0}\" et \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1044
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Le chemin intérieur \"{0}\" est à l'extérieur."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1097
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
@@ -3239,14 +3345,14 @@
 "Le style du chemin intérieur \"{0}\" est équivalent à un multipolygone."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1123
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Le style du chemin extérieur \"{0}\" ne concorde pas."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1327
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331
 msgid "untagged"
 msgstr "non étiqueté"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1328
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332
 msgid "text"
 msgstr "texte"
@@ -3270,5 +3376,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
@@ -3289,5 +3395,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
@@ -3341,5 +3447,5 @@
 msgstr "Lambert Zone (France)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambert Zone (Estonie)"
@@ -3381,9 +3487,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:38
 msgid "Do not show again"
 msgstr "Ne plus afficher"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
 #, java-format
@@ -3391,31 +3497,31 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:91
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:116
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154
 msgid "incomplete"
 msgstr "incomplet"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
 msgid "highway"
 msgstr "highway"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
-#: build/trans_presets.java:3144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: build/trans_presets.java:3156
 msgid "railway"
 msgstr "voie ferrée"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
 msgid "waterway"
 msgstr "voie navigable"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "landuse"
 msgstr "utilisation du terrain"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:474
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
@@ -3425,5 +3531,5 @@
 msgstr[1] "{0} nœuds"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
 #, java-format
 msgid "{0} member"
@@ -3450,10 +3556,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:120
 msgid "Internal Server Error"
-msgstr ""
+msgstr "Erreur interne du serveur"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
-#, fuzzy
 msgid "Bad Request"
-msgstr "Éditer sports de raquette"
+msgstr "Requête incorrecte"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144
@@ -3469,10 +3574,5 @@
 msgstr "Message du jour non disponible"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67
-#, java-format
-msgid "- running version is {0}"
-msgstr "- version utilisée {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:95
 msgid "Downloading \"Message of the day\""
 msgstr "Téléchargement du \"Message du jour\""
@@ -3546,10 +3646,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:162
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
 msgid "Username"
 msgstr "Nom d’utilisateur"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
 msgid "Password"
 msgstr "Mot de passe"
@@ -3676,5 +3776,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226
 msgid "Presets"
 msgstr "Balises"
@@ -3748,38 +3848,49 @@
 msgstr "échelle"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
 msgid "The geographic longitude at the mouse pointer."
 msgstr "La longitude géographique au niveau du pointeur de souris."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The name of the object at the mouse pointer."
 msgstr "Le nom de l’objet au niveau du pointeur de souris."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The geographic latitude at the mouse pointer."
 msgstr "La latitude géographique au niveau du pointeur de souris."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The angle between the previous and the current way segment."
 msgstr "L'angle entre le segment de chemin précédent et l’actuel."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "L’orientation (boussole) du segment en train d’être dessiné."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The length of the new way segment being drawn."
 msgstr "La longueur du nouveau segment du chemin étant actuellement dessiné."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199
+msgid ""
+"Middle click again to cycle through.<br>Hold CTRL to select directly from "
+"this list with the mouse.<hr>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290
 msgid "(no object)"
 msgstr "(aucun objet)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:301
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418
+#, fuzzy
+msgid "User:"
+msgstr "Utilisateur"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
 msgid "layer not in list."
 msgstr "le calque n’est pas dans la liste."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:488
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3852,7 +3963,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:224
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Tags"
 msgstr "Étiquettes"
@@ -3867,5 +3978,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
@@ -4065,4 +4176,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
 msgid "Up"
 msgstr "Monter"
@@ -4073,4 +4185,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Down"
 msgstr "Descendre"
@@ -4083,5 +4196,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
@@ -4526,23 +4639,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:236
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239
 msgid "No conflicts to resolve"
-msgstr "Aucun conflit d’étiquette n'est résolu"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:295
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257
+msgstr "Pas de conflits à résoudre."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254
 msgid "Cancel conflict resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:310
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269
 msgid "Apply resolved conflicts"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
+msgstr "Appliquer les conflits résolus."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Apply"
 msgstr "Appliquer"
@@ -4554,5 +4666,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "all"
 msgstr "all"
@@ -4574,5 +4686,5 @@
 #, java-format
 msgid "The key ''{0}'' and all it's values are going to be removed"
-msgstr ""
+msgstr "La clé \"{0}\" et toutes ses valeurs vont être supprimées."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:70
@@ -4584,5 +4696,5 @@
 #, java-format
 msgid "parameter ''{0}'' must not be empty"
-msgstr ""
+msgstr "Le paramètre \"{0}\" ne doit pas être vide."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
@@ -4593,10 +4705,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
 msgid "tag collection doesn't include the selected value ''{0}''"
-msgstr ""
+msgstr "La suite d’attributs ne comprend pas la valeur sélectionnée « {0} »"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
-msgid "not yet decided"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:213
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
@@ -4605,25 +4714,25 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
 msgid "Not decided yet"
-msgstr ""
+msgstr "Pas encore décidé."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49
 msgid "Tags from nodes"
-msgstr ""
+msgstr "Attributs issus de nœuds"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50
 msgid "Tags from ways"
-msgstr ""
+msgstr "Attributs issus de chemins"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51
 msgid "Tags from relations"
-msgstr ""
+msgstr "Attributs issus de relations"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78
 msgid "Conflicts in pasted tags"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:475
+msgstr "Conflits entre des attributs collés"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
@@ -4633,7 +4742,7 @@
 msgstr[1] "{0} voies"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:152
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
@@ -4643,20 +4752,20 @@
 msgstr[1] "{0} relations"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "Paste ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "From ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:372
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+msgstr "De…"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "To ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:428
+msgstr "Pour…"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
 #, java-format
 msgid "{0} tag"
@@ -4672,13 +4781,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
-#, fuzzy
 msgid "Remove this relation member from the relation"
-msgstr "Supprimer le membre de cette relation de l'entrée actuelle de la table"
+msgstr "Supprimer ce membre de la relation de la relation."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-#, fuzzy
 msgid "Replace"
-msgstr "lieu"
+msgstr "Remplacer"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
@@ -4689,11 +4796,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
-#, fuzzy
 msgid "Undecided"
-msgstr "Ne pas départager"
+msgstr "Non décidé"
 
 #. --- role editing
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:56
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510
 msgid "Role:"
 msgstr "Rôle :"
@@ -4709,11 +4815,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70
-#, fuzzy
 msgid "Value:"
-msgstr "Valeur"
+msgstr "Valeur :"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86
 msgid "Apply this role to all members"
-msgstr ""
+msgstr "Appliquer ce rôle à tout les membres."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33
@@ -4722,12 +4827,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51
-#, fuzzy
 msgid "Orig. Way"
-msgstr "Sens unique"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
-#, fuzzy
 msgid "Decision"
-msgstr "Révision"
+msgstr "Décision"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -4743,6 +4846,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
@@ -4806,5 +4910,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
 msgid "Close anyway"
-msgstr ""
+msgstr "Fermer quand même"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:194
@@ -4835,170 +4939,13 @@
 msgstr "Résolution des conflits pour ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-msgid "History"
-msgstr "Historique"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-msgid "Display the history of all selected items."
-msgstr "Afficher l’historique de tous les articles sélectionnés."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
-#, java-format
-msgid "index out of bounds Got {0}"
-msgstr "index en dehors des limites. Reçu {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr "Nœud {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
-msgid "History item"
-msgstr "Historique de l’objet"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Recharger les objets actuellement sélectionnés et rafraîchir la liste."
-
-#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
-msgid "Show"
-msgstr "Afficher"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
-msgstr "Afficher l'historique de la primitive sélectionnée"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
-msgid "Dialog not created yet. Invoke createInstance() first"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
-msgid "Layers"
-msgstr "Calques"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-msgid "Open a list of all loaded layers."
-msgstr "Ouvrir une liste de tous les calques chargés."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:297
-msgid "Delete the selected layer."
-msgstr "Supprimer le calque sélectionné."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:367
-msgid "Show/Hide"
-msgstr "Montrer/Cacher"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:378
-msgid "Toggle visible state of the selected layer."
-msgstr "Bascule l'état de visibilité du calque sélectionné."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:420
-msgid "Activate the selected layer"
-msgstr "Active la couche sélectionnée"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:475
-msgid "Merge this layer into another layer"
-msgstr "Fusionne cette couche dans une autre"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:581
-msgid "Move the selected layer one row up."
-msgstr "Déplacer le calque sélectionné un niveau vers le haut."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:600
-msgid "Move the selected layer one row down."
-msgstr "Déplacer le calque sélectionné un niveau vers le bas."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
-msgid "Information about layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
-#, java-format
-msgid "This will change up to {0} object."
-msgid_plural "This will change up to {0} objects."
-msgstr[0] "Cela modifiera {0} objet maximum."
-msgstr[1] "Cela modifiera {0} objets maximum."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
-msgid "An empty value deletes the key."
-msgstr "Une valeur vide supprime la clé."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
-msgid "<different>"
-msgstr "<différent>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
-msgid "Change values?"
-msgstr "Changer les valeurs ?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
-#, java-format
-msgid "Change properties of up to {0} object"
-msgid_plural "Change properties of up to {0} objects"
-msgstr[0] "Modifier les propriétés de {0} objet maximum."
-msgstr[1] "Modifier les propriétés de {0} objets maximum."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
-msgid "Please select a key"
-msgstr "Veuillez sélectionner une clé"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
-msgid "Please select a value"
-msgstr "Veuillez sélectionner une valeur"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
-msgid "Please select the objects you want to change properties for."
-msgstr ""
-"Veuillez sélectionner les objets dont vous voulez changer les propriétés."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
-msgid "Properties/Memberships"
-msgstr "Propriétés/Appartenances"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-msgid "Properties for selected objects."
-msgstr "Propriétés des objets sélectionnés."
-
-#. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-msgid "Member Of"
-msgstr "Membre de"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
-msgid "Add Properties"
-msgstr "Ajouter des Propriétés"
-
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+msgid "Filter objects and hide/disable them."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
@@ -5012,4 +4959,213 @@
 msgstr "Ajouter"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#, fuzzy
+msgid "Add filter."
+msgstr "Ajouter la sélection"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
+#, fuzzy
+msgid "Edit filter."
+msgstr "Modifier jetée/ponton"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#, fuzzy
+msgid "Delete filter."
+msgstr "Supprimer ma version"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
+#, fuzzy
+msgid "Move filter up."
+msgstr "Déplacer vers le haut"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
+#, fuzzy
+msgid "Move filter down."
+msgstr "Déplacer vers le bas"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128
+msgid "Enable filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
+#, fuzzy
+msgid "Hide elements"
+msgstr "Eléments seuls"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
+msgid "Apply also for children"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
+msgid "Inverse filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
+#, fuzzy
+msgid "Filter mode"
+msgstr "Filtrez"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
+msgid "History"
+msgstr "Historique"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+msgid "Display the history of all selected items."
+msgstr "Afficher l’historique de tous les articles sélectionnés."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr "index en dehors des limites. Reçu {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr "Nœud {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr "Relation {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
+msgid "History item"
+msgstr "Historique de l’objet"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
+msgid "Reload all currently selected objects and refresh the list."
+msgstr "Recharger les objets actuellement sélectionnés et rafraîchir la liste."
+
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
+msgid "Show"
+msgstr "Afficher"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
+msgid "Display the history of the selected primitive"
+msgstr "Afficher l'historique de la primitive sélectionnée"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84
+msgid "Dialog not created yet. Invoke createInstance() first"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
+msgid "Layers"
+msgstr "Calques"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+msgid "Open a list of all loaded layers."
+msgstr "Ouvrir une liste de tous les calques chargés."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294
+msgid "Delete the selected layer."
+msgstr "Supprimer le calque sélectionné."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364
+msgid "Show/Hide"
+msgstr "Montrer/Cacher"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375
+msgid "Toggle visible state of the selected layer."
+msgstr "Bascule l'état de visibilité du calque sélectionné."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgid "Activate"
+msgstr "Activer"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417
+msgid "Activate the selected layer"
+msgstr "Active la couche sélectionnée"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472
+msgid "Merge this layer into another layer"
+msgstr "Fusionne cette couche dans une autre"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578
+msgid "Move the selected layer one row up."
+msgstr "Déplacer le calque sélectionné un niveau vers le haut."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597
+msgid "Move the selected layer one row down."
+msgstr "Déplacer le calque sélectionné un niveau vers le bas."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+msgid "Information about layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+#, java-format
+msgid "This will change up to {0} object."
+msgid_plural "This will change up to {0} objects."
+msgstr[0] "Cela modifiera {0} objet maximum."
+msgstr[1] "Cela modifiera {0} objets maximum."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+msgid "An empty value deletes the key."
+msgstr "Une valeur vide supprime la clé."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+msgid "<different>"
+msgstr "<différent>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+msgid "Change values?"
+msgstr "Changer les valeurs ?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#, java-format
+msgid "Change properties of up to {0} object"
+msgid_plural "Change properties of up to {0} objects"
+msgstr[0] "Modifier les propriétés de {0} objet maximum."
+msgstr[1] "Modifier les propriétés de {0} objets maximum."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+msgid "Please select a key"
+msgstr "Veuillez sélectionner une clé"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+msgid "Please select a value"
+msgstr "Veuillez sélectionner une valeur"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
+msgid "Please select the objects you want to change properties for."
+msgstr ""
+"Veuillez sélectionner les objets dont vous voulez changer les propriétés."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
+msgid "Properties/Memberships"
+msgstr "Propriétés/Appartenances"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+msgid "Properties for selected objects."
+msgstr "Propriétés des objets sélectionnés."
+
+#. setting up the membership table
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+msgid "Member Of"
+msgstr "Membre de"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
+msgid "Add Properties"
+msgstr "Ajouter des Propriétés"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574
 msgid "Add a new key/value pair to all objects"
@@ -5051,10 +5207,9 @@
 
 #. item "Land use/Quarry" text "Name"
-#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
-#: build/trans_presets.java:3109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168
+#: build/trans_presets.java:3121
 msgid "Relations"
 msgstr "Relations"
@@ -5064,23 +5219,23 @@
 msgstr "Ouvrir une liste de toutes les relations."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relations : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276
 msgid "Open an editor for the selected relation"
 msgstr "Ouvrir un éditeur pour la relation sélectionnée"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
 msgid "Delete the selected relation"
 msgstr "Supprimer la relation sélectionnée"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349
 msgid "Create a new relation"
 msgstr "Créer une nouvelle relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:373
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1412
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
@@ -5115,5 +5270,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5125,9 +5280,9 @@
 msgstr "Sélection : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441
 msgid "Undock the panel"
 msgstr "Détacher le panneau"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5136,5 +5291,5 @@
 "d'outils de gauche."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:457
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Cliquer pour minimiser/maximiser le contenu du panneau"
@@ -5155,6 +5310,6 @@
 msgid "{0} Author"
 msgid_plural "{0} Authors"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} Auteur"
+msgstr[1] "{0} Auteurs"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142
@@ -5164,9 +5319,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172
 msgid "Show info"
-msgstr ""
+msgstr "Afficher les informations"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173
 msgid "Launches a browser with information about the user"
-msgstr ""
+msgstr "Ouvrir un navigateur avec les informations sur cet utilisateur"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185
@@ -5196,5 +5351,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr "éditer la relation en référence du membre de relation sélectionné"
@@ -5206,5 +5361,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:223
 msgid "Download All Children"
-msgstr ""
+msgstr "Télécharger tout les éléments enfants"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:242
@@ -5214,9 +5369,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:246
 msgid "Download Selected Children"
-msgstr ""
+msgstr "Télécharger les éléments enfants sélectionnés"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1502
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1370
 msgid "Download relation members"
 msgstr "télécharger les membres de la relation"
@@ -5248,5 +5403,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -5255,18 +5410,18 @@
 "Attention : exception ignorée car la tâche est annulée. Exception : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
 msgid "Tags and Members"
 msgstr "Étiquettes et membres"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:167
 msgid "Parent Relations"
 msgstr "Relations parentes"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
 msgid "Child Relations"
 msgstr "Relations enfants"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5274,15 +5429,19 @@
 "<br>How do you want to proceed with circular dependencies?</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+"<html>Il y a au moins un membre de cette relation qui réfère<br>à la "
+"relation elle-même.<br>Ceci crée des dépendances circulaires et est "
+"déconseillé.<br>Comment voulez-vous procéder avec les dépendances "
+"circulaires ?</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
 msgid "Ignore them, leave relation as is"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
+msgstr "Les ignorer, laisser la relation telle quelle."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613
 #, java-format
 msgid ""
@@ -5292,9 +5451,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid ""
@@ -5304,5 +5463,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
@@ -5311,5 +5470,5 @@
 "premier membre"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
@@ -5318,5 +5477,5 @@
 "dernier membre"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5324,5 +5483,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5330,20 +5489,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
 msgid "Relation Editor: Remove Selected"
 msgstr "Éditeur de relation : supprimer la sélection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849
 #, java-format
 msgid ""
@@ -5352,57 +5511,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:961
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
 msgid "Sort the relation members"
 msgstr "trier les membres de la relation"
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897
 msgid "Relation Editor: Sort"
 msgstr "éditeur de relation : trier"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909
 msgid "Move the currently selected members up"
 msgstr "Déplacer les membres sélectionnés vers le haut"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:979
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:912
 msgid "Relation Editor: Move Up"
 msgstr "Éditeur de relation : déplacer vers le haut"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928
 msgid "Move the currently selected members down"
 msgstr "Déplacer les membres sélectionnés vers le bas"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:998
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:931
 msgid "Relation Editor: Move Down"
 msgstr "Éditeur de relation : déplacer vers le bas"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947
 msgid "Remove the currently selected members from this relation"
-msgstr ""
+msgstr "Supprimer le membre actuellement sélectionné de cette relation."
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
 msgid "Relation Editor: Remove"
 msgstr "éditeur de relation : supprimer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
 msgid "Delete the currently edited relation"
 msgstr "Supprimer la relation actuellement éditée."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Yes, create a conflict and close"
 msgstr "Oui, créer un conflit et fermer."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050
 msgid "No, continue editing"
 msgstr "Non, continuer à éditer."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5411,9 +5570,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1058
 msgid "Conflict in data"
 msgstr "Conflit dans les données."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
 #, java-format
 msgid ""
@@ -5422,56 +5581,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090
 msgid "Apply the current updates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123
 msgid "Apply the updates and close the dialog"
 msgstr "Appliquer les changements et fermer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Cancel the updates and close the dialog"
 msgstr "Annuler les changements et fermer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 msgid "Add an empty tag"
 msgstr "Ajouter une étiquette vide"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
-msgid "Delete the currently selected tags"
-msgstr "Supprimer les étiquettes sélectionnées"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Télécharger tous les chemins et les nœuds incomplets dans la relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 msgid "Download Members"
 msgstr "Télécharger les membres"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Relation Editor: Download Members"
 msgstr "Éditeur de relation : télécharger les membres"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1208
 msgid "Sets a role for the selected members"
 msgstr "Définir un rôle pour les membres sélectionnés"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1211
 msgid "Apply Role"
 msgstr "Appliquer le rôle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1356
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 #, java-format
 msgid ""
@@ -5481,13 +5625,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228
 msgid "Yes, apply it"
 msgstr "Oui, l'appliquer."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1229
 msgid "No, don't apply"
 msgstr "Non, ne pas l'appliquer."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1367
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
 msgid "Confirm empty role"
 msgstr ""
@@ -5495,5 +5639,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
 msgid "Zoom to"
-msgstr ""
+msgstr "Zoomer à"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193
@@ -5537,5 +5681,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109
 msgid "Loading parent relations"
-msgstr ""
+msgstr "Chargement des relations parentes."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142
@@ -5574,37 +5718,37 @@
 msgstr "Marque-pages"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:82
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
 msgid "Please enter the desired coordinates first."
 msgstr "Entrer les coordonnées désirées en premier."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
 msgid "Please enter a name for the location."
 msgstr "Entrer un nom pour cet emplacement."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:107
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
 msgid "Select a bookmark first."
 msgstr "Sélectionner un marque-page en premier."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
 msgid "min lat"
 msgstr "lat min"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
 msgid "min lon"
 msgstr "lon min"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid "max lat"
 msgstr "lat max"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
 msgid "max lon"
 msgstr "lon max"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5614,22 +5758,22 @@
 "télécharger la zone)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
 msgid "Bounding Box"
 msgstr "Zone de délimitation"
 
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
 msgid "Data Sources and Types"
 msgstr "Sources et types de données"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
 msgid "Download as new layer"
 msgstr "Télécharger en tant que nouveau calque"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
 msgid "Download Area"
 msgstr "Télécharger zone"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
 msgid "Download area too large; will probably be rejected by server"
 msgstr ""
@@ -5637,5 +5781,5 @@
 "le serveur"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
 msgid "Download area ok, size probably acceptable to server"
 msgstr ""
@@ -5663,7 +5807,7 @@
 msgstr "Entrez un nom d’endroit à rechercher :"
 
-#. <separator/>
+#. group "Geography"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2759
 msgid "Places"
 msgstr "Lieux/endroits"
@@ -5710,21 +5854,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "type"
 msgstr "type"
@@ -5741,5 +5885,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-#, fuzzy
 msgid ""
 "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
@@ -5747,6 +5890,4 @@
 "Hold left mousebutton and draw a frame."
 msgstr ""
-"Zoom : molette de souris ou double-clic.   Déplacer la carte : garder le "
-"bouton droit de souris enfoncé et déplacer la souris.   Sélection : Clic"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
@@ -5778,15 +5919,15 @@
 #, java-format
 msgid "History for node {0}"
-msgstr ""
+msgstr "Historique du nœud {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:45
 #, java-format
 msgid "History for way {0}"
-msgstr ""
+msgstr "Historique du chemin {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:46
 #, java-format
 msgid "History for relation {0}"
-msgstr ""
+msgstr "Historique de la relation {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:111
@@ -6217,4 +6358,6 @@
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
 #. <key key="historic" value="wayside_shrine" />
+#. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
+#. <key key="historic" value="boundary_stone" />
 #. item "Leisure/Water Park" label "Edit Water Park"
 #. <key key="leisure" value="water_park" />
@@ -6586,153 +6729,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/trans_presets.java:66 build/trans_presets.java:102
-#: build/trans_presets.java:142 build/trans_presets.java:179
-#: build/trans_presets.java:199 build/trans_presets.java:217
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:272 build/trans_presets.java:305
-#: build/trans_presets.java:351 build/trans_presets.java:371
-#: build/trans_presets.java:386 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:463 build/trans_presets.java:482
-#: build/trans_presets.java:502 build/trans_presets.java:522
-#: build/trans_presets.java:543 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627 build/trans_presets.java:658
-#: build/trans_presets.java:679 build/trans_presets.java:692
-#: build/trans_presets.java:705 build/trans_presets.java:718
-#: build/trans_presets.java:731 build/trans_presets.java:744
-#: build/trans_presets.java:755 build/trans_presets.java:764
-#: build/trans_presets.java:811 build/trans_presets.java:832
-#: build/trans_presets.java:841 build/trans_presets.java:901
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1067 build/trans_presets.java:1075
-#: build/trans_presets.java:1085 build/trans_presets.java:1093
-#: build/trans_presets.java:1098 build/trans_presets.java:1105
-#: build/trans_presets.java:1112 build/trans_presets.java:1117
-#: build/trans_presets.java:1125 build/trans_presets.java:1134
-#: build/trans_presets.java:1140 build/trans_presets.java:1146
-#: build/trans_presets.java:1151 build/trans_presets.java:1157
-#: build/trans_presets.java:1163 build/trans_presets.java:1172
-#: build/trans_presets.java:1181 build/trans_presets.java:1188
-#: build/trans_presets.java:1196 build/trans_presets.java:1209
-#: build/trans_presets.java:1215 build/trans_presets.java:1224
-#: build/trans_presets.java:1230 build/trans_presets.java:1236
-#: build/trans_presets.java:1244 build/trans_presets.java:1299
-#: build/trans_presets.java:1346 build/trans_presets.java:1352
-#: build/trans_presets.java:1358 build/trans_presets.java:1364
-#: build/trans_presets.java:1370 build/trans_presets.java:1381
-#: build/trans_presets.java:1390 build/trans_presets.java:1405
-#: build/trans_presets.java:1412 build/trans_presets.java:1418
-#: build/trans_presets.java:1426 build/trans_presets.java:1433
-#: build/trans_presets.java:1442 build/trans_presets.java:1450
-#: build/trans_presets.java:1457 build/trans_presets.java:1468
-#: build/trans_presets.java:1478 build/trans_presets.java:1488
-#: build/trans_presets.java:1508 build/trans_presets.java:1520
-#: build/trans_presets.java:1531 build/trans_presets.java:1548
-#: build/trans_presets.java:1555 build/trans_presets.java:1570
-#: build/trans_presets.java:1577 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1594
-#: build/trans_presets.java:1599 build/trans_presets.java:1605
-#: build/trans_presets.java:1611 build/trans_presets.java:1619
-#: build/trans_presets.java:1627 build/trans_presets.java:1635
-#: build/trans_presets.java:1642 build/trans_presets.java:1648
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1670 build/trans_presets.java:1677
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1712 build/trans_presets.java:1719
-#: build/trans_presets.java:1736 build/trans_presets.java:1744
-#: build/trans_presets.java:1759 build/trans_presets.java:1769
-#: build/trans_presets.java:1781 build/trans_presets.java:1788
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:1809 build/trans_presets.java:1817
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1841
-#: build/trans_presets.java:1846 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1864
-#: build/trans_presets.java:1872 build/trans_presets.java:1881
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1908 build/trans_presets.java:1914
-#: build/trans_presets.java:1922 build/trans_presets.java:1928
-#: build/trans_presets.java:1934 build/trans_presets.java:1940
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2013
-#: build/trans_presets.java:2022 build/trans_presets.java:2030
-#: build/trans_presets.java:2036 build/trans_presets.java:2042
-#: build/trans_presets.java:2048 build/trans_presets.java:2054
-#: build/trans_presets.java:2060 build/trans_presets.java:2066
-#: build/trans_presets.java:2072 build/trans_presets.java:2078
-#: build/trans_presets.java:2084 build/trans_presets.java:2090
-#: build/trans_presets.java:2096 build/trans_presets.java:2102
-#: build/trans_presets.java:2108 build/trans_presets.java:2114
-#: build/trans_presets.java:2120 build/trans_presets.java:2126
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2158
-#: build/trans_presets.java:2165 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2186
-#: build/trans_presets.java:2192 build/trans_presets.java:2198
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2218 build/trans_presets.java:2225
-#: build/trans_presets.java:2232 build/trans_presets.java:2239
-#: build/trans_presets.java:2247 build/trans_presets.java:2279
-#: build/trans_presets.java:2284 build/trans_presets.java:2289
-#: build/trans_presets.java:2294 build/trans_presets.java:2300
-#: build/trans_presets.java:2306 build/trans_presets.java:2312
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2354
-#: build/trans_presets.java:2451 build/trans_presets.java:2458
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2485 build/trans_presets.java:2492
-#: build/trans_presets.java:2498 build/trans_presets.java:2504
-#: build/trans_presets.java:2526 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2553 build/trans_presets.java:2559
-#: build/trans_presets.java:2565 build/trans_presets.java:2571
-#: build/trans_presets.java:2577 build/trans_presets.java:2583
-#: build/trans_presets.java:2590 build/trans_presets.java:2597
-#: build/trans_presets.java:2604 build/trans_presets.java:2610
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2661
-#: build/trans_presets.java:2667 build/trans_presets.java:2677
-#: build/trans_presets.java:2686 build/trans_presets.java:2701
-#: build/trans_presets.java:2707 build/trans_presets.java:2715
-#: build/trans_presets.java:2722 build/trans_presets.java:2742
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2783
-#: build/trans_presets.java:2790 build/trans_presets.java:2797
-#: build/trans_presets.java:2803 build/trans_presets.java:2809
-#: build/trans_presets.java:2817 build/trans_presets.java:2824
-#: build/trans_presets.java:2831 build/trans_presets.java:2838
-#: build/trans_presets.java:2844 build/trans_presets.java:2851
-#: build/trans_presets.java:2858 build/trans_presets.java:2867
-#: build/trans_presets.java:2873 build/trans_presets.java:2879
-#: build/trans_presets.java:2885 build/trans_presets.java:2891
-#: build/trans_presets.java:2900 build/trans_presets.java:2910
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2948
-#: build/trans_presets.java:2957 build/trans_presets.java:2963
-#: build/trans_presets.java:2969 build/trans_presets.java:2975
-#: build/trans_presets.java:2981 build/trans_presets.java:2987
-#: build/trans_presets.java:2993 build/trans_presets.java:3000
-#: build/trans_presets.java:3006 build/trans_presets.java:3011
-#: build/trans_presets.java:3018 build/trans_presets.java:3025
-#: build/trans_presets.java:3031 build/trans_presets.java:3040
-#: build/trans_presets.java:3048 build/trans_presets.java:3054
-#: build/trans_presets.java:3060 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3080
-#: build/trans_presets.java:3086 build/trans_presets.java:3092
-#: build/trans_presets.java:3098 build/trans_presets.java:3104
-#: build/trans_presets.java:3117 build/trans_presets.java:3131
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:67 build/trans_presets.java:103
+#: build/trans_presets.java:143 build/trans_presets.java:180
+#: build/trans_presets.java:200 build/trans_presets.java:218
+#: build/trans_presets.java:235 build/trans_presets.java:253
+#: build/trans_presets.java:273 build/trans_presets.java:306
+#: build/trans_presets.java:352 build/trans_presets.java:372
+#: build/trans_presets.java:387 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:503 build/trans_presets.java:523
+#: build/trans_presets.java:544 build/trans_presets.java:565
+#: build/trans_presets.java:586 build/trans_presets.java:607
+#: build/trans_presets.java:628 build/trans_presets.java:659
+#: build/trans_presets.java:680 build/trans_presets.java:693
+#: build/trans_presets.java:706 build/trans_presets.java:719
+#: build/trans_presets.java:732 build/trans_presets.java:745
+#: build/trans_presets.java:756 build/trans_presets.java:765
+#: build/trans_presets.java:812 build/trans_presets.java:833
+#: build/trans_presets.java:842 build/trans_presets.java:902
+#: build/trans_presets.java:1053 build/trans_presets.java:1061
+#: build/trans_presets.java:1069 build/trans_presets.java:1077
+#: build/trans_presets.java:1087 build/trans_presets.java:1095
+#: build/trans_presets.java:1100 build/trans_presets.java:1107
+#: build/trans_presets.java:1114 build/trans_presets.java:1119
+#: build/trans_presets.java:1127 build/trans_presets.java:1136
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1153 build/trans_presets.java:1159
+#: build/trans_presets.java:1165 build/trans_presets.java:1174
+#: build/trans_presets.java:1183 build/trans_presets.java:1190
+#: build/trans_presets.java:1198 build/trans_presets.java:1211
+#: build/trans_presets.java:1217 build/trans_presets.java:1226
+#: build/trans_presets.java:1232 build/trans_presets.java:1238
+#: build/trans_presets.java:1246 build/trans_presets.java:1302
+#: build/trans_presets.java:1349 build/trans_presets.java:1355
+#: build/trans_presets.java:1361 build/trans_presets.java:1367
+#: build/trans_presets.java:1373 build/trans_presets.java:1384
+#: build/trans_presets.java:1393 build/trans_presets.java:1408
+#: build/trans_presets.java:1415 build/trans_presets.java:1421
+#: build/trans_presets.java:1429 build/trans_presets.java:1436
+#: build/trans_presets.java:1445 build/trans_presets.java:1453
+#: build/trans_presets.java:1460 build/trans_presets.java:1471
+#: build/trans_presets.java:1481 build/trans_presets.java:1491
+#: build/trans_presets.java:1511 build/trans_presets.java:1523
+#: build/trans_presets.java:1534 build/trans_presets.java:1551
+#: build/trans_presets.java:1558 build/trans_presets.java:1574
+#: build/trans_presets.java:1581 build/trans_presets.java:1586
+#: build/trans_presets.java:1592 build/trans_presets.java:1598
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1646 build/trans_presets.java:1652
+#: build/trans_presets.java:1659 build/trans_presets.java:1666
+#: build/trans_presets.java:1674 build/trans_presets.java:1681
+#: build/trans_presets.java:1689 build/trans_presets.java:1696
+#: build/trans_presets.java:1702 build/trans_presets.java:1709
+#: build/trans_presets.java:1716 build/trans_presets.java:1723
+#: build/trans_presets.java:1740 build/trans_presets.java:1748
+#: build/trans_presets.java:1763 build/trans_presets.java:1773
+#: build/trans_presets.java:1785 build/trans_presets.java:1792
+#: build/trans_presets.java:1798 build/trans_presets.java:1808
+#: build/trans_presets.java:1813 build/trans_presets.java:1821
+#: build/trans_presets.java:1828 build/trans_presets.java:1834
+#: build/trans_presets.java:1840 build/trans_presets.java:1845
+#: build/trans_presets.java:1850 build/trans_presets.java:1855
+#: build/trans_presets.java:1862 build/trans_presets.java:1868
+#: build/trans_presets.java:1873 build/trans_presets.java:1882
+#: build/trans_presets.java:1891 build/trans_presets.java:1900
+#: build/trans_presets.java:1909 build/trans_presets.java:1918
+#: build/trans_presets.java:1924 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 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:2023 build/trans_presets.java:2032
+#: build/trans_presets.java:2040 build/trans_presets.java:2046
+#: build/trans_presets.java:2052 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 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:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2150
+#: build/trans_presets.java:2156 build/trans_presets.java:2162
+#: build/trans_presets.java:2169 build/trans_presets.java:2176
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2197 build/trans_presets.java:2203
+#: build/trans_presets.java:2209 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2229
+#: build/trans_presets.java:2236 build/trans_presets.java:2243
+#: build/trans_presets.java:2250 build/trans_presets.java:2258
+#: build/trans_presets.java:2290 build/trans_presets.java:2295
+#: build/trans_presets.java:2300 build/trans_presets.java:2305
+#: build/trans_presets.java:2311 build/trans_presets.java:2317
+#: build/trans_presets.java:2323 build/trans_presets.java:2331
+#: build/trans_presets.java:2337 build/trans_presets.java:2343
+#: build/trans_presets.java:2349 build/trans_presets.java:2355
+#: build/trans_presets.java:2365 build/trans_presets.java:2462
+#: build/trans_presets.java:2469 build/trans_presets.java:2483
+#: build/trans_presets.java:2489 build/trans_presets.java:2496
+#: build/trans_presets.java:2503 build/trans_presets.java:2509
+#: build/trans_presets.java:2515 build/trans_presets.java:2537
+#: build/trans_presets.java:2544 build/trans_presets.java:2551
+#: build/trans_presets.java:2557 build/trans_presets.java:2564
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2594 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2615
+#: build/trans_presets.java:2621 build/trans_presets.java:2627
+#: build/trans_presets.java:2633 build/trans_presets.java:2639
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2672 build/trans_presets.java:2678
+#: build/trans_presets.java:2688 build/trans_presets.java:2697
+#: build/trans_presets.java:2712 build/trans_presets.java:2718
+#: build/trans_presets.java:2726 build/trans_presets.java:2733
+#: build/trans_presets.java:2753 build/trans_presets.java:2764
+#: build/trans_presets.java:2770 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2788
+#: build/trans_presets.java:2795 build/trans_presets.java:2802
+#: build/trans_presets.java:2809 build/trans_presets.java:2815
+#: build/trans_presets.java:2821 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2912
+#: build/trans_presets.java:2922 build/trans_presets.java:2931
+#: build/trans_presets.java:2937 build/trans_presets.java:2943
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 build/trans_presets.java:2981
+#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:2999 build/trans_presets.java:3005
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3023 build/trans_presets.java:3030
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3066 build/trans_presets.java:3072
+#: build/trans_presets.java:3079 build/trans_presets.java:3085
+#: build/trans_presets.java:3092 build/trans_presets.java:3098
+#: build/trans_presets.java:3104 build/trans_presets.java:3110
+#: build/trans_presets.java:3116 build/trans_presets.java:3129
+#: build/trans_presets.java:3143 build/trans_presets.java:3157
 msgid "Name"
 msgstr "Nom"
@@ -6766,4 +6910,58 @@
 msgid "Version"
 msgstr "Version"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
+#, fuzzy
+msgid "Changeset id:"
+msgstr "Ensemble de changements {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
+#, fuzzy
+msgid "Created at:"
+msgstr "Créer des surfaces"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
+#, fuzzy
+msgid "Changeset comment:"
+msgstr "Ensemble de changements {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
+msgid "No open changeset"
+msgstr "Aucun ensemble de changements ouvert"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48
+#, fuzzy
+msgid "<html>Please select the changesets you want to close</html>"
+msgstr "Merci de sélectionner les changements que vous voulez appliquer"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
+#, fuzzy
+msgid "Open changesets"
+msgstr "Aucun ensemble de changements ouvert"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101
+#, fuzzy
+msgid "Close changesets"
+msgstr "Fermeture de l'ensemble de changements"
+
+#. putValue(SMALL_ICON, ImageProvider.get("cancel"));
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
+#, fuzzy
+msgid "Close the selected open changesets"
+msgstr "Fermer l'ensemble de changements actuel..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126
+#, fuzzy
+msgid "Cancel closeing of changesets"
+msgstr "Fermeture de l'ensemble de changements"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37
+msgid "Closing changeset"
+msgstr "Fermeture de l'ensemble de changements"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77
+#, fuzzy, java-format
+msgid "Closing changeset {0}"
+msgstr "Fermeture de l'ensemble de changements"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
@@ -6792,5 +6990,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be uploaded"
+msgid "Layer ''{0}'' has no modifications to be uploaded."
 msgstr ""
 
@@ -6798,5 +6996,5 @@
 #, java-format
 msgid ""
-"Layer ''{0}'' has modifications which should be saved to its assoicated file "
+"Layer ''{0}'' has modifications which should be saved to its associated file "
 "''{1}''."
 msgstr ""
@@ -6804,5 +7002,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be saved"
+msgid "Layer ''{0}'' has no modifications to be saved."
 msgstr ""
 
@@ -6813,5 +7011,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84
 msgid "Please select a file"
-msgstr ""
+msgstr "Veuillez sélectionner un fichier"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:87
@@ -6834,19 +7032,21 @@
 #, java-format
 msgid "Saving layer to ''{0}'' ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114
+msgstr "Sauvegarde du calque vers ''{0}'' ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113
 msgid "Unsaved changes - Save/Upload before exiting?"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120
+"Il y a des changements non enregistrés. - Sauver/Envoyer avant de quitter ?"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140
+"Il y a des changements non enregistrés. - Sauver/Envoyer avant de supprimer ?"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139
 msgid "Uploading and saving modified layers ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195
+msgstr "Envoi et sauvegarde des calques modifiés…"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194
 #, java-format
 msgid ""
@@ -6857,12 +7057,16 @@
 "discard the modifications.<br>Layers with conflicts:</html>"
 msgstr[0] ""
+"<html>Le calque {0} comporte des conflits non résolus.<br>Résolvez-les ou "
+"abandonnez les modifications.<br>Calque qui comporte des conflits :</html>"
 msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
-#, fuzzy
+"<html>Les calques {0} comportent des conflits non résolus.<br>Résolvez-les "
+"ou abandonnez les modifications.<br>Calques qui comportent des conflits :</"
+"html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205
 msgid "Unsaved data and conflicts"
-msgstr "Résoudre les conflits"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212
 #, java-format
 msgid ""
@@ -6876,9 +7080,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223
 msgid "Unsaved data and missing associated file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230
 #, java-format
 msgid ""
@@ -6893,42 +7097,46 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243
 msgid "Unsaved data non-writable files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
 msgid "Close this dialog and resume editing in JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
+"Quitter JOSM sans sauvegarder. Les changements non-enregistrés seront perdus."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322
+msgid "Discard and Delete"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
-msgid "Discard and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
+"Quitter JOSM en sauvegardant. Les changements sont envoyés et/ou sauvé."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354
+msgid "Save and Delete"
+msgstr "Sauvegarder et supprimer."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
-msgid "Save and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
 msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403
+"Sauvegarder/Envoyer les calques avant de supprimer. Les changements non-"
+"enregistrés ne seront pas perdus."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402
 #, java-format
 msgid "Preparing layer ''{0}'' for upload ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482
+msgstr "Préparation du calque \"{0}\" pour l'envoi…"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
@@ -6936,7 +7144,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491
 msgid "Incomplete upload and/or save"
-msgstr ""
+msgstr "Envoi et/ou sauvegarde incomplet."
 
 #. item "Streets/Motorway" text "Name"
@@ -6974,21 +7182,21 @@
 #. item "Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:200
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:278
-#: build/trans_presets.java:311 build/trans_presets.java:357
-#: build/trans_presets.java:372 build/trans_presets.java:387
-#: build/trans_presets.java:409 build/trans_presets.java:429
-#: build/trans_presets.java:450 build/trans_presets.java:470
-#: build/trans_presets.java:489 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:549
-#: build/trans_presets.java:570 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:633
-#: build/trans_presets.java:664 build/trans_presets.java:1060
-#: build/trans_presets.java:1068 build/trans_presets.java:1076
-#: build/trans_presets.java:1086 build/trans_presets.java:1305
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:242
+#: build/trans_presets.java:260 build/trans_presets.java:279
+#: build/trans_presets.java:312 build/trans_presets.java:358
+#: build/trans_presets.java:373 build/trans_presets.java:388
+#: build/trans_presets.java:410 build/trans_presets.java:430
+#: build/trans_presets.java:451 build/trans_presets.java:471
+#: build/trans_presets.java:490 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:665 build/trans_presets.java:1062
+#: build/trans_presets.java:1070 build/trans_presets.java:1078
+#: build/trans_presets.java:1088 build/trans_presets.java:1308
 msgid "Layer"
 msgstr "Calque"
@@ -7007,73 +7215,32 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:200
 msgid "Upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-msgid "Use a new changeset and close it"
-msgstr "Utiliser un nouvel ensemble de changements et le fermer"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
-msgid ""
-"Select to upload the data using a new changeset and to close the changeset "
-"after the upload"
-msgstr ""
-"Choisir pour envoyer les données en utilisant un nouvel ensemble de "
-"changements et pour fermer ce dernier après l'envoi"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
-msgid "Use a new changeset and leave it open"
-msgstr "Utiliser un nouvel ensemble de changements et le laisser ouvert"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
-msgid ""
-"Select to upload the data using a new changeset and to leave the changeset "
-"open after the upload"
-msgstr ""
-"Choisir pour envoyer les données en utilisant un nouvel ensemble de "
-"changements et pour le laisser ouvert après l'envoi"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
-msgid "Upload to a new or to an existing changeset?"
-msgstr "Envoyer dans un ensemble de changements nouveau ou préexistant ?"
+msgstr "Envoyer"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
-msgid "upload all changes in one request"
-msgstr "Charger tous les changements dans une requête"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
-msgid ""
-"Enable to upload all changes in one request, disable to use one request per "
-"changed primitive"
-msgstr ""
-"Permettre l'envoi de tous les changements en une requête, désactivez pour "
-"utiliser une requête par primitive modifiée"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171
-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/gui/io/UploadDialog.java:216
 msgid "Settings"
 msgstr "Paramètres"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908
 msgid "Tags of new changeset"
 msgstr "Tags du nouvel ensemble de changements"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:221
 msgid "Objects to add:"
 msgstr "Objets à ajouter :"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:227
 msgid "Objects to modify:"
 msgstr "Objets à modifier :"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:233
 msgid "Objects to delete:"
 msgstr "Objets à supprimer :"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
 #, java-format
 msgid "{0} object to add:"
@@ -7082,5 +7249,5 @@
 msgstr[1] "{0} objets à ajouter :"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:277
 #, java-format
 msgid "{0} object to modifiy:"
@@ -7089,5 +7256,5 @@
 msgstr[1] "{0} objets à modifier :"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:286
 #, java-format
 msgid "{0} object to delete:"
@@ -7096,61 +7263,95 @@
 msgstr[1] "{0} objets à supprimer :"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422
-#, java-format
-msgid "Use the existing changeset {0} and close it after upload"
-msgstr ""
-"Utiliser la session de modification existante {0} et la fermer après l'envoi."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:423
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to close the changeset "
-"after this upload"
-msgstr ""
-"Envoyer avec la session de modification existante {0} et la fermer après cet "
-"envoi."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426
-#, java-format
-msgid "Use the existing changeset {0} and leave it open"
-msgstr ""
-"Utiliser la session de modification existante {0} et la conserver ouverte."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:427
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to leave the changeset "
-"open for further uploads"
-msgstr ""
-"Envoyer avec la session de modification existante {0} et la laisser ouverte "
-"pour d'autres envois."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:470
+msgid "Upload Changes"
+msgstr "Envoyer les changements"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472
+msgid "Upload the changed primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
+msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:479
+msgid "Illegal upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
+msgid "Cancel the upload and resume editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606
+#, fuzzy
+msgid "Upload all changes in one request"
+msgstr "Charger tous les changements dans une requête"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607
+msgid ""
+"Enable to upload all changes in one request, disable to use one request per "
+"changed primitive"
+msgstr ""
+"Permettre l'envoi de tous les changements en une requête, désactivez pour "
+"utiliser une requête par primitive modifiée"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:617
+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/gui/io/UploadDialog.java:672
+#, fuzzy
+msgid "Open a new changeset"
+msgstr "Tags du nouvel ensemble de changements"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
+#, fuzzy
+msgid "Open a new changeset and use it in the next upload"
+msgstr "Utiliser un nouvel ensemble de changements et le laisser ouvert"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
+#, fuzzy
+msgid "Use an open changeset"
+msgstr "Aucun ensemble de changements ouvert"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
+#, fuzzy
+msgid "Upload data to an already opened changeset"
+msgstr "Envoyer dans un ensemble de changements nouveau ou préexistant ?"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
+#, fuzzy
+msgid "Close changeset after upload"
+msgstr "Aucun changement à envoyer."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
+#, fuzzy
+msgid "Select to close the changeset after the next upload"
+msgstr ""
+"Choisir pour envoyer les données en utilisant un nouvel ensemble de "
+"changements et pour fermer ce dernier après l'envoi"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922
 #, java-format
 msgid "Tags of changeset {0}"
 msgstr "Attributs de la session de modification {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584
-msgid "Upload Changes"
-msgstr "Envoyer les changements"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
 #, fuzzy
-msgid "Upload the changed primitives"
-msgstr "Charger ces changements ?"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592
+msgid "Load the list of your open changesets from the server"
+msgstr "Charger les préférences actuelles vers le serveur"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
 #, fuzzy
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "Entrer un nom pour cet emplacement."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:593
-msgid "Illegal upload comment"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
-#, fuzzy
-msgid "Cancel the upload and resume editing"
-msgstr "Annuler les changements et fermer"
+msgid "Close the currently selected open changeset"
+msgstr "Supprimer les étiquettes sélectionnées"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
+#, fuzzy, java-format
+msgid "changeset id > 0 expected. Got {1}"
+msgstr "paramètre \"{0}\" > 0 attendu, reçu \"{1}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63
@@ -7228,5 +7429,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
@@ -7264,5 +7465,5 @@
 msgstr "La date indiquée ne peut être analysée."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
@@ -7270,30 +7471,30 @@
 msgstr "point GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
 msgid "Customize line drawing"
 msgstr "Personnaliser le dessin des lignes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
 msgid "Use global settings."
 msgstr "Utiliser les réglages généraux."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Draw lines between points for this layer."
 msgstr "Dessiner des lignes entre les points pour ce calque."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Do not draw lines between points for this layer."
 msgstr "Ne pas dessiner de ligne entre les points pour ce calque."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 msgid "Select line drawing options"
 msgstr "Sélectionner les options de dessin des lignes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7301,5 +7502,5 @@
 msgstr "Personnaliser la couleur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7308,5 +7509,5 @@
 msgstr "Par défaut"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7315,38 +7516,75 @@
 msgstr "Choisir une couleur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
 msgid "Markers From Named Points"
 msgstr "Marqueurs depuis des points nommés"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Points de parcours nommés depuis {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
 msgid "Import Audio"
 msgstr "Importer Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
 msgid "Wave Audio files (*.wav)"
 msgstr "Fichiers audio Wave (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Marqueurs audio de {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
 msgid "Import images"
 msgstr "Importer des images"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#, java-format
+msgid "Name: {0}"
+msgstr "Nom : {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#, java-format
+msgid "Description: {0}"
+msgstr "Description : {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#, fuzzy, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
 msgstr[0] "{0} trace, "
 msgstr[1] "{0} traces, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
+#: build/trans_presets.java:3160
+msgid "Description"
+msgstr "Description"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#, fuzzy
+msgid "Timespan"
+msgstr "Intervalle de temps : "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#, fuzzy
+msgid "Length"
+msgstr "Longueur : "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
+msgid "URL"
+msgstr "URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+msgid "Length: "
+msgstr "Longueur : "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
 #, java-format
 msgid "{0} route, "
@@ -7355,5 +7593,5 @@
 msgstr[1] "{0} chemins, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 #, java-format
 msgid "{0} waypoint"
@@ -7362,29 +7600,10 @@
 msgstr[1] "{0} chemins"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
-#, java-format
-msgid "Name: {0}"
-msgstr "Nom : {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
-#, java-format
-msgid "Description: {0}"
-msgstr "Description : {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
-msgid "Timespan: "
-msgstr "Intervalle de temps : "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
-msgid "Length: "
-msgstr "Longueur : "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Convertir en calque de données"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7395,10 +7614,10 @@
 "regardez ici :"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -7409,29 +7628,29 @@
 msgstr "Converti depuis: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
 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:769
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
 msgid "Download everything within:"
 msgstr "Tout télécharger dans un rayon de :"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
 #, java-format
 msgid "{0} meters"
 msgstr "{0} mètres"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 msgid "Maximum area per request:"
 msgstr "Aire maximale par requête:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
 #, java-format
 msgid ""
@@ -7442,9 +7661,9 @@
 "Voulez-vous<br>continuer ?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
 msgid "Download data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+msgstr "Télécharger les données."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
@@ -7452,5 +7671,5 @@
 "audio."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7460,5 +7679,5 @@
 "chemin ont été omis ou déplacés au début."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7513,31 +7732,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
-#, fuzzy
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
 "<br>If you want to upload traces, look here:</html>"
 msgstr ""
-"<html>L’envoi de données GPS non mises en forme comme données<br>sur la "
-"carte est considéré comme nuisible.<br>Si vous voulez envoyer des traces, "
-"regardez ici :"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "track"
 msgid_plural "tracks"
@@ -7678,4 +7893,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
@@ -7927,9 +8143,14 @@
 msgstr "Dessiner de gros points GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+msgid "Draw a circle form HDOP value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Vitesse (rouge = lent, vert = rapide)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
@@ -7937,5 +8158,5 @@
 "disponible)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Une seule couleur (peut être personnalisée pour les couches nommées)"
@@ -7943,6 +8164,6 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1374
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:1377
 msgid "Car"
 msgstr "Voiture"
@@ -7963,14 +8184,14 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:324 build/trans_presets.java:650
-#: build/trans_presets.java:857 build/trans_presets.java:876
-#: build/trans_presets.java:890 build/trans_presets.java:912
-#: build/trans_presets.java:949 build/trans_presets.java:962
-#: build/trans_presets.java:974 build/trans_presets.java:986
-#: build/trans_presets.java:998 build/trans_presets.java:1010
-#: build/trans_presets.java:1020 build/trans_presets.java:1029
-#: build/trans_presets.java:1038 build/trans_presets.java:1437
-#: build/trans_presets.java:1510
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:325 build/trans_presets.java:651
+#: build/trans_presets.java:858 build/trans_presets.java:877
+#: build/trans_presets.java:891 build/trans_presets.java:913
+#: build/trans_presets.java:950 build/trans_presets.java:963
+#: build/trans_presets.java:975 build/trans_presets.java:987
+#: build/trans_presets.java:999 build/trans_presets.java:1011
+#: build/trans_presets.java:1021 build/trans_presets.java:1030
+#: build/trans_presets.java:1039 build/trans_presets.java:1440
+#: build/trans_presets.java:1513
 msgid "Bicycle"
 msgstr "Vélos"
@@ -8003,28 +8224,28 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:325 build/trans_presets.java:649
-#: build/trans_presets.java:856 build/trans_presets.java:875
-#: build/trans_presets.java:889 build/trans_presets.java:911
-#: build/trans_presets.java:948 build/trans_presets.java:961
-#: build/trans_presets.java:973 build/trans_presets.java:985
-#: build/trans_presets.java:997 build/trans_presets.java:1009
-#: build/trans_presets.java:1019 build/trans_presets.java:1028
-#: build/trans_presets.java:1037
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:326 build/trans_presets.java:650
+#: build/trans_presets.java:857 build/trans_presets.java:876
+#: build/trans_presets.java:890 build/trans_presets.java:912
+#: build/trans_presets.java:949 build/trans_presets.java:962
+#: build/trans_presets.java:974 build/trans_presets.java:986
+#: build/trans_presets.java:998 build/trans_presets.java:1010
+#: build/trans_presets.java:1020 build/trans_presets.java:1029
+#: build/trans_presets.java:1038
 msgid "Foot"
 msgstr "Piétons"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Dessiner les flèches de direction"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Dessin rapide (moins joli)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
@@ -8033,34 +8254,34 @@
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Only on the head of a way."
 msgstr "Seulement à l'extrémité du chemin."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Afficher l’ordre des segments"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Dessiner les frontières des données téléchargées"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Dessiner des nœuds virtuels dans le mode sélection"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Dessiner les calques inactifs avec une autre couleur"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Lissage de la carte (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:82
 msgid "Draw lines between raw GPS points"
 msgstr "Dessine des lignes entre les points GPS bruts"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -8070,9 +8291,9 @@
 "Entrez '-1' pour dessiner toutes les lignes."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
 msgid "Maximum length for local files (meters)"
 msgstr "Longueur maximale des fichiers locaux (mètres)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
@@ -8081,10 +8302,10 @@
 "dessiner toutes les lignes."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length (meters)"
 msgstr "Longueur maximale (en mètres)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -8093,5 +8314,5 @@
 "d’information sur les lignes."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:129
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
@@ -8099,5 +8320,5 @@
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:135
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -8106,5 +8327,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:141
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -8114,13 +8335,13 @@
 "valeur l'une de l'autre."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:144
 msgid "Minimum distance (pixels)"
 msgstr "Distance minimum (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Draw larger dots for the GPS points."
 msgstr "Dessine de plus gros points GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -8130,9 +8351,9 @@
 "peut être personnalisée dans le Gestionnaire de Couches"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Colors points and track segments by velocity."
 msgstr "Colorier les points et segments de traces par vitesse"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -8143,37 +8364,37 @@
 "information."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Permet de colorer la trace en fonction de la vitesse."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid "Track and Point Coloring"
 msgstr "Colorier les traces et les points"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202
 msgid "GPS Points"
 msgstr "Points GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "Draw direction hints for way segments."
 msgstr "Dessiner des flêches de direction pour les sections de chemin."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:237
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Afficher l’ordre de tous les segments de ce chemin."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Appliquer un lissage des dessins de la carte."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Dessiner les limites des données chargées depuis le serveur."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -8182,9 +8403,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257
 msgid "Draw the inactive data layers in a different color."
 msgstr "Dessiner les calques de données inactifs avec une autre couleur."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "OSM Data"
 msgstr "Données OSM"
@@ -8267,45 +8488,46 @@
 msgstr "style utilisé"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Configure available plugins."
 msgstr "Configurer les greffons disponibles."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50
+#. buttons at the bottom
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
 msgid "Download List"
 msgstr "Télécharger la liste"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:100
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 msgid "Update"
 msgstr "Actualiser"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Configure Sites..."
 msgstr "Configurer les sites..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:125
 msgid "Add JOSM Plugin description URL."
 msgstr "Ajouter une description à l'URL des greffons de JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:126
 msgid "Enter URL"
 msgstr "Saisir l'URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:162
 msgid "Please select an entry."
 msgstr "Veuillez sélectionner une entrée."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:147
 msgid "Edit JOSM Plugin description URL."
 msgstr "Modifier la description de l'URL des greffons de JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:148
 msgid "JOSM Plugin description URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:175
 msgid "Configure Plugin Sites"
 msgstr "Configurer les sites de greffon."
@@ -8659,6 +8881,6 @@
 msgstr "<multiple>"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:369
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341
 #, java-format
 msgid "Remove old keys from up to {0} object"
@@ -8667,11 +8889,11 @@
 msgstr[1] "Enlever des clés anciennes d'au maximum {0} objets"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135
 msgid "Add a new tag"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161
+msgstr "AJouter un nouvel attribut"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160
 msgid "Delete the selection in the tag table"
-msgstr ""
+msgstr "Supprimer la sélection dans la table des attributs"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:427
@@ -8704,7 +8926,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:68
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:75
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -8748,4 +8970,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24
+#, fuzzy, java-format
+msgid "Preset group ''{0}'' of group ''{1}''"
+msgstr "Utiliser la balise \"{0}\" du groupe \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
 #, java-format
 msgid "Preset group ''{0}''"
@@ -8766,4 +8993,10 @@
 msgstr "Téléchargement des points {0} à {1}..."
 
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, fuzzy, java-format
+msgid "parameter ''{0}'' > 0 expected. Got {1}"
+msgstr "paramètre \"{0}\" > 0 attendu, reçu \"{1}\""
+
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8874,5 +9107,5 @@
 msgstr "Échec de l’analyse du fichier \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
 msgid "Parse error: invalid document structure for gpx document"
 msgstr ""
@@ -9002,10 +9235,11 @@
 "Communication établie avec {0} en utilisant le protocole de version {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
 msgstr "format d’id inattendu reçu du serveur, reçu \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -9015,75 +9249,79 @@
 "\"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315
 msgid "Creating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
 #, java-format
 msgid "Successfully opened changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#, fuzzy, java-format
+msgid "id of changeset > 0 required. Got {0}"
+msgstr "paramètre {0} > 0 requis. Reçu {1}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
-#, java-format
-msgid "Changeset {0} is unchanged. Skipping update."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
 #, java-format
 msgid "Updating changeset {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
-msgid ""
-"Failed to update changeset. Either there is no current changeset or the id "
-"of the current changeset is 0"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
 msgid "Closing changeset..."
 msgstr "Fermeture de la révision..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
-#, java-format
-msgid "Closing changeset {0}..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
-#, java-format
-msgid "Leaving changeset {0} open..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
 msgid "No changeset present for diff upload"
 msgstr "Pas de nouveau changement à envoyer"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414
 msgid "Preparing..."
 msgstr "Préparation en cours..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419
 msgid "Uploading..."
 msgstr "Envoi en cours..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438
 msgid "Waiting 10 seconds ... "
 msgstr "Attends 10 secondes… "
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449
 msgid "OK - trying again."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:485
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517
 #, java-format
 msgid "Starting retry {0} of {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
+msgid "current changeset is null. Can't upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
+#, java-format
+msgid "id of current changeset > required. Current id is {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
+#, java-format
+msgid "Open changeset expected. Got closed changeset with id {0}"
 msgstr ""
 
@@ -9109,33 +9347,98 @@
 msgstr "Fichier bz2 invalide."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
+#, fuzzy, java-format
+msgid "missing mandatory attribute ''{0}''"
+msgstr "attribut obligatoire \"{0}\" manquant"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:128
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:134
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
+#, fuzzy, java-format
+msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+"valeur non autorisée pour l’attribut obligatoire \"{0}\" de type int, reçu "
+"\"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
+#, fuzzy, java-format
+msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+"valeur non autorisée pour l’attribut obligatoire \"{0}\" de type int, reçu "
+"\"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
+#, fuzzy, java-format
+msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+"valeur non autorisée pour l’attribut obligatoire \"{0}\" de type int, reçu "
+"\"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#, java-format
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#, java-format
+msgid "Unsupported version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:176
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Aborting."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#, java-format
+msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
+#, fuzzy
+msgid "Parsing list of changesets..."
+msgstr "Fermeture de la révision..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
 msgid "Incorrect password or username."
 msgstr "Mot de passe ou nom d’utilisateur incorrect."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:168
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 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:172
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 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:178
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
 msgid "Enter Password"
 msgstr "Entrer le mot de passe"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 msgid "Login"
 msgstr "Identifiant"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:242
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
 msgid "The base URL for the OSM server (REST API)"
 msgstr "URL de base du serveur OSM (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
 msgid "Login name (e-mail) to the OSM account."
 msgstr "Nom d'utilisateur (e-mail) du compte OSM."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -9144,17 +9447,17 @@
 "aucun mot de passe."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
 msgid "Base Server URL"
 msgstr "URL du serveur de base"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
 msgid "OSM username (e-mail)"
 msgstr "Nom d'utilisateur OSM (e-mail))"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
 msgid "OSM password"
 msgstr "Mot de passe OSM"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -9166,5 +9469,5 @@
 "encodé dans l'URL.<br><b>N'utilisez pas un mot de passe de valeur.</b></html>"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:51
+#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #, java-format
 msgid "(at line {0}, column {1})"
@@ -9268,20 +9571,5 @@
 msgstr "Erreur pendant l’analyse syntaxique."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124
-#, fuzzy, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr "attribut obligatoire \"{0}\" manquant"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
-#, fuzzy, java-format
-msgid "Missing mandatory attribute ''{0}''"
-msgstr "attribut obligatoire \"{0}\" manquant"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
-#, fuzzy, java-format
-msgid "Unsupported version: {0}"
-msgstr "Version inconnue : {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:155
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -9290,79 +9578,64 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
 msgid "found XML element <nd> element not as direct child of element <way>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
-msgstr "attribut obligatoire \"{0}\" manquant"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
 msgstr ""
-"Donnée invalide pour l’attribut \"ref\" sur un membre de la relation {0}, "
-"valeur {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
 msgid "Found XML element <member> not as direct child of element <relation>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}"
-msgstr "Attribut \"ref\" manquant sur un membre de la relation {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
-"Donnée invalide pour l’attribut \"ref\" sur un membre de la relation {0}, "
-"valeur {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
-#, fuzzy, java-format
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}"
-msgstr "Attribut \"type\" manquant sur le membre {0} de la relation {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#, java-format
 msgid ""
 "Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}."
 msgstr ""
-"Donnée invalide pour l’attribut \"ref\" sur un membre de la relation {0}, "
-"valeur {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Champ <member> incomplet avec ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
-#, java-format
-msgid "Warning: Undefined element ''{0}'' found in input stream. Skipping."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
-#, fuzzy, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
-msgstr ""
-"valeur non autorisée pour l’attribut obligatoire \"{0}\" de type int, reçu "
-"\"{1}\""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Skipping."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
 msgid "Illegal object with id=0"
 msgstr "L’objet avec l’id=0 est illégal"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#, java-format
 msgid ""
 "Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
 msgstr ""
-"Donnée invalide pour l'attribut \"version\" sur la primitive OSM d'id {0}, "
-"valeur {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:303
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
 #, java-format
 msgid ""
@@ -9371,5 +9644,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
 #, java-format
 msgid ""
@@ -9378,5 +9651,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
@@ -9386,27 +9659,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:316
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#, java-format
 msgid "Unknown or unsupported API version. Got {0}"
-msgstr "Version inconnue : {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#, java-format
 msgid "Missing attribute ''version'' on OSM primitive with id {0}"
-msgstr "Attribut \"version\" manquant sur la primitive OSM d’id {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#, java-format
 msgid "Missing required attribute ''{0}''."
-msgstr "Attribut requis manquant \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
 msgstr ""
-"valeur non autorisée pour l’attribut obligatoire \"{0}\" de type int, reçu "
-"\"{1}\""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
 #, java-format
 msgid ""
@@ -9414,5 +9685,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
 #, java-format
 msgid ""
@@ -9421,5 +9692,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
 #, java-format
 msgid ""
@@ -9427,24 +9698,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#, java-format
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
 "id ''{1}''"
-msgstr "impossible de comparer la primitive d’id \"{0}\" à celle d’id \"{1}\""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
 msgid "Prepare OSM data..."
 msgstr "Préparation des données de OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 msgid "Parsing OSM data..."
-msgstr "Scrutation des données de l'historique d'OSM..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
 msgid "Preparing data set..."
-msgstr "Préparation des données..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
@@ -9466,4 +9735,24 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51
+#, fuzzy
+msgid "Reading changesets..."
+msgstr "Fermeture de la révision..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
+#, fuzzy
+msgid "Downloading changesets ..."
+msgstr "Fermeture de la révision..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85
+#, fuzzy, java-format
+msgid "Reading changeset {0} ..."
+msgstr "Lecture de {0}..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91
+#, fuzzy, java-format
+msgid "Downloading changeset {0} ..."
+msgstr "Téléchargement du greffon {0}..."
+
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
@@ -9479,10 +9768,14 @@
 msgstr "Contact du serveur..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
 msgid "Failed to open connection to API {0}"
 msgstr "Echec de l’ouverture de connexion à l’API {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
+msgid "Error: failed to add authentication credentials to the connection."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -9491,33 +9784,54 @@
 "Internet."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+msgid "XML tag <user> is missing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
+#, fuzzy, java-format
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgstr "Utiliser la balise \"{0}\" du groupe \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
+#, fuzzy, java-format
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgstr ""
+"valeur non autorisée pour l’attribut obligatoire \"{0}\" de type int, reçu "
+"\"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
 msgid "Starting to upload with one request per primitive ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
 msgid "Starting to upload in one request ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:171
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135
 msgid "Uploading data ..."
-msgstr "Envoi en cours..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:178
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
 msgid ""
 "WARNING: no API version defined for data to upload. Falling back to version "
@@ -9525,5 +9839,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147
 #, java-format
 msgid ""
@@ -9533,10 +9847,10 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
 msgid "Update Plugins"
 msgstr "Mise à jour des greffons"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 msgid "Download Plugins"
 msgstr "Télécharger les greffons"
@@ -9647,5 +9961,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:290
 msgid "<html>"
-msgstr ""
+msgstr "<html>"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291
@@ -9698,5 +10012,5 @@
 msgstr "Plus de détails"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -9705,18 +10019,18 @@
 msgstr[1] "La liste des geffons a été obtenue à partir de {0} sites."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
 msgid "No plugin information found."
 msgstr "Pas d'information sur les greffons trouvée."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr "Le plugin {0} n'est pas disponible. Mise à jour annulée."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:93
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
 msgid "All installed plugins are up to date."
 msgstr "Tous les greffons installés sont à jour."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
 #, java-format
 msgid ""
@@ -9729,9 +10043,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
 msgid "Download missing plugins"
 msgstr "Télécharger les greffons manquants"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
 #, java-format
 msgid ""
@@ -9746,43 +10060,43 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
 msgid "unknown"
 msgstr "inconnu"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Version {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 msgid "Plugin bundled with JOSM"
 msgstr "Greffon intégré à JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:357
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -9914,5 +10228,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:165
-#, fuzzy
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -9920,6 +10233,4 @@
 "community."
 msgstr ""
-"La taille maximum de la zone à télécharger est 0.25 et votre requête en "
-"demande plus. Demandez un plus petit nombre ou utilisez le planet.osm"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:168
@@ -10078,13 +10389,17 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:59
 msgid "Private (only shared as anonymous, unordered points)"
-msgstr ""
+msgstr "Privé (partagé uniquement comme anonyme, points non ordonnés)"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:60
 msgid "Public (shown in trace list and as anonymous, unordered points)"
 msgstr ""
+"Public (montré dans la liste des traces et comme anonyme, points non "
+"ordonnés)"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:61
 msgid "Trackable (only shared as anonymous, ordered points with timestamps)"
 msgstr ""
+"Cheminable (uniquement partagé en tant qu'anonyme, points ordonnés avec "
+"timestamps)"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:62
@@ -10093,4 +10408,6 @@
 "timestamps)"
 msgstr ""
+"Identifiable (montré dans la liste des traces comme identifiable, points "
+"ordonnés avec timestamps)"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
@@ -10106,23 +10423,19 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
 msgid "Visibility"
-msgstr ""
+msgstr "Visibilité"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
 msgid "Defines the visibility of your trace for other OSM users."
 msgstr ""
+"Définissez la visibilité de vos traces pour les autres utilisateurs "
+"d'OpenStreetMap."
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:140
 msgid "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
-msgstr ""
+msgstr "http://wiki.openstreetmap.org/wiki/FR:Visibility_of_GPS_traces"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:140
 msgid "(What does that mean?)"
-msgstr ""
-
-#. item "Relations/Route" text "Symbol description"
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3148
-msgid "Description"
-msgstr "Description"
+msgstr "Qu'est-ce que cela signifie ?"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
@@ -10132,5 +10445,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:145
 msgid "Tags (comma delimited)"
-msgstr ""
+msgstr "Attributs (séparés par des virgules)"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:146
@@ -10597,4 +10910,6 @@
 "or action canceled"
 msgstr ""
+"Village/Ville {0} non trouvé ou non disponible\n"
+"ou action annulée"
 
 #. this below is a temporary workaround to fix the "always on top" issue
@@ -10861,4 +11176,7 @@
 "projections and retry"
 msgstr ""
+"Pour activer le plugin WMS du cadastre, changez\n"
+"la projection actuelle vers une du cadastre\n"
+"et réessayez"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:47
@@ -10923,6 +11241,7 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
-msgid "Set "
-msgstr ""
+#, fuzzy, java-format
+msgid "Set {0} Lambert coordinates"
+msgstr "Conserver leurs coordonnées"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -11560,6 +11879,6 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 #: build/trans_style.java:990 build/trans_style.java:1007
-#: build/trans_style.java:1023 build/trans_style.java:3392
-#: build/trans_style.java:3400
+#: build/trans_style.java:1023 build/trans_style.java:3400
+#: build/trans_style.java:3408
 msgid "water"
 msgstr "eau"
@@ -11863,4 +12182,57 @@
 msgstr "Mesures"
 
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Michigan Left"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Adds no left turn for sets of 4 or 5 ways."
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45
+#, fuzzy
+msgid "Please select 4 or 5 ways to assign no left turns."
+msgstr ""
+"Veuillez sélectionner un ou plusieurs chemins fermés ou au moins quatre "
+"nœuds."
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61
+#, fuzzy, java-format
+msgid "{0} extrem nodes."
+msgstr "{0} nœud"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69
+#, fuzzy, java-format
+msgid "Via node {0}, {1}"
+msgstr "Changer {0} {1}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75
+#, fuzzy, java-format
+msgid "{0} via nodes."
+msgstr "{0} nœud"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78
+msgid "Unable to find via nodes. Please check your selection"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98
+#, fuzzy, java-format
+msgid "MIddle way: {0}"
+msgstr "Ajouter le chemin {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121
+msgid "Create Michigan left turn restriction"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129
+#, fuzzy, java-format
+msgid "Processing {0}"
+msgstr "Version {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142
+#, fuzzy, java-format
+msgid "Relation: from {0} to {1} via {2}"
+msgstr "Version {0} créée le {1} par {2}"
+
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
 msgid "OpenLayers"
@@ -12020,7 +12392,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
-#, fuzzy
 msgid "create new objects"
-msgstr "Créer un nouveau nœud."
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
@@ -12085,7 +12456,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
-#, fuzzy
 msgid "Remote Control has been asked to create a new node."
-msgstr "Il a été demandé à Remote Control de charger les données depuis l'API."
+msgstr "Il a été demandé à Remote Control de créer un nouveau nœud."
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
@@ -12348,5 +12718,5 @@
 msgstr "Lance la fenêtre de l'éditeur d'étiquette"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:158
 msgid "JOSM Tag Editor Plugin"
 msgstr "Greffon d'édition des étiquettes JOSM"
@@ -12356,5 +12726,5 @@
 msgstr "Surligner"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:370
 #, java-format
 msgid "Updating properties of up to {0} object"
@@ -12363,20 +12733,4 @@
 msgstr[1] "Mise à jour de propriétés d'au maximum {0} objets"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44
-msgid "INFO: entering compatibilty mode for JOSM with Main.ds"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47
-msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49
-msgid ""
-"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-"found."
-msgstr ""
-"Version inattendue de JOSM. Ni Main.ds ni Main.getCurrentDataSet() ont été "
-"trouvés."
-
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
 msgid "Group"
@@ -12386,9 +12740,4 @@
 msgid "Item"
 msgstr "Elément"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-msgid "Filter"
-msgstr "Filtrez"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63
@@ -12478,5 +12827,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2272
 msgid "Street name"
 msgstr "Nom de la rue"
@@ -12646,8 +12995,4 @@
 msgid "Zoom (in metres)"
 msgstr "Zoom (en mètres)"
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
-msgid "URL"
-msgstr "URL"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -12850,7 +13195,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:460
-#, fuzzy
 msgid "Fixing errors ..."
-msgstr "Attends 10 secondes… "
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:484
@@ -12860,7 +13204,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501
-#, fuzzy
 msgid "Updating map ..."
-msgstr "Mise à jour des données"
+msgstr "Mise-à-jour de la carte…"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69
@@ -12890,4 +13233,6 @@
 "the same layer, but are not connected by a node."
 msgstr ""
+"Ce test vérifie si deux routes, voix ferrées, canaux ou bâtiments se "
+"croisent dans le même calque, mais ne sont pas connecté par un nœud."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
@@ -13366,7 +13711,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
-#: build/trans_style.java:4179
+#: build/trans_style.java:4159 build/trans_style.java:4166
+#: build/trans_style.java:4173 build/trans_style.java:4180
+#: build/trans_style.java:4187
 msgid "building"
 msgstr "bâtiment"
@@ -13380,5 +13725,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4186
+#: build/trans_style.java:4194
 msgid "area"
 msgstr "zone"
@@ -13515,10 +13860,10 @@
 msgstr "Sélectionner le nœud de départ à la fin d'un chemin"
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:148
 msgid "Reached the end of the line"
 msgstr "Fin de la ligne atteinte"
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:155
 msgid "Reached a junction"
 msgstr "Intersection atteinte"
@@ -13709,5 +14054,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96
 msgid "(deactivated)"
-msgstr ""
+msgstr "(désactivé)"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:143
@@ -13844,12 +14189,10 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
-#, fuzzy
 msgid "% of east:"
-msgstr "% de lat. :"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
-#, fuzzy
 msgid "% of north:"
-msgstr "% de lat. :"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -13980,5 +14323,5 @@
 #: build/trans_plugins.java:23
 msgid "Visualizes routing information as a routing graph."
-msgstr ""
+msgstr "Visualiser les informations de routage comme un claque de routage."
 
 #. Plugin grid
@@ -14023,6 +14366,11 @@
 "GPS)."
 
+#. Plugin michigan_left
+#: build/trans_plugins.java:35
+msgid "Adds no left turn for sets of 4 or 5 ways"
+msgstr ""
+
 #. Plugin nearclick
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid ""
 "Simulates a click when you do a small and short drag. This is usefull for "
@@ -14035,15 +14383,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid "Displays an OpenLayers background image"
 msgstr "Affiche une image d'arrière plan provenant d'OpenLayers"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importe les erreurs d'OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -14053,5 +14401,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -14061,5 +14409,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -14070,15 +14418,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "L'apparence et le ressenti du superbe JGoodies Plastic"
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Let other applications send commands to JOSM."
 msgstr "Permet aux autres applications d'envoyer des commandes vers JOSM."
 
 #. Plugin routes
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -14090,10 +14438,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Provides routing capabilities."
 msgstr "Fournit des capacités de routage/calcul d'itinéraire"
 
 #. Plugin slippymap
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -14104,10 +14452,10 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Permet d'ajouter des marqueurs/points sur les positions GPS courantes."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
@@ -14116,5 +14464,5 @@
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -14127,10 +14475,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Make terraced houses out of single blocks."
 msgstr "Crée des maisons mytoyennes depuis des blocs entiers."
 
 #. Plugin usertools
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -14142,5 +14490,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -14151,5 +14499,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -14161,17 +14509,19 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
 "plugin is still under early development and may be buggy."
 msgstr ""
+"Permet le téléchargement de cartes scannée et tuilées depuis walking-papers."
+"org. Ce plugin est encore en développement et pourrait contenir des bugs"
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Téléchargement facile le long de plusieurs chemins interconnectés"
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -14229,4 +14579,10 @@
 #. <annotations>
 #: build/trans_presets.java:57
+#, fuzzy
+msgid "Highways"
+msgstr "highway"
+
+#. group "Highways"
+#: build/trans_presets.java:58
 msgid "Streets"
 msgstr "Rues"
@@ -14237,5 +14593,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:58 build/trans_surveyor.java:72
+#: build/trans_presets.java:59 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Autoroute"
@@ -14244,5 +14600,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:61
+#: build/trans_presets.java:62
 msgid "Edit Motorway"
 msgstr "Éditer une autoroute"
@@ -14269,8 +14625,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:120 build/trans_presets.java:140
-#: build/trans_presets.java:177 build/trans_presets.java:197
-#: build/trans_presets.java:1557 build/trans_presets.java:3146
+#: build/trans_presets.java:65 build/trans_presets.java:101
+#: build/trans_presets.java:121 build/trans_presets.java:141
+#: build/trans_presets.java:178 build/trans_presets.java:198
+#: build/trans_presets.java:1560 build/trans_presets.java:3158
 msgid "Reference"
 msgstr "Référence"
@@ -14284,8 +14640,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:358
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:359
 msgid "Lanes"
 msgstr "Voies"
@@ -14302,15 +14658,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:224 build/trans_presets.java:280
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:373 build/trans_presets.java:388
-#: build/trans_presets.java:412 build/trans_presets.java:431
-#: build/trans_presets.java:452 build/trans_presets.java:472
-#: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1307
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:225 build/trans_presets.java:281
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:374 build/trans_presets.java:389
+#: build/trans_presets.java:413 build/trans_presets.java:432
+#: build/trans_presets.java:453 build/trans_presets.java:473
+#: build/trans_presets.java:511 build/trans_presets.java:667
+#: build/trans_presets.java:1310
 msgid "Max. speed (km/h)"
 msgstr "Vitesse max (km/h)"
@@ -14347,16 +14703,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:293 build/trans_presets.java:306
-#: build/trans_presets.java:320 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:464
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:659 build/trans_presets.java:1300
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:294 build/trans_presets.java:307
+#: build/trans_presets.java:321 build/trans_presets.java:353
+#: build/trans_presets.java:405 build/trans_presets.java:425
+#: build/trans_presets.java:445 build/trans_presets.java:465
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:660 build/trans_presets.java:1303
 msgid "Oneway"
 msgstr "Sens unique"
@@ -14398,19 +14754,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:353
-#: build/trans_presets.java:362 build/trans_presets.java:405
-#: build/trans_presets.java:425 build/trans_presets.java:445
-#: build/trans_presets.java:465 build/trans_presets.java:485
-#: build/trans_presets.java:504 build/trans_presets.java:523
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:586 build/trans_presets.java:607
-#: build/trans_presets.java:628 build/trans_presets.java:660
-#: build/trans_presets.java:1301 build/trans_surveyor.java:12
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:354
+#: build/trans_presets.java:363 build/trans_presets.java:406
+#: build/trans_presets.java:426 build/trans_presets.java:446
+#: build/trans_presets.java:466 build/trans_presets.java:486
+#: build/trans_presets.java:505 build/trans_presets.java:524
+#: build/trans_presets.java:545 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629 build/trans_presets.java:661
+#: build/trans_presets.java:1304 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Pont"
@@ -14446,19 +14802,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:354
-#: build/trans_presets.java:378 build/trans_presets.java:406
-#: build/trans_presets.java:426 build/trans_presets.java:446
-#: build/trans_presets.java:466 build/trans_presets.java:486
-#: build/trans_presets.java:505 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629 build/trans_presets.java:661
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:355
+#: build/trans_presets.java:379 build/trans_presets.java:407
+#: build/trans_presets.java:427 build/trans_presets.java:447
+#: build/trans_presets.java:467 build/trans_presets.java:487
+#: build/trans_presets.java:506 build/trans_presets.java:525
+#: build/trans_presets.java:546 build/trans_presets.java:567
+#: build/trans_presets.java:588 build/trans_presets.java:609
+#: build/trans_presets.java:630 build/trans_presets.java:662
+#: build/trans_presets.java:1305
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -14492,18 +14848,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:73 build/trans_presets.java:90
-#: build/trans_presets.java:110 build/trans_presets.java:129
-#: build/trans_presets.java:150 build/trans_presets.java:166
-#: build/trans_presets.java:186 build/trans_presets.java:205
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:355
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:467
-#: build/trans_presets.java:487 build/trans_presets.java:506
-#: build/trans_presets.java:525 build/trans_presets.java:546
-#: build/trans_presets.java:567 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:630
-#: build/trans_presets.java:662 build/trans_presets.java:1303
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:356
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:468
+#: build/trans_presets.java:488 build/trans_presets.java:507
+#: build/trans_presets.java:526 build/trans_presets.java:547
+#: build/trans_presets.java:568 build/trans_presets.java:589
+#: build/trans_presets.java:610 build/trans_presets.java:631
+#: build/trans_presets.java:663 build/trans_presets.java:1306
 msgid "Cutting"
 msgstr "Découpe"
@@ -14537,18 +14893,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:74 build/trans_presets.java:91
-#: build/trans_presets.java:111 build/trans_presets.java:130
-#: build/trans_presets.java:151 build/trans_presets.java:167
-#: build/trans_presets.java:187 build/trans_presets.java:206
-#: build/trans_presets.java:222 build/trans_presets.java:240
-#: build/trans_presets.java:258 build/trans_presets.java:277
-#: build/trans_presets.java:310 build/trans_presets.java:356
-#: build/trans_presets.java:408 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:468
-#: build/trans_presets.java:488 build/trans_presets.java:507
-#: build/trans_presets.java:526 build/trans_presets.java:547
-#: build/trans_presets.java:568 build/trans_presets.java:589
-#: build/trans_presets.java:610 build/trans_presets.java:631
-#: build/trans_presets.java:663 build/trans_presets.java:1304
+#: build/trans_presets.java:75 build/trans_presets.java:92
+#: build/trans_presets.java:112 build/trans_presets.java:131
+#: build/trans_presets.java:152 build/trans_presets.java:168
+#: build/trans_presets.java:188 build/trans_presets.java:207
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:357
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:469
+#: build/trans_presets.java:489 build/trans_presets.java:508
+#: build/trans_presets.java:527 build/trans_presets.java:548
+#: build/trans_presets.java:569 build/trans_presets.java:590
+#: build/trans_presets.java:611 build/trans_presets.java:632
+#: build/trans_presets.java:664 build/trans_presets.java:1307
 msgid "Embankment"
 msgstr "Remblai"
@@ -14556,5 +14912,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Motorway Link"
 msgstr "Bretelle d’accès d’autoroute"
@@ -14563,5 +14919,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:80
+#: build/trans_presets.java:81
 msgid "Edit Motorway Link"
 msgstr "Éditer une bretelle d’accès d’autoroute"
@@ -14569,5 +14925,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:94
+#: build/trans_presets.java:95
 msgid "Trunk"
 msgstr "Voie rapide"
@@ -14576,5 +14932,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:97
+#: build/trans_presets.java:98
 msgid "Edit Trunk"
 msgstr "Éditer une voie rapide"
@@ -14584,6 +14940,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
 msgid "Motorroad"
 msgstr "Route à accès réglementé"
@@ -14591,5 +14947,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:114
+#: build/trans_presets.java:115
 msgid "Trunk Link"
 msgstr "Bretelle d’accès à une voie rapide"
@@ -14598,5 +14954,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:117
+#: build/trans_presets.java:118
 msgid "Edit Trunk Link"
 msgstr "Éditer une bretelle d’accès à une voie rapide"
@@ -14609,5 +14965,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:134 build/trans_surveyor.java:76
+#: build/trans_presets.java:135 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Route primaire"
@@ -14616,5 +14972,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:137
+#: build/trans_presets.java:138
 msgid "Edit Primary Road"
 msgstr "Éditer une route primaire"
@@ -14622,10 +14978,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:154
+#: build/trans_presets.java:155
 msgid "Primary Link"
 msgstr "Bretelle d’accès à une route primaire"
 
 #. item
-#: build/trans_presets.java:155
+#: build/trans_presets.java:156
 msgid "Edit Primary Link"
 msgstr "Éditer une bretelle d’accès à une route primaire"
@@ -14637,5 +14993,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:170 build/trans_surveyor.java:80
+#: build/trans_presets.java:171 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Route secondaire"
@@ -14645,5 +15001,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:174
+#: build/trans_presets.java:175
 msgid "Edit Secondary Road"
 msgstr "Éditer une route secondaire"
@@ -14651,5 +15007,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:190
+#: build/trans_presets.java:191
 msgid "Tertiary"
 msgstr "Route tertiaire"
@@ -14659,5 +15015,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:194
+#: build/trans_presets.java:195
 msgid "Edit Tertiary Road"
 msgstr "Éditer une route tertiaire"
@@ -14669,5 +15025,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:209 build/trans_surveyor.java:84
+#: build/trans_presets.java:210 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Route mineure"
@@ -14677,5 +15033,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:213
+#: build/trans_presets.java:214
 msgid "Edit Unclassified Road"
 msgstr "Éditer une route mineure"
@@ -14702,19 +15058,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:225 build/trans_presets.java:243
-#: build/trans_presets.java:261 build/trans_presets.java:281
-#: build/trans_presets.java:314 build/trans_presets.java:359
-#: build/trans_presets.java:375 build/trans_presets.java:389
-#: build/trans_presets.java:413 build/trans_presets.java:432
-#: build/trans_presets.java:453 build/trans_presets.java:473
-#: build/trans_presets.java:491 build/trans_presets.java:511
-#: build/trans_presets.java:532 build/trans_presets.java:553
-#: build/trans_presets.java:574 build/trans_presets.java:595
-#: build/trans_presets.java:616 build/trans_presets.java:637
-#: build/trans_presets.java:667 build/trans_presets.java:680
-#: build/trans_presets.java:693 build/trans_presets.java:706
-#: build/trans_presets.java:719 build/trans_presets.java:732
-#: build/trans_presets.java:745 build/trans_presets.java:1308
-#: build/trans_presets.java:1498 build/trans_presets.java:1540
+#: build/trans_presets.java:226 build/trans_presets.java:244
+#: build/trans_presets.java:262 build/trans_presets.java:282
+#: build/trans_presets.java:315 build/trans_presets.java:360
+#: build/trans_presets.java:376 build/trans_presets.java:390
+#: build/trans_presets.java:414 build/trans_presets.java:433
+#: build/trans_presets.java:454 build/trans_presets.java:474
+#: build/trans_presets.java:492 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:554
+#: build/trans_presets.java:575 build/trans_presets.java:596
+#: build/trans_presets.java:617 build/trans_presets.java:638
+#: build/trans_presets.java:668 build/trans_presets.java:681
+#: build/trans_presets.java:694 build/trans_presets.java:707
+#: build/trans_presets.java:720 build/trans_presets.java:733
+#: build/trans_presets.java:746 build/trans_presets.java:1311
+#: build/trans_presets.java:1501 build/trans_presets.java:1543
 msgid "Width (meters)"
 msgstr "Largeur (mètres)"
@@ -14726,5 +15082,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:228 build/trans_surveyor.java:88
+#: build/trans_presets.java:229 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Rue résidentielle"
@@ -14733,5 +15089,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:231
+#: build/trans_presets.java:232
 msgid "Edit Residential Street"
 msgstr "Éditer une rue résidentielle"
@@ -14756,14 +15112,14 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:611
-#: build/trans_presets.java:632 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "Surface"
 msgstr "Revêtement"
@@ -14784,53 +15140,53 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paved"
 msgstr "avec revêtement"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "unpaved"
 msgstr "sans revêtement"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "asphalt"
 msgstr "Asphalte"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "concrete"
 msgstr "béton"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
 msgid "metal"
 msgstr "Métal"
@@ -14844,22 +15200,22 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
-#: build/trans_style.java:3367
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
+#: build/trans_style.java:3375
 msgid "wood"
 msgstr "bois"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paving_stones"
 msgstr "Pavés"
@@ -14867,77 +15223,77 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "cobblestone"
 msgstr "pavés"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "gravel"
 msgstr "gravier"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "pebblestone"
 msgstr "Graviers"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "compacted"
 msgstr "Compact"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "grass_paver"
 msgstr "Herbe"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "grass"
 msgstr "herbe"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "sand"
 msgstr "sable"
@@ -14945,13 +15301,13 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "ground"
 msgstr "terre"
@@ -14959,5 +15315,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:246
+#: build/trans_presets.java:247
 msgid "Living Street"
 msgstr "Rue résidentielle partagée entre usagers"
@@ -14966,5 +15322,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:249
+#: build/trans_presets.java:250
 msgid "Edit Living Street"
 msgstr "Éditer une rue résidentielle partagée entre usagers"
@@ -14972,5 +15328,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:264
+#: build/trans_presets.java:265
 msgid "Service"
 msgstr "Voie de service"
@@ -14979,5 +15335,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:267
+#: build/trans_presets.java:268
 msgid "Edit Serviceway"
 msgstr "Éditer une voie d’accès"
@@ -14987,18 +15343,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "Serviceway type"
 msgstr "Type Voie de service"
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "alley"
 msgstr "allée"
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "driveway"
 msgstr "acceso  para vehículos (entrada a garage, etc.)"
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "parking_aisle"
 msgstr "parking_aisle"
@@ -15006,5 +15362,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:284
+#: build/trans_presets.java:285
 msgid "Parking Aisle"
 msgstr "Voie de parking"
@@ -15014,5 +15370,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:288
+#: build/trans_presets.java:289
 msgid "Edit Parking Aisle"
 msgstr "Éditer une voie de parking"
@@ -15020,5 +15376,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:298
+#: build/trans_presets.java:299
 msgid "Road (Unknown Type)"
 msgstr "Route (type inconnu)"
@@ -15027,5 +15383,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Edit Road of unknown type"
 msgstr "Éditer une route de type inconnu"
@@ -15034,20 +15390,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:318
+#: build/trans_presets.java:319
 msgid "Road Restrictions"
 msgstr "Rue à accès restreint"
 
 #. item
-#: build/trans_presets.java:319
+#: build/trans_presets.java:320
 msgid "Edit Road Restrictions"
 msgstr "Éditer les restrictions d’une route"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:321
+#: build/trans_presets.java:322
 msgid "Toll"
 msgstr "Péage"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:322
+#: build/trans_presets.java:323
 msgid "No exit (cul-de-sac)"
 msgstr "Sans issue (cul-de-sac)"
@@ -15060,8 +15416,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:323 build/trans_presets.java:529
-#: build/trans_presets.java:550 build/trans_presets.java:571
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:634
+#: build/trans_presets.java:324 build/trans_presets.java:530
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:593 build/trans_presets.java:614
+#: build/trans_presets.java:635
 msgid "Access"
 msgstr "Accès"
@@ -15115,29 +15471,29 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1397
-#: build/trans_presets.java:1398 build/trans_presets.java:1399
-#: build/trans_presets.java:1763 build/trans_presets.java:1773
-#: build/trans_presets.java:2397 build/trans_presets.java:2433
-#: build/trans_presets.java:2442 build/trans_presets.java:2443
-#: build/trans_presets.java:2444 build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:1396
+#: build/trans_presets.java:1397 build/trans_presets.java:1400
+#: build/trans_presets.java:1401 build/trans_presets.java:1402
+#: build/trans_presets.java:1767 build/trans_presets.java:1777
+#: build/trans_presets.java:2408 build/trans_presets.java:2444
+#: build/trans_presets.java:2453 build/trans_presets.java:2454
+#: build/trans_presets.java:2455 build/trans_presets.java:2725
 msgid "yes"
 msgstr "oui"
@@ -15150,40 +15506,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:212
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:212
 msgid "private"
 msgstr "privé"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655
 msgid "designated"
 msgstr "désigné"
@@ -15196,19 +15552,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:219
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:219
 msgid "destination"
 msgstr "destination"
@@ -15231,71 +15587,71 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:205
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:205
 msgid "permissive"
 msgstr "permis par le propriétaire"
 
-#: build/trans_presets.java:323 build/trans_presets.java:327
-#: build/trans_presets.java:330 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636
+#: build/trans_presets.java:324 build/trans_presets.java:328
+#: build/trans_presets.java:331 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637
 msgid "agricultural"
 msgstr "véhicules agricoles"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
-#: build/trans_presets.java:2433 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1396 build/trans_presets.java:1397
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
+#: build/trans_presets.java:2444 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
+#: build/trans_presets.java:2725
 msgid "no"
 msgstr "non"
 
-#: build/trans_presets.java:326
+#: build/trans_presets.java:327
 msgid "Goods"
 msgstr "Biens"
 
-#: build/trans_presets.java:327
+#: build/trans_presets.java:328
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Poids-lourds"
@@ -15310,10 +15666,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:328 build/trans_presets.java:651
-#: build/trans_presets.java:858 build/trans_presets.java:891
-#: build/trans_presets.java:913 build/trans_presets.java:950
-#: build/trans_presets.java:963 build/trans_presets.java:975
-#: build/trans_presets.java:987 build/trans_presets.java:999
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:329 build/trans_presets.java:652
+#: build/trans_presets.java:859 build/trans_presets.java:892
+#: build/trans_presets.java:914 build/trans_presets.java:951
+#: build/trans_presets.java:964 build/trans_presets.java:976
+#: build/trans_presets.java:988 build/trans_presets.java:1000
+#: build/trans_presets.java:1040
 msgid "Horse"
 msgstr "Cheval"
@@ -15329,13 +15685,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:329 build/trans_presets.java:530
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:635 build/trans_presets.java:859
-#: build/trans_presets.java:877 build/trans_presets.java:892
-#: build/trans_presets.java:914 build/trans_presets.java:951
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:330 build/trans_presets.java:531
+#: build/trans_presets.java:552 build/trans_presets.java:573
+#: build/trans_presets.java:594 build/trans_presets.java:615
+#: build/trans_presets.java:636 build/trans_presets.java:860
+#: build/trans_presets.java:878 build/trans_presets.java:893
+#: build/trans_presets.java:915 build/trans_presets.java:952
+#: build/trans_presets.java:965 build/trans_presets.java:977
+#: build/trans_presets.java:989 build/trans_presets.java:1001
+#: build/trans_presets.java:1041
 msgid "Motorcycle"
 msgstr "Motos"
@@ -15350,30 +15706,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:330 build/trans_presets.java:531
-#: build/trans_presets.java:552 build/trans_presets.java:573
-#: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:636 build/trans_presets.java:654
-#: build/trans_presets.java:878 build/trans_presets.java:893
-#: build/trans_presets.java:915 build/trans_presets.java:952
-#: build/trans_presets.java:965 build/trans_presets.java:977
-#: build/trans_presets.java:989 build/trans_presets.java:1001
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:331 build/trans_presets.java:532
+#: build/trans_presets.java:553 build/trans_presets.java:574
+#: build/trans_presets.java:595 build/trans_presets.java:616
+#: build/trans_presets.java:637 build/trans_presets.java:655
+#: build/trans_presets.java:879 build/trans_presets.java:894
+#: build/trans_presets.java:916 build/trans_presets.java:953
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1042
 msgid "Motorcar"
 msgstr "Voitures"
 
-#: build/trans_presets.java:331
+#: build/trans_presets.java:332
 msgid "Public Service Vehicles (psv)"
 msgstr "Véhicules de service public"
 
-#: build/trans_presets.java:332
+#: build/trans_presets.java:333
 msgid "Motorboat"
 msgstr "Bateaux à moteur"
 
-#: build/trans_presets.java:333
+#: build/trans_presets.java:334
 msgid "Boat"
 msgstr "Bateaux"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:336
 msgid "Min. speed (km/h)"
 msgstr "Vitesse min (km/h)"
@@ -15381,25 +15737,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:336 build/trans_presets.java:374
+#: build/trans_presets.java:337 build/trans_presets.java:375
 msgid "Max. weight (tonnes)"
 msgstr "Poids max (tonnes)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:337
+#: build/trans_presets.java:338
 msgid "Max. Height (meters)"
 msgstr "Hauteur max. (mètres)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Max. Width (meters)"
 msgstr "Largeur max. (mètres)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:339
+#: build/trans_presets.java:340
 msgid "Max. Length (meters)"
 msgstr "Longueur max. (mètres)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:341
+#: build/trans_presets.java:342
 msgid "Roundabout"
 msgstr "Rond-point"
@@ -15410,5 +15766,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:346
+#: build/trans_presets.java:347
 msgid "Edit Junction"
 msgstr "Éditer une jonction"
@@ -15430,9 +15786,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:349 build/trans_presets.java:648
-#: build/trans_presets.java:788 build/trans_presets.java:1135
-#: build/trans_presets.java:1392 build/trans_presets.java:2353
-#: build/trans_presets.java:2901 build/trans_presets.java:2911
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:350 build/trans_presets.java:649
+#: build/trans_presets.java:789 build/trans_presets.java:1137
+#: build/trans_presets.java:1395 build/trans_presets.java:2364
+#: build/trans_presets.java:2913 build/trans_presets.java:2923
+#: build/trans_presets.java:2932
 msgid "Type"
 msgstr "Type"
@@ -15452,10 +15808,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:547
+#: build/trans_presets.java:350 build/trans_style.java:547
 #: build/trans_style.java:555
 msgid "motorway"
 msgstr "motorway"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "motorway_link"
 msgstr "motorway_link"
@@ -15477,10 +15833,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:563
+#: build/trans_presets.java:350 build/trans_style.java:563
 #: build/trans_style.java:571
 msgid "trunk"
 msgstr "voie rapide"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "trunk_link"
 msgstr "trunk_link"
@@ -15502,10 +15858,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:579
+#: build/trans_presets.java:350 build/trans_style.java:579
 #: build/trans_style.java:587
 msgid "primary"
 msgstr "primary"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "primary_link"
 msgstr "primary_link"
@@ -15527,5 +15883,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:595
+#: build/trans_presets.java:350 build/trans_style.java:595
 #: build/trans_style.java:603
 msgid "secondary"
@@ -15540,9 +15896,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:349 build/trans_style.java:611
+#: build/trans_presets.java:350 build/trans_style.java:611
 msgid "tertiary"
 msgstr "tertiary"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "unclassified"
 msgstr "unclassified"
@@ -15556,9 +15912,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:349 build/trans_style.java:3143
+#: build/trans_presets.java:350 build/trans_style.java:3151
 msgid "residential"
 msgstr "residential"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "living_street"
 msgstr "living_street"
@@ -15588,10 +15944,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:349 build/trans_style.java:667
-#: build/trans_style.java:4244
+#: build/trans_presets.java:350 build/trans_style.java:667
+#: build/trans_style.java:4252
 msgid "service"
 msgstr "service"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "bus_guideway"
 msgstr "bus_guideway"
@@ -15621,6 +15977,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:349 build/trans_style.java:877
-#: build/trans_style.java:3208 build/trans_style.java:3209
+#: build/trans_presets.java:350 build/trans_style.java:877
+#: build/trans_style.java:3216 build/trans_style.java:3217
 msgid "construction"
 msgstr "construction"
@@ -15631,10 +15987,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Edit Bridge"
 msgstr "Éditer un pont"
 
 #. item
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "Edit Tunnel"
 msgstr "Modifier un tunnel"
@@ -15642,19 +15998,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:393
+#: build/trans_presets.java:394
 msgid "Ways"
 msgstr "Chemins"
 
 #. group "Ways"
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Construction"
 msgstr "Construction"
 
 #. item
-#: build/trans_presets.java:395
+#: build/trans_presets.java:396
 msgid "Edit Highway Under Construction"
 msgstr "Éditer une route en construction"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "Junction"
 msgstr "Jonction"
@@ -15670,5 +16026,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:411 build/trans_style.java:895
+#: build/trans_presets.java:412 build/trans_style.java:895
 msgid "roundabout"
 msgstr "roundabout"
@@ -15677,5 +16033,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:417
+#: build/trans_presets.java:418
 msgid "Bridleway"
 msgstr "Chemin équestre"
@@ -15683,5 +16039,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:419
+#: build/trans_presets.java:420
 msgid "Edit Bridleway"
 msgstr "Éditer un chemin équestre"
@@ -15689,5 +16045,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:435
+#: build/trans_presets.java:436
 msgid "Cycleway"
 msgstr "Voie cyclable"
@@ -15697,10 +16053,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:439
+#: build/trans_presets.java:440
 msgid "Edit Cycleway"
 msgstr "Éditer une voie cyclable"
 
 #. item "Ways/Cycleway" check "Embankment"
-#: build/trans_presets.java:449
+#: build/trans_presets.java:450
 msgid "Pedestrians"
 msgstr "Piétons"
@@ -15708,17 +16064,17 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Footway"
-msgstr "Voie piétonnière"
+msgstr "Voie piétonne"
 
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Footway"
 msgstr "Éditer un chemin pour piétons"
 
 #. item "Ways/Footway" check "Embankment"
-#: build/trans_presets.java:469
+#: build/trans_presets.java:470
 msgid "Bikes"
 msgstr "Vélos"
@@ -15726,5 +16082,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:476
+#: build/trans_presets.java:477
 msgid "Pedestrian"
 msgstr "Rue Piétonne"
@@ -15733,5 +16089,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Edit Pedestrian Street"
 msgstr "Éditer une rue piétonne"
@@ -15739,5 +16095,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:494
+#: build/trans_presets.java:495
 msgid "Steps"
 msgstr "Escaliers"
@@ -15747,5 +16103,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:498
+#: build/trans_presets.java:499
 msgid "Edit Flight of Steps"
 msgstr "Éditer des escaliers"
@@ -15754,5 +16110,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:515
+#: build/trans_presets.java:516
 msgid "Track"
 msgstr "Piste"
@@ -15761,5 +16117,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:518
+#: build/trans_presets.java:519
 msgid "Edit Track"
 msgstr "Éditer une route carrossable sans revêtement"
@@ -15767,5 +16123,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:535
+#: build/trans_presets.java:536
 msgid "Track Grade 1"
 msgstr "Piste grade 1"
@@ -15774,5 +16130,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:538
+#: build/trans_presets.java:539
 msgid "Edit Track of grade 1"
 msgstr "Éditer une piste grade 1"
@@ -15780,5 +16136,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:556
+#: build/trans_presets.java:557
 msgid "Track Grade 2"
 msgstr "Piste grade 2"
@@ -15787,5 +16143,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:559
+#: build/trans_presets.java:560
 msgid "Edit Track of grade 2"
 msgstr "Éditer une piste grade 2"
@@ -15793,5 +16149,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:577
+#: build/trans_presets.java:578
 msgid "Track Grade 3"
 msgstr "Piste grade 3"
@@ -15800,5 +16156,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:580
+#: build/trans_presets.java:581
 msgid "Edit Track of grade 3"
 msgstr "Éditer une piste grade 3"
@@ -15806,5 +16162,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:598
+#: build/trans_presets.java:599
 msgid "Track Grade 4"
 msgstr "Piste grade 4"
@@ -15813,5 +16169,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:601
+#: build/trans_presets.java:602
 msgid "Edit Track of grade 4"
 msgstr "Éditer une piste grade 4"
@@ -15819,5 +16175,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:619
+#: build/trans_presets.java:620
 msgid "Track Grade 5"
 msgstr "Piste grade 5"
@@ -15826,5 +16182,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:622
+#: build/trans_presets.java:623
 msgid "Edit Track of grade 5"
 msgstr "Éditer une piste grade 5"
@@ -15833,5 +16189,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:641
+#: build/trans_presets.java:642
 msgid "Path"
 msgstr "Chemin partagé"
@@ -15840,13 +16196,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:644
+#: build/trans_presets.java:645
 msgid "Edit Path"
 msgstr "Editer le chemin"
 
-#: build/trans_presets.java:652
+#: build/trans_presets.java:653
 msgid "Ski"
 msgstr "Ski"
 
-#: build/trans_presets.java:653
+#: build/trans_presets.java:654
 msgid "Snowmobile"
 msgstr "Motoneige"
@@ -15856,6 +16212,6 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:670 build/trans_presets.java:1725
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:671 build/trans_presets.java:1729
+#: build/trans_presets.java:1752
 msgid "Hiking"
 msgstr "Chemin de randonnée"
@@ -15865,5 +16221,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:674
+#: build/trans_presets.java:675
 msgid "Edit Hiking"
 msgstr "Éditer un chemin de randonnée"
@@ -15871,5 +16227,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:683
+#: build/trans_presets.java:684
 msgid "Mountain Hiking"
 msgstr "Chemin de randonnée en montagne"
@@ -15879,5 +16235,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:687
+#: build/trans_presets.java:688
 msgid "Edit Mountain Hiking"
 msgstr "Éditer un chemin de randonnée en montagne"
@@ -15885,5 +16241,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:696
+#: build/trans_presets.java:697
 msgid "Demanding Mountain Hiking"
 msgstr "Chemin de randonnée en montagne exigeant"
@@ -15893,5 +16249,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:700
+#: build/trans_presets.java:701
 msgid "Edit Demanding Mountain Hiking"
 msgstr "Éditer un chemin de randonnée en montagne exigeant"
@@ -15899,5 +16255,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:709
+#: build/trans_presets.java:710
 msgid "Alpine Hiking"
 msgstr "Chemin de randonnée alpin"
@@ -15907,5 +16263,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:713
+#: build/trans_presets.java:714
 msgid "Edit Alpine Hiking"
 msgstr "Éditer un chemin de randonnée alpin"
@@ -15913,5 +16269,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:723
 msgid "Demanding Alpine Hiking"
 msgstr "Chemin de randonnée alpin exigeant"
@@ -15921,5 +16277,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:726
+#: build/trans_presets.java:727
 msgid "Edit Demanding Alpine Hiking"
 msgstr "Éditer un chemin de randonnée alpin exigeant"
@@ -15927,5 +16283,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:735
+#: build/trans_presets.java:736
 msgid "Difficult Alpine Hiking"
 msgstr "Chemin de randonnée alpin difficile"
@@ -15935,5 +16291,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:739
+#: build/trans_presets.java:740
 msgid "Edit Difficult Alpine Hiking"
 msgstr "Éditer un chemin de randonnée alpin difficile"
@@ -15941,10 +16297,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:749
+#: build/trans_presets.java:750
 msgid "Waypoints"
 msgstr "Balises"
 
 #. group "Waypoints"
-#: build/trans_presets.java:750
+#: build/trans_presets.java:751
 msgid "Motorway Junction"
 msgstr "Jonction autoroutière"
@@ -15952,15 +16308,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:752
+#: build/trans_presets.java:753
 msgid "Edit Motorway Junction"
 msgstr "Éditer une jonction autoroutière"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:757
 msgid "Number"
 msgstr "Numéro"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:759
 msgid "Services"
 msgstr "Aire de repos"
@@ -15968,5 +16324,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:761
 msgid "Edit Service Station"
 msgstr "Éditer une aire de repos"
@@ -16004,15 +16360,15 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:765 build/trans_presets.java:902
-#: build/trans_presets.java:1382 build/trans_presets.java:1406
-#: build/trans_presets.java:1413 build/trans_presets.java:1419
-#: build/trans_presets.java:1427 build/trans_presets.java:1434
-#: build/trans_presets.java:1761 build/trans_presets.java:1771
-#: build/trans_presets.java:2361 build/trans_presets.java:2368
-#: build/trans_presets.java:2384 build/trans_presets.java:2395
-#: build/trans_presets.java:2403 build/trans_presets.java:2410
-#: build/trans_presets.java:2464 build/trans_presets.java:2512
-#: build/trans_presets.java:2678 build/trans_presets.java:2693
-#: build/trans_presets.java:2732 build/trans_presets.java:3151
+#: build/trans_presets.java:766 build/trans_presets.java:903
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
+#: build/trans_presets.java:1416 build/trans_presets.java:1422
+#: build/trans_presets.java:1430 build/trans_presets.java:1437
+#: build/trans_presets.java:1765 build/trans_presets.java:1775
+#: build/trans_presets.java:2372 build/trans_presets.java:2379
+#: build/trans_presets.java:2395 build/trans_presets.java:2406
+#: build/trans_presets.java:2414 build/trans_presets.java:2421
+#: build/trans_presets.java:2475 build/trans_presets.java:2523
+#: build/trans_presets.java:2689 build/trans_presets.java:2704
+#: build/trans_presets.java:2743 build/trans_presets.java:3163
 msgid "Operator"
 msgstr "Compagnie"
@@ -16021,5 +16377,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:769
+#: build/trans_presets.java:770
 msgid "Traffic Signal"
 msgstr "Feux tricolores"
@@ -16029,5 +16385,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:774
 msgid "Pedestrian crossing type"
 msgstr "Passage piéton"
@@ -16036,27 +16392,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "uncontrolled"
 msgstr "non contrôlé"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "traffic_signals"
 msgstr "feux tricolores"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "island"
 msgstr "île"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "unmarked"
 msgstr "unmarked"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:774 build/trans_presets.java:790
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:775 build/trans_presets.java:791
+#: build/trans_presets.java:1334
 msgid "Cross on horseback"
 msgstr "Traversée à cheval"
@@ -16064,6 +16420,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:775 build/trans_presets.java:789
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:776 build/trans_presets.java:790
+#: build/trans_presets.java:1335
 msgid "Cross by bicycle"
 msgstr "Traversée à vélo"
@@ -16072,11 +16428,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:776 build/trans_presets.java:791
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:1336
 msgid "Crossing attendant"
 msgstr "Aide à la traversée (personne)"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:778
 msgid "Crossing type name (UK)"
 msgstr "Nom du tpe de passage (UK)"
@@ -16084,30 +16440,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pelican"
 msgstr "pélican"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "toucan"
 msgstr "toucan"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "puffin"
 msgstr "puffin"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pegasus"
 msgstr "pégase"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "tiger"
 msgstr "tigre"
 
 #. </optional>
-#: build/trans_presets.java:780
+#: build/trans_presets.java:781
 msgid "Stop"
 msgstr "Stop"
@@ -16115,5 +16471,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:783
+#: build/trans_presets.java:784
 msgid "Pedestrian Crossing"
 msgstr "Passage piéton"
@@ -16122,14 +16478,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:786
+#: build/trans_presets.java:787
 msgid "Edit Crossing"
 msgstr "Modifier passage piéton sur voie ferrée"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:793
 msgid "Type name (UK)"
 msgstr "Type de nom (UK)"
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:795
 msgid "Mini-roundabout"
 msgstr "Mini-rond-point"
@@ -16140,14 +16496,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "Direction"
 msgstr "Direction"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "clockwise"
 msgstr "sens horaire"
 
-#: build/trans_presets.java:801
+#: build/trans_presets.java:802
 msgid "Turning Circle"
 msgstr "Petit élargissement pour demi-tour"
@@ -16157,20 +16513,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:806
+#: build/trans_presets.java:807
 msgid "City Limit"
 msgstr "Limite de ville"
 
 #. item
-#: build/trans_presets.java:807
+#: build/trans_presets.java:808
 msgid "Edit City Limit Sign"
 msgstr "Éditer un signe de limite de ville"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:812
+#: build/trans_presets.java:813
 msgid "Second Name"
 msgstr "Nom secondaire"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:814
+#: build/trans_presets.java:815
 msgid "Speed Camera"
 msgstr "Radar automatique"
@@ -16178,5 +16534,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:817
+#: build/trans_presets.java:818
 msgid "Emergency Phone"
 msgstr "Téléphone d'urgence"
@@ -16184,5 +16540,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:820
+#: build/trans_presets.java:821
 msgid "Incline"
 msgstr "Descente dangereuse"
@@ -16190,5 +16546,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:823
+#: build/trans_presets.java:824
 msgid "Incline Steep"
 msgstr "Descente très dangereuse"
@@ -16197,10 +16553,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:827
+#: build/trans_presets.java:828
 msgid "Ford"
 msgstr "Gué"
 
 #. item
-#: build/trans_presets.java:828
+#: build/trans_presets.java:829
 msgid "Edit Ford"
 msgstr "Modifier un gué"
@@ -16208,5 +16564,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:835
+#: build/trans_presets.java:836
 msgid "Mountain Pass"
 msgstr "Col de montagne"
@@ -16214,5 +16570,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:837
+#: build/trans_presets.java:838
 msgid "Edit Mountain Pass"
 msgstr "Éditer un col de montagne"
@@ -16224,7 +16580,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:842 build/trans_presets.java:1600
-#: build/trans_presets.java:1745 build/trans_presets.java:2845
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:843 build/trans_presets.java:1604
+#: build/trans_presets.java:1749 build/trans_presets.java:2857
+#: build/trans_presets.java:2864 build/trans_presets.java:2871
 msgid "Elevation"
 msgstr "Altitude"
@@ -16232,5 +16588,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:846
+#: build/trans_presets.java:847
 msgid "Barriers"
 msgstr "Barrières"
@@ -16238,5 +16594,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:849
+#: build/trans_presets.java:850
 msgid "Bollard"
 msgstr "Plot"
@@ -16244,5 +16600,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:852
 msgid "Edit Bollard"
 msgstr "Modifier une bitte d'amarrage"
@@ -16287,16 +16643,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:854 build/trans_presets.java:873
-#: build/trans_presets.java:887 build/trans_presets.java:909
-#: build/trans_presets.java:946 build/trans_presets.java:959
-#: build/trans_presets.java:971 build/trans_presets.java:983
-#: build/trans_presets.java:995 build/trans_presets.java:1007
-#: build/trans_presets.java:1017 build/trans_presets.java:1026
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:855 build/trans_presets.java:874
+#: build/trans_presets.java:888 build/trans_presets.java:910
+#: build/trans_presets.java:947 build/trans_presets.java:960
+#: build/trans_presets.java:972 build/trans_presets.java:984
+#: build/trans_presets.java:996 build/trans_presets.java:1008
+#: build/trans_presets.java:1018 build/trans_presets.java:1027
+#: build/trans_presets.java:1036
 msgid "Allowed traffic:"
 msgstr "Trafic autorisé:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:861
+#: build/trans_presets.java:862
 msgid "Cycle Barrier"
 msgstr "Barrière pour cycles"
@@ -16305,5 +16661,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:865
+#: build/trans_presets.java:866
 msgid "Block"
 msgstr "Ruines"
@@ -16311,5 +16667,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:868
+#: build/trans_presets.java:869
 msgid "Cattle Grid"
 msgstr "Grille dans le sol"
@@ -16317,10 +16673,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:870
+#: build/trans_presets.java:871
 msgid "Edit Cattle Grid"
 msgstr "Modifier une grille dans le sol"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:880
+#: build/trans_presets.java:881
 msgid "Bus Trap"
 msgstr "Entrée de voie de bus (Allemagne)"
@@ -16328,15 +16684,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:883
+#: build/trans_presets.java:884
 msgid "Spikes"
 msgstr "Pointes"
 
 #. item
-#: build/trans_presets.java:884
+#: build/trans_presets.java:885
 msgid "Edit Spikes"
 msgstr "Modifier pointes"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:896
 msgid "Toll Booth"
 msgstr "Péage"
@@ -16344,5 +16700,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:897
+#: build/trans_presets.java:898
 msgid "Edit Toll Booth"
 msgstr "Éditer un péage"
@@ -16350,10 +16706,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:905
+#: build/trans_presets.java:906
 msgid "Border Control"
 msgstr "Douane"
 
 #. item
-#: build/trans_presets.java:906
+#: build/trans_presets.java:907
 msgid "Edit Border Control"
 msgstr "Modifier douane"
@@ -16363,5 +16719,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:920
+#: build/trans_presets.java:921
 msgid "Hedge"
 msgstr "Haie"
@@ -16370,5 +16726,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:925
 msgid "Fence"
 msgstr "Barrière"
@@ -16377,5 +16733,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:929
 msgid "Wall"
 msgstr "Mur"
@@ -16383,5 +16739,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:931
+#: build/trans_presets.java:932
 msgid "City Wall"
 msgstr "Rempart"
@@ -16390,5 +16746,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:935
+#: build/trans_presets.java:936
 msgid "Retaining Wall"
 msgstr "Mur de soutènement"
@@ -16400,15 +16756,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:942
+#: build/trans_presets.java:943
 msgid "Entrance"
 msgstr "Entrée"
 
 #. item
-#: build/trans_presets.java:943
+#: build/trans_presets.java:944
 msgid "Edit Entrance"
 msgstr "Editez une entrée"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:954
+#: build/trans_presets.java:955
 msgid "Gate"
 msgstr "Porte"
@@ -16416,50 +16772,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:956
+#: build/trans_presets.java:957
 msgid "Edit Gate"
 msgstr "Editer une porte"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:967
+#: build/trans_presets.java:968
 msgid "Lift Gate"
 msgstr "Barrière"
 
 #. item
-#: build/trans_presets.java:968
+#: build/trans_presets.java:969
 msgid "Edit Lift Gate"
 msgstr "Modifier une barrière"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:979
+#: build/trans_presets.java:980
 msgid "Hampshire Gate"
 msgstr "Porte de clôture"
 
 #. item
-#: build/trans_presets.java:980
+#: build/trans_presets.java:981
 msgid "Edit Hampshire Gate"
 msgstr "Modifier une Porte de clôture"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:991
+#: build/trans_presets.java:992
 msgid "Bump Gate"
 msgstr "Barrière mobile"
 
 #. item
-#: build/trans_presets.java:992
+#: build/trans_presets.java:993
 msgid "Edit Bump Gate"
 msgstr "Modifier une barrière mobile"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:1003
+#: build/trans_presets.java:1004
 msgid "Kissing Gate"
 msgstr "Portillon à chicane"
 
 #. item
-#: build/trans_presets.java:1004
+#: build/trans_presets.java:1005
 msgid "Edit Kissing Gate"
 msgstr "Modifier un Portillon à chicane"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1013
 msgid "Stile"
 msgstr "Échalier"
@@ -16467,25 +16823,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1014
+#: build/trans_presets.java:1015
 msgid "Edit Stile"
 msgstr "Modifier un échalier"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1023
 msgid "Turnstile"
 msgstr "Tourniquet"
 
 #. item
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1024
 msgid "Edit Turnstile"
 msgstr "Éditer tourniquet"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1032
 msgid "Sally Port"
 msgstr "Écluse"
 
 #. item
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1033
 msgid "Edit Sally Port"
 msgstr "Modifier une écluse"
@@ -16493,13 +16849,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #.
-#. <separator/>
+#. group "Water"
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1046 build/trans_presets.java:1089
+#: build/trans_presets.java:1047 build/trans_presets.java:1048
+#: build/trans_presets.java:1091
 msgid "Water"
 msgstr "Eau"
 
 #. group "Water"
-#: build/trans_presets.java:1047
+#: build/trans_presets.java:1049
 msgid "Spring"
 msgstr "Source"
@@ -16507,5 +16864,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1049
+#: build/trans_presets.java:1051
 msgid "Edit Spring"
 msgstr "Éditer une source"
@@ -16513,5 +16870,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1056
 msgid "Drain"
 msgstr "Canal d’évacuation"
@@ -16519,10 +16876,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1058
 msgid "Edit Drain"
 msgstr "Éditer un canal d’évacuation"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1064
 msgid "Stream"
 msgstr "Ruisseau"
@@ -16530,10 +16887,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1066
 msgid "Edit Stream"
 msgstr "Éditer un ruisseau"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1072
 msgid "Canal"
 msgstr "Canal"
@@ -16541,10 +16898,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1074
 msgid "Edit Canal"
 msgstr "Éditer un canal"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1080
 msgid "River"
 msgstr "Rivière"
@@ -16554,5 +16911,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1084
 msgid "Edit River"
 msgstr "Éditer une rivière"
@@ -16560,15 +16917,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1093
 msgid "Edit Water"
 msgstr "Éditer de l’eau"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1097
 msgid "Land"
 msgstr "Terre"
 
 #. item
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1098
 msgid "Edit Land"
 msgstr "Editez un terrain"
@@ -16576,15 +16933,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1103
 msgid "Basin"
 msgstr "Bassin"
 
 #. item
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1104
 msgid "Edit Basin Landuse"
 msgstr "Éditer un bassin"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1109
 msgid "Reservoir"
 msgstr "Bassin de retenue"
@@ -16592,15 +16949,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1109
+#: build/trans_presets.java:1111
 msgid "Edit Reservoir Landuse"
 msgstr "Éditer un bassin de retenue"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1116
 msgid "Covered Reservoir"
 msgstr "Réservoir couvert"
 
 #. item
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1117
 msgid "Edit Covered Reservoir"
 msgstr "Éditer un réservoir couvert"
@@ -16608,5 +16965,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1120
+#: build/trans_presets.java:1122
 msgid "Riverbank"
 msgstr "Lit de rivière"
@@ -16615,10 +16972,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1125
 msgid "Edit Riverbank"
 msgstr "Modifier lit de rivière"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1127
+#: build/trans_presets.java:1129
 msgid "Wetland"
 msgstr "Zone inondable"
@@ -16629,14 +16986,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1134
 msgid "Edit Wetland"
 msgstr "Modifier zone inondable"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "swamp"
 msgstr "marécages"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "bog"
 msgstr "tourbière"
@@ -16650,35 +17007,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1135 build/trans_style.java:3384
+#: build/trans_presets.java:1137 build/trans_style.java:3392
 msgid "marsh"
 msgstr "marais"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "reedbed"
 msgstr "roselière"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "saltmarsh"
 msgstr "marais salant"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "tidalflat"
 msgstr "étendue vaseuse"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "mangrove"
 msgstr "mangrove"
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1139
 msgid "Mud"
 msgstr "Terrain boueux/vase"
 
 #. item
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1140
 msgid "Edit Mud"
 msgstr "Éditer un terrain boueux"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1144
 msgid "Beach"
 msgstr "Plage"
@@ -16686,20 +17043,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1144
+#: build/trans_presets.java:1146
 msgid "Edit Beach"
 msgstr "Éditer une plage"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1150
 msgid "Bay"
 msgstr "Baie"
 
 #. item
-#: build/trans_presets.java:1149
+#: build/trans_presets.java:1151
 msgid "Edit Bay"
 msgstr "Éditer une baie"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1155
 msgid "Cliff"
 msgstr "Falaise"
@@ -16707,10 +17064,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1157
 msgid "Edit Cliff"
 msgstr "Éditer une falaise"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1159
+#: build/trans_presets.java:1161
 msgid "Coastline"
 msgstr "Ligne côtière"
@@ -16718,5 +17075,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1163
 msgid "Edit Coastline"
 msgstr "Éditer une ligne côtière"
@@ -16724,5 +17081,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1168
 msgid "Ferry Route"
 msgstr "Itinéraire de ferry"
@@ -16730,5 +17087,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1170
 msgid "Edit Ferry"
 msgstr "Éditer un itinéraire de ferry"
@@ -16737,5 +17094,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1176
+#: build/trans_presets.java:1178
 msgid "Boatyard"
 msgstr "Chantier naval"
@@ -16743,10 +17100,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:1180
 msgid "Edit Boatyard"
 msgstr "Éditer un chantier naval"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1185
 msgid "Dock"
 msgstr "Dock"
@@ -16754,5 +17111,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1187
 msgid "Edit Dock"
 msgstr "Éditer un dock"
@@ -16760,5 +17117,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1193
 msgid "Dam"
 msgstr "Barrage"
@@ -16766,15 +17123,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1195
 msgid "Edit Dam"
 msgstr "Éditer un barrage"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1199
+#: build/trans_presets.java:1201
 msgid "Waterway Point"
 msgstr "Voie navigable"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1202
 msgid "Lock Gate"
 msgstr "Écluse"
@@ -16783,5 +17140,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1206
 msgid "Weir"
 msgstr "Petit barrage"
@@ -16789,20 +17146,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1208
 msgid "Edit Weir"
 msgstr "Éditer une écluse"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1213
 msgid "Waterfall"
 msgstr "Cascade"
 
 #. item
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1214
 msgid "Edit Waterfall"
 msgstr "Éditer une cascade"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1219
 msgid "Turning Point"
 msgstr "Point de retournement"
@@ -16811,15 +17168,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1221
+#: build/trans_presets.java:1223
 msgid "Marina"
 msgstr "Marina"
 
 #. item
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1224
 msgid "Edit Marina"
 msgstr "Éditer une marina"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1228
 msgid "Pier"
 msgstr "Jetée/Ponton"
@@ -16827,10 +17184,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1230
 msgid "Edit Pier"
 msgstr "Modifier jetée/ponton"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1234
 msgid "Ferry Terminal"
 msgstr "Terminal de Ferry"
@@ -16838,10 +17195,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1236
 msgid "Edit Ferry Terminal"
 msgstr "Editer un terminal de Ferry"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1240
 msgid "Slipway"
 msgstr "Slipway"
@@ -16851,16 +17208,21 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1244
 msgid "Edit Slipway"
 msgstr "Éditer un plan incliné"
 
 #. item "Waterway Point/Slipway" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1250
+#, fuzzy
+msgid "Transport"
+msgstr "Transport public"
+
+#. group "Transport"
+#: build/trans_presets.java:1251
 msgid "Railway"
 msgstr "Voie ferrée"
 
 #. group "Railway"
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1252
 msgid "Rail"
 msgstr "Rail"
@@ -16868,5 +17230,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:1254
 msgid "Edit Rail"
 msgstr "Éditer des rails"
@@ -16896,8 +17258,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "Optional Types"
 msgstr "Types optionels"
@@ -16911,35 +17273,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "yard"
 msgstr "triage"
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "siding"
 msgstr "voie de garage"
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "spur"
 msgstr "embranchement"
 
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1259
 msgid "Narrow Gauge Rail"
 msgstr "Voie ferrée étroite"
 
 #. item
-#: build/trans_presets.java:1257
+#: build/trans_presets.java:1260
 msgid "Edit Narrow Gauge Rail"
 msgstr "Éditer une voie ferrée étroite"
 
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1265
 msgid "Monorail"
 msgstr "Monorail"
@@ -16947,45 +17309,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1267
 msgid "Edit Monorail"
 msgstr "Éditer un monorail"
 
-#: build/trans_presets.java:1269
+#: build/trans_presets.java:1272
 msgid "Preserved"
 msgstr "Préservé"
 
 #. item
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1273
 msgid "Edit Preserved Railway"
 msgstr "Éditer une voie ferrée touristique"
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1278
 msgid "Light Rail"
 msgstr "Rails légers"
 
 #. item
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1279
 msgid "Edit Light Rail"
 msgstr "Éditer des rails légers"
 
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1284
 msgid "Subway"
 msgstr "Voie souterraine"
 
 #. item
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1285
 msgid "Edit Subway"
 msgstr "Éditer un métro"
 
-#: build/trans_presets.java:1287
+#: build/trans_presets.java:1290
 msgid "Tram"
 msgstr "Tram"
 
 #. item
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1291
 msgid "Edit Tram"
 msgstr "Éditer un tram"
 
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1296
 msgid "Bus Guideway"
 msgstr "Voie de guidage de bus"
@@ -16993,5 +17355,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1295
+#: build/trans_presets.java:1298
 msgid "Edit Bus Guideway"
 msgstr "Éditer une voie de guidage de bus"
@@ -17000,14 +17362,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1315
 msgid "Disused Rail"
 msgstr "Voie désaffectée"
 
 #. item
-#: build/trans_presets.java:1313
+#: build/trans_presets.java:1316
 msgid "Edit Disused Railway"
 msgstr "Éditer une voie désaffectée"
 
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1321
 msgid "Abandoned Rail"
 msgstr "Voie abandonnée"
@@ -17016,5 +17378,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1325
 msgid "Level Crossing"
 msgstr "Passage à niveau"
@@ -17023,5 +17385,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1329
 msgid "Crossing"
 msgstr "Passage piéton sur voie ferrée"
@@ -17031,5 +17393,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1333
 msgid "Crossing type"
 msgstr "Type de passage"
@@ -17037,5 +17399,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1339
 msgid "Turntable"
 msgstr "Plaque tournante"
@@ -17044,10 +17406,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1344
 msgid "Aerialway"
 msgstr "Transports aériens par câble"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1345
 msgid "Chair Lift"
 msgstr "Télésiège"
@@ -17055,10 +17417,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1347
 msgid "Edit Chair Lift"
 msgstr "Éditer un télésiège"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1351
 msgid "Drag Lift"
 msgstr "Téléski"
@@ -17066,10 +17428,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1353
 msgid "Edit Drag Lift"
 msgstr "Éditer un téléski"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1357
 msgid "Cable Car"
 msgstr "Télécabine"
@@ -17077,10 +17439,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1359
 msgid "Edit Cable Car"
 msgstr "Éditer un télécabine"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1360
+#: build/trans_presets.java:1363
 msgid "Gondola"
 msgstr "Oeufs"
@@ -17088,5 +17450,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1365
 msgid "Edit Gondola"
 msgstr "Modifier Oeufs"
@@ -17094,5 +17456,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1366 build/trans_presets.java:1461
+#: build/trans_presets.java:1369 build/trans_presets.java:1464
 msgid "Station"
 msgstr "Station"
@@ -17103,10 +17465,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1368 build/trans_presets.java:1464
+#: build/trans_presets.java:1371 build/trans_presets.java:1467
 msgid "Edit Station"
 msgstr "Éditer la station"
 
 #. group "Car"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1378
 msgid "Fuel"
 msgstr "Station service"
@@ -17116,5 +17478,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1382
 msgid "Edit Fuel"
 msgstr "Modifier station essence"
@@ -17172,32 +17534,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1671 build/trans_presets.java:1678
-#: build/trans_presets.java:1686 build/trans_presets.java:1699
-#: build/trans_presets.java:1713 build/trans_presets.java:1810
-#: build/trans_presets.java:1818 build/trans_presets.java:1909
-#: build/trans_presets.java:1915 build/trans_presets.java:2226
-#: build/trans_presets.java:2250 build/trans_presets.java:2465
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1703
+#: build/trans_presets.java:1717 build/trans_presets.java:1814
+#: build/trans_presets.java:1822 build/trans_presets.java:1919
+#: build/trans_presets.java:1925 build/trans_presets.java:2237
+#: build/trans_presets.java:2261 build/trans_presets.java:2476
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Opening Hours"
 msgstr "Horaires d’ouverture"
@@ -17256,91 +17618,91 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "24/7"
 msgstr "24h/24 7j/7"
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Lun-ven 08:30-20:00"
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Mar-dim 08:00-15:00; Sam 08:00-12:00"
@@ -17355,5 +17717,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1385 build/trans_presets.java:1438
+#: build/trans_presets.java:1388 build/trans_presets.java:1441
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -17363,5 +17725,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1391
 msgid "Edit Parking"
 msgstr "Éditer un parking"
@@ -17372,24 +17734,24 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1391 build/trans_presets.java:1762
-#: build/trans_presets.java:1772 build/trans_presets.java:2396
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:1394 build/trans_presets.java:1766
+#: build/trans_presets.java:1776 build/trans_presets.java:2407
+#: build/trans_presets.java:2524
 msgid "Reference number"
 msgstr "Numéro de référence"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "multi-storey"
 msgstr "parking (bâtiment)"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "surface"
 msgstr "surface"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "underground"
 msgstr "souterrain"
 
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1396
 msgid "Park and Ride"
 msgstr "Parking relais"
@@ -17398,38 +17760,38 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1394 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
+#: build/trans_presets.java:1397 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
 msgid "Fee"
 msgstr "Péage/Forfait"
 
 #. <space />
-#: build/trans_presets.java:1396
+#: build/trans_presets.java:1399
 msgid "Capacity (overall)"
 msgstr "Capacité (globale)"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1400
 msgid "Spaces for Disabled"
 msgstr "Espaces pour handicapés"
 
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1401
 msgid "Spaces for Women"
 msgstr "Emplacements pour femmes"
 
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1402
 msgid "Spaces for Parents"
 msgstr "Emplacements pour parents"
 
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1403
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr "Voir le Wiki pour les autres types de capacité : [types]=*."
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1405
 msgid "Wash"
 msgstr "Lavage"
 
 #. item
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1406
 msgid "Edit Car Wash"
 msgstr "Editez un espace de lavage de voitures"
@@ -17437,5 +17799,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1408 build/trans_presets.java:1452
+#: build/trans_presets.java:1411 build/trans_presets.java:1455
 msgid "Shop"
 msgstr "Concession/Réparation"
@@ -17443,15 +17805,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1413
 msgid "Edit Car Shop"
 msgstr "Éditer une concession/réparation"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1418
 msgid "Repair"
 msgstr "Réparer"
 
 #. item
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1419
 msgid "Edit Car Repair"
 msgstr "Editez un garagiste"
@@ -17459,5 +17821,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1421 build/trans_presets.java:1445
+#: build/trans_presets.java:1424 build/trans_presets.java:1448
 msgid "Rental"
 msgstr "Location"
@@ -17466,10 +17828,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1427
 msgid "Edit Car Rental"
 msgstr "Éditer une location de voiture"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1432
 msgid "Sharing"
 msgstr "Partage"
@@ -17477,5 +17839,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1434
 msgid "Edit Car Sharing"
 msgstr "Éditer un covoiturage"
@@ -17483,10 +17845,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Parking"
 msgstr "Éditer un parking à vélo"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1446
 msgid "Capacity"
 msgstr "Capacité"
@@ -17495,5 +17857,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1448
+#: build/trans_presets.java:1451
 msgid "Edit Bicycle Rental"
 msgstr "Éditer une location de vélos"
@@ -17502,15 +17864,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1458
 msgid "Edit Bicycle Shop"
 msgstr "Éditer un magasin de vélo"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1463
 msgid "Public Transport"
 msgstr "Transport public"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:1472
 msgid "UIC-Reference"
 msgstr "Référence UIC"
@@ -17518,5 +17880,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1475
 msgid "Railway Halt"
 msgstr "Halte ferroviaire"
@@ -17524,5 +17886,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1477
 msgid "Edit Halt"
 msgstr "Editez un arrêt"
@@ -17530,5 +17892,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1484
 msgid "Tram Stop"
 msgstr "Arrêt de tram"
@@ -17537,5 +17899,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1484
+#: build/trans_presets.java:1487
 msgid "Edit Tram Stop"
 msgstr "Éditer un arrêt de tram"
@@ -17543,5 +17905,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1494
 msgid "Railway Platform"
 msgstr "Quai"
@@ -17550,5 +17912,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1497
 msgid "Edit Railway Platform"
 msgstr "Éditer un quai"
@@ -17560,5 +17922,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1497 build/trans_presets.java:1539
+#: build/trans_presets.java:1500 build/trans_presets.java:1542
 msgid "Reference (track number)"
 msgstr "Référence (numéro de voie)"
@@ -17566,10 +17928,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1499 build/trans_presets.java:1541
+#: build/trans_presets.java:1502 build/trans_presets.java:1544
 msgid "Area"
 msgstr "Surface"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1504
 msgid "Subway Entrance"
 msgstr "Bouche de métro"
@@ -17578,10 +17940,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1507
 msgid "Edit Subway Entrance"
 msgstr "Éditer une bouche de métro"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1512
 msgid "Wheelchair"
 msgstr "Chaise roulante"
@@ -17590,5 +17952,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1517
 msgid "Bus Station"
 msgstr "Gare routière"
@@ -17597,5 +17959,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1520
 msgid "Edit Bus Station"
 msgstr "Éditer une gare routière"
@@ -17603,5 +17965,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1526
 msgid "Bus Stop"
 msgstr "Arrêt de bus"
@@ -17611,5 +17973,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1530
 msgid "Edit Bus Stop"
 msgstr "Éditer un arrêt de bus"
@@ -17618,6 +17980,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1532 build/trans_presets.java:1785
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:1535 build/trans_presets.java:1789
+#: build/trans_presets.java:2453
 msgid "Shelter"
 msgstr "Abri"
@@ -17625,10 +17987,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1538
 msgid "Bus Platform"
 msgstr "Plateforme de bus"
 
 #. item
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1539
 msgid "Edit Bus Platform"
 msgstr "Éditer une plateforme de bus"
@@ -17636,5 +17998,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1547
 msgid "Taxi"
 msgstr "Taxi"
@@ -17642,5 +18004,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1549
 msgid "Edit Taxi station"
 msgstr "Editez une station de taxi"
@@ -17648,5 +18010,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1554
 msgid "Airport"
 msgstr "Aéroport"
@@ -17654,15 +18016,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1556
 msgid "Edit Airport"
 msgstr "Modifier aéroport"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1561
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1559
+#: build/trans_presets.java:1562
 msgid "ICAO"
 msgstr "ICAO"
@@ -17670,6 +18032,11 @@
 #. item "Public Transport/Airport" text "ICAO"
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1567
+#, fuzzy
+msgid "Travel"
+msgstr "gravier"
+
+#. group "Travel"
+#: build/trans_presets.java:1568
 msgid "Accomodation"
 msgstr "Hôtel"
@@ -17681,5 +18048,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1565 build/trans_surveyor.java:43
+#: build/trans_presets.java:1569 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hôtel"
@@ -17688,15 +18055,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:1568
+#: build/trans_presets.java:1572
 msgid "Edit Hotel"
 msgstr "Éditer un hôtel"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1575
 msgid "Stars"
 msgstr "Étoiles"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1577
 msgid "Motel"
 msgstr "Môtel"
@@ -17704,20 +18071,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1579
 msgid "Edit Motel"
 msgstr "Éditer un motel"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1583
 msgid "Guest House"
 msgstr "Chambre d’hôte"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1584
 msgid "Edit Guest House"
 msgstr "Éditer une chambre d’hôte"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1588
 msgid "Chalet"
 msgstr "Châlet"
@@ -17725,10 +18092,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1590
 msgid "Edit Chalet"
 msgstr "Editez un châlet"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1594
 msgid "Hostel"
 msgstr "Hôtel"
@@ -17736,30 +18103,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1592
+#: build/trans_presets.java:1596
 msgid "Edit Hostel"
 msgstr "Éditer une auberge de jeunesse"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1600
 msgid "Alpine Hut"
 msgstr "Chalet"
 
 #. item
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1601
 msgid "Edit Alpine Hut"
 msgstr "Modifier chalet"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1606
 msgid "Caravan Site"
 msgstr "Site pour caravane"
 
 #. item
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1607
 msgid "Edit Caravan Site"
 msgstr "Éditer un  site pour caravane"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1611
 msgid "Camping Site"
 msgstr "Camping"
@@ -17767,10 +18134,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1613
 msgid "Edit Camping Site"
 msgstr "Éditer un camping"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1618
 msgid "Food+Drinks"
 msgstr "Nourriture & boissons"
@@ -17781,5 +18148,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1615 build/trans_surveyor.java:47
+#: build/trans_presets.java:1619 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -17787,5 +18154,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1621
 msgid "Edit Restaurant"
 msgstr "Éditer un restaurant"
@@ -17793,5 +18160,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "Cuisine"
 msgstr "Cuisine"
@@ -17799,61 +18166,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "italian"
 msgstr "italien"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "chinese"
 msgstr "chinois"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "greek"
 msgstr "greque"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "german"
 msgstr "allemand"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "indian"
 msgstr "indien"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "regional"
 msgstr "régional"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "turkish"
 msgstr "turque"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "asian"
 msgstr "asiatique"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "thai"
 msgstr "thaïlandais"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "mexican"
 msgstr "mexicain"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "japanese"
 msgstr "japonais"
 
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1627
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -17861,9 +18228,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1629
 msgid "Edit Fast Food Restaurant"
 msgstr "Éditer un fast food"
 
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1635
 msgid "Cafe"
 msgstr "Café"
@@ -17871,9 +18238,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1633
+#: build/trans_presets.java:1637
 msgid "Edit Cafe"
 msgstr "Editez un café"
 
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1642
 msgid "Pub"
 msgstr "Bar"
@@ -17881,18 +18248,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1644
 msgid "Edit Pub"
 msgstr "Pub"
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1649
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item
-#: build/trans_presets.java:1646
+#: build/trans_presets.java:1650
 msgid "Edit Biergarten"
 msgstr "Éditer un biergarten"
 
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1655
 msgid "Bar"
 msgstr "Bar"
@@ -17900,9 +18267,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1657
 msgid "Edit Bar"
 msgstr "Modifier Bar"
 
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1662
 msgid "Nightclub"
 msgstr "Boîte de nuit"
@@ -17910,24 +18277,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1664
 msgid "Edit Nightclub"
 msgstr "Éditer une boîte de nuit"
 
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1670
 msgid "Tourism"
 msgstr "Tourisme"
 
 #. group "Tourism"
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1671
 msgid "Attraction"
 msgstr "Attraction"
 
 #. item
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1672
 msgid "Edit Attraction"
 msgstr "Editez une attraction"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1677
 msgid "Museum"
 msgstr "Musée"
@@ -17935,9 +18302,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1679
 msgid "Edit Museum"
 msgstr "Éditer un musée"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1684
 msgid "Zoo"
 msgstr "Zoo"
@@ -17946,9 +18313,9 @@
 #. <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:1683
+#: build/trans_presets.java:1687
 msgid "Edit Zoo"
 msgstr "Editez un Zoo"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1692
 msgid "Viewpoint"
 msgstr "Point de vue"
@@ -17956,24 +18323,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1694
 msgid "Edit Viewpoint"
 msgstr "Éditer un point de vue"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1697
 msgid "Look-Out Tower"
 msgstr "Tour de surveillance"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1699
 msgid "Theme Park"
 msgstr "Parc d’attraction"
 
 #. item
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1700
 msgid "Edit Theme Park"
 msgstr "Éditer un parc d’attraction"
 
-#: build/trans_presets.java:1701
+#: build/trans_presets.java:1705
 msgid "Artwork"
 msgstr "Oeuvre d’art"
@@ -17981,5 +18348,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1707
 msgid "Edit Artwork"
 msgstr "Éditer une oeuvre d’art"
@@ -17987,19 +18354,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1712
 msgid "Information Office"
 msgstr "Office du Tourisme"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1719
 msgid "Map"
 msgstr "Carte"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "topo"
 msgstr ""
@@ -18037,5 +18404,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1720 build/trans_style.java:619
+#: build/trans_presets.java:1724 build/trans_style.java:619
 #: build/trans_style.java:635 build/trans_style.java:651
 #: build/trans_style.java:659
@@ -18043,28 +18410,28 @@
 msgstr "rue"
 
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "scheme"
 msgstr "Schéma"
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "Shown Area"
 msgstr "Zone affichée"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "site"
 msgstr "Site"
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "city"
 msgstr "Ville"
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "region"
 msgstr "Région"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1722 build/trans_presets.java:1738
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1726 build/trans_presets.java:1742
+#: build/trans_presets.java:1786
 msgid "Closer Description"
 msgstr "Description détaillée"
@@ -18074,5 +18441,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1724 build/trans_presets.java:1747
+#: build/trans_presets.java:1728 build/trans_presets.java:1751
 msgid "Routes shown for:"
 msgstr "Routes affichées pour :"
@@ -18080,6 +18447,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1726 build/trans_presets.java:1749
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1965
 msgid "Cycling"
 msgstr "Cyclisme"
@@ -18087,5 +18454,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1727 build/trans_presets.java:1750
+#: build/trans_presets.java:1731 build/trans_presets.java:1754
 msgid "Mountainbiking"
 msgstr "VTT"
@@ -18093,6 +18460,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1728 build/trans_presets.java:1751
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:1732 build/trans_presets.java:1755
+#: build/trans_presets.java:2019
 msgid "Skiing"
 msgstr "Ski"
@@ -18100,82 +18467,82 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1729 build/trans_presets.java:1752
+#: build/trans_presets.java:1733 build/trans_presets.java:1756
 msgid "Riding"
-msgstr ""
+msgstr "Equitation"
 
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1734 build/trans_presets.java:1757
 msgid "... other transportation modes possible"
 msgstr "... autres modes de transport possibles"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1736
 msgid "Information Board"
 msgstr "Bureau d'informations"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "Board Content"
 msgstr "Contenu du panneau"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "notice"
 msgstr "Remarque"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "history"
 msgstr "histoire"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "nature"
 msgstr "nature"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "wildlife"
 msgstr "faune"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "plants"
 msgstr "Usines"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1744
 msgid "Guidepost"
 msgstr "Poteau indicateur"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1759
 msgid "Information Terminal"
-msgstr ""
+msgstr "Poste d'informations"
 
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1760 build/trans_presets.java:1770
+#: build/trans_presets.java:1764 build/trans_presets.java:1774
 msgid "Closer description"
 msgstr "Description précise"
 
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1769
 msgid "Audioguide"
 msgstr "Guide audio"
 
 #. <space />
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1779
 msgid "Audioguide via mobile phone?"
 msgstr "Guide audio via téléphone mobile ?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1780
 msgid "Phone number"
 msgstr "Numéro de téléphone"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1778
+#: build/trans_presets.java:1782
 msgid "Other Information Points"
 msgstr "Autre points d'information"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1790
 msgid "Edit Shelter"
 msgstr "Éditer un abri"
@@ -18183,25 +18550,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1789 build/trans_presets.java:1795
+#: build/trans_presets.java:1793 build/trans_presets.java:1799
 msgid "Fireplace"
 msgstr "Âtre"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1791
+#: build/trans_presets.java:1795
 msgid "Picnic Site"
 msgstr "Site de pique-nique"
 
 #. item
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1796
 msgid "Edit Picnic Site"
 msgstr "Éditer un site de pique-nique"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1802
 msgid "Historic Places"
 msgstr "Patrimoine"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1799
+#: build/trans_presets.java:1803
 msgid "Castle"
 msgstr "Château"
@@ -18210,19 +18577,19 @@
 #. <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:1802
+#: build/trans_presets.java:1806
 msgid "Edit Castle"
 msgstr "Éditer un château"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1810
 msgid "Ruins"
 msgstr "Ruines"
 
 #. item
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1811
 msgid "Edit Ruins"
 msgstr "Éditer des ruines"
 
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1816
 msgid "Archaeological Site"
 msgstr "Site archéologique"
@@ -18231,9 +18598,9 @@
 #. <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:1815
+#: build/trans_presets.java:1819
 msgid "Edit Archaeological Site"
 msgstr "Éditer un site archéologique"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1824
 msgid "Battlefield"
 msgstr "Lieu de bataille"
@@ -18241,5 +18608,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1826
 msgid "Edit Battlefield"
 msgstr "Éditer un lieu de bataille"
@@ -18247,15 +18614,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1831
 msgid "Monument"
 msgstr "Monument commémoratif"
 
 #. item
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1832
 msgid "Edit Monument"
 msgstr "Editez un monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1836
 msgid "Memorial"
 msgstr "Mémorial"
@@ -18263,45 +18630,57 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1838
 msgid "Edit Memorial"
 msgstr "Éditer un mémorial"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1842
 msgid "Wayside Cross"
 msgstr "Croix"
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1843
 msgid "Edit Wayside Cross"
 msgstr "Éditer une croix"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1847
 msgid "Wayside Shrine"
 msgstr "Chapelle"
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1848
 msgid "Edit Wayside Shrine"
 msgstr "Éditer une Chapelle"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1852
+#, fuzzy
+msgid "Boundary Stone"
+msgstr "Frontières"
+
+#. item
+#: build/trans_presets.java:1853
+#, fuzzy
+msgid "Edit Boundary Stone"
+msgstr "Éditer librairie"
+
+#. item "Historic Places/Boundary Stone" text "Name"
+#: build/trans_presets.java:1858
 msgid "Leisure"
 msgstr "Loisir"
 
 #. group "Leisure"
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1859
 msgid "Water Park"
 msgstr "Parc aquatique"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1860
 msgid "Edit Water Park"
 msgstr "Éditer un parc aquatique"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1864
 msgid "Playground"
 msgstr "Aire de jeux"
@@ -18309,31 +18688,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1866
 msgid "Edit Playground"
 msgstr "Éditer une zone de jeu"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1870
 msgid "Fishing"
 msgstr "Pêche"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1871
 msgid "Edit Fishing"
 msgstr "Éditer un lieu de pêche"
 
 #. item "Leisure/Fishing" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1877 build/trans_presets.java:2669
+msgid "Sports"
+msgstr "Sports"
+
+#. group "Sports"
+#: build/trans_presets.java:1878
 msgid "Sport Facilities"
 msgstr "Sport"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1879
 msgid "Stadium"
 msgstr "Stade"
 
 #. item
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1880
 msgid "Edit Stadium"
 msgstr "Éditer un stade"
@@ -18347,6 +18730,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1874 build/trans_presets.java:1883
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1902 build/trans_presets.java:1911
 msgid "select sport:"
 msgstr "Selectionner un sport:"
@@ -18738,30 +19121,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884 build/trans_style.java:3892
-#: build/trans_style.java:3900 build/trans_style.java:3908
-#: build/trans_style.java:3916 build/trans_style.java:3924
-#: build/trans_style.java:3932
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_style.java:3572 build/trans_style.java:3580
+#: build/trans_style.java:3588 build/trans_style.java:3596
+#: build/trans_style.java:3604 build/trans_style.java:3612
+#: build/trans_style.java:3620 build/trans_style.java:3628
+#: build/trans_style.java:3636 build/trans_style.java:3644
+#: build/trans_style.java:3652 build/trans_style.java:3660
+#: build/trans_style.java:3668 build/trans_style.java:3676
+#: build/trans_style.java:3684 build/trans_style.java:3692
+#: build/trans_style.java:3700 build/trans_style.java:3708
+#: build/trans_style.java:3716 build/trans_style.java:3724
+#: build/trans_style.java:3732 build/trans_style.java:3740
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3764 build/trans_style.java:3772
+#: build/trans_style.java:3780 build/trans_style.java:3788
+#: build/trans_style.java:3796 build/trans_style.java:3804
+#: build/trans_style.java:3812 build/trans_style.java:3820
+#: build/trans_style.java:3828 build/trans_style.java:3836
+#: build/trans_style.java:3844 build/trans_style.java:3852
+#: build/trans_style.java:3860 build/trans_style.java:3868
+#: build/trans_style.java:3876 build/trans_style.java:3884
+#: build/trans_style.java:3892 build/trans_style.java:3900
+#: build/trans_style.java:3908 build/trans_style.java:3916
+#: build/trans_style.java:3924 build/trans_style.java:3932
+#: build/trans_style.java:3940
 msgid "sport"
 msgstr "sport"
@@ -18771,225 +19154,225 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "archery"
 msgstr "tir à l'arc"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "athletics"
 msgstr "athletics"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "australian_football"
 msgstr "australian_football"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "bowls"
 msgstr "boules"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "canoe"
 msgstr "canoë"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "climbing"
 msgstr "climbing"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket_nets"
 msgstr "cricket_nets"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cycling"
 msgstr "cycling"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "dog_racing"
 msgstr "dog_racing"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "equestrian"
 msgstr "équitation"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "football"
 msgstr "football"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "gymnastics"
 msgstr "gymnastics"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "horse_racing"
 msgstr "horse_racing"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "motor"
 msgstr "moteur"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "pelota"
 msgstr "pelote"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "racquet"
 msgstr "racquet"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "shooting"
 msgstr "chasse"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skating"
 msgstr "skate"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skiing"
 msgstr "ski"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "soccer"
 msgstr "football"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "swimming"
 msgstr "swimming"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "table_tennis"
 msgstr "table_tennis"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1888
 msgid "Sports Centre"
 msgstr "Centre sportif"
 
 #. item
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1889
 msgid "Edit Sports Centre"
 msgstr "Éditer un centre sportif"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1897
 msgid "Pitch"
 msgstr "Terrain de sport"
 
 #. item
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1898
 msgid "Edit Pitch"
 msgstr "Éditer un terrain de sport"
 
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1906
 msgid "Racetrack"
 msgstr "Circuit"
 
 #. item
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1907
 msgid "Edit Racetrack"
 msgstr "Éditer un circuit"
 
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1915
 msgid "Golf Course"
 msgstr "Parcours de Golf"
 
 #. item
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1916
 msgid "Edit Golf Course"
 msgstr "Éditer un terrain de golf"
 
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1921
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1922
 msgid "Edit Miniature Golf"
 msgstr "Éditer un minigolf"
 
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1928
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1929
 msgid "Multi"
 msgstr "Multi"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1930
 msgid "Edit Multi"
 msgstr "Editer Multi"
@@ -19028,183 +19411,183 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "pitch"
 msgstr "Terrain"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "sports_centre"
 msgstr "sports_centre"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "stadium"
 msgstr "stadium"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1935
 msgid "10pin"
 msgstr "Bowling"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1936
 msgid "Edit 10pin"
 msgstr "Éditer un Bowling"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1941
 msgid "Athletics"
 msgstr "Athlétisme"
 
 #. item
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1942
 msgid "Edit Athletics"
 msgstr "Éditer athlétisme"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1947
 msgid "Archery"
 msgstr "Tir à l’arc"
 
 #. item
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1948
 msgid "Edit Archery"
 msgstr "Éditer tir à l’arc"
 
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1953
 msgid "Climbing"
 msgstr "Escalade"
 
 #. item
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:1954
 msgid "Edit Climbing"
 msgstr "Éditer escalade"
 
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1959
 msgid "Canoeing"
 msgstr "Canoë"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1960
 msgid "Edit Canoeing"
 msgstr "Éditer canoë"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1966
 msgid "Edit Cycling"
 msgstr "Éditer cyclisme"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1971
 msgid "Dog Racing"
 msgstr "Course de chiens"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1972
 msgid "Edit Dog Racing"
 msgstr "Éditer course de chiens"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1977
 msgid "Equestrian"
 msgstr "Equitation"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1978
 msgid "Edit Equestrian"
 msgstr "Éditer sports équestres"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1983
 msgid "Horse Racing"
 msgstr "Course de chevaux"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1984
 msgid "Edit Horse Racing"
 msgstr "Éditer course de chevaux"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1989
 msgid "Gymnastics"
 msgstr "Gymnastique"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1990
 msgid "Edit Gymnastics"
 msgstr "Éditer gymnastique"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1995
 msgid "Motor Sports"
 msgstr "Sports mécaniques"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1996
 msgid "Edit Motor Sports"
 msgstr "Éditer sports mécaniques"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2001
 msgid "Skating"
 msgstr "Skate"
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2002
 msgid "Edit Skating"
 msgstr "Éditer patin à roulettes"
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2007
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2008
 msgid "Edit Skateboard"
 msgstr "Éditer skateboard"
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2013
 msgid "Swimming"
 msgstr "Natation"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2014
 msgid "Edit Swimming"
 msgstr "Éditer natation"
@@ -19212,56 +19595,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2021
 msgid "Edit Skiing"
 msgstr "ski"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "Piste type"
 msgstr "Type de piste"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "downhill"
 msgstr "de descente"
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "nordic"
 msgstr "nordique"
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "snow_park"
 msgstr "snow park"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "Difficulty"
 msgstr "Difficulté"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "novice"
 msgstr "verte"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "easy"
 msgstr "bleue"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "intermediate"
 msgstr "intermédiaire"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "advanced"
 msgstr "avancé"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "freeride"
 msgstr "jaune"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2028
 msgid "Shooting"
 msgstr "Tirer"
@@ -19269,178 +19652,183 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2030
 msgid "Edit Shooting"
 msgstr "Éditer tir sportif"
 
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2036
 msgid "Sport (Ball)"
 msgstr "Sport de balle"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2037
 msgid "Soccer"
 msgstr "Football"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2038
 msgid "Edit Soccer"
 msgstr "Éditer football"
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2043
 msgid "Football"
 msgstr "Football"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2044
 msgid "Edit Football"
 msgstr "Éditer football"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2049
 msgid "Australian Football"
 msgstr "Football australien"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2050
 msgid "Edit Australian Football"
 msgstr "Éditer football australien"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2055
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2056
 msgid "Edit Baseball"
 msgstr "Éditer baseball"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2061
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2062
 msgid "Edit Basketball"
 msgstr "Éditer basketball"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2067
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2068
 msgid "Edit Golf"
 msgstr "Editer un Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2071
 msgid "golf_course"
 msgstr "golf_course"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2073
 msgid "Boule"
 msgstr "Boules"
 
 #. item
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2074
 msgid "Edit Boule"
 msgstr "Éditer boules"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2079
 msgid "Bowls"
 msgstr "Boules"
 
 #. item
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2080
 msgid "Edit Bowls"
 msgstr "Éditer bowls"
 
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2085
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2086
 msgid "Edit Cricket"
 msgstr "Éditer cricket"
 
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2091
 msgid "Cricket Nets"
 msgstr "Filets de cricket"
 
 #. item
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2092
 msgid "Edit Cricket Nets"
 msgstr "Éditer filets de cricket"
 
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2097
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2098
 msgid "Edit Croquet"
 msgstr "Éditer croquet"
 
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2103
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2104
 msgid "Edit Hockey"
 msgstr "Éditer hockey"
 
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2109
 msgid "Pelota"
 msgstr "Pelote"
 
 #. item
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2110
 msgid "Edit Pelota"
 msgstr "Éditer pelote basque"
 
-#: build/trans_presets.java:2105
+#: build/trans_presets.java:2115
 msgid "Racquet"
 msgstr "Sports de raquette"
 
 #. item
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2116
 msgid "Edit Racquet"
 msgstr "Éditer sports de raquette"
 
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2121
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2122
 msgid "Edit Rugby"
 msgstr "Éditer rugby"
 
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2127
 msgid "Table Tennis"
 msgstr "Tennis de table"
 
 #. item
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2128
 msgid "Edit Table Tennis"
 msgstr "Éditer tennis de table"
 
-#: build/trans_presets.java:2123
+#: build/trans_presets.java:2133
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2134
 msgid "Edit Tennis"
 msgstr "Éditer tennis"
 
-#. <separator/>
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2141
+#, fuzzy
+msgid "Man-Made"
+msgstr "Édifices"
+
+#. group "Man-Made"
+#: build/trans_presets.java:2142
 msgid "Buildings"
 msgstr "Bâtiments"
 
 #. group "Buildings"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2143
 msgid "Building"
 msgstr "Bâtiment"
@@ -19448,5 +19836,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Public Building"
 msgstr "Bâtiment officiel"
@@ -19454,10 +19842,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2148
 msgid "Edit Public Building"
 msgstr "Éditer un bâtiment officiel"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2152
 msgid "Town hall"
 msgstr "Mairie"
@@ -19465,10 +19853,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2154
 msgid "Edit Town hall"
 msgstr "Éditer une mairie"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:2158
 msgid "Embassy"
 msgstr "Ambassade"
@@ -19476,10 +19864,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Edit Embassy"
 msgstr "Editer une ambassade"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2164
 msgid "Courthouse"
 msgstr "Palais de justice"
@@ -19488,10 +19876,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:2156
+#: build/trans_presets.java:2167
 msgid "Edit Courthouse"
 msgstr "Éditer un palais de justice"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2171
 msgid "Prison"
 msgstr "Prison"
@@ -19500,10 +19888,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:2163
+#: build/trans_presets.java:2174
 msgid "Edit Prison"
 msgstr "Éditer une prison"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2178
 msgid "Police"
 msgstr "Poste de police"
@@ -19513,10 +19901,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:2171
+#: build/trans_presets.java:2182
 msgid "Edit Police"
 msgstr "Éditer un poste de police"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2186
 msgid "Fire Station"
 msgstr "Caserne de pompiers"
@@ -19525,10 +19913,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:2178
+#: build/trans_presets.java:2189
 msgid "Edit Fire Station"
 msgstr "Éditer une caserne de pompiers"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "Post Office"
 msgstr "Bureau de poste"
@@ -19536,5 +19924,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Edit Post Office"
 msgstr "Éditer un bureau de poste"
@@ -19542,15 +19930,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2200
 msgid "Kindergarten"
 msgstr "Jardin d’enfants"
 
 #. item
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Kindergarten"
 msgstr "Éditer un jardin d’enfants"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2205
 msgid "School"
 msgstr "École"
@@ -19558,10 +19946,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Edit School"
 msgstr "Éditer une école"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2211
 msgid "University"
 msgstr "Université"
@@ -19569,10 +19957,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit University"
 msgstr "Éditer une université"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "College"
 msgstr "Établissement d’enseignement supérieur"
@@ -19580,5 +19968,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2219
 msgid "Edit College"
 msgstr "Éditer un établissement d’enseignement supérieur"
@@ -19586,5 +19974,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2224
 msgid "Cinema"
 msgstr "Cinema"
@@ -19593,10 +19981,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:2216
+#: build/trans_presets.java:2227
 msgid "Edit Cinema"
 msgstr "Éditer un cinéma"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2231
 msgid "Library"
 msgstr "Bibliothèque"
@@ -19605,9 +19993,9 @@
 #. <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:2223
+#: build/trans_presets.java:2234
 msgid "Edit Library"
 msgstr "Éditer une bibliothèque"
 
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Arts Centre"
 msgstr "Centre artistique"
@@ -19615,10 +20003,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Arts Centre"
 msgstr "Éditer un centre artistique"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Theatre"
 msgstr "Théâtre"
@@ -19627,10 +20015,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:2237
+#: build/trans_presets.java:2248
 msgid "Edit Theatre"
 msgstr "Éditer un théatre"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2252
 msgid "Place of Worship"
 msgstr "Lieu de culte"
@@ -19640,5 +20028,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:2245
+#: build/trans_presets.java:2256
 msgid "Edit Place of Worship"
 msgstr "Éditer un lieu de culte"
@@ -19647,6 +20035,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "Religion"
 msgstr "Religion"
@@ -19655,66 +20043,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "buddhist"
 msgstr "buddhist"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "christian"
 msgstr "christian"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jewish"
 msgstr "jewish"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "muslim"
 msgstr "muslim"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "unitarian"
 msgstr "unitarisme"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "zoroastrian"
 msgstr "zoroastrian"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "Denomination"
 msgstr "Dénomination"
@@ -19723,81 +20111,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "anglican"
 msgstr "anglican"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "catholic"
 msgstr "catholique"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "evangelical"
 msgstr "evangelical"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "jehovahs_witness"
 msgstr "jehovahs_witness"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "lutheran"
 msgstr "lutheran"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "methodist"
 msgstr "methodist"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "mormon"
 msgstr "mormon"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "presbyterian"
 msgstr "presbyterian"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "sunni"
 msgstr "sunni"
 
 #. <separator/>
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2264
 msgid "Addresses"
 msgstr "Adresses"
@@ -19806,5 +20194,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:2256
+#: build/trans_presets.java:2267
 msgid "Edit Address Information"
 msgstr "Editez l'adresse"
@@ -19812,5 +20200,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2269
 msgid "House number"
 msgstr "Numéro du bâtiment"
@@ -19818,20 +20206,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "House name"
 msgstr "Nom de la maison"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "City name"
 msgstr "Nom de la ville"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2274
 msgid "Post code"
 msgstr "Code postal"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2275
 msgid "Country code"
 msgstr "Indicatif du pays"
@@ -19839,5 +20227,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Address Interpolation"
 msgstr "Interpolation d’adresse"
@@ -19846,5 +20234,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:2270
+#: build/trans_presets.java:2281
 msgid "Edit Address Interpolation"
 msgstr "Éditer l’interpolation d’adresse"
@@ -19852,67 +20240,67 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "Numbering scheme"
 msgstr "Schéma de numérotation"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "odd"
 msgstr "pair"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "even"
 msgstr "impair"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "alphabetic"
 msgstr "alphabétique"
 
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2286
 msgid "Man Made"
 msgstr "Édifices"
 
 #. group "Man Made"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Works"
 msgstr "Usine"
 
 #. item
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2288
 msgid "Edit Works"
 msgstr "Éditer une usine"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2292
 msgid "Tower"
 msgstr "Structure de hauteur"
 
 #. item
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2293
 msgid "Edit Tower"
 msgstr "Éditer une structure de hauteur"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Water Tower"
 msgstr "Château d’eau"
 
 #. item
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2298
 msgid "Edit Water Tower"
 msgstr "Éditer un château d’eau"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Gasometer"
 msgstr "Gazomètre"
 
 #. item
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2303
 msgid "Edit Gasometer"
 msgstr "Éditer un gazomètre"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Lighthouse"
 msgstr "Phare"
@@ -19920,10 +20308,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2309
 msgid "Edit Lighthouse"
 msgstr "Éditer un phare"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Windmill"
 msgstr "Moulin à vent"
@@ -19931,10 +20319,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2315
 msgid "Edit Windmill"
 msgstr "Éditer un moulin à vent"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2319
 msgid "Pipeline"
 msgstr "Pipeline"
@@ -19942,10 +20330,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Edit Pipeline"
 msgstr "Éditer un pipeline"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2325
 msgid "Wastewater Plant"
 msgstr "Station d’épuration"
@@ -19955,10 +20343,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:2318
+#: build/trans_presets.java:2329
 msgid "Edit Wastewater Plant"
 msgstr "Éditer une station d’épuration"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2333
 msgid "Crane"
 msgstr "Grue"
@@ -19966,10 +20354,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2335
 msgid "Edit Crane"
 msgstr "Éditer une grue permanente"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Beacon"
 msgstr "Balise signalétique"
@@ -19977,10 +20365,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2341
 msgid "Edit Beacon"
 msgstr "Editer balise signalétique"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2345
 msgid "Survey Point"
 msgstr "Équipement de topographie"
@@ -19988,10 +20376,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Edit Survey Point"
 msgstr "Éditer un équipement de topographie"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2351
 msgid "Surveillance"
 msgstr "Surveillance"
@@ -19999,5 +20387,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2353
 msgid "Edit Surveillance Camera"
 msgstr "Éditer une caméra de surveillance"
@@ -20005,5 +20393,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Power Generator"
 msgstr "Centrale électrique"
@@ -20013,39 +20401,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:2351
+#: build/trans_presets.java:2362
 msgid "Edit Power Generator"
 msgstr "Éditer une centrale électrique"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "wind"
 msgstr "wind"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "hydro"
 msgstr "hydro"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "coal"
 msgstr "charbon"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "photovoltaic"
 msgstr "photovoltaïque"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "gas"
 msgstr "gaz"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2367
 msgid "Power Station"
 msgstr "Station électrique"
@@ -20054,10 +20442,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:2359
+#: build/trans_presets.java:2370
 msgid "Edit Power Station"
 msgstr "Editez une station électrique"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2374
 msgid "Power Sub Station"
 msgstr "Transformateur électrique"
@@ -20066,5 +20454,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:2366
+#: build/trans_presets.java:2377
 msgid "Edit Power Sub Station"
 msgstr "Modifier transformateur électrique"
@@ -20072,10 +20460,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2369 build/trans_presets.java:2385
+#: build/trans_presets.java:2380 build/trans_presets.java:2396
 msgid "Line reference"
 msgstr "Champ de vision"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2382
 msgid "Power Tower"
 msgstr "Pylône électrique"
@@ -20086,5 +20474,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:2376
+#: build/trans_presets.java:2387
 msgid "Edit Power Tower"
 msgstr "Éditer un pylône électrique"
@@ -20092,5 +20480,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2390
 msgid "Power Line"
 msgstr "Ligne de courant"
@@ -20099,40 +20487,40 @@
 #. <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:2382
+#: build/trans_presets.java:2393
 msgid "Edit Power Line"
 msgstr "Editez une ligne de courant"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Voltage"
 msgstr "Tension"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2398
 msgid "Amount of Wires"
 msgstr "Nombre de câbles"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Amenities"
 msgstr "Équipements"
 
 #. group "Amenities"
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2402
 msgid "Toilets"
 msgstr "Toilettes"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2398 build/trans_presets.java:2514
+#: build/trans_presets.java:2409 build/trans_presets.java:2525
 msgid "Note"
 msgstr "Note"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2411
 msgid "Post Box"
 msgstr "Boîte aux lettres"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2416
 msgid "Telephone"
 msgstr "Téléphone"
@@ -20141,5 +20529,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:2408
+#: build/trans_presets.java:2419
 msgid "Edit Telephone"
 msgstr "Éditer un téléphone"
@@ -20147,5 +20535,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2411 build/trans_presets.java:2515
+#: build/trans_presets.java:2422 build/trans_presets.java:2526
 msgid "Coins"
 msgstr "Pièces"
@@ -20153,5 +20541,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2412 build/trans_presets.java:2516
+#: build/trans_presets.java:2423 build/trans_presets.java:2527
 msgid "Notes"
 msgstr "Billets"
@@ -20159,5 +20547,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2413 build/trans_presets.java:2517
+#: build/trans_presets.java:2424 build/trans_presets.java:2528
 msgid "Electronic purses and Charge cards"
 msgstr "Cartes de crédit temporaire"
@@ -20165,5 +20553,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2414 build/trans_presets.java:2518
+#: build/trans_presets.java:2425 build/trans_presets.java:2529
 msgid "Debit cards"
 msgstr "Cartes de débit"
@@ -20171,15 +20559,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2415 build/trans_presets.java:2519
+#: build/trans_presets.java:2426 build/trans_presets.java:2530
 msgid "Credit cards"
 msgstr "Cartes de crédits"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2427
 msgid "Telephone cards"
 msgstr "Cartes téléphoniques"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2429
 msgid "Recycling"
 msgstr "Recyclage"
@@ -20188,5 +20576,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:2421
+#: build/trans_presets.java:2432
 msgid "Edit Recycling station"
 msgstr "Éditer un point de recylcage"
@@ -20194,35 +20582,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Batteries"
 msgstr "Batteries"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2435
 msgid "Cans"
 msgstr "Canettes"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Clothes"
 msgstr "Vêtements"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2437
 msgid "Glass"
 msgstr "Verre"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2438
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2439
 msgid "Scrap Metal"
 msgstr "Ferrailleur"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2441
 msgid "Bench"
 msgstr "Banc"
@@ -20231,40 +20619,33 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2433
-#, fuzzy
+#: build/trans_presets.java:2444
 msgid "Backrest"
-msgstr "Retour"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr "Accoudoir"
+
+#: build/trans_presets.java:2445
 msgid "Material"
-msgstr "Mémorial"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2434
-#, fuzzy
+#: build/trans_presets.java:2445
 msgid "stone"
-msgstr "rien"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr "pierre"
+
+#: build/trans_presets.java:2445
 msgid "plastic"
-msgstr "lieu"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr "plastique"
+
+#: build/trans_presets.java:2446
 msgid "Colour"
 msgstr "Couleur"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "black"
-msgstr "Retour"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr "noir"
+
+#: build/trans_presets.java:2446
 msgid "brown"
-msgstr "bas"
+msgstr "marron"
 
 #. color historic
@@ -20333,39 +20714,35 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2435 build/trans_style.java:3055
-#: build/trans_style.java:3063 build/trans_style.java:3071
-#: build/trans_style.java:3079 build/trans_style.java:3127
-#: build/trans_style.java:3135 build/trans_style.java:3233
-#: build/trans_style.java:3241
+#: build/trans_presets.java:2446 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3135
+#: build/trans_style.java:3143 build/trans_style.java:3241
+#: build/trans_style.java:3249
 msgid "green"
 msgstr "espace vert"
 
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "red"
-msgstr "fin"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr "rouge"
+
+#: build/trans_presets.java:2446
 msgid "blue"
-msgstr "Valeur"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr "bleu"
+
+#: build/trans_presets.java:2446
 msgid "white"
-msgstr "Site"
-
-#: build/trans_presets.java:2436
-#, fuzzy
+msgstr "blanc"
+
+#: build/trans_presets.java:2447
 msgid "Amount of Seats"
-msgstr "Nombre de câbles"
+msgstr "Nombre de places"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2449
 msgid "Hunting Stand"
 msgstr "Hutte de chasse"
 
 #. item
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2450
 msgid "Edit Hunting Stand"
 msgstr "Hutte de chasse"
@@ -20374,30 +20751,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2441 build/trans_presets.java:2902
+#: build/trans_presets.java:2452 build/trans_presets.java:2914
 msgid "Height"
 msgstr "Hauteur"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "low"
 msgstr "faible"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "half"
 msgstr "à moitié"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "full"
 msgstr "complet"
 
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2454
 msgid "Hide"
 msgstr "Masquer"
 
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2455
 msgid "Lock"
 msgstr "Verrouiller"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Fountain"
 msgstr "Fontaine"
@@ -20406,10 +20783,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:2449
+#: build/trans_presets.java:2460
 msgid "Edit Fountain"
 msgstr "Éditer une fontaine"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2464
 msgid "Drinking Water"
 msgstr "Eau potable"
@@ -20418,10 +20795,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:2456
+#: build/trans_presets.java:2467
 msgid "Edit Drinking Water"
 msgstr "Éditer un point d’eau potable"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2471
 msgid "Baby Hatch"
 msgstr "Tour d’abandon (nouveau né)"
@@ -20429,33 +20806,33 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Baby Hatch"
 msgstr "Éditer un tour d’abandon"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2479
 msgid "Shops"
 msgstr "Magasins"
 
 #. group "Shops"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2480
 msgid "Supermarket"
 msgstr "Supermarché"
 
 #. item
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2481
 msgid "Edit Supermarket"
 msgstr "Éditer un supermarché"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2486
 msgid "Chemist"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2476
+msgstr "Droguerie"
+
+#. item
+#: build/trans_presets.java:2487
 msgid "Edit Chemist"
-msgstr ""
-
-#: build/trans_presets.java:2481
+msgstr "Éditer la droguerie"
+
+#: build/trans_presets.java:2492
 msgid "Convenience Store"
 msgstr "Commerce de proximité"
@@ -20463,9 +20840,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Edit Convenience Store"
 msgstr "Éditer une épicerie"
 
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2499
 msgid "Kiosk"
 msgstr "Kiosque à journaux"
@@ -20473,27 +20850,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Kiosk"
 msgstr "Éditer un kiosque à journaux"
 
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Book Store"
 msgstr "Librairie"
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2507
 msgid "Edit Book Store"
 msgstr "Éditer librairie"
 
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2512
 msgid "Travel Agency"
 msgstr "Agence de voyage"
 
 #. item
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2513
 msgid "Edit Travel Agency"
 msgstr "Éditer agence de voyage"
 
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2518
 msgid "Vending machine"
 msgstr "Distributeur automatique"
@@ -20501,5 +20878,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Edit Vending machine"
 msgstr "Éditer un distributeur automatique"
@@ -20507,88 +20884,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "Vending products"
 msgstr "Produits vendus"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_tickets"
 msgstr "public_transport_tickets"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_plans"
 msgstr "public_transport_plans"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "parking_tickets"
 msgstr "parking_tickets"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "food"
 msgstr "food"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "drinks"
 msgstr "drinks"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "sweets"
 msgstr "bonbons"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "cigarettes"
 msgstr "cigarettes"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "photos"
 msgstr "photos"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "animal_food"
 msgstr "animal_food"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "news_papers"
 msgstr "news_papers"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "toys"
 msgstr "jouets"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "stamps"
 msgstr "stamps"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "SIM-cards"
 msgstr "SIM-cards"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "telephone_vouchers"
 msgstr "telephone_vouchers"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "vouchers"
 msgstr "vouchers"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "condoms"
 msgstr "condoms"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "excrement_bags"
 msgstr "excrement_bags"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Account or loyalty cards"
 msgstr "Cartes de fidélité"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Butcher"
 msgstr "Boucherie"
@@ -20596,9 +20973,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2535
 msgid "Edit Butcher"
 msgstr "Éditer une boucherie"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2540
 msgid "Baker"
 msgstr "Boulanger"
@@ -20606,9 +20983,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2542
 msgid "Edit Baker"
 msgstr "Éditer une boulangerie"
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2547
 msgid "Florist"
 msgstr "Fleuriste"
@@ -20616,18 +20993,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Florist"
 msgstr "Modifier fleuriste"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2554
 msgid "Organic"
 msgstr "Boutique bio"
 
 #. item
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Edit Organic Shop"
 msgstr "Modifier boutique bio"
 
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2560
 msgid "Alcohol"
 msgstr "Alcool"
@@ -20635,54 +21012,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2562
 msgid "Edit Alcohol Shop"
 msgstr "Modifier commerce d'acool"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2567
 msgid "Beverages"
 msgstr "Boissons"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2568
 msgid "Edit Beverages Shop"
 msgstr "Modifier débit de boissons"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2573
 msgid "Computer"
 msgstr "Informatique"
 
 #. item
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2574
 msgid "Edit Computer Shop"
 msgstr "Modifier magasin informatique"
 
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Electronics"
 msgstr "Électronique"
 
 #. item
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2580
 msgid "Edit Electronics Shop"
 msgstr "Modifier magasin d’électronique"
 
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2585
 msgid "Hifi"
 msgstr "Hi-Fi"
 
 #. item
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2586
 msgid "Edit Hifi Shop"
 msgstr "Modifier boutique Hi-Fi"
 
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2591
 msgid "Furniture"
 msgstr "Ameublement"
 
 #. item
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Edit Furniture Shop"
 msgstr "Modifier magasin d’ameublement"
 
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Garden Centre"
 msgstr "Jardinerie"
@@ -20690,9 +21067,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2599
 msgid "Edit Garden Centre"
 msgstr "Modifier jardinerie"
 
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Hardware"
 msgstr "Quincaillerie"
@@ -20700,9 +21077,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2606
 msgid "Edit Hardware Store"
 msgstr "Modifier quincaillerie"
 
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "Do-it-yourself-store"
 msgstr "Magasin de bricolage"
@@ -20710,54 +21087,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2613
 msgid "Edit Do-it-yourself-store"
 msgstr "Éditer un magasin de bricolage"
 
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2618
 msgid "Stationery"
 msgstr "Papeterie"
 
 #. item
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2619
 msgid "Edit Stationery Shop"
 msgstr "Modifier papeterie"
 
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Hairdresser"
 msgstr "Coiffeur"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Hairdresser"
 msgstr "Editez un Coiffeur"
 
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Shoes"
 msgstr "Magasin de chaussures"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Shoe Shop"
 msgstr "Modifier magasin de chaussures"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2636
 msgid "Toys"
 msgstr "Jouets"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit Toy Shop"
 msgstr "Modifier magasin de jouets"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Video"
 msgstr "Vidéoclub"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Video Shop"
 msgstr "Modifier vidéoclub"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "Dry Cleaning"
 msgstr "Pressing"
@@ -20765,9 +21142,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2650
 msgid "Edit Dry Cleaning"
 msgstr "Éditer un pressing"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "Laundry"
 msgstr "Laverie libre-service"
@@ -20775,9 +21152,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2657
 msgid "Edit Laundry"
 msgstr "Éditer une laverie"
 
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2662
 msgid "Outdoor"
 msgstr "Magasin de sports d’extérieur"
@@ -20785,32 +21162,28 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2664
 msgid "Edit Outdoor Shop"
 msgstr "Éditer un magasin de sports d’extérieur"
 
-#: build/trans_presets.java:2658
-msgid "Sports"
-msgstr "Sports"
-
-#. item
-#: build/trans_presets.java:2659
+#. item
+#: build/trans_presets.java:2670
 msgid "Edit Sports Shop"
 msgstr "Modifier magasin de sport"
 
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Optician"
 msgstr "Opticien"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Optician"
 msgstr "Modifier opticien"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2683
 msgid "Cash"
 msgstr "Argent"
 
 #. group "Cash"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2684
 msgid "Bank"
 msgstr "Banque"
@@ -20818,14 +21191,14 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2686
 msgid "Edit Bank"
 msgstr "Editez une banque"
 
-#: build/trans_presets.java:2680 build/trans_presets.java:2689
+#: build/trans_presets.java:2691 build/trans_presets.java:2700
 msgid "Automated Teller Machine"
 msgstr "Distributeur automatique"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2693
 msgid "Money Exchange"
 msgstr "Bureau de change"
@@ -20833,5 +21206,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Edit Money Exchange"
 msgstr "Éditer un bureau de change"
@@ -20839,15 +21212,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2691
+#: build/trans_presets.java:2702
 msgid "Edit Automated Teller Machine"
 msgstr "Éditer un distributeur automatique"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2707
 msgid "Health"
 msgstr "Santé"
 
 #. group "Health"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2708
 msgid "Doctors"
 msgstr "Médecin"
@@ -20855,18 +21228,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2710
 msgid "Edit Doctors"
 msgstr "Modifier Médecin"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2715
 msgid "Dentist"
 msgstr "Dentiste"
 
 #. item
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Edit Dentist"
 msgstr "Editez le Dentiste"
 
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2721
 msgid "Pharmacy"
 msgstr "Pharmacie"
@@ -20874,5 +21247,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Edit Pharmacy"
 msgstr "Éditer pharmacie"
@@ -20880,9 +21253,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Dispensing"
 msgstr "Dispensaire"
 
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2729
 msgid "Hospital"
 msgstr "Hôpital"
@@ -20890,10 +21263,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Edit Hospital"
 msgstr "Éditer hôpital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2735
 msgid "Emergency Access Point"
 msgstr "Point d’accès d’urgence"
@@ -20902,5 +21275,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:2727
+#: build/trans_presets.java:2738
 msgid "Edit Emergency Access Point"
 msgstr "Éditer point d’accès d’urgence"
@@ -20909,20 +21282,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2741
 msgid "Point Number"
 msgstr "Numéro du point"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2742
 msgid "Point Name"
 msgstr "Nom du point"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Phone Number"
 msgstr "Numéro de téléphone"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Utiliser le code international, comme +12-345-67890"
@@ -20930,5 +21303,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2748
 msgid "Veterinary"
 msgstr "Vétérinaire"
@@ -20937,55 +21310,60 @@
 #. <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:2740
+#: build/trans_presets.java:2751
 msgid "Edit Veterinary"
 msgstr "Editez un Vétérinaire"
 
+#: build/trans_presets.java:2758
+#, fuzzy
+msgid "Geography"
+msgstr "WGS84 Geographic"
+
 #. group "Places"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2760
 msgid "Continent"
 msgstr "Continent"
 
 #. item
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2761
 msgid "Edit Continent"
 msgstr "Éditer un continent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2766
 msgid "Country"
 msgstr "Pays"
 
 #. item
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2767
 msgid "Edit Country"
 msgstr "Éditer un pays"
 
 #. item "Places/Country" text "Name"
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2772
 msgid "State"
 msgstr "Département"
 
 #. item
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2773
 msgid "Edit State"
 msgstr "Éditer un état"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2778
 msgid "Region"
 msgstr "Région"
 
 #. item
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2779
 msgid "Edit Region"
 msgstr "Éditer une région"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2784
 msgid "County"
 msgstr "Comté/Canton"
 
 #. item
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2785
 msgid "Edit County"
 msgstr "Éditer un comté/canton"
@@ -20993,15 +21371,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2791
 msgid "City"
 msgstr "Ville de plus de 100 000 habitants"
 
 #. item
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2792
 msgid "Edit City"
 msgstr "Editez la ville"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2797
 msgid "Town"
 msgstr "Ville 10 000 à 100 000 habitants"
@@ -21009,10 +21387,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2799
 msgid "Edit Town"
 msgstr "Editez la ville"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2804
 msgid "Suburb"
 msgstr "Banlieue"
@@ -21020,25 +21398,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2806
 msgid "Edit Suburb"
 msgstr "Éditer une banlieue"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2811
 msgid "Village"
 msgstr "Village"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2812
 msgid "Edit Village"
 msgstr "Éditer un village"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2817
 msgid "Hamlet"
 msgstr "Hameau"
 
 #. item
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2818
 msgid "Edit Hamlet"
 msgstr "Éditer un hameau"
@@ -21046,5 +21424,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2824
 msgid "Locality"
 msgstr "Lieu-dit"
@@ -21052,10 +21430,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2826
 msgid "Edit Locality"
 msgstr "Éditer un lieu-dit"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2831
 msgid "Island"
 msgstr "île"
@@ -21063,10 +21441,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2833
 msgid "Edit Island"
 msgstr "Éditer une île"
 
 #. item "Places/Island" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2838
 msgid "Islet"
 msgstr ""
@@ -21074,5 +21452,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2840
 msgid "Edit Islet"
 msgstr ""
@@ -21080,5 +21458,5 @@
 #. item "Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2846
 msgid "Cave Entrance"
 msgstr "Entrée de grotte"
@@ -21086,10 +21464,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2848
 msgid "Edit Cave Entrance"
 msgstr "Éditer une entrée de grotte"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2852
 msgid "Peak"
 msgstr "Sommet"
@@ -21097,10 +21475,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2854
 msgid "Edit Peak"
 msgstr "Modifier un pic"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2859
 msgid "Glacier"
 msgstr "Glacier"
@@ -21108,10 +21486,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2861
 msgid "Edit Glacier"
 msgstr "Éditer un glacier"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2854
+#: build/trans_presets.java:2866
 msgid "Volcano"
 msgstr "Volcan"
@@ -21119,70 +21497,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2868
 msgid "Edit Volcano"
 msgstr "Éditer un volcan"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2874
 msgid "Boundaries"
 msgstr "Frontières"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2875
 msgid "National"
 msgstr "Nationale"
 
 #. item
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2876
 msgid "Edit National Boundary"
 msgstr "Éditer une frontière nationale"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2881
 msgid "Administrative"
 msgstr "Administrative"
 
 #. item
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2882
 msgid "Edit Administrative Boundary"
 msgstr "Éditer une frontière administrative"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:2887
 msgid "Civil"
 msgstr "Civile"
 
 #. item
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2888
 msgid "Edit Civil Boundary"
 msgstr "Éditer une frontière civile"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2893
 msgid "Political"
 msgstr "Politique"
 
 #. item
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2894
 msgid "Edit Political Boundary"
 msgstr "Éditer une zone électorale"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2899
 msgid "National park"
 msgstr "Parc national"
 
 #. item
-#: build/trans_presets.java:2888
+#: build/trans_presets.java:2900
 msgid "Edit National Park Boundary"
 msgstr "Éditer les frontières d’un parc national"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2906
 msgid "Land use"
 msgstr "Utilisation du terrain"
 
 #. group "Land use"
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2907
 msgid "Tree"
 msgstr "Arbre"
@@ -21191,15 +21569,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:2898
+#: build/trans_presets.java:2910
 msgid "Edit Tree"
 msgstr "Éditer un arbre isolé"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2915
 msgid "Botanical Name"
 msgstr "Nom botanique"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2917
 msgid "Wood"
 msgstr "Bois"
@@ -21208,5 +21586,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:2908
+#: build/trans_presets.java:2920
 msgid "Edit Wood"
 msgstr "Éditer un bois"
@@ -21214,17 +21592,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "coniferous"
 msgstr "coniferous"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "deciduous"
 msgstr "deciduous"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "mixed"
 msgstr "mixed"
 
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2925
 msgid "Forest"
 msgstr "Forêt"
@@ -21233,14 +21611,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:2916
+#: build/trans_presets.java:2928
 msgid "Edit Forest Landuse"
 msgstr "Éditer une forêt"
 
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2934
 msgid "Nature Reserve"
 msgstr "Réserve naturelle"
 
 #. item
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2935
 msgid "Edit Nature Reserve"
 msgstr "Éditer une réserve naturelle"
@@ -21248,25 +21626,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2940
 msgid "Scree"
 msgstr "Zone d’éboulements"
 
 #. item
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2941
 msgid "Edit Scree"
 msgstr "Éditer une zone d’éboulements"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2945
 msgid "Scrub"
 msgstr "Broussailles"
 
 #. item
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2946
 msgid "Edit Scrub"
 msgstr "Éditer des broussailles"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2950
 msgid "Fell"
 msgstr "Talus"
@@ -21274,10 +21652,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2952
 msgid "Edit Fell"
 msgstr "Éditer un talus"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2956
 msgid "Heath"
 msgstr "Lande"
@@ -21285,5 +21663,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2958
 msgid "Edit Heath"
 msgstr "Éditer une lande"
@@ -21291,5 +21669,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2963
 msgid "Farmyard"
 msgstr "Bâtiments de ferme"
@@ -21298,45 +21676,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:2954
+#: build/trans_presets.java:2966
 msgid "Edit Farmyard Landuse"
 msgstr "Éditer des bâtiments de ferme"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2971
 msgid "Farmland"
 msgstr "Terrains de ferme"
 
 #. item
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2972
 msgid "Edit Farmland Landuse"
 msgstr "Éditer des terrains de ferme"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2977
 msgid "Meadow"
 msgstr "Prairie"
 
 #. item
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2978
 msgid "Edit Meadow Landuse"
 msgstr "Editer prairie"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2983
 msgid "Vineyard"
 msgstr "Vigne"
 
 #. item
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2984
 msgid "Edit Vineyard Landuse"
 msgstr "Éditer une vigne"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:2989
 msgid "Allotments"
 msgstr "Jardins familiaux"
 
 #. item
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2990
 msgid "Edit Allotments Landuse"
 msgstr "Éditer des jardins familiaux"
@@ -21344,25 +21722,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2996
 msgid "Garden"
 msgstr "Jardin"
 
 #. item
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2997
 msgid "Edit Garden"
 msgstr "Éditer un jardin"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3001
 msgid "Grass"
 msgstr "Herbe"
 
 #. item
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3002
 msgid "Edit Grass Landuse"
 msgstr "Éditer de l’herbe"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3007
 msgid "Village Green"
 msgstr "Zone publique herborée"
@@ -21370,10 +21748,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3009
 msgid "Edit Village Green Landuse"
 msgstr "Éditer une zone publique herborée"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3014
 msgid "Common"
 msgstr "Espace commun"
@@ -21381,20 +21759,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3004
+#: build/trans_presets.java:3016
 msgid "Edit Common"
 msgstr "Éditer un espace commun"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3020
 msgid "Park"
 msgstr "Parc"
 
 #. item
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3021
 msgid "Edit Park"
 msgstr "Editez un Parc"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3025
 msgid "Recreation Ground"
 msgstr "Aire de jeux"
@@ -21402,5 +21780,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3027
 msgid "Edit Recreation Ground Landuse"
 msgstr "Éditer une aire de jeux"
@@ -21408,15 +21786,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3033
 msgid "Residential area"
 msgstr "Zone résidentielle"
 
 #. item
-#: build/trans_presets.java:3022
+#: build/trans_presets.java:3034
 msgid "Edit Residential Landuse"
 msgstr "Éditer une zone résidentielle"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3039
 msgid "Graveyard"
 msgstr "Petit cimetière"
@@ -21424,9 +21802,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3029
+#: build/trans_presets.java:3041
 msgid "Edit Graveyard"
 msgstr "Éditer un petit cimetière"
 
-#: build/trans_presets.java:3035
+#: build/trans_presets.java:3047
 msgid "Cemetery"
 msgstr "Cimetière"
@@ -21434,39 +21812,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3049
 msgid "Edit Cemetery Landuse"
 msgstr "Éditer un cimetière"
 
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3056
 msgid "Retail"
 msgstr "Zone commerciale"
 
 #. item
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3057
 msgid "Edit Retail Landuse"
 msgstr "Éditer une zone commerciale"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3062
 msgid "Commercial"
 msgstr "Bureaux"
 
 #. item
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3063
 msgid "Edit Commercial Landuse"
 msgstr "Éditer des bureaux"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3056
+#: build/trans_presets.java:3068
 msgid "Industrial"
 msgstr "Zone industrielle"
 
 #. item
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3069
 msgid "Edit Industrial Landuse"
 msgstr "Éditer une zone industrielle"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3074
 msgid "Railway land"
 msgstr "Zone ferroviaire"
@@ -21474,15 +21852,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3076
 msgid "Edit Railway Landuse"
 msgstr "Éditer une zone ferroviaire"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3081
 msgid "Military"
 msgstr "Militaire"
 
 #. item
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3082
 msgid "Edit Military Landuse"
 msgstr "Éditer un terrain militaire"
@@ -21490,55 +21868,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3088
 msgid "Construction area"
 msgstr "Zone de construction"
 
 #. item
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3089
 msgid "Edit Construction Landuse"
 msgstr "Éditer un chantier"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3094
 msgid "Brownfield"
 msgstr "Terrain en friche"
 
 #. item
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3095
 msgid "Edit Brownfield Landuse"
 msgstr "Éditer un terrain en friche"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3100
 msgid "Greenfield"
 msgstr "Espace vert"
 
 #. item
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3101
 msgid "Edit Greenfield Landuse"
 msgstr "Éditer une nouvelle zone de construction"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3106
 msgid "Landfill"
 msgstr "Décharge"
 
 #. item
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3107
 msgid "Edit Landfill Landuse"
 msgstr "Éditer une décharge"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3112
 msgid "Quarry"
 msgstr "Carrière"
 
 #. item
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3113
 msgid "Edit Quarry Landuse"
 msgstr "Éditer une carrière"
 
 #. group "Relations"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3122
 msgid "Multipolygon"
 msgstr "Multypoligone"
@@ -21548,5 +21926,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:3114
+#: build/trans_presets.java:3126
 msgid "Edit Multipolygon"
 msgstr "Modifier un multipolygone"
@@ -21555,10 +21933,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3132
 msgid "outer segment"
 msgstr "segment extérieur"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3133
 msgid "inner segment"
 msgstr "segment intérieur"
@@ -21566,5 +21944,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3136
 msgid "Turn restriction"
 msgstr "Interdiction de tourner"
@@ -21573,5 +21951,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3139
 msgid "Edit Turn Restriction"
 msgstr "Modifier une interdiction de tourner"
@@ -21579,34 +21957,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "Restriction"
 msgstr "Restriction"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_left_turn"
 msgstr "Interdiction de tourner à gauche"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_right_turn"
 msgstr "Interdiction de tourner à droite"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_straight_on"
 msgstr "Interdiction d'aller tout droit"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_u_turn"
 msgstr "Interdiction de faire demi-tour"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_right_turn"
 msgstr "Obligation de tourner à droite"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_left_turn"
 msgstr "Obligation de tourner à gauche"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_straight_on"
 msgstr "Obligation d'aller tout droit"
@@ -21615,15 +21993,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3146
 msgid "from way"
 msgstr "chemin d'origine"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3147
 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:3136
+#: build/trans_presets.java:3148
 msgid "to way"
 msgstr "chemin destination"
@@ -21631,5 +22009,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3151
 msgid "Route"
 msgstr "Route"
@@ -21638,5 +22016,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3154
 msgid "Edit Route"
 msgstr "Modifier une route"
@@ -21644,5 +22022,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "Route type"
 msgstr "Type de route"
@@ -21714,5 +22092,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3144 build/trans_style.java:233
+#: build/trans_presets.java:3156 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -21721,17 +22099,17 @@
 msgstr "vélo/bicyclette"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "road"
 msgstr "route"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ski"
 msgstr "ski"
@@ -21784,5 +22162,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3144 build/trans_style.java:247
+#: build/trans_presets.java:3156 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -21791,13 +22169,13 @@
 msgstr "piéton"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "hiking"
 msgstr "randonnée"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "detour"
 msgstr "détour"
@@ -21811,10 +22189,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3144 build/trans_style.java:1206
+#: build/trans_presets.java:3156 build/trans_style.java:1206
 msgid "subway"
 msgstr "métro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3159
 msgid "Symbol description"
 msgstr "Description du symbole"
@@ -21822,31 +22200,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3162
 msgid "Network"
 msgstr "Réseau"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "Route state"
 msgstr "État de la route"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "proposed"
 msgstr "proposé"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "alternate"
 msgstr "alternatif"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "temporary"
 msgstr "temporaire"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "connection"
 msgstr "connexion"
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "Color (hex)"
 msgstr "Couleur (hexa)"
@@ -21855,30 +22233,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3168
 msgid "route segment"
 msgstr "segment de route"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3169
 msgid "forward segment"
 msgstr "segment suivant"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3170
 msgid "backward segment"
 msgstr "segment précédent"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3171
 msgid "halt point"
 msgstr "point d'arrêt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3172
 msgid "forward halt point"
 msgstr "point d'arrêt suivant"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3173
 msgid "backward halt point"
 msgstr "point d'arrêt précédent"
@@ -22316,11 +22694,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3375 build/trans_style.java:3376
-#: build/trans_style.java:3946 build/trans_style.java:4254
-#: build/trans_style.java:4263 build/trans_style.java:4272
-#: build/trans_style.java:4281 build/trans_style.java:4290
-#: build/trans_style.java:4299 build/trans_style.java:4308
-#: build/trans_style.java:4309 build/trans_style.java:4318
-#: build/trans_style.java:4327
+#: build/trans_style.java:3383 build/trans_style.java:3384
+#: build/trans_style.java:3954 build/trans_style.java:4262
+#: build/trans_style.java:4271 build/trans_style.java:4280
+#: build/trans_style.java:4289 build/trans_style.java:4298
+#: build/trans_style.java:4307 build/trans_style.java:4316
+#: build/trans_style.java:4317 build/trans_style.java:4326
+#: build/trans_style.java:4335
 msgid "deprecated"
 msgstr "déprécié"
@@ -24344,5 +24722,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3294
+#: build/trans_style.java:3302
 msgid "light_water"
 msgstr "eau (claire)"
@@ -25024,8 +25402,17 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="boundary_stone"/>
+#. <icon annotate="true" src="historic/boundary_stone.png"/>
 #: build/trans_style.java:2990 build/trans_style.java:2998
 #: build/trans_style.java:3006 build/trans_style.java:3014
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
+#: build/trans_style.java:3054
 msgid "historic"
 msgstr "patrimoine"
@@ -25039,5 +25426,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3095
 msgid "quarry"
 msgstr "carrière"
@@ -25051,5 +25438,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "landfill"
 msgstr "décharge"
@@ -25071,5 +25458,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3103 build/trans_style.java:3111
+#: build/trans_style.java:3111 build/trans_style.java:3119
 msgid "basin"
 msgstr "bassin"
@@ -25083,5 +25470,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3127
 msgid "forest"
 msgstr "forêt"
@@ -25095,5 +25482,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3159
 msgid "farmyard"
 msgstr "bâtiments de ferme"
@@ -25116,5 +25503,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3160 build/trans_style.java:3168
+#: build/trans_style.java:3168 build/trans_style.java:3176
 msgid "retail"
 msgstr "commerce de proximité"
@@ -25128,5 +25515,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3176
+#: build/trans_style.java:3184
 msgid "industrial"
 msgstr "zone industrielle"
@@ -25140,5 +25527,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "brownfield"
 msgstr "terrain en friche"
@@ -25152,5 +25539,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "greenfield"
 msgstr "espace vert"
@@ -25164,5 +25551,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "railland"
 msgstr "zone ferroviaire"
@@ -25219,7 +25606,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3217 build/trans_style.java:3252
-#: build/trans_style.java:3260 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3225 build/trans_style.java:3260
+#: build/trans_style.java:3268 build/trans_style.java:3276
+#: build/trans_style.java:3284 build/trans_style.java:3292
 msgid "military"
 msgstr "zone militaire"
@@ -25233,5 +25620,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3225
+#: build/trans_style.java:3233
 msgid "cemetery"
 msgstr "cimetière"
@@ -25244,5 +25631,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3301
+#: build/trans_style.java:3309
 msgid "peak"
 msgstr "sommet"
@@ -25257,5 +25644,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3310
+#: build/trans_style.java:3318
 msgid "glacier"
 msgstr "glacier"
@@ -25269,5 +25656,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "volcano"
 msgstr "volcan"
@@ -25322,8 +25709,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3326 build/trans_style.java:3327
-#: build/trans_style.java:3335 build/trans_style.java:3351
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440
+#: build/trans_style.java:3334 build/trans_style.java:3335
+#: build/trans_style.java:3343 build/trans_style.java:3359
+#: build/trans_style.java:3432 build/trans_style.java:3440
+#: build/trans_style.java:3448
 msgid "natural"
 msgstr "nature"
@@ -25337,5 +25724,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3343
+#: build/trans_style.java:3351
 msgid "scrub"
 msgstr "broussailles"
@@ -25349,5 +25736,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3359
+#: build/trans_style.java:3367
 msgid "heath"
 msgstr "lande/bruyère"
@@ -25361,5 +25748,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3408
+#: build/trans_style.java:3416
 msgid "mud"
 msgstr "terrain boueux/vase"
@@ -25373,5 +25760,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "beach"
 msgstr "plage"
@@ -25449,8 +25836,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
-#: build/trans_style.java:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496 build/trans_style.java:3504
+#: build/trans_style.java:3512 build/trans_style.java:3520
 msgid "route"
 msgstr "route"
@@ -25498,7 +25885,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3522 build/trans_style.java:3530
-#: build/trans_style.java:3538 build/trans_style.java:3546
-#: build/trans_style.java:3554
+#: build/trans_style.java:3530 build/trans_style.java:3538
+#: build/trans_style.java:3546 build/trans_style.java:3554
+#: build/trans_style.java:3562
 msgid "boundary"
 msgstr "frontière"
@@ -25648,11 +26035,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090
+#: build/trans_style.java:4002 build/trans_style.java:4010
+#: build/trans_style.java:4018 build/trans_style.java:4026
+#: build/trans_style.java:4034 build/trans_style.java:4042
+#: build/trans_style.java:4050 build/trans_style.java:4058
+#: build/trans_style.java:4066 build/trans_style.java:4074
+#: build/trans_style.java:4082 build/trans_style.java:4090
+#: build/trans_style.java:4098
 msgid "place"
 msgstr "lieu"
@@ -25700,6 +26087,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4207 build/trans_style.java:4214
-#: build/trans_style.java:4221 build/trans_style.java:4228
+#: build/trans_style.java:4215 build/trans_style.java:4222
+#: build/trans_style.java:4229 build/trans_style.java:4236
 msgid "address"
 msgstr "adresse"
@@ -26007,43 +26394,58 @@
 msgstr ""
 
-#~ msgid "All the ways were empty"
-#~ msgstr "Toutes les voies étaient vides"
-
-#~ msgid "Merge nodes with different memberships?"
+#~ msgid "Close current changeset"
+#~ msgstr "Fermer ensemble de changements actuel"
+
+#~ msgid "There is currently no changeset open."
+#~ msgstr "Aucun ensemble de changements n'est actuellement ouvert."
+
+#~ msgid "paramete''{0}'' must not be null"
+#~ msgstr "Le paramètre \"{0}\" ne doit pas être nul."
+
+#~ msgid "- running version is {0}"
+#~ msgstr "- version utilisée {0}"
+
+#~ msgid "not yet decided"
+#~ msgstr "Pas encore décidé."
+
+#~ msgid "Use a new changeset and close it"
+#~ msgstr "Utiliser un nouvel ensemble de changements et le fermer"
+
+#~ msgid ""
+#~ "Select to upload the data using a new changeset and to leave the "
+#~ "changeset open after the upload"
 #~ msgstr ""
-#~ "Fusionner des nœuds qui ne sont pas les mêmes membres d’une relation ?"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Fusionner tout de même"
+#~ "Choisir pour envoyer les données en utilisant un nouvel ensemble de "
+#~ "changements et pour le laisser ouvert après l'envoi"
+
+#~ msgid "Use the existing changeset {0} and close it after upload"
+#~ msgstr ""
+#~ "Utiliser la session de modification existante {0} et la fermer après "
+#~ "l'envoi."
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
+#~ "Select to upload to the existing changeset {0} and to close the changeset "
+#~ "after this upload"
 #~ msgstr ""
-#~ "Les nœuds sélectionnés ne sont pas les mêmes membres d’une relation. "
-#~ "Voulez-vous encore les fusionner ?"
-
-#~ msgid "Unknown version"
-#~ msgstr "Version inconnue"
-
-#~ msgid "Version number missing from OSM data"
-#~ msgstr "Il manque le numéro de version dans les données OSM."
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "Élément <nd> trouvé sur un non-chemin."
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> n’a pas de ref"
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Élément <member> trouvé dans une non-relation."
-
-#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
+#~ "Envoyer avec la session de modification existante {0} et la fermer après "
+#~ "cet envoi."
+
+#~ msgid "Use the existing changeset {0} and leave it open"
 #~ msgstr ""
-#~ "Donnée invalide de l’attribut \"type\" sur le membre {0} de la relation "
-#~ "{1}, valeur {2}"
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "id du nœud mal formé"
+#~ "Utiliser la session de modification existante {0} et la conserver ouverte."
+
+#~ msgid ""
+#~ "Select to upload to the existing changeset {0} and to leave the changeset "
+#~ "open for further uploads"
+#~ msgstr ""
+#~ "Envoyer avec la session de modification existante {0} et la laisser "
+#~ "ouverte pour d'autres envois."
+
+#~ msgid ""
+#~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
+#~ "found."
+#~ msgstr ""
+#~ "Version inattendue de JOSM. Ni Main.ds ni Main.getCurrentDataSet() ont "
+#~ "été trouvés."
 
 #~ msgid "Move"
@@ -26084,4 +26486,7 @@
 #~ msgid "Contacting the OSM server..."
 #~ msgstr "Contact du serveur OSM..."
+
+#~ msgid "Unknown version"
+#~ msgstr "Version inconnue"
 
 #~ msgid "position"
@@ -26156,6 +26561,6 @@
 #~ msgstr "Ce greffon nécessite une mise à jour de JOSM : {0}."
 
-#~ msgid "Add Selected"
-#~ msgstr "Ajouter la sélection"
+#~ msgid "<nd> has zero ref"
+#~ msgstr "<nd> n’a pas de ref"
 
 #~ msgid "Hint: Some changes came from uploading new data to the server."
@@ -26230,4 +26635,7 @@
 #~ msgid "Server does not support changesets"
 #~ msgstr "Le serveur ne supporte pas les révisions"
+
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "Élément <nd> trouvé sur un non-chemin."
 
 #~ msgid ""
@@ -26298,4 +26706,21 @@
 #~ msgstr "Herse"
 
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "Élément <member> trouvé dans une non-relation."
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "id du nœud mal formé"
+
+#~ msgid ""
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
+#~ msgstr ""
+#~ "Les nœuds sélectionnés ne sont pas les mêmes membres d’une relation. "
+#~ "Voulez-vous encore les fusionner ?"
+
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr ""
+#~ "Fusionner des nœuds qui ne sont pas les mêmes membres d’une relation ?"
+
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Impossible d’ouvrir le répertoire des préférences : {0}"
@@ -26388,4 +26813,7 @@
 #~ msgstr "Supprimer et télécharger"
 
+#~ msgid "Merge Anyway"
+#~ msgstr "Fusionner tout de même"
+
 #~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
 #~ msgstr ""
@@ -26543,4 +26971,7 @@
 #~ "inintéressantes des traces."
 
+#~ msgid "All the ways were empty"
+#~ msgstr "Toutes les voies étaient vides"
+
 #~ msgid "Oberpfalz Geofabrik.de"
 #~ msgstr "Haut Palatinat Geofabrik.de"
@@ -26548,4 +26979,7 @@
 #~ msgid "Remove route nodes"
 #~ msgstr "Supprimer les nœuds du chemin"
+
+#~ msgid "Version number missing from OSM data"
+#~ msgstr "Il manque le numéro de version dans les données OSM."
 
 #~ msgid "Error processing changeset upload response"
@@ -26583,4 +27017,9 @@
 #~ msgstr "L’image dont le chemin est {0} n'existe pas ou est illisible."
 
+#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
+#~ msgstr ""
+#~ "Donnée invalide de l’attribut \"type\" sur le membre {0} de la relation "
+#~ "{1}, valeur {2}"
+
 #~ msgid "Resolve conflicts in member list of of relation {0}"
 #~ msgstr "Résoudre les conflits dans la liste des membres de la relation {0}"
@@ -26633,7 +27072,4 @@
 #~ "<strong>{3}</strong> pour annuler.<br>"
 
-#~ msgid "Delete mine"
-#~ msgstr "Supprimer ma version"
-
 #~ msgid ""
 #~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
@@ -26660,7 +27096,4 @@
 #~ msgstr "relations"
 
-#~ msgid "changesets"
-#~ msgstr "jeux de données"
-
 #~ msgid "Error when communicating with server."
 #~ msgstr "Erreur de communication avec le serveur"
@@ -26697,7 +27130,4 @@
 #~ "{0}</html>"
 
-#~ msgid "Change {0} {1}"
-#~ msgstr "Changer {0} {1}"
-
 #~ msgid "No data"
 #~ msgstr "Aucune donnée"
Index: applications/editors/josm/i18n/po/gl.po
===================================================================
--- applications/editors/josm/i18n/po/gl.po	(revision 17655)
+++ applications/editors/josm/i18n/po/gl.po	(revision 17697)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-12 18:11+0200\n"
+"POT-Creation-Date: 2009-09-19 13:00+0200\n"
 "PO-Revision-Date: 2009-06-27 15:34+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-09-12 16:05+0000\n"
+"X-Launchpad-Export-Date: 2009-09-19 10:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -42,10 +42,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:543
 #: ../core/src/org/openstreetmap/josm/Main.java:551
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -70,5 +70,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -86,6 +86,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:358
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
@@ -101,6 +101,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
@@ -124,10 +124,10 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
 msgid "Save and Exit"
 msgstr "Gardar e Sair"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
 msgid "Discard and Exit"
 msgstr "Descartar e Sair"
@@ -138,4 +138,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
@@ -143,27 +144,28 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:296
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:258
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:613
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
@@ -171,5 +173,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -189,6 +191,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
@@ -205,17 +207,17 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:654
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1528
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -226,6 +228,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
@@ -278,9 +280,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:607
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:609
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -340,5 +342,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
 msgid "Plugins"
@@ -388,5 +390,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr ""
@@ -474,5 +476,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -485,4 +487,5 @@
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -518,6 +521,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
@@ -526,6 +529,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:346
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
@@ -633,4 +636,45 @@
 msgstr "Non hai conflitos sobre os que facer zoom"
 
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#, fuzzy
+msgid "Close open changesets"
+msgstr "Pechando colección de cambios..."
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#, fuzzy
+msgid "Closes open changesets"
+msgstr "Pechando colección de cambios..."
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
+#: ../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:114
+#, java-format
+msgid "File: {0}"
+msgstr "Ficheiro: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
+msgid "There are no open changesets"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
+#, fuzzy
+msgid "No open changesets"
+msgstr "Pechando colección de cambios..."
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
+#, fuzzy
+msgid "Downloading open changesets ..."
+msgstr "Pechando colección de cambios..."
+
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
@@ -726,10 +770,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:123
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
@@ -773,31 +818,30 @@
 "Distribuir os nodos seleccionados de xeito equidistante ao longo dunha liña."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
 msgid "Download from OSM..."
 msgstr "Descargar de OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
 msgid "Download map data from the OSM server."
 msgstr "Descargar datos do mapa do servidor OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
-#, java-format
-msgid "File: {0}"
-msgstr "Ficheiro: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
 msgid "Download"
 msgstr "Descargar"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
 msgid "Please select at least one task to download"
 msgstr "Por favor, selecciona polo menos unha tarefa para descargar"
@@ -818,5 +862,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1527
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307
@@ -836,6 +880,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:376
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1415
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
 msgid "Duplicate"
 msgstr "Duplicar"
@@ -907,10 +951,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
@@ -996,25 +1041,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 msgid "Merge Nodes"
 msgstr "Acoplar Nodos"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
 msgid "Merge nodes into the oldest one."
 msgstr "Acoplar nodos no máis antigo"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
 msgid "Please select at least two nodes to merge."
 msgstr "Por favor, selecciona polo menos dous nodos a acoplar."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:394
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
@@ -1030,8 +1076,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -1057,6 +1103,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
@@ -1065,5 +1115,5 @@
 msgstr "o parámetro \"{0}\" debe non ser nulo"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
@@ -1071,5 +1121,5 @@
 "uso."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283
 #, java-format
 msgid "Merge {0} nodes"
@@ -1141,5 +1191,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "New"
 msgstr "Nova"
@@ -1418,14 +1468,15 @@
 msgstr "Axda: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
 msgid "Status Report"
 msgstr "Informe de Estado"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 msgid "Copy to clipboard and close"
 msgstr "Copiar a porta papeis e pechar"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
@@ -1506,25 +1557,4 @@
 msgstr "Separar a vía {0} en {1} partes"
 
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24
-msgid "Close current changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-msgid "Close the current changeset ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41
-msgid "There is currently no changeset open."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42
-msgid "No open changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60
-msgid "Closing changeset"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
@@ -1693,14 +1723,14 @@
 msgstr "Selección valeira"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Subir a OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 msgid "Upload all changes to the OSM server."
 msgstr "SIbir todos os cambios ó servidor OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
 #, java-format
 msgid ""
@@ -1709,23 +1739,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
 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:166
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 msgid "No changes to upload."
 msgstr "Non hai cambios que subir."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Sincronizar só {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
 msgid "Synchronize entire dataset"
 msgstr "Sincronizar o paquete de datos completo"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
 #, java-format
 msgid ""
@@ -1747,17 +1777,17 @@
 "continuar editando.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
 msgid "Conflict detected"
 msgstr "Detectado un conflito"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr "valor retornado non esperado. Obtívose {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:267
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
 #, java-format
 msgid ""
@@ -1773,5 +1803,17 @@
 "editando.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
+msgid ""
+"<html>Uploading <strong>failed</strong> because you've been "
+"using<br>changeset {0} which was already closed at {1}.<br>Please upload "
+"again with a new or an existing open changeset."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+#, fuzzy
+msgid "Changeset closed"
+msgstr "Cambiar valores?"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
@@ -1780,23 +1822,23 @@
 "\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
 msgid "Upload to OSM API failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
 msgid "Updating primitive"
 msgstr "Actualizando primitiva"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -2015,14 +2057,14 @@
 msgstr "Engadir nodo a vía e conectar"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:930
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:932
 msgid "Create new node."
 msgstr "Crear novo nodo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
 msgid "Select node under cursor."
 msgstr "Seleccionar nodo baixo o cursor."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939
 #, java-format
 msgid "Insert new node into way."
@@ -2031,14 +2073,14 @@
 msgstr[1] "Insertar novo nodo en {0} vías."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
 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:949
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951
 msgid "Continue way from last node."
 msgstr "Continuar vía a partir do último nodo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:972
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:974
 msgid "Finish drawing."
 msgstr "Rematar debuxo."
@@ -2160,60 +2202,70 @@
 "+Frecha arriba, esquerda, abaixo, dereita; mover zoom co botón dereito"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Buscar..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Buscar obxectos."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
 msgid "Can't search because there is no loaded data."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
+#, fuzzy
+msgid "Please enter a filter string."
+msgstr "Por favor, introduce unha cadea de busca."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
 msgid "Please enter a search string."
 msgstr "Por favor, introduce unha cadea de busca."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
 msgid "replace selection"
 msgstr "reemplazar selección"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72
 msgid "add to selection"
 msgstr "engadir á selección"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73
 msgid "remove from selection"
 msgstr "eliminar da selección"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
+#, fuzzy
+msgid "find in selection"
+msgstr "engadir á selección"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81
 msgid "case sensitive"
 msgstr "sensible a maiúsculas"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82
 msgid "regular expression"
 msgstr "expresión regular"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
 msgstr "<b>Baker Street</b> - 'Baker' e 'Street' en calquer clave ou nome."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
 msgstr "<b>\"Baker Street\"</b> - 'Baker Street' en calquera clave ou nome."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
 msgstr "<b>name:Bak</b> - 'Bak' en calquer posición do nome."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
 msgstr "<b>type=route</b> - a clave 'type' co valor exacto 'route'"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid ""
 "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
@@ -2223,50 +2275,50 @@
 "b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
 msgstr "<b>-name:Bak</b> - que non conteña 'Bak' no nome."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - clave=foot establecida con calquer valor."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
 msgid "<u>Special targets:</u>"
 msgstr "<u>Obxectivos especiais:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr "<b>type:</b> - tipo do obxecto(<b>node</b>,<b>way</b>,<b>relation</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - todos os obxectos cambiados polo usuario"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 msgid "<b>nodes:</b>... - object with given number of nodes"
 msgstr "<b>nodes:</b>... - obxectro có número de nodos indicado"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - todos os obxectos cambiados"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - todos os obxectos seleccionados"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - todos os obxectos incompletos"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - todos os obxectos sen etiquetar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2275,5 +2327,5 @@
 "coa expresión"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2282,54 +2334,71 @@
 "expresión"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Usar <b>|</b> ou <b>OR</b> para combinar co operador OU lóxico"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr "Usar <b>\"</b> para escapar operadores (p.e. se a clave conten : )"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Usar <b>(</b> e <b>)</b> para agrupar expresións"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
+msgid "Filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Buscar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
+msgid "Submit filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "Start Search"
 msgstr "Comezar Busca"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Non se atoparon coincidencias para \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Non se engadiu nada á selección buscando por \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Non se eliminou da selección buscando por \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#, fuzzy, java-format
+msgid "Nothing find in selection by searching for ''{0}''"
+msgstr "Non se engadiu nada á selección buscando por \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262
 #, java-format
 msgid "Found {0} matches"
 msgstr "Atopadas {0} coincidencias"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283
 msgid "RX"
 msgstr "RX"
@@ -2519,5 +2588,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
 msgid "Double conflict"
 msgstr ""
@@ -2764,4 +2833,5 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:134
 msgid "Old value"
 msgstr "Valor antigo"
@@ -2925,27 +2995,59 @@
 
 #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
 msgid "E"
 msgstr "E"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:59
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:203
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
 msgid "Changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:323
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392
 #, 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/DataSet.java:325
-#, fuzzy, java-format
-msgid "paramete''{0}'' must not be null"
-msgstr "o parámetro \"{0}\" debe non ser nulo"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331
-#, fuzzy, java-format
-msgid "unsupported value ''{0}'' or parameter ''{1}''"
-msgstr "Non hai un rol ''{0}'' útil para a Vía ''{1}'.'"
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "H"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "Text"
+msgstr "texto"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "C"
+msgstr "CS"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "I"
+msgstr "CI"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "M"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#, fuzzy
+msgid "R"
+msgstr "RX"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+msgid "A"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+msgid "D"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+msgid "F"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
@@ -2959,29 +3061,29 @@
 msgstr "Advertencia: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
+#, java-format
 msgid "expected id >= 0. Got {0}"
-msgstr "valor retornado non esperado. Obtívose {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:257
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
 msgid "a primitive with id=0 can't be invisible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:293
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
+#, java-format
 msgid "id > 0 expected. Got {0}"
-msgstr "valor retornado non esperado. Obtívose {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
 msgid "version > 0 expected. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, 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:38
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
 msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
@@ -3051,9 +3153,9 @@
 msgstr "o parámetro {0} non está no rango 0..{1}, obtívose {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:247
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:249
 msgid "Area style way is not closed."
 msgstr "A vía de estilo de área non está pechada."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:478
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:482
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
@@ -3062,118 +3164,118 @@
 #. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
 #. TODO Remove useless nullcheck when RelationMember.member is encalupsed
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:851
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855
 msgid "Empty member in relation."
 msgstr "Membro vacío na relación."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:853
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Membro \"{0}\" borrado na relación."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:864
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Vía \"{0}\" con menos de dous puntos."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "More than one \"from\" way found."
 msgstr "Atopadas máis de unha vía \"desde\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "More than one \"to\" way found."
 msgstr "Atopadas máis de unha vía \"ata\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "More than one \"via\" found."
 msgstr "Atopouse máis de un \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Papel \"{0}\" descoñecido."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Tipo de membro descoñecido para \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"from\" way found."
 msgstr "Non se atoparon vias \"desde\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"to\" way found."
 msgstr "Non se atoparon vías \"ata\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652
 msgid "No \"via\" node or way found."
 msgstr "Ningún nodo o vía \"vía\" atopados."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "A vía \"desde\" non comeza ou finaliza en un nodo \"vía\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "A vía \"ata\" non comeza ou finaliza en un nodo \"vía\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Non se atopou o estilo para a restrición {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Non hai un rol ''{0}'' útil para a Vía ''{1}'.'"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:885
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:943
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1032
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Intersección entre as vías ''{0}'' e ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1044
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "A vía interior ''{0}'' está fóra."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1097
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1123
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1327
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331
 msgid "untagged"
 msgstr "Sen etiquetar"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1328
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332
 msgid "text"
 msgstr "texto"
@@ -3194,5 +3296,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
@@ -3213,5 +3315,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
@@ -3260,5 +3362,5 @@
 msgstr "Zona Lambert (Franza)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
 msgid "Lambert Zone (Estonia)"
 msgstr "Zona Lambert (Estonia)"
@@ -3300,9 +3402,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:38
 msgid "Do not show again"
 msgstr "Non amosar de novo"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
 #, java-format
@@ -3310,31 +3412,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:91
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:116
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154
 msgid "incomplete"
 msgstr "incompleto"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
 msgid "highway"
 msgstr "Carretera"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
-#: build/trans_presets.java:3144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: build/trans_presets.java:3156
 msgid "railway"
 msgstr "Vía férrea"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
 msgid "waterway"
 msgstr "Vía acuática"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "landuse"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:474
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
@@ -3344,5 +3446,5 @@
 msgstr[1] "{0} nodos"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
 #, java-format
 msgid "{0} member"
@@ -3387,10 +3489,5 @@
 msgstr "Mensaxe do día non dispoñible"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67
-#, java-format
-msgid "- running version is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:95
 msgid "Downloading \"Message of the day\""
 msgstr "Descargando \"Mensaxe do día\""
@@ -3462,10 +3559,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:162
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
 msgid "Username"
 msgstr "Nome de usuario"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
 msgid "Password"
 msgstr "Contrasinal"
@@ -3588,5 +3685,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226
 msgid "Presets"
 msgstr "Axustes prestablecidos"
@@ -3660,38 +3757,49 @@
 msgstr "escalar"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
 msgid "The geographic longitude at the mouse pointer."
 msgstr "A lonxitude xeográfica na posición do punteiro do rato."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The name of the object at the mouse pointer."
 msgstr "O nome do obxecto na posición do punteiro do rato."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The geographic latitude at the mouse pointer."
 msgstr "A latitude xeográfica na posición do punteiro do rato."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The angle between the previous and the current way segment."
 msgstr "O ángulo entre o segmento previo e o actual da vía."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "A dirección (da brúxula) do segmento de liña que se está a debuxar."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The length of the new way segment being drawn."
 msgstr "A lonxitude do novo segmento de vía que se está a debuxar."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199
+msgid ""
+"Middle click again to cycle through.<br>Hold CTRL to select directly from "
+"this list with the mouse.<hr>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290
 msgid "(no object)"
 msgstr "(sen obxecto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:301
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418
+#, fuzzy
+msgid "User:"
+msgstr "Nome de usuario"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
 msgid "layer not in list."
 msgstr "a capa non está na lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:488
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3764,7 +3872,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:224
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Tags"
 msgstr "Etiquetas"
@@ -3779,5 +3887,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
@@ -3958,4 +4066,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
 msgid "Up"
 msgstr ""
@@ -3966,4 +4075,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Down"
 msgstr ""
@@ -3976,5 +4086,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
@@ -4399,23 +4509,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:236
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239
 msgid "No conflicts to resolve"
-msgstr "Non hai conflitos sobre os que facer zoom"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:295
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254
 msgid "Cancel conflict resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:310
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269
 msgid "Apply resolved conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Apply"
 msgstr ""
@@ -4427,5 +4536,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "all"
 msgstr ""
@@ -4469,7 +4578,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
-msgid "not yet decided"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:213
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
@@ -4496,7 +4602,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
@@ -4506,7 +4612,7 @@
 msgstr[1] "{0} vías"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:152
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
@@ -4516,20 +4622,20 @@
 msgstr[1] "{0} relacións"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "Paste ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "From ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:372
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "To ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:428
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
 #, java-format
 msgid "{0} tag"
@@ -4545,13 +4651,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
-#, fuzzy
 msgid "Remove this relation member from the relation"
-msgstr "Eliminar o membro da fila actual desta relación"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-#, fuzzy
 msgid "Replace"
-msgstr "Nome real"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
@@ -4567,5 +4671,5 @@
 #. --- role editing
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:56
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510
 msgid "Role:"
 msgstr ""
@@ -4581,7 +4685,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70
-#, fuzzy
 msgid "Value:"
-msgstr "Valor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86
@@ -4598,7 +4701,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
-#, fuzzy
 msgid "Decision"
-msgstr "Revisión"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -4614,6 +4716,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
@@ -4704,171 +4807,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-msgid "History"
-msgstr "Historial"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-msgid "Display the history of all selected items."
-msgstr "Amosar o historial de todos os elementos seleccionados."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
-#, java-format
-msgid "index out of bounds Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
-msgid "History item"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-"Recargar todos os obxectos seleccionados actualmente e actualizar a lista."
-
-#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
-msgid "Show"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
-msgid "Dialog not created yet. Invoke createInstance() first"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
-msgid "Layers"
-msgstr "Capas"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-msgid "Open a list of all loaded layers."
-msgstr "Abrir unha lista de todas as capas cargadas."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:297
-msgid "Delete the selected layer."
-msgstr "Borrar a capa seleccionada."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:367
-msgid "Show/Hide"
-msgstr "Amosar/Ocultar"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:378
-msgid "Toggle visible state of the selected layer."
-msgstr "Cambiar o estado visible da capa seleccionada."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:420
-msgid "Activate the selected layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:475
-msgid "Merge this layer into another layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:581
-msgid "Move the selected layer one row up."
-msgstr "Mover a capa seleccionada unha fila cara arriba."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:600
-msgid "Move the selected layer one row down."
-msgstr "Mover a capa seleccionada unha fila cara abaixo."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
-msgid "Information about layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
-#, java-format
-msgid "This will change up to {0} object."
-msgid_plural "This will change up to {0} objects."
-msgstr[0] "Esto cambiará ata {0} obxecto."
-msgstr[1] "Esto cambiará ata {0} obxectos."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
-msgid "An empty value deletes the key."
-msgstr "Un valor vacío borra a clave."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
-msgid "<different>"
-msgstr "<diferente>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
-msgid "Change values?"
-msgstr "Cambiar valores?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
-#, java-format
-msgid "Change properties of up to {0} object"
-msgid_plural "Change properties of up to {0} objects"
-msgstr[0] "Cambiar as propiedades de ata {0} obxecto"
-msgstr[1] "Cambiar as propiedades de ata {0} obxectos"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
-msgid "Please select a key"
-msgstr "Por favor, selecciona unha tecla"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
-msgid "Please select a value"
-msgstr "Por favor selecciona un valor"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
-msgid "Please select the objects you want to change properties for."
-msgstr ""
-"Por favor selecciona os obxectos dos que queres cambiar as propiedades."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
-msgid "Properties/Memberships"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-msgid "Properties for selected objects."
-msgstr "Propiedades dos obxectos seleccionados."
-
-#. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-msgid "Member Of"
-msgstr "Membro de"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
-msgid "Add Properties"
-msgstr "Engadir Propiedades"
-
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+msgid "Filter objects and hide/disable them."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
@@ -4882,4 +4827,212 @@
 msgstr "Engadir"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#, fuzzy
+msgid "Add filter."
+msgstr "Engadir Seleccionados"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
+msgid "Edit filter."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#, fuzzy
+msgid "Delete filter."
+msgstr "Borrar a miña"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
+#, fuzzy
+msgid "Move filter up."
+msgstr "Mover cara arriba"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
+#, fuzzy
+msgid "Move filter down."
+msgstr "Mover cara abaixo"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128
+msgid "Enable filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
+msgid "Hide elements"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
+msgid "Apply also for children"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
+msgid "Inverse filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
+#, fuzzy
+msgid "Filter mode"
+msgstr "Borrar Modo"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
+msgid "History"
+msgstr "Historial"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+msgid "Display the history of all selected items."
+msgstr "Amosar o historial de todos os elementos seleccionados."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
+msgid "History item"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
+msgid "Reload all currently selected objects and refresh the list."
+msgstr ""
+"Recargar todos os obxectos seleccionados actualmente e actualizar a lista."
+
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
+msgid "Show"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
+msgid "Display the history of the selected primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84
+msgid "Dialog not created yet. Invoke createInstance() first"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
+msgid "Layers"
+msgstr "Capas"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+msgid "Open a list of all loaded layers."
+msgstr "Abrir unha lista de todas as capas cargadas."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294
+msgid "Delete the selected layer."
+msgstr "Borrar a capa seleccionada."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364
+msgid "Show/Hide"
+msgstr "Amosar/Ocultar"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375
+msgid "Toggle visible state of the selected layer."
+msgstr "Cambiar o estado visible da capa seleccionada."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgid "Activate"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417
+msgid "Activate the selected layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472
+msgid "Merge this layer into another layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578
+msgid "Move the selected layer one row up."
+msgstr "Mover a capa seleccionada unha fila cara arriba."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597
+msgid "Move the selected layer one row down."
+msgstr "Mover a capa seleccionada unha fila cara abaixo."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+msgid "Information about layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+#, java-format
+msgid "This will change up to {0} object."
+msgid_plural "This will change up to {0} objects."
+msgstr[0] "Esto cambiará ata {0} obxecto."
+msgstr[1] "Esto cambiará ata {0} obxectos."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+msgid "An empty value deletes the key."
+msgstr "Un valor vacío borra a clave."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+msgid "<different>"
+msgstr "<diferente>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+msgid "Change values?"
+msgstr "Cambiar valores?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#, java-format
+msgid "Change properties of up to {0} object"
+msgid_plural "Change properties of up to {0} objects"
+msgstr[0] "Cambiar as propiedades de ata {0} obxecto"
+msgstr[1] "Cambiar as propiedades de ata {0} obxectos"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+msgid "Please select a key"
+msgstr "Por favor, selecciona unha tecla"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+msgid "Please select a value"
+msgstr "Por favor selecciona un valor"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
+msgid "Please select the objects you want to change properties for."
+msgstr ""
+"Por favor selecciona os obxectos dos que queres cambiar as propiedades."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
+msgid "Properties/Memberships"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+msgid "Properties for selected objects."
+msgstr "Propiedades dos obxectos seleccionados."
+
+#. setting up the membership table
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+msgid "Member Of"
+msgstr "Membro de"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
+msgid "Add Properties"
+msgstr "Engadir Propiedades"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574
 msgid "Add a new key/value pair to all objects"
@@ -4921,10 +5074,9 @@
 
 #. item "Land use/Quarry" text "Name"
-#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
-#: build/trans_presets.java:3109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168
+#: build/trans_presets.java:3121
 msgid "Relations"
 msgstr "Relacións"
@@ -4934,23 +5086,23 @@
 msgstr "Abrir unha lista con todas as relacións."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relacións: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276
 msgid "Open an editor for the selected relation"
 msgstr "Abrir un editor para a relación seleccionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
 msgid "Delete the selected relation"
 msgstr "Borrar a relación seleccionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349
 msgid "Create a new relation"
 msgstr "Crear unha nova relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:373
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1412
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
@@ -4983,5 +5135,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4993,9 +5145,9 @@
 msgstr "Selección: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441
 msgid "Undock the panel"
 msgstr "Desacoplar o panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5004,5 +5156,5 @@
 "da esquerda."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:457
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Facer click para minimizar/maximizar o contido do panel"
@@ -5064,5 +5216,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5086,5 +5238,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1502
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1370
 msgid "Download relation members"
 msgstr ""
@@ -5114,5 +5266,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -5120,18 +5272,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
 msgid "Tags and Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:167
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5140,14 +5292,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613
 #, java-format
 msgid ""
@@ -5157,9 +5309,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid ""
@@ -5169,15 +5321,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5185,5 +5337,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5191,20 +5343,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849
 #, java-format
 msgid ""
@@ -5213,57 +5365,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:961
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909
 msgid "Move the currently selected members up"
 msgstr "Mover os membros actualmente seleccionados cara arriba"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:979
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:912
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928
 msgid "Move the currently selected members down"
 msgstr "Mover os membros seleccionados actualmente cara abaixo"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:998
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:931
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5272,9 +5424,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1058
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
 #, java-format
 msgid ""
@@ -5283,56 +5435,41 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090
+msgid "Apply the current updates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123
+msgid "Apply the updates and close the dialog"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
-msgid "Apply the current updates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
-msgid "Apply the updates and close the dialog"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
-msgid "Delete the currently selected tags"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Descargar todas as vías e nodos incompletos na relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 msgid "Download Members"
 msgstr "Descargar Membros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1208
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1211
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1356
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 #, java-format
 msgid ""
@@ -5342,13 +5479,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1229
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1367
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
 msgid "Confirm empty role"
 msgstr ""
@@ -5435,37 +5572,37 @@
 msgstr "Marcadores"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:82
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
 msgid "Please enter the desired coordinates first."
 msgstr "Por favor, primeiro introduce as coordenadas desexadas."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
 msgid "Please enter a name for the location."
 msgstr "Por favor, introduce un nome para o lugar."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:107
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
 msgid "Select a bookmark first."
 msgstr "Selecciona primeiro un marcador."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
 msgid "min lat"
 msgstr "lat. min."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
 msgid "min lon"
 msgstr "lon. min."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid "max lat"
 msgstr "lat. max."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
 msgid "max lon"
 msgstr "lon. max."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5475,27 +5612,27 @@
 "área)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
 msgid "Bounding Box"
 msgstr ""
 
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
 msgid "Data Sources and Types"
 msgstr "Fontes de Datos e Tipos"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
 msgid "Download as new layer"
 msgstr "Descargar como unha nova capa"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
 msgid "Download Area"
 msgstr "Área de Descarga"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
 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:219
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
 msgid "Download area ok, size probably acceptable to server"
 msgstr ""
@@ -5522,7 +5659,7 @@
 msgstr "Introduce o nome do lugar a buscar:"
 
-#. <separator/>
+#. group "Geography"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2759
 msgid "Places"
 msgstr "Lugares"
@@ -5569,21 +5706,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "type"
 msgstr "tipo"
@@ -5600,5 +5737,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-#, fuzzy
 msgid ""
 "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
@@ -5606,6 +5742,4 @@
 "Hold left mousebutton and draw a frame."
 msgstr ""
-"Zoom: usar a roda do rato ou facer dobre click. Mover mapa: mover o rato "
-"mantendo o botón dereito pulsado. Seleccionar: Facer click."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
@@ -6066,4 +6200,6 @@
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
 #. <key key="historic" value="wayside_shrine" />
+#. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
+#. <key key="historic" value="boundary_stone" />
 #. item "Leisure/Water Park" label "Edit Water Park"
 #. <key key="leisure" value="water_park" />
@@ -6435,153 +6571,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/trans_presets.java:66 build/trans_presets.java:102
-#: build/trans_presets.java:142 build/trans_presets.java:179
-#: build/trans_presets.java:199 build/trans_presets.java:217
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:272 build/trans_presets.java:305
-#: build/trans_presets.java:351 build/trans_presets.java:371
-#: build/trans_presets.java:386 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:463 build/trans_presets.java:482
-#: build/trans_presets.java:502 build/trans_presets.java:522
-#: build/trans_presets.java:543 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627 build/trans_presets.java:658
-#: build/trans_presets.java:679 build/trans_presets.java:692
-#: build/trans_presets.java:705 build/trans_presets.java:718
-#: build/trans_presets.java:731 build/trans_presets.java:744
-#: build/trans_presets.java:755 build/trans_presets.java:764
-#: build/trans_presets.java:811 build/trans_presets.java:832
-#: build/trans_presets.java:841 build/trans_presets.java:901
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1067 build/trans_presets.java:1075
-#: build/trans_presets.java:1085 build/trans_presets.java:1093
-#: build/trans_presets.java:1098 build/trans_presets.java:1105
-#: build/trans_presets.java:1112 build/trans_presets.java:1117
-#: build/trans_presets.java:1125 build/trans_presets.java:1134
-#: build/trans_presets.java:1140 build/trans_presets.java:1146
-#: build/trans_presets.java:1151 build/trans_presets.java:1157
-#: build/trans_presets.java:1163 build/trans_presets.java:1172
-#: build/trans_presets.java:1181 build/trans_presets.java:1188
-#: build/trans_presets.java:1196 build/trans_presets.java:1209
-#: build/trans_presets.java:1215 build/trans_presets.java:1224
-#: build/trans_presets.java:1230 build/trans_presets.java:1236
-#: build/trans_presets.java:1244 build/trans_presets.java:1299
-#: build/trans_presets.java:1346 build/trans_presets.java:1352
-#: build/trans_presets.java:1358 build/trans_presets.java:1364
-#: build/trans_presets.java:1370 build/trans_presets.java:1381
-#: build/trans_presets.java:1390 build/trans_presets.java:1405
-#: build/trans_presets.java:1412 build/trans_presets.java:1418
-#: build/trans_presets.java:1426 build/trans_presets.java:1433
-#: build/trans_presets.java:1442 build/trans_presets.java:1450
-#: build/trans_presets.java:1457 build/trans_presets.java:1468
-#: build/trans_presets.java:1478 build/trans_presets.java:1488
-#: build/trans_presets.java:1508 build/trans_presets.java:1520
-#: build/trans_presets.java:1531 build/trans_presets.java:1548
-#: build/trans_presets.java:1555 build/trans_presets.java:1570
-#: build/trans_presets.java:1577 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1594
-#: build/trans_presets.java:1599 build/trans_presets.java:1605
-#: build/trans_presets.java:1611 build/trans_presets.java:1619
-#: build/trans_presets.java:1627 build/trans_presets.java:1635
-#: build/trans_presets.java:1642 build/trans_presets.java:1648
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1670 build/trans_presets.java:1677
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1712 build/trans_presets.java:1719
-#: build/trans_presets.java:1736 build/trans_presets.java:1744
-#: build/trans_presets.java:1759 build/trans_presets.java:1769
-#: build/trans_presets.java:1781 build/trans_presets.java:1788
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:1809 build/trans_presets.java:1817
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1841
-#: build/trans_presets.java:1846 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1864
-#: build/trans_presets.java:1872 build/trans_presets.java:1881
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1908 build/trans_presets.java:1914
-#: build/trans_presets.java:1922 build/trans_presets.java:1928
-#: build/trans_presets.java:1934 build/trans_presets.java:1940
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2013
-#: build/trans_presets.java:2022 build/trans_presets.java:2030
-#: build/trans_presets.java:2036 build/trans_presets.java:2042
-#: build/trans_presets.java:2048 build/trans_presets.java:2054
-#: build/trans_presets.java:2060 build/trans_presets.java:2066
-#: build/trans_presets.java:2072 build/trans_presets.java:2078
-#: build/trans_presets.java:2084 build/trans_presets.java:2090
-#: build/trans_presets.java:2096 build/trans_presets.java:2102
-#: build/trans_presets.java:2108 build/trans_presets.java:2114
-#: build/trans_presets.java:2120 build/trans_presets.java:2126
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2158
-#: build/trans_presets.java:2165 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2186
-#: build/trans_presets.java:2192 build/trans_presets.java:2198
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2218 build/trans_presets.java:2225
-#: build/trans_presets.java:2232 build/trans_presets.java:2239
-#: build/trans_presets.java:2247 build/trans_presets.java:2279
-#: build/trans_presets.java:2284 build/trans_presets.java:2289
-#: build/trans_presets.java:2294 build/trans_presets.java:2300
-#: build/trans_presets.java:2306 build/trans_presets.java:2312
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2354
-#: build/trans_presets.java:2451 build/trans_presets.java:2458
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2485 build/trans_presets.java:2492
-#: build/trans_presets.java:2498 build/trans_presets.java:2504
-#: build/trans_presets.java:2526 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2553 build/trans_presets.java:2559
-#: build/trans_presets.java:2565 build/trans_presets.java:2571
-#: build/trans_presets.java:2577 build/trans_presets.java:2583
-#: build/trans_presets.java:2590 build/trans_presets.java:2597
-#: build/trans_presets.java:2604 build/trans_presets.java:2610
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2661
-#: build/trans_presets.java:2667 build/trans_presets.java:2677
-#: build/trans_presets.java:2686 build/trans_presets.java:2701
-#: build/trans_presets.java:2707 build/trans_presets.java:2715
-#: build/trans_presets.java:2722 build/trans_presets.java:2742
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2783
-#: build/trans_presets.java:2790 build/trans_presets.java:2797
-#: build/trans_presets.java:2803 build/trans_presets.java:2809
-#: build/trans_presets.java:2817 build/trans_presets.java:2824
-#: build/trans_presets.java:2831 build/trans_presets.java:2838
-#: build/trans_presets.java:2844 build/trans_presets.java:2851
-#: build/trans_presets.java:2858 build/trans_presets.java:2867
-#: build/trans_presets.java:2873 build/trans_presets.java:2879
-#: build/trans_presets.java:2885 build/trans_presets.java:2891
-#: build/trans_presets.java:2900 build/trans_presets.java:2910
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2948
-#: build/trans_presets.java:2957 build/trans_presets.java:2963
-#: build/trans_presets.java:2969 build/trans_presets.java:2975
-#: build/trans_presets.java:2981 build/trans_presets.java:2987
-#: build/trans_presets.java:2993 build/trans_presets.java:3000
-#: build/trans_presets.java:3006 build/trans_presets.java:3011
-#: build/trans_presets.java:3018 build/trans_presets.java:3025
-#: build/trans_presets.java:3031 build/trans_presets.java:3040
-#: build/trans_presets.java:3048 build/trans_presets.java:3054
-#: build/trans_presets.java:3060 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3080
-#: build/trans_presets.java:3086 build/trans_presets.java:3092
-#: build/trans_presets.java:3098 build/trans_presets.java:3104
-#: build/trans_presets.java:3117 build/trans_presets.java:3131
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:67 build/trans_presets.java:103
+#: build/trans_presets.java:143 build/trans_presets.java:180
+#: build/trans_presets.java:200 build/trans_presets.java:218
+#: build/trans_presets.java:235 build/trans_presets.java:253
+#: build/trans_presets.java:273 build/trans_presets.java:306
+#: build/trans_presets.java:352 build/trans_presets.java:372
+#: build/trans_presets.java:387 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:503 build/trans_presets.java:523
+#: build/trans_presets.java:544 build/trans_presets.java:565
+#: build/trans_presets.java:586 build/trans_presets.java:607
+#: build/trans_presets.java:628 build/trans_presets.java:659
+#: build/trans_presets.java:680 build/trans_presets.java:693
+#: build/trans_presets.java:706 build/trans_presets.java:719
+#: build/trans_presets.java:732 build/trans_presets.java:745
+#: build/trans_presets.java:756 build/trans_presets.java:765
+#: build/trans_presets.java:812 build/trans_presets.java:833
+#: build/trans_presets.java:842 build/trans_presets.java:902
+#: build/trans_presets.java:1053 build/trans_presets.java:1061
+#: build/trans_presets.java:1069 build/trans_presets.java:1077
+#: build/trans_presets.java:1087 build/trans_presets.java:1095
+#: build/trans_presets.java:1100 build/trans_presets.java:1107
+#: build/trans_presets.java:1114 build/trans_presets.java:1119
+#: build/trans_presets.java:1127 build/trans_presets.java:1136
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1153 build/trans_presets.java:1159
+#: build/trans_presets.java:1165 build/trans_presets.java:1174
+#: build/trans_presets.java:1183 build/trans_presets.java:1190
+#: build/trans_presets.java:1198 build/trans_presets.java:1211
+#: build/trans_presets.java:1217 build/trans_presets.java:1226
+#: build/trans_presets.java:1232 build/trans_presets.java:1238
+#: build/trans_presets.java:1246 build/trans_presets.java:1302
+#: build/trans_presets.java:1349 build/trans_presets.java:1355
+#: build/trans_presets.java:1361 build/trans_presets.java:1367
+#: build/trans_presets.java:1373 build/trans_presets.java:1384
+#: build/trans_presets.java:1393 build/trans_presets.java:1408
+#: build/trans_presets.java:1415 build/trans_presets.java:1421
+#: build/trans_presets.java:1429 build/trans_presets.java:1436
+#: build/trans_presets.java:1445 build/trans_presets.java:1453
+#: build/trans_presets.java:1460 build/trans_presets.java:1471
+#: build/trans_presets.java:1481 build/trans_presets.java:1491
+#: build/trans_presets.java:1511 build/trans_presets.java:1523
+#: build/trans_presets.java:1534 build/trans_presets.java:1551
+#: build/trans_presets.java:1558 build/trans_presets.java:1574
+#: build/trans_presets.java:1581 build/trans_presets.java:1586
+#: build/trans_presets.java:1592 build/trans_presets.java:1598
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1646 build/trans_presets.java:1652
+#: build/trans_presets.java:1659 build/trans_presets.java:1666
+#: build/trans_presets.java:1674 build/trans_presets.java:1681
+#: build/trans_presets.java:1689 build/trans_presets.java:1696
+#: build/trans_presets.java:1702 build/trans_presets.java:1709
+#: build/trans_presets.java:1716 build/trans_presets.java:1723
+#: build/trans_presets.java:1740 build/trans_presets.java:1748
+#: build/trans_presets.java:1763 build/trans_presets.java:1773
+#: build/trans_presets.java:1785 build/trans_presets.java:1792
+#: build/trans_presets.java:1798 build/trans_presets.java:1808
+#: build/trans_presets.java:1813 build/trans_presets.java:1821
+#: build/trans_presets.java:1828 build/trans_presets.java:1834
+#: build/trans_presets.java:1840 build/trans_presets.java:1845
+#: build/trans_presets.java:1850 build/trans_presets.java:1855
+#: build/trans_presets.java:1862 build/trans_presets.java:1868
+#: build/trans_presets.java:1873 build/trans_presets.java:1882
+#: build/trans_presets.java:1891 build/trans_presets.java:1900
+#: build/trans_presets.java:1909 build/trans_presets.java:1918
+#: build/trans_presets.java:1924 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 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:2023 build/trans_presets.java:2032
+#: build/trans_presets.java:2040 build/trans_presets.java:2046
+#: build/trans_presets.java:2052 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 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:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2150
+#: build/trans_presets.java:2156 build/trans_presets.java:2162
+#: build/trans_presets.java:2169 build/trans_presets.java:2176
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2197 build/trans_presets.java:2203
+#: build/trans_presets.java:2209 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2229
+#: build/trans_presets.java:2236 build/trans_presets.java:2243
+#: build/trans_presets.java:2250 build/trans_presets.java:2258
+#: build/trans_presets.java:2290 build/trans_presets.java:2295
+#: build/trans_presets.java:2300 build/trans_presets.java:2305
+#: build/trans_presets.java:2311 build/trans_presets.java:2317
+#: build/trans_presets.java:2323 build/trans_presets.java:2331
+#: build/trans_presets.java:2337 build/trans_presets.java:2343
+#: build/trans_presets.java:2349 build/trans_presets.java:2355
+#: build/trans_presets.java:2365 build/trans_presets.java:2462
+#: build/trans_presets.java:2469 build/trans_presets.java:2483
+#: build/trans_presets.java:2489 build/trans_presets.java:2496
+#: build/trans_presets.java:2503 build/trans_presets.java:2509
+#: build/trans_presets.java:2515 build/trans_presets.java:2537
+#: build/trans_presets.java:2544 build/trans_presets.java:2551
+#: build/trans_presets.java:2557 build/trans_presets.java:2564
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2594 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2615
+#: build/trans_presets.java:2621 build/trans_presets.java:2627
+#: build/trans_presets.java:2633 build/trans_presets.java:2639
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2672 build/trans_presets.java:2678
+#: build/trans_presets.java:2688 build/trans_presets.java:2697
+#: build/trans_presets.java:2712 build/trans_presets.java:2718
+#: build/trans_presets.java:2726 build/trans_presets.java:2733
+#: build/trans_presets.java:2753 build/trans_presets.java:2764
+#: build/trans_presets.java:2770 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2788
+#: build/trans_presets.java:2795 build/trans_presets.java:2802
+#: build/trans_presets.java:2809 build/trans_presets.java:2815
+#: build/trans_presets.java:2821 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2912
+#: build/trans_presets.java:2922 build/trans_presets.java:2931
+#: build/trans_presets.java:2937 build/trans_presets.java:2943
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 build/trans_presets.java:2981
+#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:2999 build/trans_presets.java:3005
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3023 build/trans_presets.java:3030
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3066 build/trans_presets.java:3072
+#: build/trans_presets.java:3079 build/trans_presets.java:3085
+#: build/trans_presets.java:3092 build/trans_presets.java:3098
+#: build/trans_presets.java:3104 build/trans_presets.java:3110
+#: build/trans_presets.java:3116 build/trans_presets.java:3129
+#: build/trans_presets.java:3143 build/trans_presets.java:3157
 msgid "Name"
 msgstr "Nome"
@@ -6615,4 +6752,58 @@
 msgid "Version"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
+#, fuzzy
+msgid "Changeset id:"
+msgstr "Cambiar relación"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
+#, fuzzy
+msgid "Created at:"
+msgstr "Crear áreas"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
+#, fuzzy
+msgid "Changeset comment:"
+msgstr "Cambiar relación"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
+msgid "No open changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48
+#, fuzzy
+msgid "<html>Please select the changesets you want to close</html>"
+msgstr "Por favor, selecciona que cambios de propiedade queres aplicar."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
+#, fuzzy
+msgid "Open changesets"
+msgstr "Pechando colección de cambios..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101
+#, fuzzy
+msgid "Close changesets"
+msgstr "Pechando colección de cambios..."
+
+#. putValue(SMALL_ICON, ImageProvider.get("cancel"));
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
+#, fuzzy
+msgid "Close the selected open changesets"
+msgstr "Borrar obxectos seleccionados."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126
+#, fuzzy
+msgid "Cancel closeing of changesets"
+msgstr "Pechando colección de cambios..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37
+msgid "Closing changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77
+#, fuzzy, java-format
+msgid "Closing changeset {0}"
+msgstr "Pechando colección de cambios..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
@@ -6641,5 +6832,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be uploaded"
+msgid "Layer ''{0}'' has no modifications to be uploaded."
 msgstr ""
 
@@ -6647,5 +6838,5 @@
 #, java-format
 msgid ""
-"Layer ''{0}'' has modifications which should be saved to its assoicated file "
+"Layer ''{0}'' has modifications which should be saved to its associated file "
 "''{1}''."
 msgstr ""
@@ -6653,5 +6844,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be saved"
+msgid "Layer ''{0}'' has no modifications to be saved."
 msgstr ""
 
@@ -6685,17 +6876,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113
 msgid "Unsaved changes - Save/Upload before exiting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194
 #, java-format
 msgid ""
@@ -6708,9 +6899,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205
 msgid "Unsaved data and conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212
 #, java-format
 msgid ""
@@ -6724,9 +6915,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223
 msgid "Unsaved data and missing associated file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230
 #, java-format
 msgid ""
@@ -6741,42 +6932,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243
 msgid "Unsaved data non-writable files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
 msgid "Close this dialog and resume editing in JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322
+msgid "Discard and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
-msgid "Discard and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354
+msgid "Save and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
-msgid "Save and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
 msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402
 #, java-format
 msgid "Preparing layer ''{0}'' for upload ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
@@ -6784,5 +6975,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491
 msgid "Incomplete upload and/or save"
 msgstr ""
@@ -6822,21 +7013,21 @@
 #. item "Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:200
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:278
-#: build/trans_presets.java:311 build/trans_presets.java:357
-#: build/trans_presets.java:372 build/trans_presets.java:387
-#: build/trans_presets.java:409 build/trans_presets.java:429
-#: build/trans_presets.java:450 build/trans_presets.java:470
-#: build/trans_presets.java:489 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:549
-#: build/trans_presets.java:570 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:633
-#: build/trans_presets.java:664 build/trans_presets.java:1060
-#: build/trans_presets.java:1068 build/trans_presets.java:1076
-#: build/trans_presets.java:1086 build/trans_presets.java:1305
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:242
+#: build/trans_presets.java:260 build/trans_presets.java:279
+#: build/trans_presets.java:312 build/trans_presets.java:358
+#: build/trans_presets.java:373 build/trans_presets.java:388
+#: build/trans_presets.java:410 build/trans_presets.java:430
+#: build/trans_presets.java:451 build/trans_presets.java:471
+#: build/trans_presets.java:490 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:665 build/trans_presets.java:1062
+#: build/trans_presets.java:1070 build/trans_presets.java:1078
+#: build/trans_presets.java:1088 build/trans_presets.java:1308
 msgid "Layer"
 msgstr ""
@@ -6855,67 +7046,32 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:200
 msgid "Upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-msgid "Use a new changeset and close it"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
-msgid ""
-"Select to upload the data using a new changeset and to close the changeset "
-"after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
-msgid "Use a new changeset and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
-msgid ""
-"Select to upload the data using a new changeset and to leave the changeset "
-"open after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
-msgid "Upload to a new or to an existing changeset?"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
-msgid "upload all changes in one request"
+msgid "Settings"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
-msgid ""
-"Enable to upload all changes in one request, disable to use one request per "
-"changed primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171
-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/gui/io/UploadDialog.java:216
-msgid "Settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908
 msgid "Tags of new changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:221
 msgid "Objects to add:"
 msgstr "Obxectos para engadir:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:227
 msgid "Objects to modify:"
 msgstr "Obxectos para modificar:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:233
 msgid "Objects to delete:"
 msgstr "Obxectos para borrar:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
 #, java-format
 msgid "{0} object to add:"
@@ -6924,5 +7080,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:277
 #, java-format
 msgid "{0} object to modifiy:"
@@ -6931,5 +7087,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:286
 #, java-format
 msgid "{0} object to delete:"
@@ -6938,54 +7094,87 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422
-#, java-format
-msgid "Use the existing changeset {0} and close it after upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:423
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to close the changeset "
-"after this upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426
-#, java-format
-msgid "Use the existing changeset {0} and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:427
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to leave the changeset "
-"open for further uploads"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
-#, java-format
-msgid "Tags of changeset {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:470
 msgid "Upload Changes"
 msgstr "Subir Cambios"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472
+msgid "Upload the changed primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
+msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:479
+msgid "Illegal upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
+msgid "Cancel the upload and resume editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606
 #, fuzzy
-msgid "Upload the changed primitives"
-msgstr "Subir estes cambios?"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592
+msgid "Upload all changes in one request"
+msgstr "SIbir todos os cambios ó servidor OSM."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607
+msgid ""
+"Enable to upload all changes in one request, disable to use one request per "
+"changed primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:617
+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/gui/io/UploadDialog.java:672
+msgid "Open a new changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
+msgid "Open a new changeset and use it in the next upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
 #, fuzzy
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "Por favor, introduce un nome para o lugar."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:593
-msgid "Illegal upload comment"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
-msgid "Cancel the upload and resume editing"
-msgstr ""
+msgid "Use an open changeset"
+msgstr "Cambios non gardados"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
+msgid "Upload data to an already opened changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
+#, fuzzy
+msgid "Close changeset after upload"
+msgstr "Non hai cambios que subir."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
+msgid "Select to close the changeset after the next upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922
+#, java-format
+msgid "Tags of changeset {0}"
+msgstr ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
+#, fuzzy
+msgid "Load the list of your open changesets from the server"
+msgstr "Subir as preferencias actuais ó servidor"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
+#, fuzzy
+msgid "Close the currently selected open changeset"
+msgstr "Mover os membros actualmente seleccionados cara arriba"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
+#, fuzzy, java-format
+msgid "changeset id > 0 expected. Got {1}"
+msgstr "esperabase o parámetro \"{0}\" > 0, obtívose \"{1}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63
@@ -7063,5 +7252,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
@@ -7099,5 +7288,5 @@
 msgstr "A hora introducida non puido ser analizada."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
@@ -7105,30 +7294,30 @@
 msgstr "punto gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
 msgid "Customize line drawing"
 msgstr "Personalizar debuxo de liñas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
 msgid "Use global settings."
 msgstr "Usar configuración global."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Draw lines between points for this layer."
 msgstr "Debuxar liñas entre puntos para esta capa."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Do not draw lines between points for this layer."
 msgstr "Non debuxar liñas entre puntos para esta capa."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 msgid "Select line drawing options"
 msgstr "Seleccionar as opcións de liña do debuxo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7136,5 +7325,5 @@
 msgstr "Personalizar Cor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7143,5 +7332,5 @@
 msgstr "Predeterminado"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7150,38 +7339,75 @@
 msgstr "Escolle unha cor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
 msgid "Import Audio"
 msgstr "Importar Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
 msgid "Wave Audio files (*.wav)"
 msgstr "Ficheiros Wave Audio (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Marcas de audio de {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
 msgid "Import images"
 msgstr "Importar imaxes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#, java-format
+msgid "Name: {0}"
+msgstr "Nome: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#, java-format
+msgid "Description: {0}"
+msgstr "Descrición: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#, fuzzy, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
 msgstr[0] "{0} trazado, "
 msgstr[1] "{0} trazados, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
+#: build/trans_presets.java:3160
+msgid "Description"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#, fuzzy
+msgid "Timespan"
+msgstr "Rango de tempo: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#, fuzzy
+msgid "Length"
+msgstr "Lonxitude: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
+msgid "URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+msgid "Length: "
+msgstr "Lonxitude: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
 #, java-format
 msgid "{0} route, "
@@ -7190,5 +7416,5 @@
 msgstr[1] "{0} rutas, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 #, java-format
 msgid "{0} waypoint"
@@ -7197,29 +7423,10 @@
 msgstr[1] "{0} puntos de vía"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
-#, java-format
-msgid "Name: {0}"
-msgstr "Nome: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
-#, java-format
-msgid "Description: {0}"
-msgstr "Descrición: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
-msgid "Timespan: "
-msgstr "Rango de tempo: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
-msgid "Length: "
-msgstr "Lonxitude: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Convertir en capa de datos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7229,10 +7436,10 @@
 "perxudicial.<br>Se desexas subir trazados, mira aqui:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -7243,29 +7450,29 @@
 msgstr "Convertido de: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
 msgid "Download from OSM along this track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
 msgid "Download everything within:"
 msgstr "Descargar todo o que abarca:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metros"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 msgid "Maximum area per request:"
 msgstr "Área máxima por petición:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km cad."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
 #, java-format
 msgid ""
@@ -7276,13 +7483,13 @@
 "Desexas<br>continuar?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
 msgid "Download data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
 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:1143
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7290,5 +7497,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7341,30 +7548,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
-#, fuzzy
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
 "<br>If you want to upload traces, look here:</html>"
 msgstr ""
-"<html>A subida de datos GPS sen procesar como datos de mapa considerase "
-"perxudicial.<br>Se desexas subir trazados, mira aqui:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "track"
 msgid_plural "tracks"
@@ -7496,4 +7700,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
@@ -7739,13 +7944,18 @@
 msgstr "Debuxar puntos GPS grandes."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+msgid "Draw a circle form HDOP value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Velocidade (vermello = lento, verde = rápido)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Color simple (pode ser personalizado para as capas con nome)"
@@ -7753,6 +7963,6 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1374
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:1377
 msgid "Car"
 msgstr "Coche"
@@ -7773,14 +7983,14 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:324 build/trans_presets.java:650
-#: build/trans_presets.java:857 build/trans_presets.java:876
-#: build/trans_presets.java:890 build/trans_presets.java:912
-#: build/trans_presets.java:949 build/trans_presets.java:962
-#: build/trans_presets.java:974 build/trans_presets.java:986
-#: build/trans_presets.java:998 build/trans_presets.java:1010
-#: build/trans_presets.java:1020 build/trans_presets.java:1029
-#: build/trans_presets.java:1038 build/trans_presets.java:1437
-#: build/trans_presets.java:1510
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:325 build/trans_presets.java:651
+#: build/trans_presets.java:858 build/trans_presets.java:877
+#: build/trans_presets.java:891 build/trans_presets.java:913
+#: build/trans_presets.java:950 build/trans_presets.java:963
+#: build/trans_presets.java:975 build/trans_presets.java:987
+#: build/trans_presets.java:999 build/trans_presets.java:1011
+#: build/trans_presets.java:1021 build/trans_presets.java:1030
+#: build/trans_presets.java:1039 build/trans_presets.java:1440
+#: build/trans_presets.java:1513
 msgid "Bicycle"
 msgstr "Bicicleta"
@@ -7813,28 +8023,28 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:325 build/trans_presets.java:649
-#: build/trans_presets.java:856 build/trans_presets.java:875
-#: build/trans_presets.java:889 build/trans_presets.java:911
-#: build/trans_presets.java:948 build/trans_presets.java:961
-#: build/trans_presets.java:973 build/trans_presets.java:985
-#: build/trans_presets.java:997 build/trans_presets.java:1009
-#: build/trans_presets.java:1019 build/trans_presets.java:1028
-#: build/trans_presets.java:1037
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:326 build/trans_presets.java:650
+#: build/trans_presets.java:857 build/trans_presets.java:876
+#: build/trans_presets.java:890 build/trans_presets.java:912
+#: build/trans_presets.java:949 build/trans_presets.java:962
+#: build/trans_presets.java:974 build/trans_presets.java:986
+#: build/trans_presets.java:998 build/trans_presets.java:1010
+#: build/trans_presets.java:1020 build/trans_presets.java:1029
+#: build/trans_presets.java:1038
 msgid "Foot"
 msgstr "Pé"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Debuxar Frechas de Dirección"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Debuxo rápido (peor resultado)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
@@ -7843,34 +8053,34 @@
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Only on the head of a way."
 msgstr "Só no extremo da vía."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Debuxar os números de orde dos segmentos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Debuxar os límites dos datos descargados"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Debuxar nodos virtuais no modo de selección"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Debuxar as capas inactivas en outra cor"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Gráficos de mapa suaves (filtro antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:82
 msgid "Draw lines between raw GPS points"
 msgstr "Debuxar liñas entre puntos GPS en bruto"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -7878,9 +8088,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
 msgid "Maximum length for local files (meters)"
 msgstr "Lonxitude máxima para os arquivos locais (metros)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
@@ -7889,10 +8099,10 @@
 "todas as liñas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length (meters)"
 msgstr "Lonxitude máxima (metros)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -7901,10 +8111,10 @@
 "de liñas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:129
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Debuxar frechas de dirección para as liñas, conectando puntos GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:135
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -7913,5 +8123,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:141
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -7921,13 +8131,13 @@
 "da anterior."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:144
 msgid "Minimum distance (pixels)"
 msgstr "Distancia mínima (pixeles)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Draw larger dots for the GPS points."
 msgstr "Debuxar puntos máis grandes para os puntos GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -7937,9 +8147,9 @@
 "personalizados no Xestor de Capas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Colors points and track segments by velocity."
 msgstr "Cores, puntos e segmentos de trazado en función da velocidade."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -7947,28 +8157,28 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 "Permite afinar o coloreado de trazados para diferentes velocidades medias."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid "Track and Point Coloring"
 msgstr "Coloreado de Trazados e Puntos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202
 msgid "GPS Points"
 msgstr "Puntos GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "Draw direction hints for way segments."
 msgstr "Debuxar consellos de dirección para segmentos de vía."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:237
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Debuxar os números de orde de todos os segmentos dentro da súa liña."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -7977,10 +8187,10 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Debuxar os límites dos datos cargados dende o servidor."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -7989,9 +8199,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257
 msgid "Draw the inactive data layers in a different color."
 msgstr "Debuxar as capas de datos inactivas nunha cor diferente."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "OSM Data"
 msgstr "Datos OSM"
@@ -8071,45 +8281,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Configure available plugins."
 msgstr "Configurar os engadidos dispoñibles."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50
+#. buttons at the bottom
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
 msgid "Download List"
 msgstr "Descargar lista"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:100
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 msgid "Update"
 msgstr "Actualizar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Configure Sites..."
 msgstr "Configurar sitios..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:125
 msgid "Add JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:126
 msgid "Enter URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:162
 msgid "Please select an entry."
 msgstr "Por favor selecciona unha entrada."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:147
 msgid "Edit JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:148
 msgid "JOSM Plugin description URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:175
 msgid "Configure Plugin Sites"
 msgstr "Configurar os sitios dos engadidos"
@@ -8464,6 +8675,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:369
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341
 #, java-format
 msgid "Remove old keys from up to {0} object"
@@ -8472,9 +8683,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135
 msgid "Add a new tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160
 msgid "Delete the selection in the tag table"
 msgstr ""
@@ -8509,7 +8720,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:68
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:75
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -8553,4 +8764,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24
+#, fuzzy, java-format
+msgid "Preset group ''{0}'' of group ''{1}''"
+msgstr "Usar ó axuste preestablecido \"{0}\" do grupo \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
 #, java-format
 msgid "Preset group ''{0}''"
@@ -8571,4 +8787,10 @@
 msgstr "Descargando os puntos {0} a {1}..."
 
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, fuzzy, java-format
+msgid "parameter ''{0}'' > 0 expected. Got {1}"
+msgstr "esperabase o parámetro \"{0}\" > 0, obtívose \"{1}\""
+
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8677,5 +8899,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "Erro de análise: estrutura de documento non válida para documento gpx"
@@ -8797,10 +9019,11 @@
 msgstr "Establecida a comunicación con {0} usando o protocolo da versión {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -8808,75 +9031,79 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315
 msgid "Creating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
 #, java-format
 msgid "Successfully opened changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#, fuzzy, java-format
+msgid "id of changeset > 0 required. Got {0}"
+msgstr "Requírese o parámetro {0} > 0. Obtívose {1}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
-#, java-format
-msgid "Changeset {0} is unchanged. Skipping update."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
 #, java-format
 msgid "Updating changeset {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
-msgid ""
-"Failed to update changeset. Either there is no current changeset or the id "
-"of the current changeset is 0"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
 msgid "Closing changeset..."
 msgstr "Pechando colección de cambios..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
-#, java-format
-msgid "Closing changeset {0}..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
-#, java-format
-msgid "Leaving changeset {0} open..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
 msgid "No changeset present for diff upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414
 msgid "Preparing..."
 msgstr "Preparando..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419
 msgid "Uploading..."
 msgstr "Subindo..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438
 msgid "Waiting 10 seconds ... "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449
 msgid "OK - trying again."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:485
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517
 #, java-format
 msgid "Starting retry {0} of {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
+msgid "current changeset is null. Can't upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
+#, java-format
+msgid "id of current changeset > required. Current id is {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
+#, java-format
+msgid "Open changeset expected. Got closed changeset with id {0}"
 msgstr ""
 
@@ -8902,33 +9129,92 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
+#, java-format
+msgid "missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:128
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:134
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
+#, java-format
+msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
+#, java-format
+msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
+#, java-format
+msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#, java-format
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#, java-format
+msgid "Unsupported version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:176
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Aborting."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#, java-format
+msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
+#, fuzzy
+msgid "Parsing list of changesets..."
+msgstr "Pechando colección de cambios..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
 msgid "Incorrect password or username."
 msgstr "Contrasinal ou nome de usuario incorrectos."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:168
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Advertencia: O contrasinal transfírese sen encriptar."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Save user and password (unencrypted)"
 msgstr "Gardar usuario e contrasinal (sen encriptar)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
 msgid "Enter Password"
 msgstr "Introduce Contrasinal"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 msgid "Login"
 msgstr "Inicio de sesión"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:242
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
 msgid "The base URL for the OSM server (REST API)"
 msgstr "A URL base do servidor OSM (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -8937,17 +9223,17 @@
 "almacenar ningunha contrasinal."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
 msgid "Base Server URL"
 msgstr "URL Base do Servidor"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
 msgid "OSM password"
 msgstr "Contrasinal OSM"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -8956,5 +9242,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:51
+#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #, java-format
 msgid "(at line {0}, column {1})"
@@ -9044,20 +9330,5 @@
 msgstr "Erro durante a análise."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124
-#, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
-#, fuzzy, java-format
-msgid "Missing mandatory attribute ''{0}''"
-msgstr "Falta o atributo obrigatorio \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
-#, fuzzy, java-format
-msgid "Unsupported version: {0}"
-msgstr "Versión descoñecida: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:155
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -9066,38 +9337,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
 msgid "found XML element <nd> element not as direct child of element <way>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
 msgid "Found XML element <member> not as direct child of element <relation>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
 #, java-format
 msgid ""
@@ -9105,24 +9376,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Especificación incompleta de elemento <member> con ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
-#, java-format
-msgid "Warning: Undefined element ''{0}'' found in input stream. Skipping."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
-#, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Skipping."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
 msgid "Illegal object with id=0"
 msgstr "Obxecto ilegal con id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #, java-format
 msgid ""
@@ -9130,5 +9396,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:303
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
 #, java-format
 msgid ""
@@ -9137,5 +9403,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
 #, java-format
 msgid ""
@@ -9144,5 +9410,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
@@ -9152,25 +9418,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:316
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#, java-format
 msgid "Unknown or unsupported API version. Got {0}"
-msgstr "Versión descoñecida: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with id {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#, java-format
 msgid "Missing required attribute ''{0}''."
-msgstr "Falta o atributo obrigatorio \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
 #, java-format
 msgid ""
@@ -9178,5 +9444,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
 #, java-format
 msgid ""
@@ -9185,5 +9451,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
 #, java-format
 msgid ""
@@ -9191,25 +9457,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#, java-format
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
 "id ''{1}''"
 msgstr ""
-"non se pode comparar a primitiva coa ide \"{0}\" coa primitiva coa id \"{1}\""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
 msgid "Prepare OSM data..."
 msgstr "Preparar os datos de OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 msgid "Parsing OSM data..."
-msgstr "Preparar os datos de OSM..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
 msgid "Preparing data set..."
-msgstr "Preparando datos..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
@@ -9230,4 +9493,24 @@
 msgid "Downloading referring relations ..."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51
+#, fuzzy
+msgid "Reading changesets..."
+msgstr "Pechando colección de cambios..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
+#, fuzzy
+msgid "Downloading changesets ..."
+msgstr "Pechando colección de cambios..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85
+#, fuzzy, java-format
+msgid "Reading changeset {0} ..."
+msgstr "Lendo {0}..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91
+#, fuzzy, java-format
+msgid "Downloading changeset {0} ..."
+msgstr "Pechando colección de cambios..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
@@ -9244,10 +9527,14 @@
 msgstr "Contactando co Servidor..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
 msgid "Failed to open connection to API {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
+msgid "Error: failed to add authentication credentials to the connection."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -9256,33 +9543,52 @@
 "internet."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+msgid "XML tag <user> is missing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
+#, fuzzy, java-format
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgstr "Usar ó axuste preestablecido \"{0}\" do grupo \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
+#, java-format
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
 msgid "Starting to upload with one request per primitive ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
 msgid "Starting to upload in one request ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:171
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135
 msgid "Uploading data ..."
-msgstr "Subindo..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:178
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
 msgid ""
 "WARNING: no API version defined for data to upload. Falling back to version "
@@ -9290,5 +9596,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147
 #, java-format
 msgid ""
@@ -9298,10 +9604,10 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
 msgid "Update Plugins"
 msgstr "Actualizar Engadidos"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 msgid "Download Plugins"
 msgstr "Descargar Engadidos"
@@ -9460,5 +9766,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -9467,18 +9773,18 @@
 msgstr[1] "Descargada información de engadidos de {0} sitios"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
 msgid "No plugin information found."
 msgstr "Non se atopou información de engadidos."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:93
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
 msgid "All installed plugins are up to date."
 msgstr "Todos os engadidos instalados estan actualizados."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
 #, java-format
 msgid ""
@@ -9491,9 +9797,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
 msgid "Download missing plugins"
 msgstr "Descargar engadidos perdidos"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
 #, java-format
 msgid ""
@@ -9508,43 +9814,43 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
 msgid "unknown"
 msgstr "descoñecido"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Versión {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 msgid "Plugin bundled with JOSM"
 msgstr "Engadido empaquetado con JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:357
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -9857,10 +10163,4 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:140
 msgid "(What does that mean?)"
-msgstr ""
-
-#. item "Relations/Route" text "Symbol description"
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3148
-msgid "Description"
 msgstr ""
 
@@ -10617,6 +10917,7 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
-msgid "Set "
-msgstr ""
+#, fuzzy, java-format
+msgid "Set {0} Lambert coordinates"
+msgstr "Coordenada cero: "
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -11236,6 +11537,6 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 #: build/trans_style.java:990 build/trans_style.java:1007
-#: build/trans_style.java:1023 build/trans_style.java:3392
-#: build/trans_style.java:3400
+#: build/trans_style.java:1023 build/trans_style.java:3400
+#: build/trans_style.java:3408
 msgid "water"
 msgstr ""
@@ -11520,4 +11821,56 @@
 msgstr ""
 
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Michigan Left"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Adds no left turn for sets of 4 or 5 ways."
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45
+#, fuzzy
+msgid "Please select 4 or 5 ways to assign no left turns."
+msgstr ""
+"Por favor, selecciona unha ou máis vias pechadas de, polo menos, catro nodos."
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61
+#, fuzzy, java-format
+msgid "{0} extrem nodes."
+msgstr "{0} nodo"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69
+#, java-format
+msgid "Via node {0}, {1}"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75
+#, fuzzy, java-format
+msgid "{0} via nodes."
+msgstr "{0} nodo"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78
+msgid "Unable to find via nodes. Please check your selection"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98
+#, fuzzy, java-format
+msgid "MIddle way: {0}"
+msgstr "Modo: {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121
+msgid "Create Michigan left turn restriction"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129
+#, fuzzy, java-format
+msgid "Processing {0}"
+msgstr "Versión {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142
+#, java-format
+msgid "Relation: from {0} to {1} via {2}"
+msgstr ""
+
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
 msgid "OpenLayers"
@@ -11663,7 +12016,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
-#, fuzzy
 msgid "create new objects"
-msgstr "Crear novo nodo."
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
@@ -11983,5 +12335,5 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:158
 msgid "JOSM Tag Editor Plugin"
 msgstr ""
@@ -11991,5 +12343,5 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:370
 #, java-format
 msgid "Updating properties of up to {0} object"
@@ -11998,18 +12350,4 @@
 msgstr[1] ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44
-msgid "INFO: entering compatibilty mode for JOSM with Main.ds"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47
-msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49
-msgid ""
-"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-"found."
-msgstr ""
-
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
 msgid "Group"
@@ -12018,9 +12356,4 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
 msgid "Item"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-msgid "Filter"
 msgstr ""
 
@@ -12107,5 +12440,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2272
 msgid "Street name"
 msgstr ""
@@ -12266,8 +12599,4 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88
 msgid "Zoom (in metres)"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
-msgid "URL"
 msgstr ""
 
@@ -12471,7 +12800,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501
-#, fuzzy
 msgid "Updating map ..."
-msgstr "Desfacendo borrado de vía..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69
@@ -12958,7 +13286,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
-#: build/trans_style.java:4179
+#: build/trans_style.java:4159 build/trans_style.java:4166
+#: build/trans_style.java:4173 build/trans_style.java:4180
+#: build/trans_style.java:4187
 msgid "building"
 msgstr ""
@@ -12972,5 +13300,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4186
+#: build/trans_style.java:4194
 msgid "area"
 msgstr ""
@@ -13097,10 +13425,10 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:148
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:155
 msgid "Reached a junction"
 msgstr ""
@@ -13388,7 +13716,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
-#, fuzzy
 msgid "Overlap tiles"
-msgstr "Ficheiros de Servidor OSM"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
@@ -13541,6 +13868,11 @@
 msgstr ""
 
+#. Plugin michigan_left
+#: build/trans_plugins.java:35
+msgid "Adds no left turn for sets of 4 or 5 ways"
+msgstr ""
+
 #. Plugin nearclick
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid ""
 "Simulates a click when you do a small and short drag. This is usefull for "
@@ -13550,15 +13882,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13566,5 +13898,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13572,5 +13904,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13579,15 +13911,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13596,10 +13928,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13608,15 +13940,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -13626,10 +13958,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin usertools
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -13638,5 +13970,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -13645,5 +13977,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -13652,5 +13984,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -13659,10 +13991,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -13718,4 +14050,10 @@
 #. <annotations>
 #: build/trans_presets.java:57
+#, fuzzy
+msgid "Highways"
+msgstr "Carretera"
+
+#. group "Highways"
+#: build/trans_presets.java:58
 msgid "Streets"
 msgstr ""
@@ -13726,5 +14064,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:58 build/trans_surveyor.java:72
+#: build/trans_presets.java:59 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr ""
@@ -13733,5 +14071,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:61
+#: build/trans_presets.java:62
 msgid "Edit Motorway"
 msgstr ""
@@ -13758,8 +14096,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:120 build/trans_presets.java:140
-#: build/trans_presets.java:177 build/trans_presets.java:197
-#: build/trans_presets.java:1557 build/trans_presets.java:3146
+#: build/trans_presets.java:65 build/trans_presets.java:101
+#: build/trans_presets.java:121 build/trans_presets.java:141
+#: build/trans_presets.java:178 build/trans_presets.java:198
+#: build/trans_presets.java:1560 build/trans_presets.java:3158
 msgid "Reference"
 msgstr ""
@@ -13773,8 +14111,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:358
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:359
 msgid "Lanes"
 msgstr ""
@@ -13791,15 +14129,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:224 build/trans_presets.java:280
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:373 build/trans_presets.java:388
-#: build/trans_presets.java:412 build/trans_presets.java:431
-#: build/trans_presets.java:452 build/trans_presets.java:472
-#: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1307
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:225 build/trans_presets.java:281
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:374 build/trans_presets.java:389
+#: build/trans_presets.java:413 build/trans_presets.java:432
+#: build/trans_presets.java:453 build/trans_presets.java:473
+#: build/trans_presets.java:511 build/trans_presets.java:667
+#: build/trans_presets.java:1310
 msgid "Max. speed (km/h)"
 msgstr ""
@@ -13836,16 +14174,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:293 build/trans_presets.java:306
-#: build/trans_presets.java:320 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:464
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:659 build/trans_presets.java:1300
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:294 build/trans_presets.java:307
+#: build/trans_presets.java:321 build/trans_presets.java:353
+#: build/trans_presets.java:405 build/trans_presets.java:425
+#: build/trans_presets.java:445 build/trans_presets.java:465
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:660 build/trans_presets.java:1303
 msgid "Oneway"
 msgstr ""
@@ -13887,19 +14225,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:353
-#: build/trans_presets.java:362 build/trans_presets.java:405
-#: build/trans_presets.java:425 build/trans_presets.java:445
-#: build/trans_presets.java:465 build/trans_presets.java:485
-#: build/trans_presets.java:504 build/trans_presets.java:523
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:586 build/trans_presets.java:607
-#: build/trans_presets.java:628 build/trans_presets.java:660
-#: build/trans_presets.java:1301 build/trans_surveyor.java:12
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:354
+#: build/trans_presets.java:363 build/trans_presets.java:406
+#: build/trans_presets.java:426 build/trans_presets.java:446
+#: build/trans_presets.java:466 build/trans_presets.java:486
+#: build/trans_presets.java:505 build/trans_presets.java:524
+#: build/trans_presets.java:545 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629 build/trans_presets.java:661
+#: build/trans_presets.java:1304 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr ""
@@ -13935,19 +14273,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:354
-#: build/trans_presets.java:378 build/trans_presets.java:406
-#: build/trans_presets.java:426 build/trans_presets.java:446
-#: build/trans_presets.java:466 build/trans_presets.java:486
-#: build/trans_presets.java:505 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629 build/trans_presets.java:661
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:355
+#: build/trans_presets.java:379 build/trans_presets.java:407
+#: build/trans_presets.java:427 build/trans_presets.java:447
+#: build/trans_presets.java:467 build/trans_presets.java:487
+#: build/trans_presets.java:506 build/trans_presets.java:525
+#: build/trans_presets.java:546 build/trans_presets.java:567
+#: build/trans_presets.java:588 build/trans_presets.java:609
+#: build/trans_presets.java:630 build/trans_presets.java:662
+#: build/trans_presets.java:1305
 msgid "Tunnel"
 msgstr ""
@@ -13981,18 +14319,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:73 build/trans_presets.java:90
-#: build/trans_presets.java:110 build/trans_presets.java:129
-#: build/trans_presets.java:150 build/trans_presets.java:166
-#: build/trans_presets.java:186 build/trans_presets.java:205
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:355
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:467
-#: build/trans_presets.java:487 build/trans_presets.java:506
-#: build/trans_presets.java:525 build/trans_presets.java:546
-#: build/trans_presets.java:567 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:630
-#: build/trans_presets.java:662 build/trans_presets.java:1303
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:356
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:468
+#: build/trans_presets.java:488 build/trans_presets.java:507
+#: build/trans_presets.java:526 build/trans_presets.java:547
+#: build/trans_presets.java:568 build/trans_presets.java:589
+#: build/trans_presets.java:610 build/trans_presets.java:631
+#: build/trans_presets.java:663 build/trans_presets.java:1306
 msgid "Cutting"
 msgstr ""
@@ -14026,18 +14364,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:74 build/trans_presets.java:91
-#: build/trans_presets.java:111 build/trans_presets.java:130
-#: build/trans_presets.java:151 build/trans_presets.java:167
-#: build/trans_presets.java:187 build/trans_presets.java:206
-#: build/trans_presets.java:222 build/trans_presets.java:240
-#: build/trans_presets.java:258 build/trans_presets.java:277
-#: build/trans_presets.java:310 build/trans_presets.java:356
-#: build/trans_presets.java:408 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:468
-#: build/trans_presets.java:488 build/trans_presets.java:507
-#: build/trans_presets.java:526 build/trans_presets.java:547
-#: build/trans_presets.java:568 build/trans_presets.java:589
-#: build/trans_presets.java:610 build/trans_presets.java:631
-#: build/trans_presets.java:663 build/trans_presets.java:1304
+#: build/trans_presets.java:75 build/trans_presets.java:92
+#: build/trans_presets.java:112 build/trans_presets.java:131
+#: build/trans_presets.java:152 build/trans_presets.java:168
+#: build/trans_presets.java:188 build/trans_presets.java:207
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:357
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:469
+#: build/trans_presets.java:489 build/trans_presets.java:508
+#: build/trans_presets.java:527 build/trans_presets.java:548
+#: build/trans_presets.java:569 build/trans_presets.java:590
+#: build/trans_presets.java:611 build/trans_presets.java:632
+#: build/trans_presets.java:664 build/trans_presets.java:1307
 msgid "Embankment"
 msgstr ""
@@ -14045,5 +14383,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Motorway Link"
 msgstr ""
@@ -14052,5 +14390,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:80
+#: build/trans_presets.java:81
 msgid "Edit Motorway Link"
 msgstr ""
@@ -14058,5 +14396,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:94
+#: build/trans_presets.java:95
 msgid "Trunk"
 msgstr ""
@@ -14065,5 +14403,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:97
+#: build/trans_presets.java:98
 msgid "Edit Trunk"
 msgstr ""
@@ -14073,6 +14411,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
 msgid "Motorroad"
 msgstr ""
@@ -14080,5 +14418,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:114
+#: build/trans_presets.java:115
 msgid "Trunk Link"
 msgstr ""
@@ -14087,5 +14425,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:117
+#: build/trans_presets.java:118
 msgid "Edit Trunk Link"
 msgstr ""
@@ -14098,5 +14436,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:134 build/trans_surveyor.java:76
+#: build/trans_presets.java:135 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr ""
@@ -14105,5 +14443,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:137
+#: build/trans_presets.java:138
 msgid "Edit Primary Road"
 msgstr ""
@@ -14111,10 +14449,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:154
+#: build/trans_presets.java:155
 msgid "Primary Link"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:155
+#: build/trans_presets.java:156
 msgid "Edit Primary Link"
 msgstr ""
@@ -14126,5 +14464,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:170 build/trans_surveyor.java:80
+#: build/trans_presets.java:171 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr ""
@@ -14134,5 +14472,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:174
+#: build/trans_presets.java:175
 msgid "Edit Secondary Road"
 msgstr ""
@@ -14140,5 +14478,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:190
+#: build/trans_presets.java:191
 msgid "Tertiary"
 msgstr ""
@@ -14148,5 +14486,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:194
+#: build/trans_presets.java:195
 msgid "Edit Tertiary Road"
 msgstr ""
@@ -14158,5 +14496,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:209 build/trans_surveyor.java:84
+#: build/trans_presets.java:210 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr ""
@@ -14166,5 +14504,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:213
+#: build/trans_presets.java:214
 msgid "Edit Unclassified Road"
 msgstr ""
@@ -14191,19 +14529,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:225 build/trans_presets.java:243
-#: build/trans_presets.java:261 build/trans_presets.java:281
-#: build/trans_presets.java:314 build/trans_presets.java:359
-#: build/trans_presets.java:375 build/trans_presets.java:389
-#: build/trans_presets.java:413 build/trans_presets.java:432
-#: build/trans_presets.java:453 build/trans_presets.java:473
-#: build/trans_presets.java:491 build/trans_presets.java:511
-#: build/trans_presets.java:532 build/trans_presets.java:553
-#: build/trans_presets.java:574 build/trans_presets.java:595
-#: build/trans_presets.java:616 build/trans_presets.java:637
-#: build/trans_presets.java:667 build/trans_presets.java:680
-#: build/trans_presets.java:693 build/trans_presets.java:706
-#: build/trans_presets.java:719 build/trans_presets.java:732
-#: build/trans_presets.java:745 build/trans_presets.java:1308
-#: build/trans_presets.java:1498 build/trans_presets.java:1540
+#: build/trans_presets.java:226 build/trans_presets.java:244
+#: build/trans_presets.java:262 build/trans_presets.java:282
+#: build/trans_presets.java:315 build/trans_presets.java:360
+#: build/trans_presets.java:376 build/trans_presets.java:390
+#: build/trans_presets.java:414 build/trans_presets.java:433
+#: build/trans_presets.java:454 build/trans_presets.java:474
+#: build/trans_presets.java:492 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:554
+#: build/trans_presets.java:575 build/trans_presets.java:596
+#: build/trans_presets.java:617 build/trans_presets.java:638
+#: build/trans_presets.java:668 build/trans_presets.java:681
+#: build/trans_presets.java:694 build/trans_presets.java:707
+#: build/trans_presets.java:720 build/trans_presets.java:733
+#: build/trans_presets.java:746 build/trans_presets.java:1311
+#: build/trans_presets.java:1501 build/trans_presets.java:1543
 msgid "Width (meters)"
 msgstr ""
@@ -14215,5 +14553,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:228 build/trans_surveyor.java:88
+#: build/trans_presets.java:229 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr ""
@@ -14222,5 +14560,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:231
+#: build/trans_presets.java:232
 msgid "Edit Residential Street"
 msgstr ""
@@ -14245,14 +14583,14 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:611
-#: build/trans_presets.java:632 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "Surface"
 msgstr ""
@@ -14273,53 +14611,53 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paved"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "unpaved"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
 msgid "metal"
 msgstr ""
@@ -14333,22 +14671,22 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
-#: build/trans_style.java:3367
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
+#: build/trans_style.java:3375
 msgid "wood"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paving_stones"
 msgstr ""
@@ -14356,77 +14694,77 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "cobblestone"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "gravel"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "grass"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "sand"
 msgstr ""
@@ -14434,13 +14772,13 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "ground"
 msgstr ""
@@ -14448,5 +14786,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:246
+#: build/trans_presets.java:247
 msgid "Living Street"
 msgstr ""
@@ -14455,5 +14793,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:249
+#: build/trans_presets.java:250
 msgid "Edit Living Street"
 msgstr ""
@@ -14461,5 +14799,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:264
+#: build/trans_presets.java:265
 msgid "Service"
 msgstr ""
@@ -14468,5 +14806,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:267
+#: build/trans_presets.java:268
 msgid "Edit Serviceway"
 msgstr ""
@@ -14476,18 +14814,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "parking_aisle"
 msgstr ""
@@ -14495,5 +14833,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:284
+#: build/trans_presets.java:285
 msgid "Parking Aisle"
 msgstr ""
@@ -14503,5 +14841,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:288
+#: build/trans_presets.java:289
 msgid "Edit Parking Aisle"
 msgstr ""
@@ -14509,5 +14847,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:298
+#: build/trans_presets.java:299
 msgid "Road (Unknown Type)"
 msgstr ""
@@ -14516,5 +14854,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Edit Road of unknown type"
 msgstr ""
@@ -14523,20 +14861,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:318
+#: build/trans_presets.java:319
 msgid "Road Restrictions"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:319
+#: build/trans_presets.java:320
 msgid "Edit Road Restrictions"
 msgstr ""
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:321
+#: build/trans_presets.java:322
 msgid "Toll"
 msgstr ""
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:322
+#: build/trans_presets.java:323
 msgid "No exit (cul-de-sac)"
 msgstr ""
@@ -14549,8 +14887,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:323 build/trans_presets.java:529
-#: build/trans_presets.java:550 build/trans_presets.java:571
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:634
+#: build/trans_presets.java:324 build/trans_presets.java:530
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:593 build/trans_presets.java:614
+#: build/trans_presets.java:635
 msgid "Access"
 msgstr ""
@@ -14604,29 +14942,29 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1397
-#: build/trans_presets.java:1398 build/trans_presets.java:1399
-#: build/trans_presets.java:1763 build/trans_presets.java:1773
-#: build/trans_presets.java:2397 build/trans_presets.java:2433
-#: build/trans_presets.java:2442 build/trans_presets.java:2443
-#: build/trans_presets.java:2444 build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:1396
+#: build/trans_presets.java:1397 build/trans_presets.java:1400
+#: build/trans_presets.java:1401 build/trans_presets.java:1402
+#: build/trans_presets.java:1767 build/trans_presets.java:1777
+#: build/trans_presets.java:2408 build/trans_presets.java:2444
+#: build/trans_presets.java:2453 build/trans_presets.java:2454
+#: build/trans_presets.java:2455 build/trans_presets.java:2725
 msgid "yes"
 msgstr ""
@@ -14639,40 +14977,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:212
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:212
 msgid "private"
 msgstr ""
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655
 msgid "designated"
 msgstr ""
@@ -14685,19 +15023,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:219
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:219
 msgid "destination"
 msgstr ""
@@ -14720,71 +15058,71 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:205
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:205
 msgid "permissive"
 msgstr ""
 
-#: build/trans_presets.java:323 build/trans_presets.java:327
-#: build/trans_presets.java:330 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636
+#: build/trans_presets.java:324 build/trans_presets.java:328
+#: build/trans_presets.java:331 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637
 msgid "agricultural"
 msgstr ""
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
-#: build/trans_presets.java:2433 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1396 build/trans_presets.java:1397
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
+#: build/trans_presets.java:2444 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
+#: build/trans_presets.java:2725
 msgid "no"
 msgstr ""
 
-#: build/trans_presets.java:326
+#: build/trans_presets.java:327
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:327
+#: build/trans_presets.java:328
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -14799,10 +15137,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:328 build/trans_presets.java:651
-#: build/trans_presets.java:858 build/trans_presets.java:891
-#: build/trans_presets.java:913 build/trans_presets.java:950
-#: build/trans_presets.java:963 build/trans_presets.java:975
-#: build/trans_presets.java:987 build/trans_presets.java:999
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:329 build/trans_presets.java:652
+#: build/trans_presets.java:859 build/trans_presets.java:892
+#: build/trans_presets.java:914 build/trans_presets.java:951
+#: build/trans_presets.java:964 build/trans_presets.java:976
+#: build/trans_presets.java:988 build/trans_presets.java:1000
+#: build/trans_presets.java:1040
 msgid "Horse"
 msgstr ""
@@ -14818,13 +15156,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:329 build/trans_presets.java:530
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:635 build/trans_presets.java:859
-#: build/trans_presets.java:877 build/trans_presets.java:892
-#: build/trans_presets.java:914 build/trans_presets.java:951
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:330 build/trans_presets.java:531
+#: build/trans_presets.java:552 build/trans_presets.java:573
+#: build/trans_presets.java:594 build/trans_presets.java:615
+#: build/trans_presets.java:636 build/trans_presets.java:860
+#: build/trans_presets.java:878 build/trans_presets.java:893
+#: build/trans_presets.java:915 build/trans_presets.java:952
+#: build/trans_presets.java:965 build/trans_presets.java:977
+#: build/trans_presets.java:989 build/trans_presets.java:1001
+#: build/trans_presets.java:1041
 msgid "Motorcycle"
 msgstr ""
@@ -14839,30 +15177,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:330 build/trans_presets.java:531
-#: build/trans_presets.java:552 build/trans_presets.java:573
-#: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:636 build/trans_presets.java:654
-#: build/trans_presets.java:878 build/trans_presets.java:893
-#: build/trans_presets.java:915 build/trans_presets.java:952
-#: build/trans_presets.java:965 build/trans_presets.java:977
-#: build/trans_presets.java:989 build/trans_presets.java:1001
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:331 build/trans_presets.java:532
+#: build/trans_presets.java:553 build/trans_presets.java:574
+#: build/trans_presets.java:595 build/trans_presets.java:616
+#: build/trans_presets.java:637 build/trans_presets.java:655
+#: build/trans_presets.java:879 build/trans_presets.java:894
+#: build/trans_presets.java:916 build/trans_presets.java:953
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1042
 msgid "Motorcar"
 msgstr ""
 
-#: build/trans_presets.java:331
+#: build/trans_presets.java:332
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
-#: build/trans_presets.java:332
+#: build/trans_presets.java:333
 msgid "Motorboat"
 msgstr ""
 
-#: build/trans_presets.java:333
+#: build/trans_presets.java:334
 msgid "Boat"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:336
 msgid "Min. speed (km/h)"
 msgstr ""
@@ -14870,25 +15208,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:336 build/trans_presets.java:374
+#: build/trans_presets.java:337 build/trans_presets.java:375
 msgid "Max. weight (tonnes)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:337
+#: build/trans_presets.java:338
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:339
+#: build/trans_presets.java:340
 msgid "Max. Length (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:341
+#: build/trans_presets.java:342
 msgid "Roundabout"
 msgstr ""
@@ -14899,5 +15237,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:346
+#: build/trans_presets.java:347
 msgid "Edit Junction"
 msgstr ""
@@ -14919,9 +15257,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:349 build/trans_presets.java:648
-#: build/trans_presets.java:788 build/trans_presets.java:1135
-#: build/trans_presets.java:1392 build/trans_presets.java:2353
-#: build/trans_presets.java:2901 build/trans_presets.java:2911
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:350 build/trans_presets.java:649
+#: build/trans_presets.java:789 build/trans_presets.java:1137
+#: build/trans_presets.java:1395 build/trans_presets.java:2364
+#: build/trans_presets.java:2913 build/trans_presets.java:2923
+#: build/trans_presets.java:2932
 msgid "Type"
 msgstr ""
@@ -14941,10 +15279,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:547
+#: build/trans_presets.java:350 build/trans_style.java:547
 #: build/trans_style.java:555
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "motorway_link"
 msgstr ""
@@ -14966,10 +15304,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:563
+#: build/trans_presets.java:350 build/trans_style.java:563
 #: build/trans_style.java:571
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "trunk_link"
 msgstr ""
@@ -14991,10 +15329,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:579
+#: build/trans_presets.java:350 build/trans_style.java:579
 #: build/trans_style.java:587
 msgid "primary"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "primary_link"
 msgstr ""
@@ -15016,5 +15354,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:595
+#: build/trans_presets.java:350 build/trans_style.java:595
 #: build/trans_style.java:603
 msgid "secondary"
@@ -15029,9 +15367,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:349 build/trans_style.java:611
+#: build/trans_presets.java:350 build/trans_style.java:611
 msgid "tertiary"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "unclassified"
 msgstr ""
@@ -15045,9 +15383,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:349 build/trans_style.java:3143
+#: build/trans_presets.java:350 build/trans_style.java:3151
 msgid "residential"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "living_street"
 msgstr ""
@@ -15077,10 +15415,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:349 build/trans_style.java:667
-#: build/trans_style.java:4244
+#: build/trans_presets.java:350 build/trans_style.java:667
+#: build/trans_style.java:4252
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "bus_guideway"
 msgstr ""
@@ -15110,6 +15448,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:349 build/trans_style.java:877
-#: build/trans_style.java:3208 build/trans_style.java:3209
+#: build/trans_presets.java:350 build/trans_style.java:877
+#: build/trans_style.java:3216 build/trans_style.java:3217
 msgid "construction"
 msgstr ""
@@ -15120,10 +15458,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Edit Bridge"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "Edit Tunnel"
 msgstr ""
@@ -15131,19 +15469,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:393
+#: build/trans_presets.java:394
 msgid "Ways"
 msgstr ""
 
 #. group "Ways"
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Construction"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:395
+#: build/trans_presets.java:396
 msgid "Edit Highway Under Construction"
 msgstr ""
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "Junction"
 msgstr ""
@@ -15159,5 +15497,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:411 build/trans_style.java:895
+#: build/trans_presets.java:412 build/trans_style.java:895
 msgid "roundabout"
 msgstr ""
@@ -15166,5 +15504,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:417
+#: build/trans_presets.java:418
 msgid "Bridleway"
 msgstr ""
@@ -15172,5 +15510,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:419
+#: build/trans_presets.java:420
 msgid "Edit Bridleway"
 msgstr ""
@@ -15178,5 +15516,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:435
+#: build/trans_presets.java:436
 msgid "Cycleway"
 msgstr ""
@@ -15186,10 +15524,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:439
+#: build/trans_presets.java:440
 msgid "Edit Cycleway"
 msgstr ""
 
 #. item "Ways/Cycleway" check "Embankment"
-#: build/trans_presets.java:449
+#: build/trans_presets.java:450
 msgid "Pedestrians"
 msgstr ""
@@ -15197,5 +15535,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Footway"
 msgstr ""
@@ -15204,10 +15542,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Footway"
 msgstr ""
 
 #. item "Ways/Footway" check "Embankment"
-#: build/trans_presets.java:469
+#: build/trans_presets.java:470
 msgid "Bikes"
 msgstr ""
@@ -15215,5 +15553,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:476
+#: build/trans_presets.java:477
 msgid "Pedestrian"
 msgstr ""
@@ -15222,5 +15560,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Edit Pedestrian Street"
 msgstr ""
@@ -15228,5 +15566,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:494
+#: build/trans_presets.java:495
 msgid "Steps"
 msgstr ""
@@ -15236,5 +15574,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:498
+#: build/trans_presets.java:499
 msgid "Edit Flight of Steps"
 msgstr ""
@@ -15243,5 +15581,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:515
+#: build/trans_presets.java:516
 msgid "Track"
 msgstr ""
@@ -15250,5 +15588,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:518
+#: build/trans_presets.java:519
 msgid "Edit Track"
 msgstr ""
@@ -15256,5 +15594,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:535
+#: build/trans_presets.java:536
 msgid "Track Grade 1"
 msgstr ""
@@ -15263,5 +15601,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:538
+#: build/trans_presets.java:539
 msgid "Edit Track of grade 1"
 msgstr ""
@@ -15269,5 +15607,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:556
+#: build/trans_presets.java:557
 msgid "Track Grade 2"
 msgstr ""
@@ -15276,5 +15614,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:559
+#: build/trans_presets.java:560
 msgid "Edit Track of grade 2"
 msgstr ""
@@ -15282,5 +15620,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:577
+#: build/trans_presets.java:578
 msgid "Track Grade 3"
 msgstr ""
@@ -15289,5 +15627,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:580
+#: build/trans_presets.java:581
 msgid "Edit Track of grade 3"
 msgstr ""
@@ -15295,5 +15633,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:598
+#: build/trans_presets.java:599
 msgid "Track Grade 4"
 msgstr ""
@@ -15302,5 +15640,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:601
+#: build/trans_presets.java:602
 msgid "Edit Track of grade 4"
 msgstr ""
@@ -15308,5 +15646,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:619
+#: build/trans_presets.java:620
 msgid "Track Grade 5"
 msgstr ""
@@ -15315,5 +15653,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:622
+#: build/trans_presets.java:623
 msgid "Edit Track of grade 5"
 msgstr ""
@@ -15322,5 +15660,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:641
+#: build/trans_presets.java:642
 msgid "Path"
 msgstr ""
@@ -15329,13 +15667,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:644
+#: build/trans_presets.java:645
 msgid "Edit Path"
 msgstr ""
 
-#: build/trans_presets.java:652
+#: build/trans_presets.java:653
 msgid "Ski"
 msgstr ""
 
-#: build/trans_presets.java:653
+#: build/trans_presets.java:654
 msgid "Snowmobile"
 msgstr ""
@@ -15345,6 +15683,6 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:670 build/trans_presets.java:1725
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:671 build/trans_presets.java:1729
+#: build/trans_presets.java:1752
 msgid "Hiking"
 msgstr ""
@@ -15354,5 +15692,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:674
+#: build/trans_presets.java:675
 msgid "Edit Hiking"
 msgstr ""
@@ -15360,5 +15698,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:683
+#: build/trans_presets.java:684
 msgid "Mountain Hiking"
 msgstr ""
@@ -15368,5 +15706,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:687
+#: build/trans_presets.java:688
 msgid "Edit Mountain Hiking"
 msgstr ""
@@ -15374,5 +15712,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:696
+#: build/trans_presets.java:697
 msgid "Demanding Mountain Hiking"
 msgstr ""
@@ -15382,5 +15720,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:700
+#: build/trans_presets.java:701
 msgid "Edit Demanding Mountain Hiking"
 msgstr ""
@@ -15388,5 +15726,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:709
+#: build/trans_presets.java:710
 msgid "Alpine Hiking"
 msgstr ""
@@ -15396,5 +15734,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:713
+#: build/trans_presets.java:714
 msgid "Edit Alpine Hiking"
 msgstr ""
@@ -15402,5 +15740,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:723
 msgid "Demanding Alpine Hiking"
 msgstr ""
@@ -15410,5 +15748,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:726
+#: build/trans_presets.java:727
 msgid "Edit Demanding Alpine Hiking"
 msgstr ""
@@ -15416,5 +15754,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:735
+#: build/trans_presets.java:736
 msgid "Difficult Alpine Hiking"
 msgstr ""
@@ -15424,5 +15762,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:739
+#: build/trans_presets.java:740
 msgid "Edit Difficult Alpine Hiking"
 msgstr ""
@@ -15430,10 +15768,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:749
+#: build/trans_presets.java:750
 msgid "Waypoints"
 msgstr ""
 
 #. group "Waypoints"
-#: build/trans_presets.java:750
+#: build/trans_presets.java:751
 msgid "Motorway Junction"
 msgstr ""
@@ -15441,15 +15779,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:752
+#: build/trans_presets.java:753
 msgid "Edit Motorway Junction"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:757
 msgid "Number"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:759
 msgid "Services"
 msgstr ""
@@ -15457,5 +15795,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:761
 msgid "Edit Service Station"
 msgstr ""
@@ -15493,15 +15831,15 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:765 build/trans_presets.java:902
-#: build/trans_presets.java:1382 build/trans_presets.java:1406
-#: build/trans_presets.java:1413 build/trans_presets.java:1419
-#: build/trans_presets.java:1427 build/trans_presets.java:1434
-#: build/trans_presets.java:1761 build/trans_presets.java:1771
-#: build/trans_presets.java:2361 build/trans_presets.java:2368
-#: build/trans_presets.java:2384 build/trans_presets.java:2395
-#: build/trans_presets.java:2403 build/trans_presets.java:2410
-#: build/trans_presets.java:2464 build/trans_presets.java:2512
-#: build/trans_presets.java:2678 build/trans_presets.java:2693
-#: build/trans_presets.java:2732 build/trans_presets.java:3151
+#: build/trans_presets.java:766 build/trans_presets.java:903
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
+#: build/trans_presets.java:1416 build/trans_presets.java:1422
+#: build/trans_presets.java:1430 build/trans_presets.java:1437
+#: build/trans_presets.java:1765 build/trans_presets.java:1775
+#: build/trans_presets.java:2372 build/trans_presets.java:2379
+#: build/trans_presets.java:2395 build/trans_presets.java:2406
+#: build/trans_presets.java:2414 build/trans_presets.java:2421
+#: build/trans_presets.java:2475 build/trans_presets.java:2523
+#: build/trans_presets.java:2689 build/trans_presets.java:2704
+#: build/trans_presets.java:2743 build/trans_presets.java:3163
 msgid "Operator"
 msgstr ""
@@ -15510,5 +15848,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:769
+#: build/trans_presets.java:770
 msgid "Traffic Signal"
 msgstr ""
@@ -15518,5 +15856,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:774
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -15525,27 +15863,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "island"
 msgstr ""
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:774 build/trans_presets.java:790
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:775 build/trans_presets.java:791
+#: build/trans_presets.java:1334
 msgid "Cross on horseback"
 msgstr ""
@@ -15553,6 +15891,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:775 build/trans_presets.java:789
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:776 build/trans_presets.java:790
+#: build/trans_presets.java:1335
 msgid "Cross by bicycle"
 msgstr ""
@@ -15561,11 +15899,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:776 build/trans_presets.java:791
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:1336
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:778
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -15573,30 +15911,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:780
+#: build/trans_presets.java:781
 msgid "Stop"
 msgstr ""
@@ -15604,5 +15942,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:783
+#: build/trans_presets.java:784
 msgid "Pedestrian Crossing"
 msgstr ""
@@ -15611,14 +15949,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:786
+#: build/trans_presets.java:787
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:793
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:795
 msgid "Mini-roundabout"
 msgstr ""
@@ -15629,14 +15967,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:801
+#: build/trans_presets.java:802
 msgid "Turning Circle"
 msgstr ""
@@ -15646,20 +15984,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:806
+#: build/trans_presets.java:807
 msgid "City Limit"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:807
+#: build/trans_presets.java:808
 msgid "Edit City Limit Sign"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:812
+#: build/trans_presets.java:813
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:814
+#: build/trans_presets.java:815
 msgid "Speed Camera"
 msgstr ""
@@ -15667,5 +16005,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:817
+#: build/trans_presets.java:818
 msgid "Emergency Phone"
 msgstr ""
@@ -15673,5 +16011,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:820
+#: build/trans_presets.java:821
 msgid "Incline"
 msgstr ""
@@ -15679,5 +16017,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:823
+#: build/trans_presets.java:824
 msgid "Incline Steep"
 msgstr ""
@@ -15686,10 +16024,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:827
+#: build/trans_presets.java:828
 msgid "Ford"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:828
+#: build/trans_presets.java:829
 msgid "Edit Ford"
 msgstr ""
@@ -15697,5 +16035,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:835
+#: build/trans_presets.java:836
 msgid "Mountain Pass"
 msgstr ""
@@ -15703,5 +16041,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:837
+#: build/trans_presets.java:838
 msgid "Edit Mountain Pass"
 msgstr ""
@@ -15713,7 +16051,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:842 build/trans_presets.java:1600
-#: build/trans_presets.java:1745 build/trans_presets.java:2845
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:843 build/trans_presets.java:1604
+#: build/trans_presets.java:1749 build/trans_presets.java:2857
+#: build/trans_presets.java:2864 build/trans_presets.java:2871
 msgid "Elevation"
 msgstr ""
@@ -15721,5 +16059,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:846
+#: build/trans_presets.java:847
 msgid "Barriers"
 msgstr ""
@@ -15727,5 +16065,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:849
+#: build/trans_presets.java:850
 msgid "Bollard"
 msgstr ""
@@ -15733,5 +16071,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:852
 msgid "Edit Bollard"
 msgstr ""
@@ -15776,16 +16114,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:854 build/trans_presets.java:873
-#: build/trans_presets.java:887 build/trans_presets.java:909
-#: build/trans_presets.java:946 build/trans_presets.java:959
-#: build/trans_presets.java:971 build/trans_presets.java:983
-#: build/trans_presets.java:995 build/trans_presets.java:1007
-#: build/trans_presets.java:1017 build/trans_presets.java:1026
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:855 build/trans_presets.java:874
+#: build/trans_presets.java:888 build/trans_presets.java:910
+#: build/trans_presets.java:947 build/trans_presets.java:960
+#: build/trans_presets.java:972 build/trans_presets.java:984
+#: build/trans_presets.java:996 build/trans_presets.java:1008
+#: build/trans_presets.java:1018 build/trans_presets.java:1027
+#: build/trans_presets.java:1036
 msgid "Allowed traffic:"
 msgstr ""
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:861
+#: build/trans_presets.java:862
 msgid "Cycle Barrier"
 msgstr ""
@@ -15794,5 +16132,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:865
+#: build/trans_presets.java:866
 msgid "Block"
 msgstr ""
@@ -15800,5 +16138,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:868
+#: build/trans_presets.java:869
 msgid "Cattle Grid"
 msgstr ""
@@ -15806,10 +16144,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:870
+#: build/trans_presets.java:871
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:880
+#: build/trans_presets.java:881
 msgid "Bus Trap"
 msgstr ""
@@ -15817,15 +16155,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:883
+#: build/trans_presets.java:884
 msgid "Spikes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:884
+#: build/trans_presets.java:885
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:896
 msgid "Toll Booth"
 msgstr ""
@@ -15833,5 +16171,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:897
+#: build/trans_presets.java:898
 msgid "Edit Toll Booth"
 msgstr ""
@@ -15839,10 +16177,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:905
+#: build/trans_presets.java:906
 msgid "Border Control"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:906
+#: build/trans_presets.java:907
 msgid "Edit Border Control"
 msgstr ""
@@ -15852,5 +16190,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:920
+#: build/trans_presets.java:921
 msgid "Hedge"
 msgstr ""
@@ -15859,5 +16197,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:925
 msgid "Fence"
 msgstr ""
@@ -15866,5 +16204,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:929
 msgid "Wall"
 msgstr ""
@@ -15872,5 +16210,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:931
+#: build/trans_presets.java:932
 msgid "City Wall"
 msgstr ""
@@ -15879,5 +16217,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:935
+#: build/trans_presets.java:936
 msgid "Retaining Wall"
 msgstr ""
@@ -15889,15 +16227,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:942
+#: build/trans_presets.java:943
 msgid "Entrance"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:943
+#: build/trans_presets.java:944
 msgid "Edit Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:954
+#: build/trans_presets.java:955
 msgid "Gate"
 msgstr ""
@@ -15905,50 +16243,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:956
+#: build/trans_presets.java:957
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:967
+#: build/trans_presets.java:968
 msgid "Lift Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:968
+#: build/trans_presets.java:969
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:979
+#: build/trans_presets.java:980
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:980
+#: build/trans_presets.java:981
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:991
+#: build/trans_presets.java:992
 msgid "Bump Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:992
+#: build/trans_presets.java:993
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:1003
+#: build/trans_presets.java:1004
 msgid "Kissing Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1004
+#: build/trans_presets.java:1005
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1013
 msgid "Stile"
 msgstr ""
@@ -15956,25 +16294,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1014
+#: build/trans_presets.java:1015
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1023
 msgid "Turnstile"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1024
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1032
 msgid "Sally Port"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1033
 msgid "Edit Sally Port"
 msgstr ""
@@ -15982,13 +16320,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #.
-#. <separator/>
+#. group "Water"
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1046 build/trans_presets.java:1089
+#: build/trans_presets.java:1047 build/trans_presets.java:1048
+#: build/trans_presets.java:1091
 msgid "Water"
 msgstr ""
 
 #. group "Water"
-#: build/trans_presets.java:1047
+#: build/trans_presets.java:1049
 msgid "Spring"
 msgstr ""
@@ -15996,5 +16335,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1049
+#: build/trans_presets.java:1051
 msgid "Edit Spring"
 msgstr ""
@@ -16002,5 +16341,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1056
 msgid "Drain"
 msgstr ""
@@ -16008,10 +16347,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1058
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1064
 msgid "Stream"
 msgstr ""
@@ -16019,10 +16358,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1066
 msgid "Edit Stream"
 msgstr ""
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1072
 msgid "Canal"
 msgstr ""
@@ -16030,10 +16369,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1074
 msgid "Edit Canal"
 msgstr ""
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1080
 msgid "River"
 msgstr ""
@@ -16043,5 +16382,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1084
 msgid "Edit River"
 msgstr ""
@@ -16049,15 +16388,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1093
 msgid "Edit Water"
 msgstr ""
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1097
 msgid "Land"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1098
 msgid "Edit Land"
 msgstr ""
@@ -16065,15 +16404,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1103
 msgid "Basin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1104
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1109
 msgid "Reservoir"
 msgstr ""
@@ -16081,15 +16420,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1109
+#: build/trans_presets.java:1111
 msgid "Edit Reservoir Landuse"
 msgstr ""
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1116
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1117
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -16097,5 +16436,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1120
+#: build/trans_presets.java:1122
 msgid "Riverbank"
 msgstr ""
@@ -16104,10 +16443,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1125
 msgid "Edit Riverbank"
 msgstr ""
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1127
+#: build/trans_presets.java:1129
 msgid "Wetland"
 msgstr ""
@@ -16118,14 +16457,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1134
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "swamp"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "bog"
 msgstr ""
@@ -16139,35 +16478,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1135 build/trans_style.java:3384
+#: build/trans_presets.java:1137 build/trans_style.java:3392
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1139
 msgid "Mud"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1140
 msgid "Edit Mud"
 msgstr ""
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1144
 msgid "Beach"
 msgstr ""
@@ -16175,20 +16514,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1144
+#: build/trans_presets.java:1146
 msgid "Edit Beach"
 msgstr ""
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1150
 msgid "Bay"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1149
+#: build/trans_presets.java:1151
 msgid "Edit Bay"
 msgstr ""
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1155
 msgid "Cliff"
 msgstr ""
@@ -16196,10 +16535,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1157
 msgid "Edit Cliff"
 msgstr ""
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1159
+#: build/trans_presets.java:1161
 msgid "Coastline"
 msgstr ""
@@ -16207,5 +16546,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1163
 msgid "Edit Coastline"
 msgstr ""
@@ -16213,5 +16552,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1168
 msgid "Ferry Route"
 msgstr ""
@@ -16219,5 +16558,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1170
 msgid "Edit Ferry"
 msgstr ""
@@ -16226,5 +16565,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1176
+#: build/trans_presets.java:1178
 msgid "Boatyard"
 msgstr ""
@@ -16232,10 +16571,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:1180
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1185
 msgid "Dock"
 msgstr ""
@@ -16243,5 +16582,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1187
 msgid "Edit Dock"
 msgstr ""
@@ -16249,5 +16588,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1193
 msgid "Dam"
 msgstr ""
@@ -16255,15 +16594,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1195
 msgid "Edit Dam"
 msgstr ""
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1199
+#: build/trans_presets.java:1201
 msgid "Waterway Point"
 msgstr ""
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1202
 msgid "Lock Gate"
 msgstr ""
@@ -16272,5 +16611,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1206
 msgid "Weir"
 msgstr ""
@@ -16278,20 +16617,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1208
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1213
 msgid "Waterfall"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1214
 msgid "Edit Waterfall"
 msgstr ""
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1219
 msgid "Turning Point"
 msgstr ""
@@ -16300,15 +16639,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1221
+#: build/trans_presets.java:1223
 msgid "Marina"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1224
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1228
 msgid "Pier"
 msgstr ""
@@ -16316,10 +16655,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1230
 msgid "Edit Pier"
 msgstr ""
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1234
 msgid "Ferry Terminal"
 msgstr ""
@@ -16327,10 +16666,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1236
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1240
 msgid "Slipway"
 msgstr ""
@@ -16340,16 +16679,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1244
 msgid "Edit Slipway"
 msgstr ""
 
 #. item "Waterway Point/Slipway" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1250
+msgid "Transport"
+msgstr ""
+
+#. group "Transport"
+#: build/trans_presets.java:1251
 msgid "Railway"
 msgstr ""
 
 #. group "Railway"
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1252
 msgid "Rail"
 msgstr ""
@@ -16357,5 +16700,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:1254
 msgid "Edit Rail"
 msgstr ""
@@ -16385,8 +16728,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "Optional Types"
 msgstr ""
@@ -16400,35 +16743,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1259
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1257
+#: build/trans_presets.java:1260
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1265
 msgid "Monorail"
 msgstr ""
@@ -16436,45 +16779,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1267
 msgid "Edit Monorail"
 msgstr ""
 
-#: build/trans_presets.java:1269
+#: build/trans_presets.java:1272
 msgid "Preserved"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1273
 msgid "Edit Preserved Railway"
 msgstr ""
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1278
 msgid "Light Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1279
 msgid "Edit Light Rail"
 msgstr ""
 
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1284
 msgid "Subway"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1285
 msgid "Edit Subway"
 msgstr ""
 
-#: build/trans_presets.java:1287
+#: build/trans_presets.java:1290
 msgid "Tram"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1291
 msgid "Edit Tram"
 msgstr ""
 
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1296
 msgid "Bus Guideway"
 msgstr ""
@@ -16482,5 +16825,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1295
+#: build/trans_presets.java:1298
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -16489,14 +16832,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1315
 msgid "Disused Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1313
+#: build/trans_presets.java:1316
 msgid "Edit Disused Railway"
 msgstr ""
 
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1321
 msgid "Abandoned Rail"
 msgstr ""
@@ -16505,5 +16848,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1325
 msgid "Level Crossing"
 msgstr ""
@@ -16512,5 +16855,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1329
 msgid "Crossing"
 msgstr ""
@@ -16520,5 +16863,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1333
 msgid "Crossing type"
 msgstr ""
@@ -16526,5 +16869,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1339
 msgid "Turntable"
 msgstr ""
@@ -16533,10 +16876,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1344
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1345
 msgid "Chair Lift"
 msgstr ""
@@ -16544,10 +16887,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1347
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1351
 msgid "Drag Lift"
 msgstr ""
@@ -16555,10 +16898,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1353
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1357
 msgid "Cable Car"
 msgstr ""
@@ -16566,10 +16909,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1359
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1360
+#: build/trans_presets.java:1363
 msgid "Gondola"
 msgstr ""
@@ -16577,5 +16920,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1365
 msgid "Edit Gondola"
 msgstr ""
@@ -16583,5 +16926,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1366 build/trans_presets.java:1461
+#: build/trans_presets.java:1369 build/trans_presets.java:1464
 msgid "Station"
 msgstr ""
@@ -16592,10 +16935,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1368 build/trans_presets.java:1464
+#: build/trans_presets.java:1371 build/trans_presets.java:1467
 msgid "Edit Station"
 msgstr ""
 
 #. group "Car"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1378
 msgid "Fuel"
 msgstr ""
@@ -16605,5 +16948,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1382
 msgid "Edit Fuel"
 msgstr ""
@@ -16661,32 +17004,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1671 build/trans_presets.java:1678
-#: build/trans_presets.java:1686 build/trans_presets.java:1699
-#: build/trans_presets.java:1713 build/trans_presets.java:1810
-#: build/trans_presets.java:1818 build/trans_presets.java:1909
-#: build/trans_presets.java:1915 build/trans_presets.java:2226
-#: build/trans_presets.java:2250 build/trans_presets.java:2465
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1703
+#: build/trans_presets.java:1717 build/trans_presets.java:1814
+#: build/trans_presets.java:1822 build/trans_presets.java:1919
+#: build/trans_presets.java:1925 build/trans_presets.java:2237
+#: build/trans_presets.java:2261 build/trans_presets.java:2476
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Opening Hours"
 msgstr ""
@@ -16745,91 +17088,91 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -16844,5 +17187,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1385 build/trans_presets.java:1438
+#: build/trans_presets.java:1388 build/trans_presets.java:1441
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -16852,5 +17195,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1391
 msgid "Edit Parking"
 msgstr ""
@@ -16861,24 +17204,24 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1391 build/trans_presets.java:1762
-#: build/trans_presets.java:1772 build/trans_presets.java:2396
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:1394 build/trans_presets.java:1766
+#: build/trans_presets.java:1776 build/trans_presets.java:2407
+#: build/trans_presets.java:2524
 msgid "Reference number"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "surface"
 msgstr ""
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1396
 msgid "Park and Ride"
 msgstr ""
@@ -16887,38 +17230,38 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1394 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
+#: build/trans_presets.java:1397 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
 msgid "Fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1396
+#: build/trans_presets.java:1399
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1400
 msgid "Spaces for Disabled"
 msgstr ""
 
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1401
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1402
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1403
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1405
 msgid "Wash"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1406
 msgid "Edit Car Wash"
 msgstr ""
@@ -16926,5 +17269,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1408 build/trans_presets.java:1452
+#: build/trans_presets.java:1411 build/trans_presets.java:1455
 msgid "Shop"
 msgstr ""
@@ -16932,15 +17275,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1413
 msgid "Edit Car Shop"
 msgstr ""
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1418
 msgid "Repair"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1419
 msgid "Edit Car Repair"
 msgstr ""
@@ -16948,5 +17291,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1421 build/trans_presets.java:1445
+#: build/trans_presets.java:1424 build/trans_presets.java:1448
 msgid "Rental"
 msgstr ""
@@ -16955,10 +17298,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1427
 msgid "Edit Car Rental"
 msgstr ""
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1432
 msgid "Sharing"
 msgstr ""
@@ -16966,5 +17309,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1434
 msgid "Edit Car Sharing"
 msgstr ""
@@ -16972,10 +17315,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Parking"
 msgstr ""
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1446
 msgid "Capacity"
 msgstr ""
@@ -16984,5 +17327,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1448
+#: build/trans_presets.java:1451
 msgid "Edit Bicycle Rental"
 msgstr ""
@@ -16991,15 +17334,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1458
 msgid "Edit Bicycle Shop"
 msgstr ""
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1463
 msgid "Public Transport"
 msgstr ""
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:1472
 msgid "UIC-Reference"
 msgstr ""
@@ -17007,5 +17350,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1475
 msgid "Railway Halt"
 msgstr ""
@@ -17013,5 +17356,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1477
 msgid "Edit Halt"
 msgstr ""
@@ -17019,5 +17362,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1484
 msgid "Tram Stop"
 msgstr ""
@@ -17026,5 +17369,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1484
+#: build/trans_presets.java:1487
 msgid "Edit Tram Stop"
 msgstr ""
@@ -17032,5 +17375,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1494
 msgid "Railway Platform"
 msgstr ""
@@ -17039,5 +17382,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1497
 msgid "Edit Railway Platform"
 msgstr ""
@@ -17049,5 +17392,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1497 build/trans_presets.java:1539
+#: build/trans_presets.java:1500 build/trans_presets.java:1542
 msgid "Reference (track number)"
 msgstr ""
@@ -17055,10 +17398,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1499 build/trans_presets.java:1541
+#: build/trans_presets.java:1502 build/trans_presets.java:1544
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1504
 msgid "Subway Entrance"
 msgstr ""
@@ -17067,10 +17410,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1507
 msgid "Edit Subway Entrance"
 msgstr ""
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1512
 msgid "Wheelchair"
 msgstr ""
@@ -17079,5 +17422,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1517
 msgid "Bus Station"
 msgstr ""
@@ -17086,5 +17429,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1520
 msgid "Edit Bus Station"
 msgstr ""
@@ -17092,5 +17435,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1526
 msgid "Bus Stop"
 msgstr ""
@@ -17100,5 +17443,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1530
 msgid "Edit Bus Stop"
 msgstr ""
@@ -17107,6 +17450,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1532 build/trans_presets.java:1785
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:1535 build/trans_presets.java:1789
+#: build/trans_presets.java:2453
 msgid "Shelter"
 msgstr ""
@@ -17114,10 +17457,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1538
 msgid "Bus Platform"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1539
 msgid "Edit Bus Platform"
 msgstr ""
@@ -17125,5 +17468,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1547
 msgid "Taxi"
 msgstr ""
@@ -17131,5 +17474,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1549
 msgid "Edit Taxi station"
 msgstr ""
@@ -17137,5 +17480,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1554
 msgid "Airport"
 msgstr ""
@@ -17143,15 +17486,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1556
 msgid "Edit Airport"
 msgstr ""
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1561
 msgid "IATA"
 msgstr ""
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1559
+#: build/trans_presets.java:1562
 msgid "ICAO"
 msgstr ""
@@ -17159,6 +17502,11 @@
 #. item "Public Transport/Airport" text "ICAO"
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1567
+#, fuzzy
+msgid "Travel"
+msgstr "Gardar"
+
+#. group "Travel"
+#: build/trans_presets.java:1568
 msgid "Accomodation"
 msgstr ""
@@ -17170,5 +17518,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1565 build/trans_surveyor.java:43
+#: build/trans_presets.java:1569 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr ""
@@ -17177,15 +17525,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:1568
+#: build/trans_presets.java:1572
 msgid "Edit Hotel"
 msgstr ""
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1575
 msgid "Stars"
 msgstr ""
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1577
 msgid "Motel"
 msgstr ""
@@ -17193,20 +17541,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1579
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1583
 msgid "Guest House"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1584
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1588
 msgid "Chalet"
 msgstr ""
@@ -17214,10 +17562,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1590
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1594
 msgid "Hostel"
 msgstr ""
@@ -17225,30 +17573,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1592
+#: build/trans_presets.java:1596
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1600
 msgid "Alpine Hut"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1601
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1606
 msgid "Caravan Site"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1607
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1611
 msgid "Camping Site"
 msgstr ""
@@ -17256,10 +17604,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1613
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1618
 msgid "Food+Drinks"
 msgstr ""
@@ -17270,5 +17618,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1615 build/trans_surveyor.java:47
+#: build/trans_presets.java:1619 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr ""
@@ -17276,5 +17624,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1621
 msgid "Edit Restaurant"
 msgstr ""
@@ -17282,5 +17630,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "Cuisine"
 msgstr ""
@@ -17288,61 +17636,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "turkish"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "asian"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "thai"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "mexican"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "japanese"
 msgstr ""
 
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1627
 msgid "Fast Food"
 msgstr ""
@@ -17350,9 +17698,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1629
 msgid "Edit Fast Food Restaurant"
 msgstr ""
 
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1635
 msgid "Cafe"
 msgstr ""
@@ -17360,9 +17708,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1633
+#: build/trans_presets.java:1637
 msgid "Edit Cafe"
 msgstr ""
 
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1642
 msgid "Pub"
 msgstr ""
@@ -17370,18 +17718,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1644
 msgid "Edit Pub"
 msgstr ""
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1649
 msgid "Biergarten"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1646
+#: build/trans_presets.java:1650
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1655
 msgid "Bar"
 msgstr ""
@@ -17389,9 +17737,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1657
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1662
 msgid "Nightclub"
 msgstr ""
@@ -17399,24 +17747,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1664
 msgid "Edit Nightclub"
 msgstr ""
 
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1670
 msgid "Tourism"
 msgstr ""
 
 #. group "Tourism"
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1671
 msgid "Attraction"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1672
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1677
 msgid "Museum"
 msgstr ""
@@ -17424,9 +17772,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1679
 msgid "Edit Museum"
 msgstr ""
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1684
 msgid "Zoo"
 msgstr ""
@@ -17435,9 +17783,9 @@
 #. <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:1683
+#: build/trans_presets.java:1687
 msgid "Edit Zoo"
 msgstr ""
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1692
 msgid "Viewpoint"
 msgstr ""
@@ -17445,24 +17793,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1694
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1697
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1699
 msgid "Theme Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1700
 msgid "Edit Theme Park"
 msgstr ""
 
-#: build/trans_presets.java:1701
+#: build/trans_presets.java:1705
 msgid "Artwork"
 msgstr ""
@@ -17470,5 +17818,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1707
 msgid "Edit Artwork"
 msgstr ""
@@ -17476,19 +17824,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1712
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1719
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "topo"
 msgstr ""
@@ -17526,5 +17874,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1720 build/trans_style.java:619
+#: build/trans_presets.java:1724 build/trans_style.java:619
 #: build/trans_style.java:635 build/trans_style.java:651
 #: build/trans_style.java:659
@@ -17532,28 +17880,28 @@
 msgstr ""
 
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1722 build/trans_presets.java:1738
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1726 build/trans_presets.java:1742
+#: build/trans_presets.java:1786
 msgid "Closer Description"
 msgstr ""
@@ -17563,5 +17911,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1724 build/trans_presets.java:1747
+#: build/trans_presets.java:1728 build/trans_presets.java:1751
 msgid "Routes shown for:"
 msgstr ""
@@ -17569,6 +17917,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1726 build/trans_presets.java:1749
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1965
 msgid "Cycling"
 msgstr ""
@@ -17576,5 +17924,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1727 build/trans_presets.java:1750
+#: build/trans_presets.java:1731 build/trans_presets.java:1754
 msgid "Mountainbiking"
 msgstr ""
@@ -17582,6 +17930,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1728 build/trans_presets.java:1751
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:1732 build/trans_presets.java:1755
+#: build/trans_presets.java:2019
 msgid "Skiing"
 msgstr ""
@@ -17589,5 +17937,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1729 build/trans_presets.java:1752
+#: build/trans_presets.java:1733 build/trans_presets.java:1756
 msgid "Riding"
 msgstr ""
@@ -17595,46 +17943,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1734 build/trans_presets.java:1757
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1736
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "history"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1744
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1759
 msgid "Information Terminal"
 msgstr ""
@@ -17642,29 +17990,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1760 build/trans_presets.java:1770
+#: build/trans_presets.java:1764 build/trans_presets.java:1774
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1769
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1779
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1780
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1778
+#: build/trans_presets.java:1782
 msgid "Other Information Points"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1790
 msgid "Edit Shelter"
 msgstr ""
@@ -17672,25 +18020,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1789 build/trans_presets.java:1795
+#: build/trans_presets.java:1793 build/trans_presets.java:1799
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1791
+#: build/trans_presets.java:1795
 msgid "Picnic Site"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1796
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1802
 msgid "Historic Places"
 msgstr ""
 
 #. group "Historic Places"
-#: build/trans_presets.java:1799
+#: build/trans_presets.java:1803
 msgid "Castle"
 msgstr ""
@@ -17699,19 +18047,19 @@
 #. <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:1802
+#: build/trans_presets.java:1806
 msgid "Edit Castle"
 msgstr ""
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1810
 msgid "Ruins"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1811
 msgid "Edit Ruins"
 msgstr ""
 
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1816
 msgid "Archaeological Site"
 msgstr ""
@@ -17720,9 +18068,9 @@
 #. <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:1815
+#: build/trans_presets.java:1819
 msgid "Edit Archaeological Site"
 msgstr ""
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1824
 msgid "Battlefield"
 msgstr ""
@@ -17730,5 +18078,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1826
 msgid "Edit Battlefield"
 msgstr ""
@@ -17736,15 +18084,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1831
 msgid "Monument"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1832
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1836
 msgid "Memorial"
 msgstr ""
@@ -17752,45 +18100,55 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1838
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1842
 msgid "Wayside Cross"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1843
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1847
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1848
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1852
+msgid "Boundary Stone"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:1853
+msgid "Edit Boundary Stone"
+msgstr ""
+
+#. item "Historic Places/Boundary Stone" text "Name"
+#: build/trans_presets.java:1858
 msgid "Leisure"
 msgstr ""
 
 #. group "Leisure"
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1859
 msgid "Water Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1860
 msgid "Edit Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1864
 msgid "Playground"
 msgstr ""
@@ -17798,31 +18156,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1866
 msgid "Edit Playground"
 msgstr ""
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1870
 msgid "Fishing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1871
 msgid "Edit Fishing"
 msgstr ""
 
 #. item "Leisure/Fishing" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1877 build/trans_presets.java:2669
+msgid "Sports"
+msgstr ""
+
+#. group "Sports"
+#: build/trans_presets.java:1878
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1879
 msgid "Stadium"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1880
 msgid "Edit Stadium"
 msgstr ""
@@ -17836,6 +18198,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1874 build/trans_presets.java:1883
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1902 build/trans_presets.java:1911
 msgid "select sport:"
 msgstr ""
@@ -18227,30 +18589,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884 build/trans_style.java:3892
-#: build/trans_style.java:3900 build/trans_style.java:3908
-#: build/trans_style.java:3916 build/trans_style.java:3924
-#: build/trans_style.java:3932
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_style.java:3572 build/trans_style.java:3580
+#: build/trans_style.java:3588 build/trans_style.java:3596
+#: build/trans_style.java:3604 build/trans_style.java:3612
+#: build/trans_style.java:3620 build/trans_style.java:3628
+#: build/trans_style.java:3636 build/trans_style.java:3644
+#: build/trans_style.java:3652 build/trans_style.java:3660
+#: build/trans_style.java:3668 build/trans_style.java:3676
+#: build/trans_style.java:3684 build/trans_style.java:3692
+#: build/trans_style.java:3700 build/trans_style.java:3708
+#: build/trans_style.java:3716 build/trans_style.java:3724
+#: build/trans_style.java:3732 build/trans_style.java:3740
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3764 build/trans_style.java:3772
+#: build/trans_style.java:3780 build/trans_style.java:3788
+#: build/trans_style.java:3796 build/trans_style.java:3804
+#: build/trans_style.java:3812 build/trans_style.java:3820
+#: build/trans_style.java:3828 build/trans_style.java:3836
+#: build/trans_style.java:3844 build/trans_style.java:3852
+#: build/trans_style.java:3860 build/trans_style.java:3868
+#: build/trans_style.java:3876 build/trans_style.java:3884
+#: build/trans_style.java:3892 build/trans_style.java:3900
+#: build/trans_style.java:3908 build/trans_style.java:3916
+#: build/trans_style.java:3924 build/trans_style.java:3932
+#: build/trans_style.java:3940
 msgid "sport"
 msgstr ""
@@ -18260,225 +18622,225 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "archery"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "baseball"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "basketball"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "climbing"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "football"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "golf"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "rugby"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skiing"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "soccer"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "swimming"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "table_tennis"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "tennis"
 msgstr ""
 
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1888
 msgid "Sports Centre"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1889
 msgid "Edit Sports Centre"
 msgstr ""
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1897
 msgid "Pitch"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1898
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1906
 msgid "Racetrack"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1907
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1915
 msgid "Golf Course"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1916
 msgid "Edit Golf Course"
 msgstr ""
 
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1921
 msgid "Miniature Golf"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1922
 msgid "Edit Miniature Golf"
 msgstr ""
 
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1928
 msgid "Sport"
 msgstr ""
 
 #. group "Sport"
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1929
 msgid "Multi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1930
 msgid "Edit Multi"
 msgstr ""
@@ -18517,183 +18879,183 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "stadium"
 msgstr ""
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1935
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1936
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1941
 msgid "Athletics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1942
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1947
 msgid "Archery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1948
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1953
 msgid "Climbing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:1954
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1959
 msgid "Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1960
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1966
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1971
 msgid "Dog Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1972
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1977
 msgid "Equestrian"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1978
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1983
 msgid "Horse Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1984
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1989
 msgid "Gymnastics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1990
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1995
 msgid "Motor Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1996
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2001
 msgid "Skating"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2002
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2007
 msgid "Skateboard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2008
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2013
 msgid "Swimming"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2014
 msgid "Edit Swimming"
 msgstr ""
@@ -18701,56 +19063,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2021
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2028
 msgid "Shooting"
 msgstr ""
@@ -18758,178 +19120,182 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2030
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2036
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2037
 msgid "Soccer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2038
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2043
 msgid "Football"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2044
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2049
 msgid "Australian Football"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2050
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2055
 msgid "Baseball"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2056
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2061
 msgid "Basketball"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2062
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2067
 msgid "Golf"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2068
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2071
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2073
 msgid "Boule"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2074
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2079
 msgid "Bowls"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2080
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2085
 msgid "Cricket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2086
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2091
 msgid "Cricket Nets"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2092
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2097
 msgid "Croquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2098
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2103
 msgid "Hockey"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2104
 msgid "Edit Hockey"
 msgstr ""
 
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2109
 msgid "Pelota"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2110
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2105
+#: build/trans_presets.java:2115
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2116
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2121
 msgid "Rugby"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2122
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2127
 msgid "Table Tennis"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2128
 msgid "Edit Table Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2123
+#: build/trans_presets.java:2133
 msgid "Tennis"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2134
 msgid "Edit Tennis"
 msgstr ""
 
-#. <separator/>
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2141
+msgid "Man-Made"
+msgstr ""
+
+#. group "Man-Made"
+#: build/trans_presets.java:2142
 msgid "Buildings"
 msgstr ""
 
 #. group "Buildings"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2143
 msgid "Building"
 msgstr ""
@@ -18937,5 +19303,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Public Building"
 msgstr ""
@@ -18943,10 +19309,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2148
 msgid "Edit Public Building"
 msgstr ""
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2152
 msgid "Town hall"
 msgstr ""
@@ -18954,10 +19320,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2154
 msgid "Edit Town hall"
 msgstr ""
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:2158
 msgid "Embassy"
 msgstr ""
@@ -18965,10 +19331,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Edit Embassy"
 msgstr ""
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2164
 msgid "Courthouse"
 msgstr ""
@@ -18977,10 +19343,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:2156
+#: build/trans_presets.java:2167
 msgid "Edit Courthouse"
 msgstr ""
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2171
 msgid "Prison"
 msgstr ""
@@ -18989,10 +19355,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:2163
+#: build/trans_presets.java:2174
 msgid "Edit Prison"
 msgstr ""
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2178
 msgid "Police"
 msgstr ""
@@ -19002,10 +19368,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:2171
+#: build/trans_presets.java:2182
 msgid "Edit Police"
 msgstr ""
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2186
 msgid "Fire Station"
 msgstr ""
@@ -19014,10 +19380,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:2178
+#: build/trans_presets.java:2189
 msgid "Edit Fire Station"
 msgstr ""
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "Post Office"
 msgstr ""
@@ -19025,5 +19391,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Edit Post Office"
 msgstr ""
@@ -19031,15 +19397,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2200
 msgid "Kindergarten"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Kindergarten"
 msgstr ""
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2205
 msgid "School"
 msgstr ""
@@ -19047,10 +19413,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Edit School"
 msgstr ""
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2211
 msgid "University"
 msgstr ""
@@ -19058,10 +19424,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit University"
 msgstr ""
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "College"
 msgstr ""
@@ -19069,5 +19435,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2219
 msgid "Edit College"
 msgstr ""
@@ -19075,5 +19441,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2224
 msgid "Cinema"
 msgstr ""
@@ -19082,10 +19448,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:2216
+#: build/trans_presets.java:2227
 msgid "Edit Cinema"
 msgstr ""
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2231
 msgid "Library"
 msgstr ""
@@ -19094,9 +19460,9 @@
 #. <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:2223
+#: build/trans_presets.java:2234
 msgid "Edit Library"
 msgstr ""
 
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Arts Centre"
 msgstr ""
@@ -19104,10 +19470,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Theatre"
 msgstr ""
@@ -19116,10 +19482,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:2237
+#: build/trans_presets.java:2248
 msgid "Edit Theatre"
 msgstr ""
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2252
 msgid "Place of Worship"
 msgstr ""
@@ -19129,5 +19495,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:2245
+#: build/trans_presets.java:2256
 msgid "Edit Place of Worship"
 msgstr ""
@@ -19136,6 +19502,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "Religion"
 msgstr ""
@@ -19144,66 +19510,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "Denomination"
 msgstr ""
@@ -19212,81 +19578,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2264
 msgid "Addresses"
 msgstr ""
@@ -19295,5 +19661,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:2256
+#: build/trans_presets.java:2267
 msgid "Edit Address Information"
 msgstr ""
@@ -19301,5 +19667,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2269
 msgid "House number"
 msgstr ""
@@ -19307,20 +19673,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "House name"
 msgstr ""
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "City name"
 msgstr ""
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2274
 msgid "Post code"
 msgstr ""
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2275
 msgid "Country code"
 msgstr ""
@@ -19328,5 +19694,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Address Interpolation"
 msgstr ""
@@ -19335,5 +19701,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:2270
+#: build/trans_presets.java:2281
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -19341,67 +19707,67 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "odd"
 msgstr ""
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "even"
 msgstr ""
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2286
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Works"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2288
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2292
 msgid "Tower"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2293
 msgid "Edit Tower"
 msgstr ""
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Water Tower"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2298
 msgid "Edit Water Tower"
 msgstr ""
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Gasometer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2303
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Lighthouse"
 msgstr ""
@@ -19409,10 +19775,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2309
 msgid "Edit Lighthouse"
 msgstr ""
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Windmill"
 msgstr ""
@@ -19420,10 +19786,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2315
 msgid "Edit Windmill"
 msgstr ""
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2319
 msgid "Pipeline"
 msgstr ""
@@ -19431,10 +19797,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Edit Pipeline"
 msgstr ""
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2325
 msgid "Wastewater Plant"
 msgstr ""
@@ -19444,10 +19810,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:2318
+#: build/trans_presets.java:2329
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2333
 msgid "Crane"
 msgstr ""
@@ -19455,10 +19821,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2335
 msgid "Edit Crane"
 msgstr ""
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Beacon"
 msgstr ""
@@ -19466,10 +19832,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2341
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2345
 msgid "Survey Point"
 msgstr ""
@@ -19477,10 +19843,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2351
 msgid "Surveillance"
 msgstr ""
@@ -19488,5 +19854,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2353
 msgid "Edit Surveillance Camera"
 msgstr ""
@@ -19494,5 +19860,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Power Generator"
 msgstr ""
@@ -19502,39 +19868,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:2351
+#: build/trans_presets.java:2362
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "photovoltaic"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "gas"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2367
 msgid "Power Station"
 msgstr ""
@@ -19543,10 +19909,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:2359
+#: build/trans_presets.java:2370
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2374
 msgid "Power Sub Station"
 msgstr ""
@@ -19555,5 +19921,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:2366
+#: build/trans_presets.java:2377
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -19561,10 +19927,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2369 build/trans_presets.java:2385
+#: build/trans_presets.java:2380 build/trans_presets.java:2396
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2382
 msgid "Power Tower"
 msgstr ""
@@ -19575,5 +19941,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:2376
+#: build/trans_presets.java:2387
 msgid "Edit Power Tower"
 msgstr ""
@@ -19581,5 +19947,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2390
 msgid "Power Line"
 msgstr ""
@@ -19588,40 +19954,40 @@
 #. <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:2382
+#: build/trans_presets.java:2393
 msgid "Edit Power Line"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Voltage"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2398
 msgid "Amount of Wires"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2402
 msgid "Toilets"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2398 build/trans_presets.java:2514
+#: build/trans_presets.java:2409 build/trans_presets.java:2525
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2411
 msgid "Post Box"
 msgstr ""
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2416
 msgid "Telephone"
 msgstr ""
@@ -19630,5 +19996,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:2408
+#: build/trans_presets.java:2419
 msgid "Edit Telephone"
 msgstr ""
@@ -19636,5 +20002,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2411 build/trans_presets.java:2515
+#: build/trans_presets.java:2422 build/trans_presets.java:2526
 msgid "Coins"
 msgstr ""
@@ -19642,5 +20008,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2412 build/trans_presets.java:2516
+#: build/trans_presets.java:2423 build/trans_presets.java:2527
 msgid "Notes"
 msgstr ""
@@ -19648,5 +20014,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2413 build/trans_presets.java:2517
+#: build/trans_presets.java:2424 build/trans_presets.java:2528
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -19654,5 +20020,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2414 build/trans_presets.java:2518
+#: build/trans_presets.java:2425 build/trans_presets.java:2529
 msgid "Debit cards"
 msgstr ""
@@ -19660,15 +20026,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2415 build/trans_presets.java:2519
+#: build/trans_presets.java:2426 build/trans_presets.java:2530
 msgid "Credit cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2427
 msgid "Telephone cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2429
 msgid "Recycling"
 msgstr ""
@@ -19677,5 +20043,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:2421
+#: build/trans_presets.java:2432
 msgid "Edit Recycling station"
 msgstr ""
@@ -19683,35 +20049,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Batteries"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2435
 msgid "Cans"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Clothes"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2437
 msgid "Glass"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2438
 msgid "Paper"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2439
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2441
 msgid "Bench"
 msgstr ""
@@ -19720,40 +20086,33 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2433
-#, fuzzy
+#: build/trans_presets.java:2444
 msgid "Backrest"
-msgstr "Atrais"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "Material"
-msgstr "Vía acuática"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2434
-#, fuzzy
+#: build/trans_presets.java:2445
 msgid "stone"
-msgstr "Ningún"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "plastic"
-msgstr "Básico"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "Colour"
-msgstr "Cor"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "black"
-msgstr "Atrais"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "brown"
-msgstr "abaixo"
+msgstr ""
 
 #. color historic
@@ -19822,36 +20181,35 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2435 build/trans_style.java:3055
-#: build/trans_style.java:3063 build/trans_style.java:3071
-#: build/trans_style.java:3079 build/trans_style.java:3127
-#: build/trans_style.java:3135 build/trans_style.java:3233
-#: build/trans_style.java:3241
+#: build/trans_presets.java:2446 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3135
+#: build/trans_style.java:3143 build/trans_style.java:3241
+#: build/trans_style.java:3249
 msgid "green"
 msgstr ""
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2446
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "blue"
-msgstr "Valor"
-
-#: build/trans_presets.java:2435
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2447
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2449
 msgid "Hunting Stand"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2450
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -19860,30 +20218,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2441 build/trans_presets.java:2902
+#: build/trans_presets.java:2452 build/trans_presets.java:2914
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2454
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2455
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Fountain"
 msgstr ""
@@ -19892,10 +20250,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:2449
+#: build/trans_presets.java:2460
 msgid "Edit Fountain"
 msgstr ""
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2464
 msgid "Drinking Water"
 msgstr ""
@@ -19904,10 +20262,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:2456
+#: build/trans_presets.java:2467
 msgid "Edit Drinking Water"
 msgstr ""
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2471
 msgid "Baby Hatch"
 msgstr ""
@@ -19915,33 +20273,33 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2479
 msgid "Shops"
 msgstr ""
 
 #. group "Shops"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2480
 msgid "Supermarket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2481
 msgid "Edit Supermarket"
 msgstr ""
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2486
 msgid "Chemist"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2487
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2492
 msgid "Convenience Store"
 msgstr ""
@@ -19949,9 +20307,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2499
 msgid "Kiosk"
 msgstr ""
@@ -19959,27 +20317,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Kiosk"
 msgstr ""
 
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Book Store"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2507
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2512
 msgid "Travel Agency"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2513
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2518
 msgid "Vending machine"
 msgstr ""
@@ -19987,5 +20345,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Edit Vending machine"
 msgstr ""
@@ -19993,88 +20351,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "drinks"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "SIM-cards"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Butcher"
 msgstr ""
@@ -20082,9 +20440,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2535
 msgid "Edit Butcher"
 msgstr ""
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2540
 msgid "Baker"
 msgstr ""
@@ -20092,9 +20450,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2542
 msgid "Edit Baker"
 msgstr ""
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2547
 msgid "Florist"
 msgstr ""
@@ -20102,18 +20460,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Florist"
 msgstr ""
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2554
 msgid "Organic"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Edit Organic Shop"
 msgstr ""
 
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2560
 msgid "Alcohol"
 msgstr ""
@@ -20121,54 +20479,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2562
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2567
 msgid "Beverages"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2568
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2573
 msgid "Computer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2574
 msgid "Edit Computer Shop"
 msgstr ""
 
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Electronics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2580
 msgid "Edit Electronics Shop"
 msgstr ""
 
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2585
 msgid "Hifi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2586
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2591
 msgid "Furniture"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Edit Furniture Shop"
 msgstr ""
 
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Garden Centre"
 msgstr ""
@@ -20176,9 +20534,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2599
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Hardware"
 msgstr ""
@@ -20186,9 +20544,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2606
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -20196,54 +20554,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2613
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2618
 msgid "Stationery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2619
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Hairdresser"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Hairdresser"
 msgstr ""
 
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Shoes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Shoe Shop"
 msgstr ""
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2636
 msgid "Toys"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit Toy Shop"
 msgstr ""
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "Dry Cleaning"
 msgstr ""
@@ -20251,9 +20609,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2650
 msgid "Edit Dry Cleaning"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "Laundry"
 msgstr ""
@@ -20261,9 +20619,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2657
 msgid "Edit Laundry"
 msgstr ""
 
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2662
 msgid "Outdoor"
 msgstr ""
@@ -20271,32 +20629,28 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2664
 msgid "Edit Outdoor Shop"
 msgstr ""
 
-#: build/trans_presets.java:2658
-msgid "Sports"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2659
+#. item
+#: build/trans_presets.java:2670
 msgid "Edit Sports Shop"
 msgstr ""
 
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Optician"
 msgstr ""
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2683
 msgid "Cash"
 msgstr ""
 
 #. group "Cash"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2684
 msgid "Bank"
 msgstr ""
@@ -20304,14 +20658,14 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2686
 msgid "Edit Bank"
 msgstr ""
 
-#: build/trans_presets.java:2680 build/trans_presets.java:2689
+#: build/trans_presets.java:2691 build/trans_presets.java:2700
 msgid "Automated Teller Machine"
 msgstr ""
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2693
 msgid "Money Exchange"
 msgstr ""
@@ -20319,5 +20673,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Edit Money Exchange"
 msgstr ""
@@ -20325,15 +20679,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2691
+#: build/trans_presets.java:2702
 msgid "Edit Automated Teller Machine"
 msgstr ""
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2707
 msgid "Health"
 msgstr ""
 
 #. group "Health"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2708
 msgid "Doctors"
 msgstr ""
@@ -20341,18 +20695,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2710
 msgid "Edit Doctors"
 msgstr ""
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2715
 msgid "Dentist"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Edit Dentist"
 msgstr ""
 
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2721
 msgid "Pharmacy"
 msgstr ""
@@ -20360,5 +20714,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Edit Pharmacy"
 msgstr ""
@@ -20366,9 +20720,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2729
 msgid "Hospital"
 msgstr ""
@@ -20376,10 +20730,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Edit Hospital"
 msgstr ""
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2735
 msgid "Emergency Access Point"
 msgstr ""
@@ -20388,5 +20742,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:2727
+#: build/trans_presets.java:2738
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -20395,20 +20749,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2741
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2742
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Phone Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -20416,5 +20770,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2748
 msgid "Veterinary"
 msgstr ""
@@ -20423,55 +20777,59 @@
 #. <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:2740
+#: build/trans_presets.java:2751
 msgid "Edit Veterinary"
 msgstr ""
 
+#: build/trans_presets.java:2758
+msgid "Geography"
+msgstr ""
+
 #. group "Places"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2760
 msgid "Continent"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2761
 msgid "Edit Continent"
 msgstr ""
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2766
 msgid "Country"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2767
 msgid "Edit Country"
 msgstr ""
 
 #. item "Places/Country" text "Name"
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2772
 msgid "State"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2773
 msgid "Edit State"
 msgstr ""
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2778
 msgid "Region"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2779
 msgid "Edit Region"
 msgstr ""
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2784
 msgid "County"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2785
 msgid "Edit County"
 msgstr ""
@@ -20479,15 +20837,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2791
 msgid "City"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2792
 msgid "Edit City"
 msgstr ""
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2797
 msgid "Town"
 msgstr ""
@@ -20495,10 +20853,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2799
 msgid "Edit Town"
 msgstr ""
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2804
 msgid "Suburb"
 msgstr ""
@@ -20506,25 +20864,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2806
 msgid "Edit Suburb"
 msgstr ""
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2811
 msgid "Village"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2812
 msgid "Edit Village"
 msgstr ""
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2817
 msgid "Hamlet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2818
 msgid "Edit Hamlet"
 msgstr ""
@@ -20532,5 +20890,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2824
 msgid "Locality"
 msgstr ""
@@ -20538,10 +20896,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2826
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2831
 msgid "Island"
 msgstr ""
@@ -20549,10 +20907,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2833
 msgid "Edit Island"
 msgstr ""
 
 #. item "Places/Island" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2838
 msgid "Islet"
 msgstr ""
@@ -20560,5 +20918,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2840
 msgid "Edit Islet"
 msgstr ""
@@ -20566,5 +20924,5 @@
 #. item "Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2846
 msgid "Cave Entrance"
 msgstr ""
@@ -20572,10 +20930,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2848
 msgid "Edit Cave Entrance"
 msgstr ""
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2852
 msgid "Peak"
 msgstr ""
@@ -20583,10 +20941,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2854
 msgid "Edit Peak"
 msgstr ""
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2859
 msgid "Glacier"
 msgstr ""
@@ -20594,10 +20952,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2861
 msgid "Edit Glacier"
 msgstr ""
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2854
+#: build/trans_presets.java:2866
 msgid "Volcano"
 msgstr ""
@@ -20605,70 +20963,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2868
 msgid "Edit Volcano"
 msgstr ""
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2874
 msgid "Boundaries"
 msgstr ""
 
 #. group "Boundaries"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2875
 msgid "National"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2876
 msgid "Edit National Boundary"
 msgstr ""
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2881
 msgid "Administrative"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2882
 msgid "Edit Administrative Boundary"
 msgstr ""
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:2887
 msgid "Civil"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2888
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2893
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2894
 msgid "Edit Political Boundary"
 msgstr ""
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2899
 msgid "National park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2888
+#: build/trans_presets.java:2900
 msgid "Edit National Park Boundary"
 msgstr ""
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2906
 msgid "Land use"
 msgstr ""
 
 #. group "Land use"
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2907
 msgid "Tree"
 msgstr ""
@@ -20677,15 +21035,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:2898
+#: build/trans_presets.java:2910
 msgid "Edit Tree"
 msgstr ""
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2915
 msgid "Botanical Name"
 msgstr ""
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2917
 msgid "Wood"
 msgstr ""
@@ -20694,5 +21052,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:2908
+#: build/trans_presets.java:2920
 msgid "Edit Wood"
 msgstr ""
@@ -20700,17 +21058,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "coniferous"
 msgstr ""
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "mixed"
 msgstr ""
 
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2925
 msgid "Forest"
 msgstr ""
@@ -20719,14 +21077,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:2916
+#: build/trans_presets.java:2928
 msgid "Edit Forest Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2934
 msgid "Nature Reserve"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2935
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -20734,25 +21092,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2940
 msgid "Scree"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2941
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2945
 msgid "Scrub"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2946
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2950
 msgid "Fell"
 msgstr ""
@@ -20760,10 +21118,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2952
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2956
 msgid "Heath"
 msgstr ""
@@ -20771,5 +21129,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2958
 msgid "Edit Heath"
 msgstr ""
@@ -20777,5 +21135,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2963
 msgid "Farmyard"
 msgstr ""
@@ -20784,45 +21142,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:2954
+#: build/trans_presets.java:2966
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2971
 msgid "Farmland"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2972
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2977
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2978
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2983
 msgid "Vineyard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2984
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:2989
 msgid "Allotments"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2990
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -20830,25 +21188,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2996
 msgid "Garden"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2997
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3001
 msgid "Grass"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3002
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3007
 msgid "Village Green"
 msgstr ""
@@ -20856,10 +21214,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3009
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3014
 msgid "Common"
 msgstr ""
@@ -20867,20 +21225,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3004
+#: build/trans_presets.java:3016
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3020
 msgid "Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3021
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3025
 msgid "Recreation Ground"
 msgstr ""
@@ -20888,5 +21246,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3027
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -20894,15 +21252,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3033
 msgid "Residential area"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3022
+#: build/trans_presets.java:3034
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3039
 msgid "Graveyard"
 msgstr ""
@@ -20910,9 +21268,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3029
+#: build/trans_presets.java:3041
 msgid "Edit Graveyard"
 msgstr ""
 
-#: build/trans_presets.java:3035
+#: build/trans_presets.java:3047
 msgid "Cemetery"
 msgstr ""
@@ -20920,39 +21278,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3049
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3056
 msgid "Retail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3057
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3062
 msgid "Commercial"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3063
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3056
+#: build/trans_presets.java:3068
 msgid "Industrial"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3069
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3074
 msgid "Railway land"
 msgstr ""
@@ -20960,15 +21318,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3076
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3081
 msgid "Military"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3082
 msgid "Edit Military Landuse"
 msgstr ""
@@ -20976,55 +21334,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3088
 msgid "Construction area"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3089
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3094
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3095
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3100
 msgid "Greenfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3101
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3106
 msgid "Landfill"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3107
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3112
 msgid "Quarry"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3113
 msgid "Edit Quarry Landuse"
 msgstr ""
 
 #. group "Relations"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3122
 msgid "Multipolygon"
 msgstr ""
@@ -21034,5 +21392,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:3114
+#: build/trans_presets.java:3126
 msgid "Edit Multipolygon"
 msgstr ""
@@ -21041,10 +21399,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3132
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3133
 msgid "inner segment"
 msgstr ""
@@ -21052,5 +21410,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3136
 msgid "Turn restriction"
 msgstr ""
@@ -21059,5 +21417,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3139
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -21065,34 +21423,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_straight_on"
 msgstr ""
@@ -21101,15 +21459,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3146
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3147
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3148
 msgid "to way"
 msgstr ""
@@ -21117,5 +21475,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3151
 msgid "Route"
 msgstr ""
@@ -21124,5 +21482,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3154
 msgid "Edit Route"
 msgstr ""
@@ -21130,5 +21488,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "Route type"
 msgstr ""
@@ -21200,5 +21558,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3144 build/trans_style.java:233
+#: build/trans_presets.java:3156 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -21207,17 +21565,17 @@
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ski"
 msgstr ""
@@ -21270,5 +21628,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3144 build/trans_style.java:247
+#: build/trans_presets.java:3156 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -21277,13 +21635,13 @@
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "detour"
 msgstr ""
@@ -21297,10 +21655,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3144 build/trans_style.java:1206
+#: build/trans_presets.java:3156 build/trans_style.java:1206
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3159
 msgid "Symbol description"
 msgstr ""
@@ -21308,31 +21666,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3162
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "Color (hex)"
 msgstr ""
@@ -21341,30 +21699,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3168
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3169
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3170
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3171
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3172
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3173
 msgid "backward halt point"
 msgstr ""
@@ -21802,11 +22160,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3375 build/trans_style.java:3376
-#: build/trans_style.java:3946 build/trans_style.java:4254
-#: build/trans_style.java:4263 build/trans_style.java:4272
-#: build/trans_style.java:4281 build/trans_style.java:4290
-#: build/trans_style.java:4299 build/trans_style.java:4308
-#: build/trans_style.java:4309 build/trans_style.java:4318
-#: build/trans_style.java:4327
+#: build/trans_style.java:3383 build/trans_style.java:3384
+#: build/trans_style.java:3954 build/trans_style.java:4262
+#: build/trans_style.java:4271 build/trans_style.java:4280
+#: build/trans_style.java:4289 build/trans_style.java:4298
+#: build/trans_style.java:4307 build/trans_style.java:4316
+#: build/trans_style.java:4317 build/trans_style.java:4326
+#: build/trans_style.java:4335
 msgid "deprecated"
 msgstr ""
@@ -23830,5 +24188,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3294
+#: build/trans_style.java:3302
 msgid "light_water"
 msgstr ""
@@ -24510,8 +24868,17 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="boundary_stone"/>
+#. <icon annotate="true" src="historic/boundary_stone.png"/>
 #: build/trans_style.java:2990 build/trans_style.java:2998
 #: build/trans_style.java:3006 build/trans_style.java:3014
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
+#: build/trans_style.java:3054
 msgid "historic"
 msgstr ""
@@ -24525,5 +24892,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3095
 msgid "quarry"
 msgstr ""
@@ -24537,5 +24904,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "landfill"
 msgstr ""
@@ -24557,5 +24924,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3103 build/trans_style.java:3111
+#: build/trans_style.java:3111 build/trans_style.java:3119
 msgid "basin"
 msgstr ""
@@ -24569,5 +24936,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3127
 msgid "forest"
 msgstr ""
@@ -24581,5 +24948,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3159
 msgid "farmyard"
 msgstr ""
@@ -24602,5 +24969,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3160 build/trans_style.java:3168
+#: build/trans_style.java:3168 build/trans_style.java:3176
 msgid "retail"
 msgstr ""
@@ -24614,5 +24981,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3176
+#: build/trans_style.java:3184
 msgid "industrial"
 msgstr ""
@@ -24626,5 +24993,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "brownfield"
 msgstr ""
@@ -24638,5 +25005,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "greenfield"
 msgstr ""
@@ -24650,5 +25017,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "railland"
 msgstr ""
@@ -24705,7 +25072,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3217 build/trans_style.java:3252
-#: build/trans_style.java:3260 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3225 build/trans_style.java:3260
+#: build/trans_style.java:3268 build/trans_style.java:3276
+#: build/trans_style.java:3284 build/trans_style.java:3292
 msgid "military"
 msgstr ""
@@ -24719,5 +25086,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3225
+#: build/trans_style.java:3233
 msgid "cemetery"
 msgstr ""
@@ -24730,5 +25097,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3301
+#: build/trans_style.java:3309
 msgid "peak"
 msgstr ""
@@ -24743,5 +25110,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3310
+#: build/trans_style.java:3318
 msgid "glacier"
 msgstr ""
@@ -24755,5 +25122,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "volcano"
 msgstr ""
@@ -24808,8 +25175,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3326 build/trans_style.java:3327
-#: build/trans_style.java:3335 build/trans_style.java:3351
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440
+#: build/trans_style.java:3334 build/trans_style.java:3335
+#: build/trans_style.java:3343 build/trans_style.java:3359
+#: build/trans_style.java:3432 build/trans_style.java:3440
+#: build/trans_style.java:3448
 msgid "natural"
 msgstr ""
@@ -24823,5 +25190,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3343
+#: build/trans_style.java:3351
 msgid "scrub"
 msgstr ""
@@ -24835,5 +25202,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3359
+#: build/trans_style.java:3367
 msgid "heath"
 msgstr ""
@@ -24847,5 +25214,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3408
+#: build/trans_style.java:3416
 msgid "mud"
 msgstr ""
@@ -24859,5 +25226,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "beach"
 msgstr ""
@@ -24935,8 +25302,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
-#: build/trans_style.java:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496 build/trans_style.java:3504
+#: build/trans_style.java:3512 build/trans_style.java:3520
 msgid "route"
 msgstr ""
@@ -24984,7 +25351,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3522 build/trans_style.java:3530
-#: build/trans_style.java:3538 build/trans_style.java:3546
-#: build/trans_style.java:3554
+#: build/trans_style.java:3530 build/trans_style.java:3538
+#: build/trans_style.java:3546 build/trans_style.java:3554
+#: build/trans_style.java:3562
 msgid "boundary"
 msgstr ""
@@ -25134,11 +25501,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090
+#: build/trans_style.java:4002 build/trans_style.java:4010
+#: build/trans_style.java:4018 build/trans_style.java:4026
+#: build/trans_style.java:4034 build/trans_style.java:4042
+#: build/trans_style.java:4050 build/trans_style.java:4058
+#: build/trans_style.java:4066 build/trans_style.java:4074
+#: build/trans_style.java:4082 build/trans_style.java:4090
+#: build/trans_style.java:4098
 msgid "place"
 msgstr ""
@@ -25186,6 +25553,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4207 build/trans_style.java:4214
-#: build/trans_style.java:4221 build/trans_style.java:4228
+#: build/trans_style.java:4215 build/trans_style.java:4222
+#: build/trans_style.java:4229 build/trans_style.java:4236
 msgid "address"
 msgstr ""
@@ -25493,28 +25860,4 @@
 msgstr ""
 
-#~ msgid "All the ways were empty"
-#~ msgstr "Todas as vías están vacías"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Acoplar de todas formas"
-
-#~ msgid "Unknown version"
-#~ msgstr "Versión descoñecida"
-
-#~ msgid "Version number missing from OSM data"
-#~ msgstr "Falta o número de versión dos datos do OSM"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "Atopouse un elemento <nd> no que non é unha vía."
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> ten referencia cero"
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Atopouse un elemento <member> no que non é unha relación."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "ID de nodo mal formada"
-
 #~ msgid ""
 #~ "Server returned internal error. Try a reduced area or retry after waiting "
@@ -25524,4 +25867,7 @@
 #~ "logo de esperar un tempo."
 
+#~ msgid "Unknown version"
+#~ msgstr "Versión descoñecida"
+
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr "Saltando unha via porque inclue un nodo que non existe: {0}\n"
@@ -25610,6 +25956,15 @@
 #~ msgstr "versión final:"
 
-#~ msgid "Add Selected"
-#~ msgstr "Engadir Seleccionados"
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "Atopouse un elemento <nd> no que non é unha vía."
+
+#~ msgid "<nd> has zero ref"
+#~ msgstr "<nd> ten referencia cero"
+
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "Atopouse un elemento <member> no que non é unha relación."
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "ID de nodo mal formada"
 
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
@@ -25691,4 +26046,7 @@
 #~ msgstr "Algúns dos nodos están (case) na liña"
 
+#~ msgid "All the ways were empty"
+#~ msgstr "Todas as vías están vacías"
+
 #~ msgid ""
 #~ "Please select at least one node, way or relation. Only already uploaded "
@@ -25698,4 +26056,7 @@
 #~ "elementos xa subidos teñen historial."
 
+#~ msgid "Merge Anyway"
+#~ msgstr "Acoplar de todas formas"
+
 #~ msgid "unnamed"
 #~ msgstr "sen nome"
@@ -25764,4 +26125,7 @@
 #~ msgid "Cannot read numeric value from response"
 #~ msgstr "Non se pode ler valor numérico da resposta"
+
+#~ msgid "Version number missing from OSM data"
+#~ msgstr "Falta o número de versión dos datos do OSM"
 
 #~ msgid "Data upload failed for unknown reason"
@@ -25798,7 +26162,4 @@
 #~ "<br>Fai click en <strong>{3}</strong> para cancelar.<br>"
 
-#~ msgid "Delete mine"
-#~ msgstr "Borrar a miña"
-
 #~ msgid ""
 #~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
Index: applications/editors/josm/i18n/po/he.po
===================================================================
--- applications/editors/josm/i18n/po/he.po	(revision 17655)
+++ applications/editors/josm/i18n/po/he.po	(revision 17697)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-12 18:11+0200\n"
-"PO-Revision-Date: 2009-09-07 18:36+0000\n"
-"Last-Translator: ilangut <Unknown>\n"
+"POT-Creation-Date: 2009-09-19 13:00+0200\n"
+"PO-Revision-Date: 2009-09-15 05:36+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Hebrew <he@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-09-12 16:05+0000\n"
+"X-Launchpad-Export-Date: 2009-09-19 10:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -42,10 +42,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:543
 #: ../core/src/org/openstreetmap/josm/Main.java:551
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -70,5 +70,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -86,6 +86,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:358
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
@@ -101,6 +101,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
@@ -124,10 +124,10 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
 msgid "Save and Exit"
 msgstr "שמור וצא"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
 msgid "Discard and Exit"
 msgstr "התעלם משינויים וצא"
@@ -138,4 +138,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
@@ -143,27 +144,28 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:296
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:258
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:613
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
@@ -171,5 +173,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -189,6 +191,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
@@ -205,17 +207,17 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:654
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1528
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -226,6 +228,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
@@ -278,9 +280,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:607
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:609
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -340,5 +342,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
 msgid "Plugins"
@@ -392,5 +394,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "מזג"
@@ -478,5 +480,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -489,4 +491,5 @@
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -522,6 +525,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
@@ -530,6 +533,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:346
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
@@ -639,4 +642,46 @@
 msgstr "אין התנגשויות להתמקד בהם"
 
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#, fuzzy
+msgid "Close open changesets"
+msgstr "סגור את סט השינויים הנוכחי"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#, fuzzy
+msgid "Closes open changesets"
+msgstr "סגור את סט השינויים הנוכחי"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
+#: ../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:114
+#, java-format
+msgid "File: {0}"
+msgstr "קובץ: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
+#, fuzzy
+msgid "There are no open changesets"
+msgstr "אין סט שינויים פתוח כרגע"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
+#, fuzzy
+msgid "No open changesets"
+msgstr "סגור את סט השינויים הנוכחי"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
+#, fuzzy
+msgid "Downloading open changesets ..."
+msgstr "מוריד משטח תמונה..."
+
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
@@ -729,10 +774,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:123
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
@@ -775,31 +821,30 @@
 msgstr "פזר את הצמתים הנבחרים במרחקים  שווים לאורך קו"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
 msgid "Download from OSM..."
 msgstr "הורד מ-OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
 msgid "Download map data from the OSM server."
 msgstr "הורד נתוני מפה משרת ה-OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
-#, java-format
-msgid "File: {0}"
-msgstr "קובץ: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
 msgid "Download"
 msgstr "הורד"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "אישור"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
 msgid "Please select at least one task to download"
 msgstr "אנא בחר לפחות משימה אחת להורדה"
@@ -820,5 +865,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1527
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307
@@ -838,6 +883,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:376
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1415
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
 msgid "Duplicate"
 msgstr "שכפל"
@@ -909,10 +954,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
@@ -996,25 +1042,26 @@
 msgstr "מזג את השכבה הנוכחית לתוך שכבה אחרת"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 msgid "Merge Nodes"
 msgstr "מיזוג צמתים"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
 msgid "Merge nodes into the oldest one."
 msgstr "מזג את הצמתים לישנים ביותר."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
 msgid "Please select at least two nodes to merge."
 msgstr "אנא בחר לפחות שני צמתים למיזוג."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:394
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
@@ -1030,8 +1077,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -1057,6 +1104,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
@@ -1065,9 +1116,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr "לא ניתן למזג צמתים: יש למחוק דרך שעדיין בשימוש."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283
 #, java-format
 msgid "Merge {0} nodes"
@@ -1139,5 +1190,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "New"
 msgstr "חדש"
@@ -1410,14 +1461,15 @@
 msgstr "עזרה: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
 msgid "Status Report"
 msgstr "דו\"ח מצב"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 msgid "Copy to clipboard and close"
 msgstr "העתק ללוח הגזירים וסגור"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
@@ -1492,25 +1544,4 @@
 msgstr "פצל דרך {0} ל-{1} חלקים"
 
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24
-msgid "Close current changeset"
-msgstr "סגור את סט השינויים הנוכחי"
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-msgid "Close the current changeset ..."
-msgstr "סגור את סט השינויים הנוכחי ..."
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41
-msgid "There is currently no changeset open."
-msgstr "אין סט שינויים פתוח כרגע"
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42
-msgid "No open changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60
-msgid "Closing changeset"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
@@ -1670,14 +1701,14 @@
 msgstr "בחירה ריקה"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "העלה ל-OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 msgid "Upload all changes to the OSM server."
 msgstr "העלה את כל השינויים לשרת ה-OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
 #, java-format
 msgid ""
@@ -1686,23 +1717,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
 msgid "Nothing to upload. Get some data first."
 msgstr "אין מה להעלות. קבל כמה נתונים תחילה."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 msgid "No changes to upload."
 msgstr "אין שינויים להעלאה."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "סנכרן רק את {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
 msgid "Synchronize entire dataset"
 msgstr "סנכרן את כל סט הנתונים"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
 #, java-format
 msgid ""
@@ -1716,17 +1747,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
 msgid "Conflict detected"
 msgstr "התגלתה התנגשות"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr "ערך מוחזר לא צפוי. התקבל {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:267
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
 #, java-format
 msgid ""
@@ -1737,28 +1768,40 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
+msgid ""
+"<html>Uploading <strong>failed</strong> because you've been "
+"using<br>changeset {0} which was already closed at {1}.<br>Please upload "
+"again with a new or an existing open changeset."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+#, fuzzy
+msgid "Changeset closed"
+msgstr "לשנות ערכים?"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
 msgid "Upload to OSM API failed"
 msgstr "העלאה ל-API של OSM נכשלה"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1977,14 +2020,14 @@
 msgstr "הוסף צומת לדרך וחבר"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:930
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:932
 msgid "Create new node."
 msgstr "יוצר נקודה חדשה."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
 msgid "Select node under cursor."
 msgstr "בחר את הנקודה שמתחת לסמן."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939
 #, java-format
 msgid "Insert new node into way."
@@ -1993,14 +2036,14 @@
 msgstr[1] "הוסף נקודה חדשה ל-{0} דרכים."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
 msgid "Start new way from last node."
 msgstr "התחל דרך חדשה מהנקודה האחרונה."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951
 msgid "Continue way from last node."
 msgstr "המשך דרך מהנקודה האחרונה."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:972
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:974
 msgid "Finish drawing."
 msgstr "הפסק לצייר."
@@ -2116,60 +2159,70 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "חפש..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "חיפוש אחר פריטים."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
 msgid "Can't search because there is no loaded data."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
+#, fuzzy
+msgid "Please enter a filter string."
+msgstr "נא הזן מחרוזת לחיפוש."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
 msgid "Please enter a search string."
 msgstr "נא הזן מחרוזת לחיפוש."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
 msgid "replace selection"
 msgstr "החלפת הבחירה"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72
 msgid "add to selection"
 msgstr "הוספה לבחירה"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73
 msgid "remove from selection"
 msgstr "הסר מהבחירה"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
+#, fuzzy
+msgid "find in selection"
+msgstr "הוספה לבחירה"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81
 msgid "case sensitive"
 msgstr "רגיש להבדל בין אותיות גדולות וקטנות"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82
 msgid "regular expression"
 msgstr "ביטוי רגולרי"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
 msgstr "<b>רחוב אבג</b>-'רחוב' ו'אבג' בכל מפתח או שם."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
 msgstr "<b>\"רחוב אבג\"</b>-'רחוב אבג' בכל מפתח או שם."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
 msgstr "<b>name:אבג</b>-'אבג' איפשהו בשם."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
 msgstr "<b>type=route</b>-מפתח 'type' עם הערך 'route' במדוייק."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid ""
 "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
@@ -2179,109 +2232,126 @@
 "<b>*=*</b>, <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
 msgstr "<b>-name:אבג</b>-ללא 'אבג' בשם."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b>-מפתח 'foot' עם כל ערך."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
 msgid "<u>Special targets:</u>"
 msgstr "<u>מטרות מיוחדות:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr "<b>type:</b>-סוג העצם (<b>נקודה</b>, <b>דרך</b>, <b>יחס</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>...-כל העצמים ששונו ע\"י המשתמש"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 msgid "<b>nodes:</b>... - object with given number of nodes"
 msgstr "<b>nodes:</b>...-עצמים עם מספר הנקודות הנתון"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b>...- כל העצמים ששונו"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - כל העצמים הבחורים"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - כל העצמים הבלתי גמורים"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - כל העצמים הלא מתוייגים"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "השתמש ב-<b>|</b> או <b>OR</b> כדי לחבר ב\"או\" לוגי"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "השתמש ב-<b>(</b> ו <b>)</b> כדי לצרף ביטויים"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
+msgid "Filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "חפש"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
+msgid "Submit filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "Start Search"
 msgstr "התחל חיפוש"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "לא נמצאה התאמה עבור \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "דבר לא נוסף לבחירה ע\"י חיפוש \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "דבר לא הורד מהבחירה ע\"י חיפוש \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#, fuzzy, java-format
+msgid "Nothing find in selection by searching for ''{0}''"
+msgstr "דבר לא נוסף לבחירה ע\"י חיפוש \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262
 #, java-format
 msgid "Found {0} matches"
 msgstr "נמצאו {0} התאמות"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283
 msgid "RX"
 msgstr "RX"
@@ -2466,5 +2536,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
 msgid "Double conflict"
 msgstr ""
@@ -2706,4 +2776,5 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:134
 msgid "Old value"
 msgstr "ערך ישן"
@@ -2867,26 +2938,58 @@
 
 #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
 msgid "E"
 msgstr "מזרח"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:59
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:203
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
 msgid "Changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:323
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:325
-#, fuzzy, java-format
-msgid "paramete''{0}'' must not be null"
-msgstr "פרמטר ''{0}'' אינו יכול להיות אפס"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331
-#, java-format
-msgid "unsupported value ''{0}'' or parameter ''{1}''"
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "H"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "Text"
+msgstr "טקסט"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "C"
+msgstr "CS"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "I"
+msgstr "CI"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "M"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#, fuzzy
+msgid "R"
+msgstr "RX"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+msgid "A"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+msgid "D"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+msgid "F"
 msgstr ""
 
@@ -2901,29 +3004,29 @@
 msgstr "אזהרה: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
+#, java-format
 msgid "expected id >= 0. Got {0}"
-msgstr "אינדקס טור לא צפוי. התקבל {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:257
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
 msgid "a primitive with id=0 can't be invisible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:293
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
+#, java-format
 msgid "id > 0 expected. Got {0}"
-msgstr "ערך מוחזר לא צפוי. התקבל {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
 msgid "version > 0 expected. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
 msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
 msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
@@ -2990,9 +3093,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:247
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:249
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:478
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:482
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
@@ -3001,118 +3104,118 @@
 #. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
 #. TODO Remove useless nullcheck when RelationMember.member is encalupsed
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:851
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855
 msgid "Empty member in relation."
 msgstr "איבר ריק ביחס."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:853
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "מחק איבר \"{0}\" ביחס."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:864
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "הדרך \"{0}\" בת פחות משתי נקודות."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "More than one \"to\" way found."
 msgstr "יותר מ-\"to\" אחד נמצא."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "More than one \"via\" found."
 msgstr "יותר מ-\"via\" אחד נמצא."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"from\" way found."
 msgstr "אף דרך \"from\" לא נמצאה."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"to\" way found."
 msgstr "אף דרך \"to\" לא נמצאה."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652
 msgid "No \"via\" node or way found."
 msgstr "לא נמצאה אף נקודה או דרך מסוג \"via\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:885
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:943
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1032
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1044
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "דרך פנימית ''{0}'' נמצאת בחוץ."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1097
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1123
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1327
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331
 msgid "untagged"
 msgstr "לא מתוייג"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1328
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332
 msgid "text"
 msgstr "טקסט"
@@ -3133,5 +3236,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
@@ -3152,5 +3255,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
@@ -3199,5 +3302,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
 msgid "Lambert Zone (Estonia)"
 msgstr ""
@@ -3239,9 +3342,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:38
 msgid "Do not show again"
 msgstr "אל תציג שוב"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
 #, java-format
@@ -3249,31 +3352,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:91
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:116
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154
 msgid "incomplete"
 msgstr "לא גמור"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
 msgid "highway"
 msgstr "כביש ראשי"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
-#: build/trans_presets.java:3144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: build/trans_presets.java:3156
 msgid "railway"
 msgstr "מסילת רכבת"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
 msgid "waterway"
 msgstr "נתיב מים"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "landuse"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:474
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
@@ -3283,5 +3386,5 @@
 msgstr[1] "{0} נקודות"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
 #, java-format
 msgid "{0} member"
@@ -3326,10 +3429,5 @@
 msgstr "מסר יומי זמין"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67
-#, java-format
-msgid "- running version is {0}"
-msgstr "- הגירסה שרצה היא {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:95
 msgid "Downloading \"Message of the day\""
 msgstr "מוריד את \"המסר היומי\""
@@ -3401,10 +3499,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:162
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
 msgid "Username"
 msgstr "שם משתמש"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
 msgid "Password"
 msgstr "סיסמא"
@@ -3525,5 +3623,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226
 msgid "Presets"
 msgstr ""
@@ -3597,38 +3695,49 @@
 msgstr "הגדלה"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
 msgid "The geographic longitude at the mouse pointer."
 msgstr "קו האורך הגיאוגרפי בסמן העכבר."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The name of the object at the mouse pointer."
 msgstr "שם העצם בסמן העכבר."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The geographic latitude at the mouse pointer."
 msgstr "קו הרוחב הגיאוגרפי בסמן העכבר."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The angle between the previous and the current way segment."
 msgstr "הזווית בין קטע הדרך הקודם לנוכחי"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "כיוון (המצפן) של קטע הדרך מצויר."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The length of the new way segment being drawn."
 msgstr "אורך קטע הדרך החדש מצויר."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199
+msgid ""
+"Middle click again to cycle through.<br>Hold CTRL to select directly from "
+"this list with the mouse.<hr>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290
 msgid "(no object)"
 msgstr "(אין עצם)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:301
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418
+#, fuzzy
+msgid "User:"
+msgstr "משתמש"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
 msgid "layer not in list."
 msgstr "השכבה אינה ברשימה."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:488
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3698,7 +3807,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:224
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Tags"
 msgstr "תוויות"
@@ -3713,5 +3822,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
@@ -3900,4 +4009,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
 msgid "Up"
 msgstr "מעלה"
@@ -3908,4 +4018,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Down"
 msgstr "מטה"
@@ -3918,5 +4029,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
@@ -4339,23 +4450,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:236
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239
 msgid "No conflicts to resolve"
-msgstr "אין התנגשויות להתמקד בהם"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:295
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254
 msgid "Cancel conflict resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:310
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269
 msgid "Apply resolved conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Apply"
 msgstr ""
@@ -4367,5 +4477,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "all"
 msgstr "הכל"
@@ -4409,7 +4519,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
-msgid "not yet decided"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:213
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
@@ -4436,7 +4543,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
@@ -4446,7 +4553,7 @@
 msgstr[1] "{0} דרכים"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:152
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
@@ -4456,20 +4563,20 @@
 msgstr[1] "יחסים"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "Paste ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "From ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:372
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "To ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:428
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
 #, java-format
 msgid "{0} tag"
@@ -4485,13 +4592,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
-#, fuzzy
 msgid "Remove this relation member from the relation"
-msgstr "הסר את החבר בשורת הטבלה הבחורה מהיחס"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-#, fuzzy
 msgid "Replace"
-msgstr "מקום"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
@@ -4502,11 +4607,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
-#, fuzzy
 msgid "Undecided"
-msgstr "<לא מוגדר>"
+msgstr ""
 
 #. --- role editing
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:56
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510
 msgid "Role:"
 msgstr ""
@@ -4522,7 +4626,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70
-#, fuzzy
 msgid "Value:"
-msgstr "ערך"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86
@@ -4535,12 +4638,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51
-#, fuzzy
 msgid "Orig. Way"
-msgstr "חד סטרי"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
-#, fuzzy
 msgid "Decision"
-msgstr "מהדורה"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -4556,6 +4657,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
@@ -4644,169 +4746,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-msgid "History"
-msgstr "היסטוריה"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-msgid "Display the history of all selected items."
-msgstr "הצג את ההיסטוריה של כל הפריטים הבחורים."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
-#, java-format
-msgid "index out of bounds Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
-msgid "History item"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "טען מחדש את כל העצמים הבחורים ורענן את הרשימה."
-
-#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
-msgid "Show"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
-msgid "Dialog not created yet. Invoke createInstance() first"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
-msgid "Layers"
-msgstr "שכבות"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-msgid "Open a list of all loaded layers."
-msgstr "פתח רשימה המכילה את כל השכבות שנטענו."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:297
-msgid "Delete the selected layer."
-msgstr "מחק את השכבה הנבחרת."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:367
-msgid "Show/Hide"
-msgstr "הצג/הסתר"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:378
-msgid "Toggle visible state of the selected layer."
-msgstr "מחליף את המצב החזותי של השכבה הנבחרת."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:420
-msgid "Activate the selected layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:475
-msgid "Merge this layer into another layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:581
-msgid "Move the selected layer one row up."
-msgstr "העבר את השכבה הנבחרת שורה אחת מעלה."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:600
-msgid "Move the selected layer one row down."
-msgstr "העבר את השכבה הנוכחית שורה אחת מטה."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
-msgid "Information about layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
-#, java-format
-msgid "This will change up to {0} object."
-msgid_plural "This will change up to {0} objects."
-msgstr[0] "זה ישנה עד עצם {0}"
-msgstr[1] "זה ישנה עד {0} עצמים"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
-msgid "An empty value deletes the key."
-msgstr "ערך ריק מוחק את המפתח."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
-msgid "<different>"
-msgstr "<שונה>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
-msgid "Change values?"
-msgstr "לשנות ערכים?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
-#, java-format
-msgid "Change properties of up to {0} object"
-msgid_plural "Change properties of up to {0} objects"
-msgstr[0] "שנה תכונות של עד עצם {0}"
-msgstr[1] "שנה תכונות של עד {0} עצמים"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
-msgid "Please select a key"
-msgstr "נא בחר מפתח"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
-msgid "Please select a value"
-msgstr "נא בחר ערך"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
-msgid "Please select the objects you want to change properties for."
-msgstr "בחר את העצמים שאתה רוצה לשנות את תכונותיהם."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
-msgid "Properties/Memberships"
-msgstr "תכונות\\חברויות"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-msgid "Properties for selected objects."
-msgstr "תכונות לעצמים שנבחרו."
-
-#. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-msgid "Member Of"
-msgstr "חבר ב"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
-msgid "Add Properties"
-msgstr "הוסף תכונות"
-
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+msgid "Filter objects and hide/disable them."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
@@ -4820,4 +4766,212 @@
 msgstr "הוסף"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#, fuzzy
+msgid "Add filter."
+msgstr "הוסף את הנבחרים"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
+#, fuzzy
+msgid "Edit filter."
+msgstr "ערוך מקלט"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#, fuzzy
+msgid "Delete filter."
+msgstr "מחק את שלי"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
+#, fuzzy
+msgid "Move filter up."
+msgstr "הזז מעלה"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
+#, fuzzy
+msgid "Move filter down."
+msgstr "הזז מטה"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128
+msgid "Enable filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
+#, fuzzy
+msgid "Hide elements"
+msgstr "אלמנטים בודדים"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
+msgid "Apply also for children"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
+msgid "Inverse filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
+#, fuzzy
+msgid "Filter mode"
+msgstr "מצב מחיקה"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
+msgid "History"
+msgstr "היסטוריה"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+msgid "Display the history of all selected items."
+msgstr "הצג את ההיסטוריה של כל הפריטים הבחורים."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
+msgid "History item"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
+msgid "Reload all currently selected objects and refresh the list."
+msgstr "טען מחדש את כל העצמים הבחורים ורענן את הרשימה."
+
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
+msgid "Show"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
+msgid "Display the history of the selected primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84
+msgid "Dialog not created yet. Invoke createInstance() first"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
+msgid "Layers"
+msgstr "שכבות"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+msgid "Open a list of all loaded layers."
+msgstr "פתח רשימה המכילה את כל השכבות שנטענו."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294
+msgid "Delete the selected layer."
+msgstr "מחק את השכבה הנבחרת."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364
+msgid "Show/Hide"
+msgstr "הצג/הסתר"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375
+msgid "Toggle visible state of the selected layer."
+msgstr "מחליף את המצב החזותי של השכבה הנבחרת."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgid "Activate"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417
+msgid "Activate the selected layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472
+msgid "Merge this layer into another layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578
+msgid "Move the selected layer one row up."
+msgstr "העבר את השכבה הנבחרת שורה אחת מעלה."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597
+msgid "Move the selected layer one row down."
+msgstr "העבר את השכבה הנוכחית שורה אחת מטה."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+msgid "Information about layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+#, java-format
+msgid "This will change up to {0} object."
+msgid_plural "This will change up to {0} objects."
+msgstr[0] "זה ישנה עד עצם {0}"
+msgstr[1] "זה ישנה עד {0} עצמים"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+msgid "An empty value deletes the key."
+msgstr "ערך ריק מוחק את המפתח."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+msgid "<different>"
+msgstr "<שונה>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+msgid "Change values?"
+msgstr "לשנות ערכים?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#, java-format
+msgid "Change properties of up to {0} object"
+msgid_plural "Change properties of up to {0} objects"
+msgstr[0] "שנה תכונות של עד עצם {0}"
+msgstr[1] "שנה תכונות של עד {0} עצמים"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+msgid "Please select a key"
+msgstr "נא בחר מפתח"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+msgid "Please select a value"
+msgstr "נא בחר ערך"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
+msgid "Please select the objects you want to change properties for."
+msgstr "בחר את העצמים שאתה רוצה לשנות את תכונותיהם."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
+msgid "Properties/Memberships"
+msgstr "תכונות\\חברויות"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+msgid "Properties for selected objects."
+msgstr "תכונות לעצמים שנבחרו."
+
+#. setting up the membership table
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+msgid "Member Of"
+msgstr "חבר ב"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
+msgid "Add Properties"
+msgstr "הוסף תכונות"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574
 msgid "Add a new key/value pair to all objects"
@@ -4859,10 +5013,9 @@
 
 #. item "Land use/Quarry" text "Name"
-#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
-#: build/trans_presets.java:3109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168
+#: build/trans_presets.java:3121
 msgid "Relations"
 msgstr "יחסים"
@@ -4872,23 +5025,23 @@
 msgstr "פתח רשימה של כל היחסים."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166
 #, java-format
 msgid "Relations: {0}"
 msgstr "יחסים: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276
 msgid "Open an editor for the selected relation"
 msgstr "פתח עורך עבור היחס הנבחר"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
 msgid "Delete the selected relation"
 msgstr "מחק את היחס הנבחר"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349
 msgid "Create a new relation"
 msgstr "צור יחס חדש"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:373
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1412
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
@@ -4921,5 +5074,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4931,14 +5084,14 @@
 msgstr "בחירה: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441
 msgid "Undock the panel"
 msgstr "\"שחרר\" את הפאנל"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr "סגור את הפאנל. ניתן לפתוח אותו מחדש בעזרת הכפתורים בסרגל הכלים השמאלי."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:457
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "לחץ כדי למזער \\ למקסם את תוכן הפאנל"
@@ -4999,5 +5152,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5021,5 +5174,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1502
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1370
 msgid "Download relation members"
 msgstr ""
@@ -5049,5 +5202,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -5055,18 +5208,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
 msgid "Tags and Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:167
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5075,14 +5228,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613
 #, java-format
 msgid ""
@@ -5092,9 +5245,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid ""
@@ -5104,15 +5257,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5120,5 +5273,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5126,20 +5279,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849
 #, java-format
 msgid ""
@@ -5148,57 +5301,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:961
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909
 msgid "Move the currently selected members up"
 msgstr "הזז את החברים הנבחרים מעלה"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:979
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:912
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928
 msgid "Move the currently selected members down"
 msgstr "הזז מטה את החברים שנבחרו"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:998
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:931
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5207,9 +5360,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1058
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
 #, java-format
 msgid ""
@@ -5218,56 +5371,41 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090
+msgid "Apply the current updates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123
+msgid "Apply the updates and close the dialog"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
-msgid "Apply the current updates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
-msgid "Apply the updates and close the dialog"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "אישור"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
-msgid "Delete the currently selected tags"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "הורד את כל הדרכים והנקודות הבלתי שלמות ביחס"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 msgid "Download Members"
 msgstr "הורד חברים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1208
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1211
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1356
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 #, java-format
 msgid ""
@@ -5277,13 +5415,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1229
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1367
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
 msgid "Confirm empty role"
 msgstr ""
@@ -5370,37 +5508,37 @@
 msgstr "סימניות"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:82
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
 msgid "Please enter the desired coordinates first."
 msgstr "נא הזן את נקודות הציון הרצויות תחילה."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
 msgid "Please enter a name for the location."
 msgstr "נא הזן שם עבור המיקום."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:107
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
 msgid "Select a bookmark first."
 msgstr "בחר סימניה תחילה."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
 msgid "min lat"
 msgstr "רוחב מזערי"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
 msgid "min lon"
 msgstr "אורך מזערי"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid "max lat"
 msgstr "רוחב מירבי"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
 msgid "max lon"
 msgstr "אורך מירבי"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5409,26 +5547,26 @@
 "כתובת מ www.openstreetmap.org (אתה יכול להדביק כאן כתובת להורדת האיזור)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
 msgid "Bounding Box"
 msgstr ""
 
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
 msgid "Data Sources and Types"
 msgstr "מקורות מידע וסוגים"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
 msgid "Download as new layer"
 msgstr "הורדה כשכבה חדשה"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
 msgid "Download Area"
 msgstr "הורדת איזור"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
 msgid "Download area too large; will probably be rejected by server"
 msgstr "הורדת איזור גדול מידי; כנראה שתדחה ע\"י השרת"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
 msgid "Download area ok, size probably acceptable to server"
 msgstr "הורדת איזור בסדר; כנראה שתתקבל ע\"י השרת"
@@ -5453,7 +5591,7 @@
 msgstr "הזן שם מקום לחיפוש:"
 
-#. <separator/>
+#. group "Geography"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2759
 msgid "Places"
 msgstr "מקומות"
@@ -5500,21 +5638,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "type"
 msgstr "סוג"
@@ -5994,4 +6132,6 @@
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
 #. <key key="historic" value="wayside_shrine" />
+#. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
+#. <key key="historic" value="boundary_stone" />
 #. item "Leisure/Water Park" label "Edit Water Park"
 #. <key key="leisure" value="water_park" />
@@ -6363,153 +6503,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/trans_presets.java:66 build/trans_presets.java:102
-#: build/trans_presets.java:142 build/trans_presets.java:179
-#: build/trans_presets.java:199 build/trans_presets.java:217
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:272 build/trans_presets.java:305
-#: build/trans_presets.java:351 build/trans_presets.java:371
-#: build/trans_presets.java:386 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:463 build/trans_presets.java:482
-#: build/trans_presets.java:502 build/trans_presets.java:522
-#: build/trans_presets.java:543 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627 build/trans_presets.java:658
-#: build/trans_presets.java:679 build/trans_presets.java:692
-#: build/trans_presets.java:705 build/trans_presets.java:718
-#: build/trans_presets.java:731 build/trans_presets.java:744
-#: build/trans_presets.java:755 build/trans_presets.java:764
-#: build/trans_presets.java:811 build/trans_presets.java:832
-#: build/trans_presets.java:841 build/trans_presets.java:901
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1067 build/trans_presets.java:1075
-#: build/trans_presets.java:1085 build/trans_presets.java:1093
-#: build/trans_presets.java:1098 build/trans_presets.java:1105
-#: build/trans_presets.java:1112 build/trans_presets.java:1117
-#: build/trans_presets.java:1125 build/trans_presets.java:1134
-#: build/trans_presets.java:1140 build/trans_presets.java:1146
-#: build/trans_presets.java:1151 build/trans_presets.java:1157
-#: build/trans_presets.java:1163 build/trans_presets.java:1172
-#: build/trans_presets.java:1181 build/trans_presets.java:1188
-#: build/trans_presets.java:1196 build/trans_presets.java:1209
-#: build/trans_presets.java:1215 build/trans_presets.java:1224
-#: build/trans_presets.java:1230 build/trans_presets.java:1236
-#: build/trans_presets.java:1244 build/trans_presets.java:1299
-#: build/trans_presets.java:1346 build/trans_presets.java:1352
-#: build/trans_presets.java:1358 build/trans_presets.java:1364
-#: build/trans_presets.java:1370 build/trans_presets.java:1381
-#: build/trans_presets.java:1390 build/trans_presets.java:1405
-#: build/trans_presets.java:1412 build/trans_presets.java:1418
-#: build/trans_presets.java:1426 build/trans_presets.java:1433
-#: build/trans_presets.java:1442 build/trans_presets.java:1450
-#: build/trans_presets.java:1457 build/trans_presets.java:1468
-#: build/trans_presets.java:1478 build/trans_presets.java:1488
-#: build/trans_presets.java:1508 build/trans_presets.java:1520
-#: build/trans_presets.java:1531 build/trans_presets.java:1548
-#: build/trans_presets.java:1555 build/trans_presets.java:1570
-#: build/trans_presets.java:1577 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1594
-#: build/trans_presets.java:1599 build/trans_presets.java:1605
-#: build/trans_presets.java:1611 build/trans_presets.java:1619
-#: build/trans_presets.java:1627 build/trans_presets.java:1635
-#: build/trans_presets.java:1642 build/trans_presets.java:1648
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1670 build/trans_presets.java:1677
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1712 build/trans_presets.java:1719
-#: build/trans_presets.java:1736 build/trans_presets.java:1744
-#: build/trans_presets.java:1759 build/trans_presets.java:1769
-#: build/trans_presets.java:1781 build/trans_presets.java:1788
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:1809 build/trans_presets.java:1817
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1841
-#: build/trans_presets.java:1846 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1864
-#: build/trans_presets.java:1872 build/trans_presets.java:1881
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1908 build/trans_presets.java:1914
-#: build/trans_presets.java:1922 build/trans_presets.java:1928
-#: build/trans_presets.java:1934 build/trans_presets.java:1940
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2013
-#: build/trans_presets.java:2022 build/trans_presets.java:2030
-#: build/trans_presets.java:2036 build/trans_presets.java:2042
-#: build/trans_presets.java:2048 build/trans_presets.java:2054
-#: build/trans_presets.java:2060 build/trans_presets.java:2066
-#: build/trans_presets.java:2072 build/trans_presets.java:2078
-#: build/trans_presets.java:2084 build/trans_presets.java:2090
-#: build/trans_presets.java:2096 build/trans_presets.java:2102
-#: build/trans_presets.java:2108 build/trans_presets.java:2114
-#: build/trans_presets.java:2120 build/trans_presets.java:2126
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2158
-#: build/trans_presets.java:2165 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2186
-#: build/trans_presets.java:2192 build/trans_presets.java:2198
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2218 build/trans_presets.java:2225
-#: build/trans_presets.java:2232 build/trans_presets.java:2239
-#: build/trans_presets.java:2247 build/trans_presets.java:2279
-#: build/trans_presets.java:2284 build/trans_presets.java:2289
-#: build/trans_presets.java:2294 build/trans_presets.java:2300
-#: build/trans_presets.java:2306 build/trans_presets.java:2312
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2354
-#: build/trans_presets.java:2451 build/trans_presets.java:2458
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2485 build/trans_presets.java:2492
-#: build/trans_presets.java:2498 build/trans_presets.java:2504
-#: build/trans_presets.java:2526 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2553 build/trans_presets.java:2559
-#: build/trans_presets.java:2565 build/trans_presets.java:2571
-#: build/trans_presets.java:2577 build/trans_presets.java:2583
-#: build/trans_presets.java:2590 build/trans_presets.java:2597
-#: build/trans_presets.java:2604 build/trans_presets.java:2610
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2661
-#: build/trans_presets.java:2667 build/trans_presets.java:2677
-#: build/trans_presets.java:2686 build/trans_presets.java:2701
-#: build/trans_presets.java:2707 build/trans_presets.java:2715
-#: build/trans_presets.java:2722 build/trans_presets.java:2742
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2783
-#: build/trans_presets.java:2790 build/trans_presets.java:2797
-#: build/trans_presets.java:2803 build/trans_presets.java:2809
-#: build/trans_presets.java:2817 build/trans_presets.java:2824
-#: build/trans_presets.java:2831 build/trans_presets.java:2838
-#: build/trans_presets.java:2844 build/trans_presets.java:2851
-#: build/trans_presets.java:2858 build/trans_presets.java:2867
-#: build/trans_presets.java:2873 build/trans_presets.java:2879
-#: build/trans_presets.java:2885 build/trans_presets.java:2891
-#: build/trans_presets.java:2900 build/trans_presets.java:2910
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2948
-#: build/trans_presets.java:2957 build/trans_presets.java:2963
-#: build/trans_presets.java:2969 build/trans_presets.java:2975
-#: build/trans_presets.java:2981 build/trans_presets.java:2987
-#: build/trans_presets.java:2993 build/trans_presets.java:3000
-#: build/trans_presets.java:3006 build/trans_presets.java:3011
-#: build/trans_presets.java:3018 build/trans_presets.java:3025
-#: build/trans_presets.java:3031 build/trans_presets.java:3040
-#: build/trans_presets.java:3048 build/trans_presets.java:3054
-#: build/trans_presets.java:3060 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3080
-#: build/trans_presets.java:3086 build/trans_presets.java:3092
-#: build/trans_presets.java:3098 build/trans_presets.java:3104
-#: build/trans_presets.java:3117 build/trans_presets.java:3131
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:67 build/trans_presets.java:103
+#: build/trans_presets.java:143 build/trans_presets.java:180
+#: build/trans_presets.java:200 build/trans_presets.java:218
+#: build/trans_presets.java:235 build/trans_presets.java:253
+#: build/trans_presets.java:273 build/trans_presets.java:306
+#: build/trans_presets.java:352 build/trans_presets.java:372
+#: build/trans_presets.java:387 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:503 build/trans_presets.java:523
+#: build/trans_presets.java:544 build/trans_presets.java:565
+#: build/trans_presets.java:586 build/trans_presets.java:607
+#: build/trans_presets.java:628 build/trans_presets.java:659
+#: build/trans_presets.java:680 build/trans_presets.java:693
+#: build/trans_presets.java:706 build/trans_presets.java:719
+#: build/trans_presets.java:732 build/trans_presets.java:745
+#: build/trans_presets.java:756 build/trans_presets.java:765
+#: build/trans_presets.java:812 build/trans_presets.java:833
+#: build/trans_presets.java:842 build/trans_presets.java:902
+#: build/trans_presets.java:1053 build/trans_presets.java:1061
+#: build/trans_presets.java:1069 build/trans_presets.java:1077
+#: build/trans_presets.java:1087 build/trans_presets.java:1095
+#: build/trans_presets.java:1100 build/trans_presets.java:1107
+#: build/trans_presets.java:1114 build/trans_presets.java:1119
+#: build/trans_presets.java:1127 build/trans_presets.java:1136
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1153 build/trans_presets.java:1159
+#: build/trans_presets.java:1165 build/trans_presets.java:1174
+#: build/trans_presets.java:1183 build/trans_presets.java:1190
+#: build/trans_presets.java:1198 build/trans_presets.java:1211
+#: build/trans_presets.java:1217 build/trans_presets.java:1226
+#: build/trans_presets.java:1232 build/trans_presets.java:1238
+#: build/trans_presets.java:1246 build/trans_presets.java:1302
+#: build/trans_presets.java:1349 build/trans_presets.java:1355
+#: build/trans_presets.java:1361 build/trans_presets.java:1367
+#: build/trans_presets.java:1373 build/trans_presets.java:1384
+#: build/trans_presets.java:1393 build/trans_presets.java:1408
+#: build/trans_presets.java:1415 build/trans_presets.java:1421
+#: build/trans_presets.java:1429 build/trans_presets.java:1436
+#: build/trans_presets.java:1445 build/trans_presets.java:1453
+#: build/trans_presets.java:1460 build/trans_presets.java:1471
+#: build/trans_presets.java:1481 build/trans_presets.java:1491
+#: build/trans_presets.java:1511 build/trans_presets.java:1523
+#: build/trans_presets.java:1534 build/trans_presets.java:1551
+#: build/trans_presets.java:1558 build/trans_presets.java:1574
+#: build/trans_presets.java:1581 build/trans_presets.java:1586
+#: build/trans_presets.java:1592 build/trans_presets.java:1598
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1646 build/trans_presets.java:1652
+#: build/trans_presets.java:1659 build/trans_presets.java:1666
+#: build/trans_presets.java:1674 build/trans_presets.java:1681
+#: build/trans_presets.java:1689 build/trans_presets.java:1696
+#: build/trans_presets.java:1702 build/trans_presets.java:1709
+#: build/trans_presets.java:1716 build/trans_presets.java:1723
+#: build/trans_presets.java:1740 build/trans_presets.java:1748
+#: build/trans_presets.java:1763 build/trans_presets.java:1773
+#: build/trans_presets.java:1785 build/trans_presets.java:1792
+#: build/trans_presets.java:1798 build/trans_presets.java:1808
+#: build/trans_presets.java:1813 build/trans_presets.java:1821
+#: build/trans_presets.java:1828 build/trans_presets.java:1834
+#: build/trans_presets.java:1840 build/trans_presets.java:1845
+#: build/trans_presets.java:1850 build/trans_presets.java:1855
+#: build/trans_presets.java:1862 build/trans_presets.java:1868
+#: build/trans_presets.java:1873 build/trans_presets.java:1882
+#: build/trans_presets.java:1891 build/trans_presets.java:1900
+#: build/trans_presets.java:1909 build/trans_presets.java:1918
+#: build/trans_presets.java:1924 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 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:2023 build/trans_presets.java:2032
+#: build/trans_presets.java:2040 build/trans_presets.java:2046
+#: build/trans_presets.java:2052 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 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:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2150
+#: build/trans_presets.java:2156 build/trans_presets.java:2162
+#: build/trans_presets.java:2169 build/trans_presets.java:2176
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2197 build/trans_presets.java:2203
+#: build/trans_presets.java:2209 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2229
+#: build/trans_presets.java:2236 build/trans_presets.java:2243
+#: build/trans_presets.java:2250 build/trans_presets.java:2258
+#: build/trans_presets.java:2290 build/trans_presets.java:2295
+#: build/trans_presets.java:2300 build/trans_presets.java:2305
+#: build/trans_presets.java:2311 build/trans_presets.java:2317
+#: build/trans_presets.java:2323 build/trans_presets.java:2331
+#: build/trans_presets.java:2337 build/trans_presets.java:2343
+#: build/trans_presets.java:2349 build/trans_presets.java:2355
+#: build/trans_presets.java:2365 build/trans_presets.java:2462
+#: build/trans_presets.java:2469 build/trans_presets.java:2483
+#: build/trans_presets.java:2489 build/trans_presets.java:2496
+#: build/trans_presets.java:2503 build/trans_presets.java:2509
+#: build/trans_presets.java:2515 build/trans_presets.java:2537
+#: build/trans_presets.java:2544 build/trans_presets.java:2551
+#: build/trans_presets.java:2557 build/trans_presets.java:2564
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2594 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2615
+#: build/trans_presets.java:2621 build/trans_presets.java:2627
+#: build/trans_presets.java:2633 build/trans_presets.java:2639
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2672 build/trans_presets.java:2678
+#: build/trans_presets.java:2688 build/trans_presets.java:2697
+#: build/trans_presets.java:2712 build/trans_presets.java:2718
+#: build/trans_presets.java:2726 build/trans_presets.java:2733
+#: build/trans_presets.java:2753 build/trans_presets.java:2764
+#: build/trans_presets.java:2770 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2788
+#: build/trans_presets.java:2795 build/trans_presets.java:2802
+#: build/trans_presets.java:2809 build/trans_presets.java:2815
+#: build/trans_presets.java:2821 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2912
+#: build/trans_presets.java:2922 build/trans_presets.java:2931
+#: build/trans_presets.java:2937 build/trans_presets.java:2943
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 build/trans_presets.java:2981
+#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:2999 build/trans_presets.java:3005
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3023 build/trans_presets.java:3030
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3066 build/trans_presets.java:3072
+#: build/trans_presets.java:3079 build/trans_presets.java:3085
+#: build/trans_presets.java:3092 build/trans_presets.java:3098
+#: build/trans_presets.java:3104 build/trans_presets.java:3110
+#: build/trans_presets.java:3116 build/trans_presets.java:3129
+#: build/trans_presets.java:3143 build/trans_presets.java:3157
 msgid "Name"
 msgstr "שם"
@@ -6543,4 +6684,58 @@
 msgid "Version"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
+#, fuzzy
+msgid "Changeset id:"
+msgstr "שנה יחס"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
+#, fuzzy
+msgid "Created at:"
+msgstr "צור אזורים"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
+#, fuzzy
+msgid "Changeset comment:"
+msgstr "הערת ביצוע"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
+msgid "No open changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48
+#, fuzzy
+msgid "<html>Please select the changesets you want to close</html>"
+msgstr "בחר אילו שינויי תכונות אתה רוצה להחיל."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
+#, fuzzy
+msgid "Open changesets"
+msgstr "סגור את סט השינויים הנוכחי"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101
+#, fuzzy
+msgid "Close changesets"
+msgstr "סגור את סט השינויים הנוכחי"
+
+#. putValue(SMALL_ICON, ImageProvider.get("cancel"));
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
+#, fuzzy
+msgid "Close the selected open changesets"
+msgstr "סגור את סט השינויים הנוכחי ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126
+#, fuzzy
+msgid "Cancel closeing of changesets"
+msgstr "סגור את סט השינויים הנוכחי"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37
+msgid "Closing changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77
+#, fuzzy, java-format
+msgid "Closing changeset {0}"
+msgstr "סגור את סט השינויים הנוכחי"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
@@ -6569,5 +6764,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be uploaded"
+msgid "Layer ''{0}'' has no modifications to be uploaded."
 msgstr ""
 
@@ -6575,5 +6770,5 @@
 #, java-format
 msgid ""
-"Layer ''{0}'' has modifications which should be saved to its assoicated file "
+"Layer ''{0}'' has modifications which should be saved to its associated file "
 "''{1}''."
 msgstr ""
@@ -6581,5 +6776,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be saved"
+msgid "Layer ''{0}'' has no modifications to be saved."
 msgstr ""
 
@@ -6613,17 +6808,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113
 msgid "Unsaved changes - Save/Upload before exiting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194
 #, java-format
 msgid ""
@@ -6636,10 +6831,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205
 msgid "Unsaved data and conflicts"
-msgstr "פתור התנגשויות"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212
 #, java-format
 msgid ""
@@ -6653,9 +6847,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223
 msgid "Unsaved data and missing associated file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230
 #, java-format
 msgid ""
@@ -6670,42 +6864,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243
 msgid "Unsaved data non-writable files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
 msgid "Close this dialog and resume editing in JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322
+msgid "Discard and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
-msgid "Discard and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354
+msgid "Save and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
-msgid "Save and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
 msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402
 #, java-format
 msgid "Preparing layer ''{0}'' for upload ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
@@ -6713,5 +6907,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491
 msgid "Incomplete upload and/or save"
 msgstr ""
@@ -6751,21 +6945,21 @@
 #. item "Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:200
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:278
-#: build/trans_presets.java:311 build/trans_presets.java:357
-#: build/trans_presets.java:372 build/trans_presets.java:387
-#: build/trans_presets.java:409 build/trans_presets.java:429
-#: build/trans_presets.java:450 build/trans_presets.java:470
-#: build/trans_presets.java:489 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:549
-#: build/trans_presets.java:570 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:633
-#: build/trans_presets.java:664 build/trans_presets.java:1060
-#: build/trans_presets.java:1068 build/trans_presets.java:1076
-#: build/trans_presets.java:1086 build/trans_presets.java:1305
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:242
+#: build/trans_presets.java:260 build/trans_presets.java:279
+#: build/trans_presets.java:312 build/trans_presets.java:358
+#: build/trans_presets.java:373 build/trans_presets.java:388
+#: build/trans_presets.java:410 build/trans_presets.java:430
+#: build/trans_presets.java:451 build/trans_presets.java:471
+#: build/trans_presets.java:490 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:665 build/trans_presets.java:1062
+#: build/trans_presets.java:1070 build/trans_presets.java:1078
+#: build/trans_presets.java:1088 build/trans_presets.java:1308
 msgid "Layer"
 msgstr "שכבה"
@@ -6784,67 +6978,32 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:200
 msgid "Upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-msgid "Use a new changeset and close it"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
-msgid ""
-"Select to upload the data using a new changeset and to close the changeset "
-"after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
-msgid "Use a new changeset and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
-msgid ""
-"Select to upload the data using a new changeset and to leave the changeset "
-"open after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
-msgid "Upload to a new or to an existing changeset?"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
-msgid "upload all changes in one request"
+msgid "Settings"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
-msgid ""
-"Enable to upload all changes in one request, disable to use one request per "
-"changed primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "ספק הערה קצרה לשינויים שאתה מעלה:"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:216
-msgid "Settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908
 msgid "Tags of new changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:221
 msgid "Objects to add:"
 msgstr "פריטים להוספה:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:227
 msgid "Objects to modify:"
 msgstr "פריטים לשינוי:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:233
 msgid "Objects to delete:"
 msgstr "פריטים למחיקה:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
 #, java-format
 msgid "{0} object to add:"
@@ -6853,5 +7012,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:277
 #, java-format
 msgid "{0} object to modifiy:"
@@ -6860,5 +7019,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:286
 #, java-format
 msgid "{0} object to delete:"
@@ -6867,53 +7026,87 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422
-#, java-format
-msgid "Use the existing changeset {0} and close it after upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:423
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to close the changeset "
-"after this upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426
-#, java-format
-msgid "Use the existing changeset {0} and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:427
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to leave the changeset "
-"open for further uploads"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
-#, java-format
-msgid "Tags of changeset {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:470
 msgid "Upload Changes"
 msgstr "העלה שינויים"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472
+msgid "Upload the changed primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
+msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:479
+msgid "Illegal upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
+msgid "Cancel the upload and resume editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606
 #, fuzzy
-msgid "Upload the changed primitives"
-msgstr "העלה את השינויים האלה?"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592
+msgid "Upload all changes in one request"
+msgstr "העלה את כל השינויים לשרת ה-OSM"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607
+msgid ""
+"Enable to upload all changes in one request, disable to use one request per "
+"changed primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:617
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "ספק הערה קצרה לשינויים שאתה מעלה:"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672
 #, fuzzy
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "נא הזן שם עבור המיקום."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:593
-msgid "Illegal upload comment"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
-msgid "Cancel the upload and resume editing"
+msgid "Open a new changeset"
+msgstr "סגור את סט השינויים הנוכחי"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
+msgid "Open a new changeset and use it in the next upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
+#, fuzzy
+msgid "Use an open changeset"
+msgstr "סגור את סט השינויים הנוכחי"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
+msgid "Upload data to an already opened changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
+#, fuzzy
+msgid "Close changeset after upload"
+msgstr "אין שינויים להעלאה."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
+msgid "Select to close the changeset after the next upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922
+#, java-format
+msgid "Tags of changeset {0}"
+msgstr ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
+#, fuzzy
+msgid "Load the list of your open changesets from the server"
+msgstr "העלה את המאפיינים הנוכחיים לשרת"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
+#, fuzzy
+msgid "Close the currently selected open changeset"
+msgstr "סגור את סט השינויים הנוכחי ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
+#, java-format
+msgid "changeset id > 0 expected. Got {1}"
 msgstr ""
 
@@ -6992,5 +7185,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
@@ -7028,5 +7221,5 @@
 msgstr "לא ניתן לנתח את הזמן שהוזן."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
@@ -7034,30 +7227,30 @@
 msgstr "נקודת gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
 msgid "Customize line drawing"
 msgstr "התאם ציור קו"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
 msgid "Use global settings."
 msgstr "השתמש בהגדרות הגלובליות."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Draw lines between points for this layer."
 msgstr "צייר קווים בין נקודות בשכבה זו."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Do not draw lines between points for this layer."
 msgstr "אל תצייר קווים בין נקודות בשכבה זו."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 msgid "Select line drawing options"
 msgstr "בחר אפשרויות ציור קו"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7065,5 +7258,5 @@
 msgstr "התאם צבעים"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7072,5 +7265,5 @@
 msgstr "ברירת מחדל"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7079,38 +7272,74 @@
 msgstr "בחר צבע"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
 msgid "Markers From Named Points"
 msgstr "סמנים מנקודות בעלות שם"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
 msgid "Import Audio"
 msgstr "ייבא שמע"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
 msgid "Wave Audio files (*.wav)"
 msgstr "קובץ שמע (wav.*)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "סמן שמע מ {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
 msgid "Import images"
 msgstr "ייבא תמונות"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#, java-format
+msgid "Name: {0}"
+msgstr "שם: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#, java-format
+msgid "Description: {0}"
+msgstr "תיאור: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#, fuzzy, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
+msgstr[0] "מסלול"
+msgstr[1] "מסלולים"
+
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
+#: build/trans_presets.java:3160
+msgid "Description"
+msgstr "תיאור"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+msgid "Timespan"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#, fuzzy
+msgid "Length"
+msgstr "אורך: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
+msgid "URL"
+msgstr "כתובת"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+msgid "Length: "
+msgstr "אורך: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
 #, java-format
 msgid "{0} route, "
@@ -7119,5 +7348,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 #, java-format
 msgid "{0} waypoint"
@@ -7126,29 +7355,10 @@
 msgstr[1] "{0} נקודות דרך"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
-#, java-format
-msgid "Name: {0}"
-msgstr "שם: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
-#, java-format
-msgid "Description: {0}"
-msgstr "תיאור: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
-msgid "Timespan: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
-msgid "Length: "
-msgstr "אורך: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "המר לשכבת נתונים"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7158,10 +7368,10 @@
 "מסלולים, ראה כאן:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -7172,29 +7382,29 @@
 msgstr "המר מ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
 msgid "Download from OSM along this track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
 msgid "Download everything within:"
 msgstr "הורד הכל עם:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
 #, java-format
 msgid "{0} meters"
 msgstr "{0} מטרים"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 msgid "Maximum area per request:"
 msgstr "שטח מירבי לבקשה"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} קמ\"ר"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
 #, java-format
 msgid ""
@@ -7205,13 +7415,13 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
 msgid "Download data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7219,5 +7429,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7270,30 +7480,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
-#, fuzzy
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
 "<br>If you want to upload traces, look here:</html>"
 msgstr ""
-"<html>העלאת קובץ נתוני GPS לא מעובדים נחשבת מזיקה.<br>אם אתה רוצה להעלות "
-"מסלולים, ראה כאן:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "track"
 msgid_plural "tracks"
@@ -7424,4 +7631,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
@@ -7648,13 +7856,18 @@
 msgstr "צייר נקודות GPS גדולות."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+msgid "Draw a circle form HDOP value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -7662,6 +7875,6 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1374
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:1377
 msgid "Car"
 msgstr "רכב"
@@ -7682,14 +7895,14 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:324 build/trans_presets.java:650
-#: build/trans_presets.java:857 build/trans_presets.java:876
-#: build/trans_presets.java:890 build/trans_presets.java:912
-#: build/trans_presets.java:949 build/trans_presets.java:962
-#: build/trans_presets.java:974 build/trans_presets.java:986
-#: build/trans_presets.java:998 build/trans_presets.java:1010
-#: build/trans_presets.java:1020 build/trans_presets.java:1029
-#: build/trans_presets.java:1038 build/trans_presets.java:1437
-#: build/trans_presets.java:1510
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:325 build/trans_presets.java:651
+#: build/trans_presets.java:858 build/trans_presets.java:877
+#: build/trans_presets.java:891 build/trans_presets.java:913
+#: build/trans_presets.java:950 build/trans_presets.java:963
+#: build/trans_presets.java:975 build/trans_presets.java:987
+#: build/trans_presets.java:999 build/trans_presets.java:1011
+#: build/trans_presets.java:1021 build/trans_presets.java:1030
+#: build/trans_presets.java:1039 build/trans_presets.java:1440
+#: build/trans_presets.java:1513
 msgid "Bicycle"
 msgstr "אופניים"
@@ -7722,62 +7935,62 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:325 build/trans_presets.java:649
-#: build/trans_presets.java:856 build/trans_presets.java:875
-#: build/trans_presets.java:889 build/trans_presets.java:911
-#: build/trans_presets.java:948 build/trans_presets.java:961
-#: build/trans_presets.java:973 build/trans_presets.java:985
-#: build/trans_presets.java:997 build/trans_presets.java:1009
-#: build/trans_presets.java:1019 build/trans_presets.java:1028
-#: build/trans_presets.java:1037
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:326 build/trans_presets.java:650
+#: build/trans_presets.java:857 build/trans_presets.java:876
+#: build/trans_presets.java:890 build/trans_presets.java:912
+#: build/trans_presets.java:949 build/trans_presets.java:962
+#: build/trans_presets.java:974 build/trans_presets.java:986
+#: build/trans_presets.java:998 build/trans_presets.java:1010
+#: build/trans_presets.java:1020 build/trans_presets.java:1029
+#: build/trans_presets.java:1038
 msgid "Foot"
 msgstr "רגל"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "צייר חיצי כיוון"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "ציור מהיר (נראה מכוער יותר)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "רק רמזי כיוון מעניינים (למשל עם תג חד-סטרי)."
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Only on the head of a way."
 msgstr "רק בראשית הדרך"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "צייר מספרים סידוריים של קטע"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "צייר גבולות של נתונים שהורדו"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "צייר נקודות וירטואליות במצב הנבחר"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "צייר שכבות לא פעילות בצבע שונה"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "החלק גרפיקה של מפה (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:82
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -7785,34 +7998,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
 msgstr "אורך מירבי (במטרים) לציור קוים. קבע כ'1-' לציור כל הקווים"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length (meters)"
 msgstr "אורך מירבי (מטרים)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "הכרח ציור קווים במידה והנתונים המיובאים אינם מכילים נתוני קווים."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:129
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "צייר חצי כיוון לקווים המחברים נקודות GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:135
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr "צייר את חצי הכיוון תוך שימוש בטבלת חיפוש במקום חישובים מסובכים."
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:141
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -7820,13 +8033,13 @@
 msgstr "אל תצייר חצים אם הם לא לפחות במרחק זה מהקודם."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:144
 msgid "Minimum distance (pixels)"
 msgstr "מרחק מינימלי (פיקסלים)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Draw larger dots for the GPS points."
 msgstr "צייר נקודות גדולות יותר עבור נקודות ה-GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -7834,9 +8047,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -7844,46 +8057,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202
 msgid "GPS Points"
 msgstr "נקודות GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "Draw direction hints for way segments."
 msgstr "צייר רמזי כיוון עבור קטעי דרך."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:237
 msgid "Draw the order numbers of all segments within their way."
 msgstr "צייר את המספרים הסידוריים של כל הקטעים בתוך הדרכים שלהם."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "צייר את גבולות המידע שמורד מהשרת."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "צייר נקודיות וירטואליות במצב הנבחר להקלת שינוי דרך"
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257
 msgid "Draw the inactive data layers in a different color."
 msgstr "צייר את שכבת הנתונים הלא פעילה בצבע אחר."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "OSM Data"
 msgstr "נתוני OSM"
@@ -7962,45 +8175,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Configure available plugins."
 msgstr "התאם תוספים זמינים."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50
+#. buttons at the bottom
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
 msgid "Download List"
 msgstr "הורד רשימה"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:100
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 msgid "Update"
 msgstr "עדכן"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Configure Sites..."
 msgstr "התאם אתרים..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:125
 msgid "Add JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:126
 msgid "Enter URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:162
 msgid "Please select an entry."
 msgstr "בחר כניסה."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:147
 msgid "Edit JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:148
 msgid "JOSM Plugin description URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:175
 msgid "Configure Plugin Sites"
 msgstr "התאם אתרי תוספים"
@@ -8328,6 +8542,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:369
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341
 #, java-format
 msgid "Remove old keys from up to {0} object"
@@ -8336,9 +8550,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135
 msgid "Add a new tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160
 msgid "Delete the selection in the tag table"
 msgstr ""
@@ -8373,7 +8587,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:68
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:75
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -8417,4 +8631,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24
+#, java-format
+msgid "Preset group ''{0}'' of group ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
 #, java-format
 msgid "Preset group ''{0}''"
@@ -8435,4 +8654,10 @@
 msgstr "מוריד נקודות {0} עד {1}..."
 
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, fuzzy, java-format
+msgid "parameter ''{0}'' > 0 expected. Got {1}"
+msgstr "פרמטר ''{0}'' אינו יכול להיות אפס"
+
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8539,5 +8764,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "שגיאת ניתוח. למסמך gpx מבנה לא תקין."
@@ -8657,10 +8882,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -8668,75 +8894,79 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315
 msgid "Creating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
 #, java-format
 msgid "Successfully opened changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#, java-format
+msgid "id of changeset > 0 required. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
-#, java-format
-msgid "Changeset {0} is unchanged. Skipping update."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
 #, java-format
 msgid "Updating changeset {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
-msgid ""
-"Failed to update changeset. Either there is no current changeset or the id "
-"of the current changeset is 0"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
 msgid "Closing changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
-#, java-format
-msgid "Closing changeset {0}..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
-#, java-format
-msgid "Leaving changeset {0} open..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
 msgid "No changeset present for diff upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414
 msgid "Preparing..."
 msgstr "מכין..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419
 msgid "Uploading..."
 msgstr "מעלה..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438
 msgid "Waiting 10 seconds ... "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449
 msgid "OK - trying again."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:485
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517
 #, java-format
 msgid "Starting retry {0} of {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
+msgid "current changeset is null. Can't upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
+#, java-format
+msgid "id of current changeset > required. Current id is {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
+#, java-format
+msgid "Open changeset expected. Got closed changeset with id {0}"
 msgstr ""
 
@@ -8762,50 +8992,108 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
+#, java-format
+msgid "missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:128
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:134
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
+#, java-format
+msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
+#, java-format
+msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
+#, java-format
+msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#, java-format
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#, java-format
+msgid "Unsupported version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:176
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Aborting."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#, java-format
+msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
+msgid "Parsing list of changesets..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
 msgid "Incorrect password or username."
 msgstr "סיסמא או שם משתמש שגויים."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:168
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Warning: The password is transferred unencrypted."
 msgstr "אזהרה: הסיסמא נשלחת בצורה לא מוצפנת."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Save user and password (unencrypted)"
 msgstr "שמור את המשתמש והסיסמא (לא מוצפנים)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
 msgid "Enter Password"
 msgstr "הכנס סיסמא"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 msgid "Login"
 msgstr "התחברות"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:242
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
 msgid "The base URL for the OSM server (REST API)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr "סיסמת כניסה לחשבון OSM. השאר ריק כדי לא לשמור אף סיסמא."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
 msgid "Base Server URL"
 msgstr "כתובת שרת הבסיס"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
 msgid "OSM password"
 msgstr "סיסמת OSM"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -8814,5 +9102,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:51
+#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #, java-format
 msgid "(at line {0}, column {1})"
@@ -8902,20 +9190,5 @@
 msgstr "שגיאה בזמן הניתוח."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124
-#, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
-#, java-format
-msgid "Missing mandatory attribute ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
-#, fuzzy, java-format
-msgid "Unsupported version: {0}"
-msgstr "גירסת API: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:155
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -8924,38 +9197,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
 msgid "found XML element <nd> element not as direct child of element <way>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
 msgid "Found XML element <member> not as direct child of element <relation>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
 #, java-format
 msgid ""
@@ -8963,24 +9236,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
 msgid "Incomplete <member> specification with ref=0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
-#, java-format
-msgid "Warning: Undefined element ''{0}'' found in input stream. Skipping."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
-#, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Skipping."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
 msgid "Illegal object with id=0"
 msgstr "עצם לא חוקי עם id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #, java-format
 msgid ""
@@ -8988,5 +9256,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:303
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
 #, java-format
 msgid ""
@@ -8995,5 +9263,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
 #, java-format
 msgid ""
@@ -9002,5 +9270,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
@@ -9010,25 +9278,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:316
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with id {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
 #, java-format
 msgid ""
@@ -9036,5 +9304,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
 #, java-format
 msgid ""
@@ -9043,5 +9311,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
 #, java-format
 msgid ""
@@ -9049,5 +9317,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
 #, java-format
 msgid ""
@@ -9056,17 +9324,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
 msgid "Prepare OSM data..."
 msgstr "מכין נתוני OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 msgid "Parsing OSM data..."
-msgstr "מכין נתוני OSM..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
 msgid "Preparing data set..."
-msgstr "מכין נתונים..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
@@ -9087,4 +9353,24 @@
 msgid "Downloading referring relations ..."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51
+#, fuzzy
+msgid "Reading changesets..."
+msgstr "קורא {0}..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
+#, fuzzy
+msgid "Downloading changesets ..."
+msgstr "מוריד משטח תמונה..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85
+#, fuzzy, java-format
+msgid "Reading changeset {0} ..."
+msgstr "קורא {0}..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91
+#, fuzzy, java-format
+msgid "Downloading changeset {0} ..."
+msgstr "מוריד נקודות {0} עד {1}..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
@@ -9101,43 +9387,66 @@
 msgstr "מתחבר לשרת..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
 msgid "Failed to open connection to API {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
+msgid "Error: failed to add authentication credentials to the connection."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
 msgstr "לא יכול להתחבר לשרת osm. בדוק את חיבור האינטרנט."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+msgid "XML tag <user> is missing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
+#, java-format
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
+#, java-format
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
 msgid "Starting to upload with one request per primitive ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
 msgid "Starting to upload in one request ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:171
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135
 msgid "Uploading data ..."
-msgstr "מעלה..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:178
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
 msgid ""
 "WARNING: no API version defined for data to upload. Falling back to version "
@@ -9145,5 +9454,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147
 #, java-format
 msgid ""
@@ -9153,10 +9462,10 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
 msgid "Update Plugins"
 msgstr "עדכן תוספים"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 msgid "Download Plugins"
 msgstr ""
@@ -9311,5 +9620,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -9318,18 +9627,18 @@
 msgstr[1] "הורד מידע על התוסף מ{0} אתרים"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
 msgid "No plugin information found."
 msgstr "מידע על התוסף לא נמצא."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:93
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
 msgid "All installed plugins are up to date."
 msgstr "כל התוספים המותקנים מעודכנים."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
 #, java-format
 msgid ""
@@ -9342,9 +9651,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
 msgid "Download missing plugins"
 msgstr "הורד תוספים חסרים"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
 #, java-format
 msgid ""
@@ -9359,43 +9668,43 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
 msgid "unknown"
 msgstr "לא ידוע"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: גירסא {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 msgid "Plugin bundled with JOSM"
 msgstr "תוסף ארוז עם JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:357
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -9708,10 +10017,4 @@
 msgid "(What does that mean?)"
 msgstr ""
-
-#. item "Relations/Route" text "Symbol description"
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3148
-msgid "Description"
-msgstr "תיאור"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
@@ -10469,6 +10772,7 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
-msgid "Set "
-msgstr ""
+#, fuzzy, java-format
+msgid "Set {0} Lambert coordinates"
+msgstr "שמור את הקואורדינטות שלהם"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -11086,6 +11390,6 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 #: build/trans_style.java:990 build/trans_style.java:1007
-#: build/trans_style.java:1023 build/trans_style.java:3392
-#: build/trans_style.java:3400
+#: build/trans_style.java:1023 build/trans_style.java:3400
+#: build/trans_style.java:3408
 msgid "water"
 msgstr "מים"
@@ -11373,4 +11677,55 @@
 msgstr "מדידות"
 
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Michigan Left"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Adds no left turn for sets of 4 or 5 ways."
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45
+#, fuzzy
+msgid "Please select 4 or 5 ways to assign no left turns."
+msgstr "בחר דרך סגורה אחת או יותר בנות ארבע נקודות לפחות"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61
+#, fuzzy, java-format
+msgid "{0} extrem nodes."
+msgstr "נקודה {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69
+#, java-format
+msgid "Via node {0}, {1}"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75
+#, fuzzy, java-format
+msgid "{0} via nodes."
+msgstr "נקודה {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78
+msgid "Unable to find via nodes. Please check your selection"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98
+#, fuzzy, java-format
+msgid "MIddle way: {0}"
+msgstr "נקודה: {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121
+msgid "Create Michigan left turn restriction"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129
+#, fuzzy, java-format
+msgid "Processing {0}"
+msgstr "גירסא {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142
+#, java-format
+msgid "Relation: from {0} to {1} via {2}"
+msgstr ""
+
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
 msgid "OpenLayers"
@@ -11517,7 +11872,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
-#, fuzzy
 msgid "create new objects"
-msgstr "יוצר נקודה חדשה."
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
@@ -11580,7 +11934,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
-#, fuzzy
 msgid "Remote Control has been asked to create a new node."
-msgstr "שלט רחוק ביקש להוריד נתונים מה-API"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
@@ -11840,5 +12193,5 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:158
 msgid "JOSM Tag Editor Plugin"
 msgstr ""
@@ -11848,5 +12201,5 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:370
 #, java-format
 msgid "Updating properties of up to {0} object"
@@ -11855,18 +12208,4 @@
 msgstr[1] ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44
-msgid "INFO: entering compatibilty mode for JOSM with Main.ds"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47
-msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49
-msgid ""
-"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-"found."
-msgstr ""
-
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
 msgid "Group"
@@ -11875,9 +12214,4 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
 msgid "Item"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-msgid "Filter"
 msgstr ""
 
@@ -11964,5 +12298,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2272
 msgid "Street name"
 msgstr "שם רחוב"
@@ -12124,8 +12458,4 @@
 msgid "Zoom (in metres)"
 msgstr "מיקוד (במטרים)"
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
-msgid "URL"
-msgstr "כתובת"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -12330,7 +12660,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501
-#, fuzzy
 msgid "Updating map ..."
-msgstr "ביטול מחיקת דרך..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69
@@ -12816,7 +13145,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
-#: build/trans_style.java:4179
+#: build/trans_style.java:4159 build/trans_style.java:4166
+#: build/trans_style.java:4173 build/trans_style.java:4180
+#: build/trans_style.java:4187
 msgid "building"
 msgstr "בניין"
@@ -12830,5 +13159,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4186
+#: build/trans_style.java:4194
 msgid "area"
 msgstr "שטח"
@@ -12955,10 +13284,10 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:148
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:155
 msgid "Reached a junction"
 msgstr ""
@@ -13246,7 +13575,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
-#, fuzzy
 msgid "Overlap tiles"
-msgstr "שטחים חופפים"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
@@ -13255,7 +13583,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
-#, fuzzy
 msgid "% of north:"
-msgstr "צפון"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -13402,6 +13729,11 @@
 msgstr ""
 
+#. Plugin michigan_left
+#: build/trans_plugins.java:35
+msgid "Adds no left turn for sets of 4 or 5 ways"
+msgstr ""
+
 #. Plugin nearclick
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid ""
 "Simulates a click when you do a small and short drag. This is usefull for "
@@ -13411,15 +13743,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13427,5 +13759,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13433,5 +13765,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13440,15 +13772,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13457,10 +13789,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13469,15 +13801,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -13487,10 +13819,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin usertools
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -13499,5 +13831,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -13506,5 +13838,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -13513,5 +13845,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -13520,10 +13852,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -13579,4 +13911,10 @@
 #. <annotations>
 #: build/trans_presets.java:57
+#, fuzzy
+msgid "Highways"
+msgstr "כביש ראשי"
+
+#. group "Highways"
+#: build/trans_presets.java:58
 msgid "Streets"
 msgstr "רחובות"
@@ -13587,5 +13925,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:58 build/trans_surveyor.java:72
+#: build/trans_presets.java:59 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "כבישים"
@@ -13594,5 +13932,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:61
+#: build/trans_presets.java:62
 msgid "Edit Motorway"
 msgstr ""
@@ -13619,8 +13957,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:120 build/trans_presets.java:140
-#: build/trans_presets.java:177 build/trans_presets.java:197
-#: build/trans_presets.java:1557 build/trans_presets.java:3146
+#: build/trans_presets.java:65 build/trans_presets.java:101
+#: build/trans_presets.java:121 build/trans_presets.java:141
+#: build/trans_presets.java:178 build/trans_presets.java:198
+#: build/trans_presets.java:1560 build/trans_presets.java:3158
 msgid "Reference"
 msgstr "התייחסות"
@@ -13634,8 +13972,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:358
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:359
 msgid "Lanes"
 msgstr "מסלולים"
@@ -13652,15 +13990,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:224 build/trans_presets.java:280
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:373 build/trans_presets.java:388
-#: build/trans_presets.java:412 build/trans_presets.java:431
-#: build/trans_presets.java:452 build/trans_presets.java:472
-#: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1307
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:225 build/trans_presets.java:281
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:374 build/trans_presets.java:389
+#: build/trans_presets.java:413 build/trans_presets.java:432
+#: build/trans_presets.java:453 build/trans_presets.java:473
+#: build/trans_presets.java:511 build/trans_presets.java:667
+#: build/trans_presets.java:1310
 msgid "Max. speed (km/h)"
 msgstr "מהירות מירבית (קמ\"ש)"
@@ -13697,16 +14035,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:293 build/trans_presets.java:306
-#: build/trans_presets.java:320 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:464
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:659 build/trans_presets.java:1300
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:294 build/trans_presets.java:307
+#: build/trans_presets.java:321 build/trans_presets.java:353
+#: build/trans_presets.java:405 build/trans_presets.java:425
+#: build/trans_presets.java:445 build/trans_presets.java:465
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:660 build/trans_presets.java:1303
 msgid "Oneway"
 msgstr "חד סטרי"
@@ -13748,19 +14086,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:353
-#: build/trans_presets.java:362 build/trans_presets.java:405
-#: build/trans_presets.java:425 build/trans_presets.java:445
-#: build/trans_presets.java:465 build/trans_presets.java:485
-#: build/trans_presets.java:504 build/trans_presets.java:523
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:586 build/trans_presets.java:607
-#: build/trans_presets.java:628 build/trans_presets.java:660
-#: build/trans_presets.java:1301 build/trans_surveyor.java:12
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:354
+#: build/trans_presets.java:363 build/trans_presets.java:406
+#: build/trans_presets.java:426 build/trans_presets.java:446
+#: build/trans_presets.java:466 build/trans_presets.java:486
+#: build/trans_presets.java:505 build/trans_presets.java:524
+#: build/trans_presets.java:545 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629 build/trans_presets.java:661
+#: build/trans_presets.java:1304 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "גשר"
@@ -13796,19 +14134,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:354
-#: build/trans_presets.java:378 build/trans_presets.java:406
-#: build/trans_presets.java:426 build/trans_presets.java:446
-#: build/trans_presets.java:466 build/trans_presets.java:486
-#: build/trans_presets.java:505 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629 build/trans_presets.java:661
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:355
+#: build/trans_presets.java:379 build/trans_presets.java:407
+#: build/trans_presets.java:427 build/trans_presets.java:447
+#: build/trans_presets.java:467 build/trans_presets.java:487
+#: build/trans_presets.java:506 build/trans_presets.java:525
+#: build/trans_presets.java:546 build/trans_presets.java:567
+#: build/trans_presets.java:588 build/trans_presets.java:609
+#: build/trans_presets.java:630 build/trans_presets.java:662
+#: build/trans_presets.java:1305
 msgid "Tunnel"
 msgstr "מנהרה"
@@ -13842,18 +14180,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:73 build/trans_presets.java:90
-#: build/trans_presets.java:110 build/trans_presets.java:129
-#: build/trans_presets.java:150 build/trans_presets.java:166
-#: build/trans_presets.java:186 build/trans_presets.java:205
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:355
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:467
-#: build/trans_presets.java:487 build/trans_presets.java:506
-#: build/trans_presets.java:525 build/trans_presets.java:546
-#: build/trans_presets.java:567 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:630
-#: build/trans_presets.java:662 build/trans_presets.java:1303
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:356
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:468
+#: build/trans_presets.java:488 build/trans_presets.java:507
+#: build/trans_presets.java:526 build/trans_presets.java:547
+#: build/trans_presets.java:568 build/trans_presets.java:589
+#: build/trans_presets.java:610 build/trans_presets.java:631
+#: build/trans_presets.java:663 build/trans_presets.java:1306
 msgid "Cutting"
 msgstr ""
@@ -13887,18 +14225,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:74 build/trans_presets.java:91
-#: build/trans_presets.java:111 build/trans_presets.java:130
-#: build/trans_presets.java:151 build/trans_presets.java:167
-#: build/trans_presets.java:187 build/trans_presets.java:206
-#: build/trans_presets.java:222 build/trans_presets.java:240
-#: build/trans_presets.java:258 build/trans_presets.java:277
-#: build/trans_presets.java:310 build/trans_presets.java:356
-#: build/trans_presets.java:408 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:468
-#: build/trans_presets.java:488 build/trans_presets.java:507
-#: build/trans_presets.java:526 build/trans_presets.java:547
-#: build/trans_presets.java:568 build/trans_presets.java:589
-#: build/trans_presets.java:610 build/trans_presets.java:631
-#: build/trans_presets.java:663 build/trans_presets.java:1304
+#: build/trans_presets.java:75 build/trans_presets.java:92
+#: build/trans_presets.java:112 build/trans_presets.java:131
+#: build/trans_presets.java:152 build/trans_presets.java:168
+#: build/trans_presets.java:188 build/trans_presets.java:207
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:357
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:469
+#: build/trans_presets.java:489 build/trans_presets.java:508
+#: build/trans_presets.java:527 build/trans_presets.java:548
+#: build/trans_presets.java:569 build/trans_presets.java:590
+#: build/trans_presets.java:611 build/trans_presets.java:632
+#: build/trans_presets.java:664 build/trans_presets.java:1307
 msgid "Embankment"
 msgstr ""
@@ -13906,5 +14244,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Motorway Link"
 msgstr ""
@@ -13913,5 +14251,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:80
+#: build/trans_presets.java:81
 msgid "Edit Motorway Link"
 msgstr ""
@@ -13919,5 +14257,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:94
+#: build/trans_presets.java:95
 msgid "Trunk"
 msgstr ""
@@ -13926,5 +14264,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:97
+#: build/trans_presets.java:98
 msgid "Edit Trunk"
 msgstr ""
@@ -13934,6 +14272,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
 msgid "Motorroad"
 msgstr ""
@@ -13941,5 +14279,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:114
+#: build/trans_presets.java:115
 msgid "Trunk Link"
 msgstr ""
@@ -13948,5 +14286,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:117
+#: build/trans_presets.java:118
 msgid "Edit Trunk Link"
 msgstr ""
@@ -13959,5 +14297,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:134 build/trans_surveyor.java:76
+#: build/trans_presets.java:135 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "ראשי"
@@ -13966,5 +14304,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:137
+#: build/trans_presets.java:138
 msgid "Edit Primary Road"
 msgstr ""
@@ -13972,10 +14310,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:154
+#: build/trans_presets.java:155
 msgid "Primary Link"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:155
+#: build/trans_presets.java:156
 msgid "Edit Primary Link"
 msgstr ""
@@ -13987,5 +14325,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:170 build/trans_surveyor.java:80
+#: build/trans_presets.java:171 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "משני"
@@ -13995,5 +14333,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:174
+#: build/trans_presets.java:175
 msgid "Edit Secondary Road"
 msgstr ""
@@ -14001,5 +14339,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:190
+#: build/trans_presets.java:191
 msgid "Tertiary"
 msgstr ""
@@ -14009,5 +14347,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:194
+#: build/trans_presets.java:195
 msgid "Edit Tertiary Road"
 msgstr ""
@@ -14019,5 +14357,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:209 build/trans_surveyor.java:84
+#: build/trans_presets.java:210 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "לא מסווג"
@@ -14027,5 +14365,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:213
+#: build/trans_presets.java:214
 msgid "Edit Unclassified Road"
 msgstr "ערוך כביש לא מסווג"
@@ -14052,19 +14390,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:225 build/trans_presets.java:243
-#: build/trans_presets.java:261 build/trans_presets.java:281
-#: build/trans_presets.java:314 build/trans_presets.java:359
-#: build/trans_presets.java:375 build/trans_presets.java:389
-#: build/trans_presets.java:413 build/trans_presets.java:432
-#: build/trans_presets.java:453 build/trans_presets.java:473
-#: build/trans_presets.java:491 build/trans_presets.java:511
-#: build/trans_presets.java:532 build/trans_presets.java:553
-#: build/trans_presets.java:574 build/trans_presets.java:595
-#: build/trans_presets.java:616 build/trans_presets.java:637
-#: build/trans_presets.java:667 build/trans_presets.java:680
-#: build/trans_presets.java:693 build/trans_presets.java:706
-#: build/trans_presets.java:719 build/trans_presets.java:732
-#: build/trans_presets.java:745 build/trans_presets.java:1308
-#: build/trans_presets.java:1498 build/trans_presets.java:1540
+#: build/trans_presets.java:226 build/trans_presets.java:244
+#: build/trans_presets.java:262 build/trans_presets.java:282
+#: build/trans_presets.java:315 build/trans_presets.java:360
+#: build/trans_presets.java:376 build/trans_presets.java:390
+#: build/trans_presets.java:414 build/trans_presets.java:433
+#: build/trans_presets.java:454 build/trans_presets.java:474
+#: build/trans_presets.java:492 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:554
+#: build/trans_presets.java:575 build/trans_presets.java:596
+#: build/trans_presets.java:617 build/trans_presets.java:638
+#: build/trans_presets.java:668 build/trans_presets.java:681
+#: build/trans_presets.java:694 build/trans_presets.java:707
+#: build/trans_presets.java:720 build/trans_presets.java:733
+#: build/trans_presets.java:746 build/trans_presets.java:1311
+#: build/trans_presets.java:1501 build/trans_presets.java:1543
 msgid "Width (meters)"
 msgstr ""
@@ -14076,5 +14414,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:228 build/trans_surveyor.java:88
+#: build/trans_presets.java:229 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "מגורים"
@@ -14083,5 +14421,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:231
+#: build/trans_presets.java:232
 msgid "Edit Residential Street"
 msgstr "ערוך רחוב מגורים"
@@ -14106,14 +14444,14 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:611
-#: build/trans_presets.java:632 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "Surface"
 msgstr "שטח פנים"
@@ -14134,53 +14472,53 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paved"
 msgstr "סלול"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "unpaved"
 msgstr "לא סלול"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
 msgid "metal"
 msgstr ""
@@ -14194,22 +14532,22 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
-#: build/trans_style.java:3367
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
+#: build/trans_style.java:3375
 msgid "wood"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paving_stones"
 msgstr ""
@@ -14217,77 +14555,77 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "cobblestone"
 msgstr "אבני ריצוף"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "gravel"
 msgstr "חצץ"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "grass"
 msgstr "דשא"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "sand"
 msgstr "חול"
@@ -14295,13 +14633,13 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "ground"
 msgstr "אדמה"
@@ -14309,5 +14647,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:246
+#: build/trans_presets.java:247
 msgid "Living Street"
 msgstr ""
@@ -14316,5 +14654,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:249
+#: build/trans_presets.java:250
 msgid "Edit Living Street"
 msgstr ""
@@ -14322,5 +14660,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:264
+#: build/trans_presets.java:265
 msgid "Service"
 msgstr "שירות"
@@ -14329,5 +14667,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:267
+#: build/trans_presets.java:268
 msgid "Edit Serviceway"
 msgstr "ערוך דרך שירות"
@@ -14337,18 +14675,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "parking_aisle"
 msgstr ""
@@ -14356,5 +14694,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:284
+#: build/trans_presets.java:285
 msgid "Parking Aisle"
 msgstr "מפרץ חנייה"
@@ -14364,5 +14702,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:288
+#: build/trans_presets.java:289
 msgid "Edit Parking Aisle"
 msgstr "ערוך מפרץ חנייה"
@@ -14370,5 +14708,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:298
+#: build/trans_presets.java:299
 msgid "Road (Unknown Type)"
 msgstr "כביש (סוג לא ידוע)"
@@ -14377,5 +14715,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Edit Road of unknown type"
 msgstr "ערוך כביש מסוג לא ידוע"
@@ -14384,20 +14722,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:318
+#: build/trans_presets.java:319
 msgid "Road Restrictions"
 msgstr "הגבלות דרך"
 
 #. item
-#: build/trans_presets.java:319
+#: build/trans_presets.java:320
 msgid "Edit Road Restrictions"
 msgstr "ערוך הגבלות דרך"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:321
+#: build/trans_presets.java:322
 msgid "Toll"
 msgstr "אגרה"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:322
+#: build/trans_presets.java:323
 msgid "No exit (cul-de-sac)"
 msgstr "דרך ללא מוצא"
@@ -14410,8 +14748,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:323 build/trans_presets.java:529
-#: build/trans_presets.java:550 build/trans_presets.java:571
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:634
+#: build/trans_presets.java:324 build/trans_presets.java:530
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:593 build/trans_presets.java:614
+#: build/trans_presets.java:635
 msgid "Access"
 msgstr "גישה"
@@ -14465,29 +14803,29 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1397
-#: build/trans_presets.java:1398 build/trans_presets.java:1399
-#: build/trans_presets.java:1763 build/trans_presets.java:1773
-#: build/trans_presets.java:2397 build/trans_presets.java:2433
-#: build/trans_presets.java:2442 build/trans_presets.java:2443
-#: build/trans_presets.java:2444 build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:1396
+#: build/trans_presets.java:1397 build/trans_presets.java:1400
+#: build/trans_presets.java:1401 build/trans_presets.java:1402
+#: build/trans_presets.java:1767 build/trans_presets.java:1777
+#: build/trans_presets.java:2408 build/trans_presets.java:2444
+#: build/trans_presets.java:2453 build/trans_presets.java:2454
+#: build/trans_presets.java:2455 build/trans_presets.java:2725
 msgid "yes"
 msgstr "כן"
@@ -14500,40 +14838,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:212
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:212
 msgid "private"
 msgstr "פרטי"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655
 msgid "designated"
 msgstr ""
@@ -14546,19 +14884,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:219
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:219
 msgid "destination"
 msgstr "יעד"
@@ -14581,71 +14919,71 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:205
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:205
 msgid "permissive"
 msgstr ""
 
-#: build/trans_presets.java:323 build/trans_presets.java:327
-#: build/trans_presets.java:330 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636
+#: build/trans_presets.java:324 build/trans_presets.java:328
+#: build/trans_presets.java:331 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637
 msgid "agricultural"
 msgstr "חקלאי"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
-#: build/trans_presets.java:2433 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1396 build/trans_presets.java:1397
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
+#: build/trans_presets.java:2444 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
+#: build/trans_presets.java:2725
 msgid "no"
 msgstr "לא"
 
-#: build/trans_presets.java:326
+#: build/trans_presets.java:327
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:327
+#: build/trans_presets.java:328
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -14660,10 +14998,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:328 build/trans_presets.java:651
-#: build/trans_presets.java:858 build/trans_presets.java:891
-#: build/trans_presets.java:913 build/trans_presets.java:950
-#: build/trans_presets.java:963 build/trans_presets.java:975
-#: build/trans_presets.java:987 build/trans_presets.java:999
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:329 build/trans_presets.java:652
+#: build/trans_presets.java:859 build/trans_presets.java:892
+#: build/trans_presets.java:914 build/trans_presets.java:951
+#: build/trans_presets.java:964 build/trans_presets.java:976
+#: build/trans_presets.java:988 build/trans_presets.java:1000
+#: build/trans_presets.java:1040
 msgid "Horse"
 msgstr "סוס"
@@ -14679,13 +15017,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:329 build/trans_presets.java:530
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:635 build/trans_presets.java:859
-#: build/trans_presets.java:877 build/trans_presets.java:892
-#: build/trans_presets.java:914 build/trans_presets.java:951
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:330 build/trans_presets.java:531
+#: build/trans_presets.java:552 build/trans_presets.java:573
+#: build/trans_presets.java:594 build/trans_presets.java:615
+#: build/trans_presets.java:636 build/trans_presets.java:860
+#: build/trans_presets.java:878 build/trans_presets.java:893
+#: build/trans_presets.java:915 build/trans_presets.java:952
+#: build/trans_presets.java:965 build/trans_presets.java:977
+#: build/trans_presets.java:989 build/trans_presets.java:1001
+#: build/trans_presets.java:1041
 msgid "Motorcycle"
 msgstr "אופנוע"
@@ -14700,30 +15038,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:330 build/trans_presets.java:531
-#: build/trans_presets.java:552 build/trans_presets.java:573
-#: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:636 build/trans_presets.java:654
-#: build/trans_presets.java:878 build/trans_presets.java:893
-#: build/trans_presets.java:915 build/trans_presets.java:952
-#: build/trans_presets.java:965 build/trans_presets.java:977
-#: build/trans_presets.java:989 build/trans_presets.java:1001
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:331 build/trans_presets.java:532
+#: build/trans_presets.java:553 build/trans_presets.java:574
+#: build/trans_presets.java:595 build/trans_presets.java:616
+#: build/trans_presets.java:637 build/trans_presets.java:655
+#: build/trans_presets.java:879 build/trans_presets.java:894
+#: build/trans_presets.java:916 build/trans_presets.java:953
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1042
 msgid "Motorcar"
 msgstr ""
 
-#: build/trans_presets.java:331
+#: build/trans_presets.java:332
 msgid "Public Service Vehicles (psv)"
 msgstr "רכב ציבורי"
 
-#: build/trans_presets.java:332
+#: build/trans_presets.java:333
 msgid "Motorboat"
 msgstr "סירת מנוע"
 
-#: build/trans_presets.java:333
+#: build/trans_presets.java:334
 msgid "Boat"
 msgstr "סירה"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:336
 msgid "Min. speed (km/h)"
 msgstr "מהירות מינימלית (קמ\"ש)"
@@ -14731,25 +15069,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:336 build/trans_presets.java:374
+#: build/trans_presets.java:337 build/trans_presets.java:375
 msgid "Max. weight (tonnes)"
 msgstr "משקל מירבי (טונות)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:337
+#: build/trans_presets.java:338
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:339
+#: build/trans_presets.java:340
 msgid "Max. Length (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:341
+#: build/trans_presets.java:342
 msgid "Roundabout"
 msgstr "כיכר"
@@ -14760,5 +15098,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:346
+#: build/trans_presets.java:347
 msgid "Edit Junction"
 msgstr "ערוך צומת"
@@ -14780,9 +15118,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:349 build/trans_presets.java:648
-#: build/trans_presets.java:788 build/trans_presets.java:1135
-#: build/trans_presets.java:1392 build/trans_presets.java:2353
-#: build/trans_presets.java:2901 build/trans_presets.java:2911
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:350 build/trans_presets.java:649
+#: build/trans_presets.java:789 build/trans_presets.java:1137
+#: build/trans_presets.java:1395 build/trans_presets.java:2364
+#: build/trans_presets.java:2913 build/trans_presets.java:2923
+#: build/trans_presets.java:2932
 msgid "Type"
 msgstr "סוג"
@@ -14802,10 +15140,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:547
+#: build/trans_presets.java:350 build/trans_style.java:547
 #: build/trans_style.java:555
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "motorway_link"
 msgstr ""
@@ -14827,10 +15165,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:563
+#: build/trans_presets.java:350 build/trans_style.java:563
 #: build/trans_style.java:571
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "trunk_link"
 msgstr ""
@@ -14852,10 +15190,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:579
+#: build/trans_presets.java:350 build/trans_style.java:579
 #: build/trans_style.java:587
 msgid "primary"
 msgstr "ראשי"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "primary_link"
 msgstr ""
@@ -14877,5 +15215,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:595
+#: build/trans_presets.java:350 build/trans_style.java:595
 #: build/trans_style.java:603
 msgid "secondary"
@@ -14890,9 +15228,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:349 build/trans_style.java:611
+#: build/trans_presets.java:350 build/trans_style.java:611
 msgid "tertiary"
 msgstr "שלישוני"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "unclassified"
 msgstr ""
@@ -14906,9 +15244,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:349 build/trans_style.java:3143
+#: build/trans_presets.java:350 build/trans_style.java:3151
 msgid "residential"
 msgstr "מגורים"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "living_street"
 msgstr ""
@@ -14938,10 +15276,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:349 build/trans_style.java:667
-#: build/trans_style.java:4244
+#: build/trans_presets.java:350 build/trans_style.java:667
+#: build/trans_style.java:4252
 msgid "service"
 msgstr "שירות"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "bus_guideway"
 msgstr ""
@@ -14971,6 +15309,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:349 build/trans_style.java:877
-#: build/trans_style.java:3208 build/trans_style.java:3209
+#: build/trans_presets.java:350 build/trans_style.java:877
+#: build/trans_style.java:3216 build/trans_style.java:3217
 msgid "construction"
 msgstr "בנייה"
@@ -14981,10 +15319,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Edit Bridge"
 msgstr "ערוך גשר"
 
 #. item
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "Edit Tunnel"
 msgstr ""
@@ -14992,19 +15330,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:393
+#: build/trans_presets.java:394
 msgid "Ways"
 msgstr "דרכים"
 
 #. group "Ways"
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Construction"
 msgstr "בנייה"
 
 #. item
-#: build/trans_presets.java:395
+#: build/trans_presets.java:396
 msgid "Edit Highway Under Construction"
 msgstr "ערוך דרך מהירה בבנייה"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "Junction"
 msgstr "צומת"
@@ -15020,5 +15358,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:411 build/trans_style.java:895
+#: build/trans_presets.java:412 build/trans_style.java:895
 msgid "roundabout"
 msgstr "כיכר"
@@ -15027,5 +15365,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:417
+#: build/trans_presets.java:418
 msgid "Bridleway"
 msgstr ""
@@ -15033,5 +15371,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:419
+#: build/trans_presets.java:420
 msgid "Edit Bridleway"
 msgstr ""
@@ -15039,5 +15377,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:435
+#: build/trans_presets.java:436
 msgid "Cycleway"
 msgstr "שביל אופניים"
@@ -15047,10 +15385,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:439
+#: build/trans_presets.java:440
 msgid "Edit Cycleway"
 msgstr "ערוך שביל אופניים"
 
 #. item "Ways/Cycleway" check "Embankment"
-#: build/trans_presets.java:449
+#: build/trans_presets.java:450
 msgid "Pedestrians"
 msgstr ""
@@ -15058,5 +15396,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Footway"
 msgstr "שביל להולכי רגל"
@@ -15065,10 +15403,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Footway"
 msgstr "ערוך שביל להולכי רגל"
 
 #. item "Ways/Footway" check "Embankment"
-#: build/trans_presets.java:469
+#: build/trans_presets.java:470
 msgid "Bikes"
 msgstr ""
@@ -15076,5 +15414,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:476
+#: build/trans_presets.java:477
 msgid "Pedestrian"
 msgstr "הולכי רגל"
@@ -15083,5 +15421,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Edit Pedestrian Street"
 msgstr "ערוך רחוב להולכי רגל"
@@ -15089,5 +15427,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:494
+#: build/trans_presets.java:495
 msgid "Steps"
 msgstr "מדרגות"
@@ -15097,5 +15435,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:498
+#: build/trans_presets.java:499
 msgid "Edit Flight of Steps"
 msgstr "ערוך גרם מדרגות"
@@ -15104,5 +15442,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:515
+#: build/trans_presets.java:516
 msgid "Track"
 msgstr ""
@@ -15111,5 +15449,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:518
+#: build/trans_presets.java:519
 msgid "Edit Track"
 msgstr ""
@@ -15117,5 +15455,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:535
+#: build/trans_presets.java:536
 msgid "Track Grade 1"
 msgstr ""
@@ -15124,5 +15462,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:538
+#: build/trans_presets.java:539
 msgid "Edit Track of grade 1"
 msgstr ""
@@ -15130,5 +15468,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:556
+#: build/trans_presets.java:557
 msgid "Track Grade 2"
 msgstr ""
@@ -15137,5 +15475,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:559
+#: build/trans_presets.java:560
 msgid "Edit Track of grade 2"
 msgstr ""
@@ -15143,5 +15481,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:577
+#: build/trans_presets.java:578
 msgid "Track Grade 3"
 msgstr ""
@@ -15150,5 +15488,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:580
+#: build/trans_presets.java:581
 msgid "Edit Track of grade 3"
 msgstr ""
@@ -15156,5 +15494,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:598
+#: build/trans_presets.java:599
 msgid "Track Grade 4"
 msgstr ""
@@ -15163,5 +15501,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:601
+#: build/trans_presets.java:602
 msgid "Edit Track of grade 4"
 msgstr ""
@@ -15169,5 +15507,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:619
+#: build/trans_presets.java:620
 msgid "Track Grade 5"
 msgstr ""
@@ -15176,5 +15514,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:622
+#: build/trans_presets.java:623
 msgid "Edit Track of grade 5"
 msgstr ""
@@ -15183,5 +15521,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:641
+#: build/trans_presets.java:642
 msgid "Path"
 msgstr "נתיב"
@@ -15190,13 +15528,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:644
+#: build/trans_presets.java:645
 msgid "Edit Path"
 msgstr "ערוך נתיב"
 
-#: build/trans_presets.java:652
+#: build/trans_presets.java:653
 msgid "Ski"
 msgstr "סקי"
 
-#: build/trans_presets.java:653
+#: build/trans_presets.java:654
 msgid "Snowmobile"
 msgstr "רכב שלג"
@@ -15206,6 +15544,6 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:670 build/trans_presets.java:1725
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:671 build/trans_presets.java:1729
+#: build/trans_presets.java:1752
 msgid "Hiking"
 msgstr "צעידה"
@@ -15215,5 +15553,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:674
+#: build/trans_presets.java:675
 msgid "Edit Hiking"
 msgstr "ערוך צעידה"
@@ -15221,5 +15559,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:683
+#: build/trans_presets.java:684
 msgid "Mountain Hiking"
 msgstr "צעידה הררית"
@@ -15229,5 +15567,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:687
+#: build/trans_presets.java:688
 msgid "Edit Mountain Hiking"
 msgstr "ערוך צעידה הררית"
@@ -15235,5 +15573,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:696
+#: build/trans_presets.java:697
 msgid "Demanding Mountain Hiking"
 msgstr "צעידה הררית מאומצת"
@@ -15243,5 +15581,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:700
+#: build/trans_presets.java:701
 msgid "Edit Demanding Mountain Hiking"
 msgstr "ערוך צעידה הררית מאומצת"
@@ -15249,5 +15587,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:709
+#: build/trans_presets.java:710
 msgid "Alpine Hiking"
 msgstr "צעידה אלפינית"
@@ -15257,5 +15595,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:713
+#: build/trans_presets.java:714
 msgid "Edit Alpine Hiking"
 msgstr "ערוך צעידה אלפינית"
@@ -15263,5 +15601,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:723
 msgid "Demanding Alpine Hiking"
 msgstr "צעידה אלפינית מאומצת"
@@ -15271,5 +15609,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:726
+#: build/trans_presets.java:727
 msgid "Edit Demanding Alpine Hiking"
 msgstr "ערוך צעידה אלפינית מאומצת"
@@ -15277,5 +15615,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:735
+#: build/trans_presets.java:736
 msgid "Difficult Alpine Hiking"
 msgstr "צעידה אלפינית קשה"
@@ -15285,5 +15623,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:739
+#: build/trans_presets.java:740
 msgid "Edit Difficult Alpine Hiking"
 msgstr "ערוך צעידה אלפינית קשה"
@@ -15291,10 +15629,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:749
+#: build/trans_presets.java:750
 msgid "Waypoints"
 msgstr "ציון דרך"
 
 #. group "Waypoints"
-#: build/trans_presets.java:750
+#: build/trans_presets.java:751
 msgid "Motorway Junction"
 msgstr ""
@@ -15302,15 +15640,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:752
+#: build/trans_presets.java:753
 msgid "Edit Motorway Junction"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:757
 msgid "Number"
 msgstr "מספר"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:759
 msgid "Services"
 msgstr "שירותים"
@@ -15318,5 +15656,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:761
 msgid "Edit Service Station"
 msgstr "ערוך תחנת שירות"
@@ -15354,15 +15692,15 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:765 build/trans_presets.java:902
-#: build/trans_presets.java:1382 build/trans_presets.java:1406
-#: build/trans_presets.java:1413 build/trans_presets.java:1419
-#: build/trans_presets.java:1427 build/trans_presets.java:1434
-#: build/trans_presets.java:1761 build/trans_presets.java:1771
-#: build/trans_presets.java:2361 build/trans_presets.java:2368
-#: build/trans_presets.java:2384 build/trans_presets.java:2395
-#: build/trans_presets.java:2403 build/trans_presets.java:2410
-#: build/trans_presets.java:2464 build/trans_presets.java:2512
-#: build/trans_presets.java:2678 build/trans_presets.java:2693
-#: build/trans_presets.java:2732 build/trans_presets.java:3151
+#: build/trans_presets.java:766 build/trans_presets.java:903
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
+#: build/trans_presets.java:1416 build/trans_presets.java:1422
+#: build/trans_presets.java:1430 build/trans_presets.java:1437
+#: build/trans_presets.java:1765 build/trans_presets.java:1775
+#: build/trans_presets.java:2372 build/trans_presets.java:2379
+#: build/trans_presets.java:2395 build/trans_presets.java:2406
+#: build/trans_presets.java:2414 build/trans_presets.java:2421
+#: build/trans_presets.java:2475 build/trans_presets.java:2523
+#: build/trans_presets.java:2689 build/trans_presets.java:2704
+#: build/trans_presets.java:2743 build/trans_presets.java:3163
 msgid "Operator"
 msgstr "מפעיל"
@@ -15371,5 +15709,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:769
+#: build/trans_presets.java:770
 msgid "Traffic Signal"
 msgstr "רמזור"
@@ -15379,5 +15717,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:774
 msgid "Pedestrian crossing type"
 msgstr "סוג מעבר חציה"
@@ -15386,27 +15724,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "island"
 msgstr "אי"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:774 build/trans_presets.java:790
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:775 build/trans_presets.java:791
+#: build/trans_presets.java:1334
 msgid "Cross on horseback"
 msgstr ""
@@ -15414,6 +15752,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:775 build/trans_presets.java:789
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:776 build/trans_presets.java:790
+#: build/trans_presets.java:1335
 msgid "Cross by bicycle"
 msgstr ""
@@ -15422,11 +15760,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:776 build/trans_presets.java:791
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:1336
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:778
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -15434,30 +15772,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "zebra"
 msgstr "זברה"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pelican"
 msgstr "שקנאי"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:780
+#: build/trans_presets.java:781
 msgid "Stop"
 msgstr "עצור"
@@ -15465,5 +15803,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:783
+#: build/trans_presets.java:784
 msgid "Pedestrian Crossing"
 msgstr "מעבר חציה"
@@ -15472,14 +15810,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:786
+#: build/trans_presets.java:787
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:793
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:795
 msgid "Mini-roundabout"
 msgstr ""
@@ -15490,14 +15828,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:801
+#: build/trans_presets.java:802
 msgid "Turning Circle"
 msgstr ""
@@ -15507,20 +15845,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:806
+#: build/trans_presets.java:807
 msgid "City Limit"
 msgstr "תחום עיר"
 
 #. item
-#: build/trans_presets.java:807
+#: build/trans_presets.java:808
 msgid "Edit City Limit Sign"
 msgstr "ערוך שלט תחום עיר"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:812
+#: build/trans_presets.java:813
 msgid "Second Name"
 msgstr "שם שני"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:814
+#: build/trans_presets.java:815
 msgid "Speed Camera"
 msgstr "מצלמת מהירות"
@@ -15528,5 +15866,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:817
+#: build/trans_presets.java:818
 msgid "Emergency Phone"
 msgstr "טלפון חירום"
@@ -15534,5 +15872,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:820
+#: build/trans_presets.java:821
 msgid "Incline"
 msgstr ""
@@ -15540,5 +15878,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:823
+#: build/trans_presets.java:824
 msgid "Incline Steep"
 msgstr ""
@@ -15547,10 +15885,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:827
+#: build/trans_presets.java:828
 msgid "Ford"
 msgstr "אזור צליחה"
 
 #. item
-#: build/trans_presets.java:828
+#: build/trans_presets.java:829
 msgid "Edit Ford"
 msgstr "ערוך אזור צליחה"
@@ -15558,5 +15896,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:835
+#: build/trans_presets.java:836
 msgid "Mountain Pass"
 msgstr "מעבר הרים"
@@ -15564,5 +15902,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:837
+#: build/trans_presets.java:838
 msgid "Edit Mountain Pass"
 msgstr "ערוך מעבר הרים"
@@ -15574,7 +15912,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:842 build/trans_presets.java:1600
-#: build/trans_presets.java:1745 build/trans_presets.java:2845
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:843 build/trans_presets.java:1604
+#: build/trans_presets.java:1749 build/trans_presets.java:2857
+#: build/trans_presets.java:2864 build/trans_presets.java:2871
 msgid "Elevation"
 msgstr "הגבהה"
@@ -15582,5 +15920,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:846
+#: build/trans_presets.java:847
 msgid "Barriers"
 msgstr "מחסומים"
@@ -15588,5 +15926,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:849
+#: build/trans_presets.java:850
 msgid "Bollard"
 msgstr ""
@@ -15594,5 +15932,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:852
 msgid "Edit Bollard"
 msgstr ""
@@ -15637,16 +15975,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:854 build/trans_presets.java:873
-#: build/trans_presets.java:887 build/trans_presets.java:909
-#: build/trans_presets.java:946 build/trans_presets.java:959
-#: build/trans_presets.java:971 build/trans_presets.java:983
-#: build/trans_presets.java:995 build/trans_presets.java:1007
-#: build/trans_presets.java:1017 build/trans_presets.java:1026
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:855 build/trans_presets.java:874
+#: build/trans_presets.java:888 build/trans_presets.java:910
+#: build/trans_presets.java:947 build/trans_presets.java:960
+#: build/trans_presets.java:972 build/trans_presets.java:984
+#: build/trans_presets.java:996 build/trans_presets.java:1008
+#: build/trans_presets.java:1018 build/trans_presets.java:1027
+#: build/trans_presets.java:1036
 msgid "Allowed traffic:"
 msgstr "תנועה מותרת:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:861
+#: build/trans_presets.java:862
 msgid "Cycle Barrier"
 msgstr ""
@@ -15655,5 +15993,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:865
+#: build/trans_presets.java:866
 msgid "Block"
 msgstr "מחסום"
@@ -15661,5 +15999,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:868
+#: build/trans_presets.java:869
 msgid "Cattle Grid"
 msgstr ""
@@ -15667,10 +16005,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:870
+#: build/trans_presets.java:871
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:880
+#: build/trans_presets.java:881
 msgid "Bus Trap"
 msgstr ""
@@ -15678,15 +16016,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:883
+#: build/trans_presets.java:884
 msgid "Spikes"
 msgstr "דוקרנים"
 
 #. item
-#: build/trans_presets.java:884
+#: build/trans_presets.java:885
 msgid "Edit Spikes"
 msgstr "ערוך דוקרנים"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:896
 msgid "Toll Booth"
 msgstr "תא אגרה"
@@ -15694,5 +16032,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:897
+#: build/trans_presets.java:898
 msgid "Edit Toll Booth"
 msgstr "ערוך תא אגרה"
@@ -15700,10 +16038,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:905
+#: build/trans_presets.java:906
 msgid "Border Control"
 msgstr "ביקורת גבולות"
 
 #. item
-#: build/trans_presets.java:906
+#: build/trans_presets.java:907
 msgid "Edit Border Control"
 msgstr "ערוך ביקורת גבולות"
@@ -15713,5 +16051,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:920
+#: build/trans_presets.java:921
 msgid "Hedge"
 msgstr ""
@@ -15720,5 +16058,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:925
 msgid "Fence"
 msgstr ""
@@ -15727,5 +16065,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:929
 msgid "Wall"
 msgstr "חומה"
@@ -15733,5 +16071,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:931
+#: build/trans_presets.java:932
 msgid "City Wall"
 msgstr "חומת עיר"
@@ -15740,5 +16078,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:935
+#: build/trans_presets.java:936
 msgid "Retaining Wall"
 msgstr ""
@@ -15750,15 +16088,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:942
+#: build/trans_presets.java:943
 msgid "Entrance"
 msgstr "כניסה"
 
 #. item
-#: build/trans_presets.java:943
+#: build/trans_presets.java:944
 msgid "Edit Entrance"
 msgstr "ערוך כניסה"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:954
+#: build/trans_presets.java:955
 msgid "Gate"
 msgstr "שער"
@@ -15766,50 +16104,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:956
+#: build/trans_presets.java:957
 msgid "Edit Gate"
 msgstr "ערוך שער"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:967
+#: build/trans_presets.java:968
 msgid "Lift Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:968
+#: build/trans_presets.java:969
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:979
+#: build/trans_presets.java:980
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:980
+#: build/trans_presets.java:981
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:991
+#: build/trans_presets.java:992
 msgid "Bump Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:992
+#: build/trans_presets.java:993
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:1003
+#: build/trans_presets.java:1004
 msgid "Kissing Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1004
+#: build/trans_presets.java:1005
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1013
 msgid "Stile"
 msgstr ""
@@ -15817,25 +16155,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1014
+#: build/trans_presets.java:1015
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1023
 msgid "Turnstile"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1024
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1032
 msgid "Sally Port"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1033
 msgid "Edit Sally Port"
 msgstr ""
@@ -15843,13 +16181,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #.
-#. <separator/>
+#. group "Water"
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1046 build/trans_presets.java:1089
+#: build/trans_presets.java:1047 build/trans_presets.java:1048
+#: build/trans_presets.java:1091
 msgid "Water"
 msgstr "מים"
 
 #. group "Water"
-#: build/trans_presets.java:1047
+#: build/trans_presets.java:1049
 msgid "Spring"
 msgstr "מעיין"
@@ -15857,5 +16196,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1049
+#: build/trans_presets.java:1051
 msgid "Edit Spring"
 msgstr "ערוך מעיין"
@@ -15863,5 +16202,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1056
 msgid "Drain"
 msgstr ""
@@ -15869,10 +16208,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1058
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1064
 msgid "Stream"
 msgstr "נחל"
@@ -15880,10 +16219,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1066
 msgid "Edit Stream"
 msgstr "ערוך נחל"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1072
 msgid "Canal"
 msgstr "תעלה"
@@ -15891,10 +16230,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1074
 msgid "Edit Canal"
 msgstr "ערוך תעלה"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1080
 msgid "River"
 msgstr "נהר"
@@ -15904,5 +16243,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1084
 msgid "Edit River"
 msgstr "ערוך נהר"
@@ -15910,15 +16249,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1093
 msgid "Edit Water"
 msgstr "ערוך מים"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1097
 msgid "Land"
 msgstr "אדמה"
 
 #. item
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1098
 msgid "Edit Land"
 msgstr "ערוך אדמה"
@@ -15926,15 +16265,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1103
 msgid "Basin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1104
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1109
 msgid "Reservoir"
 msgstr ""
@@ -15942,15 +16281,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1109
+#: build/trans_presets.java:1111
 msgid "Edit Reservoir Landuse"
 msgstr ""
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1116
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1117
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -15958,5 +16297,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1120
+#: build/trans_presets.java:1122
 msgid "Riverbank"
 msgstr "גדת נחל"
@@ -15965,10 +16304,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1125
 msgid "Edit Riverbank"
 msgstr "ערוך גדת נחל"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1127
+#: build/trans_presets.java:1129
 msgid "Wetland"
 msgstr ""
@@ -15979,14 +16318,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1134
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "swamp"
 msgstr "ביצה"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "bog"
 msgstr "אדמה בוצית"
@@ -16000,35 +16339,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1135 build/trans_style.java:3384
+#: build/trans_presets.java:1137 build/trans_style.java:3392
 msgid "marsh"
 msgstr "ביצה"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "reedbed"
 msgstr "מצע קנה-סוף"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "saltmarsh"
 msgstr "ביצה מלוחה"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "mangrove"
 msgstr "מנגרוב"
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1139
 msgid "Mud"
 msgstr "בוץ"
 
 #. item
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1140
 msgid "Edit Mud"
 msgstr "ערוך בוץ"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1144
 msgid "Beach"
 msgstr "חוף"
@@ -16036,20 +16375,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1144
+#: build/trans_presets.java:1146
 msgid "Edit Beach"
 msgstr "ערוך חוף"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1150
 msgid "Bay"
 msgstr "מפרץ"
 
 #. item
-#: build/trans_presets.java:1149
+#: build/trans_presets.java:1151
 msgid "Edit Bay"
 msgstr "ערוך מפרץ"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1155
 msgid "Cliff"
 msgstr "צוק"
@@ -16057,10 +16396,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1157
 msgid "Edit Cliff"
 msgstr "ערוך צוק"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1159
+#: build/trans_presets.java:1161
 msgid "Coastline"
 msgstr "קו חוף"
@@ -16068,5 +16407,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1163
 msgid "Edit Coastline"
 msgstr "ערוך קו חוף"
@@ -16074,5 +16413,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1168
 msgid "Ferry Route"
 msgstr "נתיב מעבורת"
@@ -16080,5 +16419,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1170
 msgid "Edit Ferry"
 msgstr "ערוך מעבורת"
@@ -16087,5 +16426,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1176
+#: build/trans_presets.java:1178
 msgid "Boatyard"
 msgstr "מספנה"
@@ -16093,10 +16432,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:1180
 msgid "Edit Boatyard"
 msgstr "ערוך מספנה"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1185
 msgid "Dock"
 msgstr ""
@@ -16104,5 +16443,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1187
 msgid "Edit Dock"
 msgstr ""
@@ -16110,5 +16449,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1193
 msgid "Dam"
 msgstr ""
@@ -16116,15 +16455,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1195
 msgid "Edit Dam"
 msgstr ""
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1199
+#: build/trans_presets.java:1201
 msgid "Waterway Point"
 msgstr ""
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1202
 msgid "Lock Gate"
 msgstr ""
@@ -16133,5 +16472,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1206
 msgid "Weir"
 msgstr ""
@@ -16139,20 +16478,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1208
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1213
 msgid "Waterfall"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1214
 msgid "Edit Waterfall"
 msgstr ""
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1219
 msgid "Turning Point"
 msgstr ""
@@ -16161,15 +16500,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1221
+#: build/trans_presets.java:1223
 msgid "Marina"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1224
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1228
 msgid "Pier"
 msgstr ""
@@ -16177,10 +16516,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1230
 msgid "Edit Pier"
 msgstr ""
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1234
 msgid "Ferry Terminal"
 msgstr ""
@@ -16188,10 +16527,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1236
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1240
 msgid "Slipway"
 msgstr ""
@@ -16201,16 +16540,21 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1244
 msgid "Edit Slipway"
 msgstr ""
 
 #. item "Waterway Point/Slipway" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1250
+#, fuzzy
+msgid "Transport"
+msgstr "תחבורה ציבורית"
+
+#. group "Transport"
+#: build/trans_presets.java:1251
 msgid "Railway"
 msgstr ""
 
 #. group "Railway"
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1252
 msgid "Rail"
 msgstr ""
@@ -16218,5 +16562,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:1254
 msgid "Edit Rail"
 msgstr ""
@@ -16246,8 +16590,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "Optional Types"
 msgstr ""
@@ -16261,35 +16605,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1259
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1257
+#: build/trans_presets.java:1260
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1265
 msgid "Monorail"
 msgstr ""
@@ -16297,45 +16641,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1267
 msgid "Edit Monorail"
 msgstr ""
 
-#: build/trans_presets.java:1269
+#: build/trans_presets.java:1272
 msgid "Preserved"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1273
 msgid "Edit Preserved Railway"
 msgstr ""
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1278
 msgid "Light Rail"
 msgstr "רכבת קלה"
 
 #. item
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1279
 msgid "Edit Light Rail"
 msgstr "ערוך רכבת קלה"
 
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1284
 msgid "Subway"
 msgstr "רכבת תחתית"
 
 #. item
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1285
 msgid "Edit Subway"
 msgstr "ערוך רכבת תחתית"
 
-#: build/trans_presets.java:1287
+#: build/trans_presets.java:1290
 msgid "Tram"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1291
 msgid "Edit Tram"
 msgstr ""
 
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1296
 msgid "Bus Guideway"
 msgstr ""
@@ -16343,5 +16687,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1295
+#: build/trans_presets.java:1298
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -16350,14 +16694,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1315
 msgid "Disused Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1313
+#: build/trans_presets.java:1316
 msgid "Edit Disused Railway"
 msgstr ""
 
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1321
 msgid "Abandoned Rail"
 msgstr ""
@@ -16366,5 +16710,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1325
 msgid "Level Crossing"
 msgstr ""
@@ -16373,5 +16717,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1329
 msgid "Crossing"
 msgstr ""
@@ -16381,5 +16725,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1333
 msgid "Crossing type"
 msgstr ""
@@ -16387,5 +16731,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1339
 msgid "Turntable"
 msgstr ""
@@ -16394,10 +16738,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1344
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1345
 msgid "Chair Lift"
 msgstr ""
@@ -16405,10 +16749,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1347
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1351
 msgid "Drag Lift"
 msgstr ""
@@ -16416,10 +16760,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1353
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1357
 msgid "Cable Car"
 msgstr ""
@@ -16427,10 +16771,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1359
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1360
+#: build/trans_presets.java:1363
 msgid "Gondola"
 msgstr ""
@@ -16438,5 +16782,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1365
 msgid "Edit Gondola"
 msgstr ""
@@ -16444,5 +16788,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1366 build/trans_presets.java:1461
+#: build/trans_presets.java:1369 build/trans_presets.java:1464
 msgid "Station"
 msgstr "תחנה"
@@ -16453,10 +16797,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1368 build/trans_presets.java:1464
+#: build/trans_presets.java:1371 build/trans_presets.java:1467
 msgid "Edit Station"
 msgstr "ערוך תחנה"
 
 #. group "Car"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1378
 msgid "Fuel"
 msgstr "דלק"
@@ -16466,5 +16810,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1382
 msgid "Edit Fuel"
 msgstr "ערוך דלק"
@@ -16522,32 +16866,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1671 build/trans_presets.java:1678
-#: build/trans_presets.java:1686 build/trans_presets.java:1699
-#: build/trans_presets.java:1713 build/trans_presets.java:1810
-#: build/trans_presets.java:1818 build/trans_presets.java:1909
-#: build/trans_presets.java:1915 build/trans_presets.java:2226
-#: build/trans_presets.java:2250 build/trans_presets.java:2465
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1703
+#: build/trans_presets.java:1717 build/trans_presets.java:1814
+#: build/trans_presets.java:1822 build/trans_presets.java:1919
+#: build/trans_presets.java:1925 build/trans_presets.java:2237
+#: build/trans_presets.java:2261 build/trans_presets.java:2476
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Opening Hours"
 msgstr "שעות פתיחה"
@@ -16606,91 +16950,91 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -16705,5 +17049,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1385 build/trans_presets.java:1438
+#: build/trans_presets.java:1388 build/trans_presets.java:1441
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -16713,5 +17057,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1391
 msgid "Edit Parking"
 msgstr ""
@@ -16722,24 +17066,24 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1391 build/trans_presets.java:1762
-#: build/trans_presets.java:1772 build/trans_presets.java:2396
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:1394 build/trans_presets.java:1766
+#: build/trans_presets.java:1776 build/trans_presets.java:2407
+#: build/trans_presets.java:2524
 msgid "Reference number"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "surface"
 msgstr ""
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1396
 msgid "Park and Ride"
 msgstr ""
@@ -16748,38 +17092,38 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1394 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
+#: build/trans_presets.java:1397 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
 msgid "Fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1396
+#: build/trans_presets.java:1399
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1400
 msgid "Spaces for Disabled"
 msgstr ""
 
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1401
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1402
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1403
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1405
 msgid "Wash"
 msgstr "שטיפה"
 
 #. item
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1406
 msgid "Edit Car Wash"
 msgstr "ערוך שטיפת רכב"
@@ -16787,5 +17131,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1408 build/trans_presets.java:1452
+#: build/trans_presets.java:1411 build/trans_presets.java:1455
 msgid "Shop"
 msgstr "חנות"
@@ -16793,15 +17137,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1413
 msgid "Edit Car Shop"
 msgstr "ערוך חנות רכב"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1418
 msgid "Repair"
 msgstr "תיקונים"
 
 #. item
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1419
 msgid "Edit Car Repair"
 msgstr "ערוך תיקוני רכבים"
@@ -16809,5 +17153,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1421 build/trans_presets.java:1445
+#: build/trans_presets.java:1424 build/trans_presets.java:1448
 msgid "Rental"
 msgstr "השכרה"
@@ -16816,10 +17160,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1427
 msgid "Edit Car Rental"
 msgstr "ערוך השכרת רכב"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1432
 msgid "Sharing"
 msgstr "שיתוף"
@@ -16827,5 +17171,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1434
 msgid "Edit Car Sharing"
 msgstr "ערוך שיתוף רכבים"
@@ -16833,10 +17177,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Parking"
 msgstr ""
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1446
 msgid "Capacity"
 msgstr ""
@@ -16845,5 +17189,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1448
+#: build/trans_presets.java:1451
 msgid "Edit Bicycle Rental"
 msgstr "ערוך השכרת אופניים"
@@ -16852,15 +17196,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1458
 msgid "Edit Bicycle Shop"
 msgstr "ערוך חנות אופניים"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1463
 msgid "Public Transport"
 msgstr "תחבורה ציבורית"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:1472
 msgid "UIC-Reference"
 msgstr ""
@@ -16868,5 +17212,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1475
 msgid "Railway Halt"
 msgstr ""
@@ -16874,5 +17218,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1477
 msgid "Edit Halt"
 msgstr ""
@@ -16880,5 +17224,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1484
 msgid "Tram Stop"
 msgstr ""
@@ -16887,5 +17231,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1484
+#: build/trans_presets.java:1487
 msgid "Edit Tram Stop"
 msgstr ""
@@ -16893,5 +17237,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1494
 msgid "Railway Platform"
 msgstr ""
@@ -16900,5 +17244,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1497
 msgid "Edit Railway Platform"
 msgstr ""
@@ -16910,5 +17254,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1497 build/trans_presets.java:1539
+#: build/trans_presets.java:1500 build/trans_presets.java:1542
 msgid "Reference (track number)"
 msgstr ""
@@ -16916,10 +17260,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1499 build/trans_presets.java:1541
+#: build/trans_presets.java:1502 build/trans_presets.java:1544
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1504
 msgid "Subway Entrance"
 msgstr "כניסת רכבת תחתית"
@@ -16928,10 +17272,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1507
 msgid "Edit Subway Entrance"
 msgstr "ערוך כניסת רכבת תחתית"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1512
 msgid "Wheelchair"
 msgstr ""
@@ -16940,5 +17284,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1517
 msgid "Bus Station"
 msgstr "תחנת אוטובוס"
@@ -16947,5 +17291,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1520
 msgid "Edit Bus Station"
 msgstr "ערוך תחנת אוטובוס"
@@ -16953,5 +17297,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1526
 msgid "Bus Stop"
 msgstr ""
@@ -16961,5 +17305,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1530
 msgid "Edit Bus Stop"
 msgstr ""
@@ -16968,6 +17312,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1532 build/trans_presets.java:1785
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:1535 build/trans_presets.java:1789
+#: build/trans_presets.java:2453
 msgid "Shelter"
 msgstr "מקלט"
@@ -16975,10 +17319,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1538
 msgid "Bus Platform"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1539
 msgid "Edit Bus Platform"
 msgstr ""
@@ -16986,5 +17330,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1547
 msgid "Taxi"
 msgstr "מונית"
@@ -16992,5 +17336,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1549
 msgid "Edit Taxi station"
 msgstr "ערוך תחנת מוניות"
@@ -16998,5 +17342,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1554
 msgid "Airport"
 msgstr "שדה תעופה"
@@ -17004,15 +17348,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1556
 msgid "Edit Airport"
 msgstr "ערוך שדה תעופה"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1561
 msgid "IATA"
 msgstr ""
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1559
+#: build/trans_presets.java:1562
 msgid "ICAO"
 msgstr ""
@@ -17020,6 +17364,11 @@
 #. item "Public Transport/Airport" text "ICAO"
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1567
+#, fuzzy
+msgid "Travel"
+msgstr "חצץ"
+
+#. group "Travel"
+#: build/trans_presets.java:1568
 msgid "Accomodation"
 msgstr "לינה"
@@ -17031,5 +17380,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1565 build/trans_surveyor.java:43
+#: build/trans_presets.java:1569 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "מלון"
@@ -17038,15 +17387,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:1568
+#: build/trans_presets.java:1572
 msgid "Edit Hotel"
 msgstr ""
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1575
 msgid "Stars"
 msgstr ""
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1577
 msgid "Motel"
 msgstr ""
@@ -17054,20 +17403,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1579
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1583
 msgid "Guest House"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1584
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1588
 msgid "Chalet"
 msgstr ""
@@ -17075,10 +17424,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1590
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1594
 msgid "Hostel"
 msgstr ""
@@ -17086,30 +17435,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1592
+#: build/trans_presets.java:1596
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1600
 msgid "Alpine Hut"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1601
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1606
 msgid "Caravan Site"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1607
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1611
 msgid "Camping Site"
 msgstr ""
@@ -17117,10 +17466,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1613
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1618
 msgid "Food+Drinks"
 msgstr "מזון ושתיה"
@@ -17131,5 +17480,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1615 build/trans_surveyor.java:47
+#: build/trans_presets.java:1619 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "מסעדה"
@@ -17137,5 +17486,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1621
 msgid "Edit Restaurant"
 msgstr ""
@@ -17143,5 +17492,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "Cuisine"
 msgstr ""
@@ -17149,61 +17498,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "kebab"
 msgstr "קבב"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "turkish"
 msgstr "תורכי"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "asian"
 msgstr "אסייתי"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "thai"
 msgstr "תאילנדי"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "mexican"
 msgstr "מקסיקני"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "japanese"
 msgstr "יפני"
 
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1627
 msgid "Fast Food"
 msgstr "מזון מהיר"
@@ -17211,9 +17560,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1629
 msgid "Edit Fast Food Restaurant"
 msgstr "ערוך מסעדת מזון מהיר"
 
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1635
 msgid "Cafe"
 msgstr "בית קפה"
@@ -17221,9 +17570,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1633
+#: build/trans_presets.java:1637
 msgid "Edit Cafe"
 msgstr "ערוך בית קפה"
 
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1642
 msgid "Pub"
 msgstr "פאב"
@@ -17231,18 +17580,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1644
 msgid "Edit Pub"
 msgstr "ערוך פאב"
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1649
 msgid "Biergarten"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1646
+#: build/trans_presets.java:1650
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1655
 msgid "Bar"
 msgstr "בר"
@@ -17250,9 +17599,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1657
 msgid "Edit Bar"
 msgstr "ערוך בר"
 
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1662
 msgid "Nightclub"
 msgstr "מועדון לילה"
@@ -17260,24 +17609,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1664
 msgid "Edit Nightclub"
 msgstr "ערוך מועדון לילה"
 
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1670
 msgid "Tourism"
 msgstr "תיירות"
 
 #. group "Tourism"
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1671
 msgid "Attraction"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1672
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1677
 msgid "Museum"
 msgstr "מוזיאון"
@@ -17285,9 +17634,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1679
 msgid "Edit Museum"
 msgstr "ערוך מוזיאון"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1684
 msgid "Zoo"
 msgstr "גן חיות"
@@ -17296,9 +17645,9 @@
 #. <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:1683
+#: build/trans_presets.java:1687
 msgid "Edit Zoo"
 msgstr "ערוך גן חיות"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1692
 msgid "Viewpoint"
 msgstr "נקודת תצפית"
@@ -17306,24 +17655,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1694
 msgid "Edit Viewpoint"
 msgstr "ערוך נקודת תצפית"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1697
 msgid "Look-Out Tower"
 msgstr "מגדל תצפית"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1699
 msgid "Theme Park"
 msgstr "פארק שעשועים"
 
 #. item
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1700
 msgid "Edit Theme Park"
 msgstr "ערוך פארק שעשועים"
 
-#: build/trans_presets.java:1701
+#: build/trans_presets.java:1705
 msgid "Artwork"
 msgstr "יצירת אומנות"
@@ -17331,5 +17680,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1707
 msgid "Edit Artwork"
 msgstr "ערוך יצירת אומנות"
@@ -17337,19 +17686,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1712
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1719
 msgid "Map"
 msgstr "מפה"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "topo"
 msgstr ""
@@ -17387,5 +17736,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1720 build/trans_style.java:619
+#: build/trans_presets.java:1724 build/trans_style.java:619
 #: build/trans_style.java:635 build/trans_style.java:651
 #: build/trans_style.java:659
@@ -17393,28 +17742,28 @@
 msgstr "רחוב"
 
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1722 build/trans_presets.java:1738
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1726 build/trans_presets.java:1742
+#: build/trans_presets.java:1786
 msgid "Closer Description"
 msgstr ""
@@ -17424,5 +17773,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1724 build/trans_presets.java:1747
+#: build/trans_presets.java:1728 build/trans_presets.java:1751
 msgid "Routes shown for:"
 msgstr ""
@@ -17430,6 +17779,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1726 build/trans_presets.java:1749
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1965
 msgid "Cycling"
 msgstr "רכיבה"
@@ -17437,5 +17786,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1727 build/trans_presets.java:1750
+#: build/trans_presets.java:1731 build/trans_presets.java:1754
 msgid "Mountainbiking"
 msgstr ""
@@ -17443,6 +17792,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1728 build/trans_presets.java:1751
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:1732 build/trans_presets.java:1755
+#: build/trans_presets.java:2019
 msgid "Skiing"
 msgstr "סקי"
@@ -17450,5 +17799,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1729 build/trans_presets.java:1752
+#: build/trans_presets.java:1733 build/trans_presets.java:1756
 msgid "Riding"
 msgstr ""
@@ -17456,46 +17805,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1734 build/trans_presets.java:1757
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1736
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "history"
 msgstr "היסטוריה"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "nature"
 msgstr "טבע"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1744
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1759
 msgid "Information Terminal"
 msgstr ""
@@ -17503,29 +17852,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1760 build/trans_presets.java:1770
+#: build/trans_presets.java:1764 build/trans_presets.java:1774
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1769
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1779
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1780
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1778
+#: build/trans_presets.java:1782
 msgid "Other Information Points"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1790
 msgid "Edit Shelter"
 msgstr "ערוך מקלט"
@@ -17533,25 +17882,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1789 build/trans_presets.java:1795
+#: build/trans_presets.java:1793 build/trans_presets.java:1799
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1791
+#: build/trans_presets.java:1795
 msgid "Picnic Site"
 msgstr "אתר פיקניק"
 
 #. item
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1796
 msgid "Edit Picnic Site"
 msgstr "ערוך אתר פיקניק"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1802
 msgid "Historic Places"
 msgstr "מקומות היסטורים"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1799
+#: build/trans_presets.java:1803
 msgid "Castle"
 msgstr "טירה"
@@ -17560,19 +17909,19 @@
 #. <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:1802
+#: build/trans_presets.java:1806
 msgid "Edit Castle"
 msgstr "ערוך טירה"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1810
 msgid "Ruins"
 msgstr "חורבות"
 
 #. item
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1811
 msgid "Edit Ruins"
 msgstr "ערוך חורבות"
 
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1816
 msgid "Archaeological Site"
 msgstr "אתר ארכיאולוגי"
@@ -17581,9 +17930,9 @@
 #. <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:1815
+#: build/trans_presets.java:1819
 msgid "Edit Archaeological Site"
 msgstr "ערוך אתר ארכיאולוגי"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1824
 msgid "Battlefield"
 msgstr "שדה קרב"
@@ -17591,5 +17940,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1826
 msgid "Edit Battlefield"
 msgstr "ערוך שדה קרב"
@@ -17597,15 +17946,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1831
 msgid "Monument"
 msgstr "אנדרטה"
 
 #. item
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1832
 msgid "Edit Monument"
 msgstr "ערוך אנדרטה"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1836
 msgid "Memorial"
 msgstr "מצבת זיכרון"
@@ -17613,45 +17962,57 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1838
 msgid "Edit Memorial"
 msgstr "ערוך מצבת זיכרון"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1842
 msgid "Wayside Cross"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1843
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1847
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1848
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1852
+#, fuzzy
+msgid "Boundary Stone"
+msgstr "גבולות"
+
+#. item
+#: build/trans_presets.java:1853
+#, fuzzy
+msgid "Edit Boundary Stone"
+msgstr "ערוך תחנת אוטובוס"
+
+#. item "Historic Places/Boundary Stone" text "Name"
+#: build/trans_presets.java:1858
 msgid "Leisure"
 msgstr "פנאי"
 
 #. group "Leisure"
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1859
 msgid "Water Park"
 msgstr "פארק מים"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1860
 msgid "Edit Water Park"
 msgstr "ערוך פארק מים"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1864
 msgid "Playground"
 msgstr "מגרש משחקים"
@@ -17659,31 +18020,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1866
 msgid "Edit Playground"
 msgstr "ערוך מגרש משחקים"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1870
 msgid "Fishing"
 msgstr "דייג"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1871
 msgid "Edit Fishing"
 msgstr "ערוך דייג"
 
 #. item "Leisure/Fishing" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1877 build/trans_presets.java:2669
+msgid "Sports"
+msgstr ""
+
+#. group "Sports"
+#: build/trans_presets.java:1878
 msgid "Sport Facilities"
 msgstr "מתקני ספורט"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1879
 msgid "Stadium"
 msgstr "איצטדיון"
 
 #. item
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1880
 msgid "Edit Stadium"
 msgstr "ערוך איצטדיון"
@@ -17697,6 +18062,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1874 build/trans_presets.java:1883
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1902 build/trans_presets.java:1911
 msgid "select sport:"
 msgstr "בחר ענף ספורט:"
@@ -18088,30 +18453,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884 build/trans_style.java:3892
-#: build/trans_style.java:3900 build/trans_style.java:3908
-#: build/trans_style.java:3916 build/trans_style.java:3924
-#: build/trans_style.java:3932
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_style.java:3572 build/trans_style.java:3580
+#: build/trans_style.java:3588 build/trans_style.java:3596
+#: build/trans_style.java:3604 build/trans_style.java:3612
+#: build/trans_style.java:3620 build/trans_style.java:3628
+#: build/trans_style.java:3636 build/trans_style.java:3644
+#: build/trans_style.java:3652 build/trans_style.java:3660
+#: build/trans_style.java:3668 build/trans_style.java:3676
+#: build/trans_style.java:3684 build/trans_style.java:3692
+#: build/trans_style.java:3700 build/trans_style.java:3708
+#: build/trans_style.java:3716 build/trans_style.java:3724
+#: build/trans_style.java:3732 build/trans_style.java:3740
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3764 build/trans_style.java:3772
+#: build/trans_style.java:3780 build/trans_style.java:3788
+#: build/trans_style.java:3796 build/trans_style.java:3804
+#: build/trans_style.java:3812 build/trans_style.java:3820
+#: build/trans_style.java:3828 build/trans_style.java:3836
+#: build/trans_style.java:3844 build/trans_style.java:3852
+#: build/trans_style.java:3860 build/trans_style.java:3868
+#: build/trans_style.java:3876 build/trans_style.java:3884
+#: build/trans_style.java:3892 build/trans_style.java:3900
+#: build/trans_style.java:3908 build/trans_style.java:3916
+#: build/trans_style.java:3924 build/trans_style.java:3932
+#: build/trans_style.java:3940
 msgid "sport"
 msgstr "ספורט"
@@ -18121,225 +18486,225 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "archery"
 msgstr "קשתות"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "athletics"
 msgstr "אתלטיקה"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "australian_football"
 msgstr "כדורגל אוסטרלי"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "baseball"
 msgstr "כדור בסיס"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "basketball"
 msgstr "כדורסל"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "bowls"
 msgstr "כדורת דשא"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "canoe"
 msgstr "קנו"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "climbing"
 msgstr "טיפוס"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket"
 msgstr "קריקט"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "dog_racing"
 msgstr "מירוץ כלבים"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "football"
 msgstr "כדורגל אמריקאי"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "golf"
 msgstr "גולף"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "gymnastics"
 msgstr "התעמלות"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "hockey"
 msgstr "הוקי"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "horse_racing"
 msgstr "מירוץ סוסים"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "rugby"
 msgstr "רוגבי"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skateboard"
 msgstr "סקייטבורד"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skating"
 msgstr "סקייטים"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skiing"
 msgstr "סקי"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "soccer"
 msgstr "כדורגל"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "swimming"
 msgstr "שחייה"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "table_tennis"
 msgstr "טניס שולחן"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "tennis"
 msgstr "טניס"
 
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1888
 msgid "Sports Centre"
 msgstr "מרכז ספורט"
 
 #. item
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1889
 msgid "Edit Sports Centre"
 msgstr "ערוך מרכז ספורט"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1897
 msgid "Pitch"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1898
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1906
 msgid "Racetrack"
 msgstr "מסלול מירוצים"
 
 #. item
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1907
 msgid "Edit Racetrack"
 msgstr "ערוך מסלול מירוצים"
 
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1915
 msgid "Golf Course"
 msgstr "מגרש גולף"
 
 #. item
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1916
 msgid "Edit Golf Course"
 msgstr "ערוך מגרש גולף"
 
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1921
 msgid "Miniature Golf"
 msgstr "מיני-גולף"
 
 #. item
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1922
 msgid "Edit Miniature Golf"
 msgstr "ערוך מיני-גולף"
 
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1928
 msgid "Sport"
 msgstr "ספורט"
 
 #. group "Sport"
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1929
 msgid "Multi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1930
 msgid "Edit Multi"
 msgstr ""
@@ -18378,183 +18743,183 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "sports_centre"
 msgstr "מרכז ספורט"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "stadium"
 msgstr "איצטדיון"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1935
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1936
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1941
 msgid "Athletics"
 msgstr "אתלטיקה"
 
 #. item
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1942
 msgid "Edit Athletics"
 msgstr "ערוך אתלטיקה"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1947
 msgid "Archery"
 msgstr "קשתות"
 
 #. item
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1948
 msgid "Edit Archery"
 msgstr "ערוך קשתות"
 
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1953
 msgid "Climbing"
 msgstr "טיפוס"
 
 #. item
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:1954
 msgid "Edit Climbing"
 msgstr "ערוך טיפוס"
 
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1959
 msgid "Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1960
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1966
 msgid "Edit Cycling"
 msgstr "ערוך רכיבה"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1971
 msgid "Dog Racing"
 msgstr "מירוץ כלבים"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1972
 msgid "Edit Dog Racing"
 msgstr "ערוך מירוץ כלבים"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1977
 msgid "Equestrian"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1978
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1983
 msgid "Horse Racing"
 msgstr "מירוץ סוסים"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1984
 msgid "Edit Horse Racing"
 msgstr "ערוך מירוץ סוסים"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1989
 msgid "Gymnastics"
 msgstr "התעמלות"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1990
 msgid "Edit Gymnastics"
 msgstr "ערוך התעמלות"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1995
 msgid "Motor Sports"
 msgstr "ספורט מוטורי"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1996
 msgid "Edit Motor Sports"
 msgstr "ערוך ספורט מוטורי"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2001
 msgid "Skating"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2002
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2007
 msgid "Skateboard"
 msgstr "סקייטבורד"
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2008
 msgid "Edit Skateboard"
 msgstr "ערוך סקייטבורד"
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2013
 msgid "Swimming"
 msgstr "שחייה"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2014
 msgid "Edit Swimming"
 msgstr "ערוך שחייה"
@@ -18562,56 +18927,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2021
 msgid "Edit Skiing"
 msgstr "ערוך סקי"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "Piste type"
 msgstr "סוג מסלול"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "downhill"
 msgstr "גלישה במורד"
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "snow_park"
 msgstr "פארק שלג"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "Difficulty"
 msgstr "קושי"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "novice"
 msgstr "מתחילים"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "easy"
 msgstr "קל"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "expert"
 msgstr "מקצוענים"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2028
 msgid "Shooting"
 msgstr "ירי"
@@ -18619,178 +18984,183 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2030
 msgid "Edit Shooting"
 msgstr "ערוך ירי"
 
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2036
 msgid "Sport (Ball)"
 msgstr "ספורט (משחקי כדור)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2037
 msgid "Soccer"
 msgstr "כדורגל"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2038
 msgid "Edit Soccer"
 msgstr "ערוך כדורגל"
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2043
 msgid "Football"
 msgstr "כדורגל אמריקאי"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2044
 msgid "Edit Football"
 msgstr "ערוך כדורגל אמריקאי"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2049
 msgid "Australian Football"
 msgstr "כדורגל אוסטרלי"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2050
 msgid "Edit Australian Football"
 msgstr "ערוך כדורגל אוסטרלי"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2055
 msgid "Baseball"
 msgstr "כדור בסיס"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2056
 msgid "Edit Baseball"
 msgstr "ערוך כדור בסיס"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2061
 msgid "Basketball"
 msgstr "כדורסל"
 
 #. item
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2062
 msgid "Edit Basketball"
 msgstr "ערוך כדורסל"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2067
 msgid "Golf"
 msgstr "גולף"
 
 #. item
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2068
 msgid "Edit Golf"
 msgstr "ערוך גולף"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2071
 msgid "golf_course"
 msgstr "מגרש גולף"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2073
 msgid "Boule"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2074
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2079
 msgid "Bowls"
 msgstr "כדורת דשא"
 
 #. item
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2080
 msgid "Edit Bowls"
 msgstr "ערוך כדורת דשא"
 
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2085
 msgid "Cricket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2086
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2091
 msgid "Cricket Nets"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2092
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2097
 msgid "Croquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2098
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2103
 msgid "Hockey"
 msgstr "הוקי"
 
 #. item
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2104
 msgid "Edit Hockey"
 msgstr "ערוך הוקי"
 
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2109
 msgid "Pelota"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2110
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2105
+#: build/trans_presets.java:2115
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2116
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2121
 msgid "Rugby"
 msgstr "רוגבי"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2122
 msgid "Edit Rugby"
 msgstr "ערוך רוגבי"
 
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2127
 msgid "Table Tennis"
 msgstr "טניס שולחן"
 
 #. item
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2128
 msgid "Edit Table Tennis"
 msgstr "ערוך טניס שולחן"
 
-#: build/trans_presets.java:2123
+#: build/trans_presets.java:2133
 msgid "Tennis"
 msgstr "טניס"
 
 #. item
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2134
 msgid "Edit Tennis"
 msgstr "ערוך טניס"
 
-#. <separator/>
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2141
+#, fuzzy
+msgid "Man-Made"
+msgstr "מעשה אדם"
+
+#. group "Man-Made"
+#: build/trans_presets.java:2142
 msgid "Buildings"
 msgstr "מבנים"
 
 #. group "Buildings"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2143
 msgid "Building"
 msgstr "מבנה"
@@ -18798,5 +19168,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Public Building"
 msgstr "מבנה ציבור"
@@ -18804,10 +19174,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2148
 msgid "Edit Public Building"
 msgstr "ערוך מבנה ציבור"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2152
 msgid "Town hall"
 msgstr "בניין העירייה"
@@ -18815,10 +19185,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2154
 msgid "Edit Town hall"
 msgstr "ערוך בניין העירייה"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:2158
 msgid "Embassy"
 msgstr "שגרירות"
@@ -18826,10 +19196,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Edit Embassy"
 msgstr "ערוך שגרירות"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2164
 msgid "Courthouse"
 msgstr "בית משפט"
@@ -18838,10 +19208,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:2156
+#: build/trans_presets.java:2167
 msgid "Edit Courthouse"
 msgstr "ערוך בית משפט"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2171
 msgid "Prison"
 msgstr "כלא"
@@ -18850,10 +19220,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:2163
+#: build/trans_presets.java:2174
 msgid "Edit Prison"
 msgstr "ערוך כלא"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2178
 msgid "Police"
 msgstr "משטרה"
@@ -18863,10 +19233,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:2171
+#: build/trans_presets.java:2182
 msgid "Edit Police"
 msgstr "ערוך משטרה"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2186
 msgid "Fire Station"
 msgstr "תחנת מכבי אש"
@@ -18875,10 +19245,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:2178
+#: build/trans_presets.java:2189
 msgid "Edit Fire Station"
 msgstr "ערוך תחנת מכבי אש"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "Post Office"
 msgstr "דואר"
@@ -18886,5 +19256,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Edit Post Office"
 msgstr "ערוך דואר"
@@ -18892,15 +19262,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2200
 msgid "Kindergarten"
 msgstr "גן ילדים"
 
 #. item
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Kindergarten"
 msgstr "ערוך גן ילדים"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2205
 msgid "School"
 msgstr "בית ספר"
@@ -18908,10 +19278,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Edit School"
 msgstr "ערוך בית ספר"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2211
 msgid "University"
 msgstr "אוניברסיטה"
@@ -18919,10 +19289,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit University"
 msgstr "ערוך אוניברסיטה"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "College"
 msgstr "מכללה"
@@ -18930,5 +19300,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2219
 msgid "Edit College"
 msgstr "ערוך מכללה"
@@ -18936,5 +19306,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2224
 msgid "Cinema"
 msgstr "קולנוע"
@@ -18943,10 +19313,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:2216
+#: build/trans_presets.java:2227
 msgid "Edit Cinema"
 msgstr "ערוך קולנוע"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2231
 msgid "Library"
 msgstr "ספרייה"
@@ -18955,9 +19325,9 @@
 #. <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:2223
+#: build/trans_presets.java:2234
 msgid "Edit Library"
 msgstr "ערוך ספרייה"
 
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Arts Centre"
 msgstr "מרכז אומנויות"
@@ -18965,10 +19335,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Arts Centre"
 msgstr "ערוך מרכז אומנויות"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Theatre"
 msgstr "תיאטרון"
@@ -18977,10 +19347,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:2237
+#: build/trans_presets.java:2248
 msgid "Edit Theatre"
 msgstr "ערוך תיאטרון"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2252
 msgid "Place of Worship"
 msgstr "מקום תפילה"
@@ -18990,5 +19360,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:2245
+#: build/trans_presets.java:2256
 msgid "Edit Place of Worship"
 msgstr "ערוך מקום תפילה"
@@ -18997,6 +19367,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "Religion"
 msgstr "דת"
@@ -19005,66 +19375,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "bahai"
 msgstr "בהאי"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "buddhist"
 msgstr "בודהיסט"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "christian"
 msgstr "נוצרי"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "hindu"
 msgstr "הינדי"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jewish"
 msgstr "יהודי"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "muslim"
 msgstr "מוסלמי"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "sikh"
 msgstr "סיקי"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "spiritualist"
 msgstr "ספיריטואליסט"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "taoist"
 msgstr "טאואיסט"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "Denomination"
 msgstr ""
@@ -19073,81 +19443,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "anglican"
 msgstr "אנגליקני"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "baptist"
 msgstr "באפטיסט"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "catholic"
 msgstr "קתולי"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "lutheran"
 msgstr "לותרני"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "methodist"
 msgstr "מתודיסט"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "mormon"
 msgstr "מורמוני"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "orthodox"
 msgstr "אורתודוקסי"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "protestant"
 msgstr "פרוטסטנטי"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "shia"
 msgstr "שיעי"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "sunni"
 msgstr "סוני"
 
 #. <separator/>
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2264
 msgid "Addresses"
 msgstr "כתובות"
@@ -19156,5 +19526,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:2256
+#: build/trans_presets.java:2267
 msgid "Edit Address Information"
 msgstr "ערוך כתובת"
@@ -19162,5 +19532,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2269
 msgid "House number"
 msgstr "מספר בית"
@@ -19168,20 +19538,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "House name"
 msgstr "שם בית"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "City name"
 msgstr "שם עיר"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2274
 msgid "Post code"
 msgstr "מיקוד"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2275
 msgid "Country code"
 msgstr "קוד מדינה"
@@ -19189,5 +19559,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Address Interpolation"
 msgstr ""
@@ -19196,5 +19566,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:2270
+#: build/trans_presets.java:2281
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -19202,67 +19572,67 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "Numbering scheme"
 msgstr "סכמת מספור"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "odd"
 msgstr "אי-זוגי"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "even"
 msgstr "זוגי"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2286
 msgid "Man Made"
 msgstr "מעשה אדם"
 
 #. group "Man Made"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Works"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2288
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2292
 msgid "Tower"
 msgstr "מגדל"
 
 #. item
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2293
 msgid "Edit Tower"
 msgstr "ערוך מגדל"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Water Tower"
 msgstr "מגדל מים"
 
 #. item
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2298
 msgid "Edit Water Tower"
 msgstr "ערוך מגדל מים"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Gasometer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2303
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Lighthouse"
 msgstr "מגדלור"
@@ -19270,10 +19640,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2309
 msgid "Edit Lighthouse"
 msgstr "ערוך מגדלור"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Windmill"
 msgstr "טחנת רוח"
@@ -19281,10 +19651,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2315
 msgid "Edit Windmill"
 msgstr "ערוך טחנת רוח"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2319
 msgid "Pipeline"
 msgstr "צינור"
@@ -19292,10 +19662,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Edit Pipeline"
 msgstr "ערוך צינור"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2325
 msgid "Wastewater Plant"
 msgstr ""
@@ -19305,10 +19675,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:2318
+#: build/trans_presets.java:2329
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2333
 msgid "Crane"
 msgstr ""
@@ -19316,10 +19686,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2335
 msgid "Edit Crane"
 msgstr ""
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Beacon"
 msgstr ""
@@ -19327,10 +19697,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2341
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2345
 msgid "Survey Point"
 msgstr ""
@@ -19338,10 +19708,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2351
 msgid "Surveillance"
 msgstr ""
@@ -19349,5 +19719,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2353
 msgid "Edit Surveillance Camera"
 msgstr ""
@@ -19355,5 +19725,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Power Generator"
 msgstr ""
@@ -19363,39 +19733,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:2351
+#: build/trans_presets.java:2362
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "photovoltaic"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "gas"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2367
 msgid "Power Station"
 msgstr "תחנת כח"
@@ -19404,10 +19774,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:2359
+#: build/trans_presets.java:2370
 msgid "Edit Power Station"
 msgstr "ערוך תחנת כח"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2374
 msgid "Power Sub Station"
 msgstr ""
@@ -19416,5 +19786,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:2366
+#: build/trans_presets.java:2377
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -19422,10 +19792,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2369 build/trans_presets.java:2385
+#: build/trans_presets.java:2380 build/trans_presets.java:2396
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2382
 msgid "Power Tower"
 msgstr "עמוד חשמל"
@@ -19436,5 +19806,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:2376
+#: build/trans_presets.java:2387
 msgid "Edit Power Tower"
 msgstr "ערוך עמוד חשמל"
@@ -19442,5 +19812,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2390
 msgid "Power Line"
 msgstr "קו מתח"
@@ -19449,40 +19819,40 @@
 #. <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:2382
+#: build/trans_presets.java:2393
 msgid "Edit Power Line"
 msgstr "ערוך קו מתח"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Voltage"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2398
 msgid "Amount of Wires"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2402
 msgid "Toilets"
 msgstr "שירותים"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2398 build/trans_presets.java:2514
+#: build/trans_presets.java:2409 build/trans_presets.java:2525
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2411
 msgid "Post Box"
 msgstr "תיבת דואר"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2416
 msgid "Telephone"
 msgstr "טלפון"
@@ -19491,5 +19861,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:2408
+#: build/trans_presets.java:2419
 msgid "Edit Telephone"
 msgstr "ערוך טלפון"
@@ -19497,5 +19867,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2411 build/trans_presets.java:2515
+#: build/trans_presets.java:2422 build/trans_presets.java:2526
 msgid "Coins"
 msgstr ""
@@ -19503,5 +19873,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2412 build/trans_presets.java:2516
+#: build/trans_presets.java:2423 build/trans_presets.java:2527
 msgid "Notes"
 msgstr ""
@@ -19509,5 +19879,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2413 build/trans_presets.java:2517
+#: build/trans_presets.java:2424 build/trans_presets.java:2528
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -19515,5 +19885,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2414 build/trans_presets.java:2518
+#: build/trans_presets.java:2425 build/trans_presets.java:2529
 msgid "Debit cards"
 msgstr ""
@@ -19521,15 +19891,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2415 build/trans_presets.java:2519
+#: build/trans_presets.java:2426 build/trans_presets.java:2530
 msgid "Credit cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2427
 msgid "Telephone cards"
 msgstr "כרטיסי טלפון"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2429
 msgid "Recycling"
 msgstr ""
@@ -19538,5 +19908,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:2421
+#: build/trans_presets.java:2432
 msgid "Edit Recycling station"
 msgstr "ערוך תחנת מיחזור"
@@ -19544,35 +19914,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Batteries"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2435
 msgid "Cans"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Clothes"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2437
 msgid "Glass"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2438
 msgid "Paper"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2439
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2441
 msgid "Bench"
 msgstr "ספסל"
@@ -19581,40 +19951,33 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2433
-#, fuzzy
+#: build/trans_presets.java:2444
 msgid "Backrest"
-msgstr "חזרה"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "Material"
-msgstr "מצבת זיכרון"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2434
-#, fuzzy
+#: build/trans_presets.java:2445
 msgid "stone"
-msgstr "כלום"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "plastic"
-msgstr "מקום"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "Colour"
-msgstr "צבע"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "black"
-msgstr "חזרה"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "brown"
-msgstr "למטה"
+msgstr ""
 
 #. color historic
@@ -19683,38 +20046,35 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2435 build/trans_style.java:3055
-#: build/trans_style.java:3063 build/trans_style.java:3071
-#: build/trans_style.java:3079 build/trans_style.java:3127
-#: build/trans_style.java:3135 build/trans_style.java:3233
-#: build/trans_style.java:3241
+#: build/trans_presets.java:2446 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3135
+#: build/trans_style.java:3143 build/trans_style.java:3241
+#: build/trans_style.java:3249
 msgid "green"
 msgstr "ירוק"
 
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "red"
-msgstr "סוף"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "blue"
-msgstr "ערך"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "white"
-msgstr "מים"
-
-#: build/trans_presets.java:2436
+msgstr ""
+
+#: build/trans_presets.java:2447
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2449
 msgid "Hunting Stand"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2450
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -19723,30 +20083,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2441 build/trans_presets.java:2902
+#: build/trans_presets.java:2452 build/trans_presets.java:2914
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2454
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2455
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Fountain"
 msgstr "מזרקה"
@@ -19755,10 +20115,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:2449
+#: build/trans_presets.java:2460
 msgid "Edit Fountain"
 msgstr "ערוך מזרקה"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2464
 msgid "Drinking Water"
 msgstr "מי שתיה"
@@ -19767,10 +20127,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:2456
+#: build/trans_presets.java:2467
 msgid "Edit Drinking Water"
 msgstr "ערוך מי שתיה"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2471
 msgid "Baby Hatch"
 msgstr ""
@@ -19778,33 +20138,33 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2479
 msgid "Shops"
 msgstr "חנויות"
 
 #. group "Shops"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2480
 msgid "Supermarket"
 msgstr "סופרמרקט"
 
 #. item
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2481
 msgid "Edit Supermarket"
 msgstr "ערוך סופרמרקט"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2486
 msgid "Chemist"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2487
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2492
 msgid "Convenience Store"
 msgstr "מכולת"
@@ -19812,9 +20172,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Edit Convenience Store"
 msgstr "ערוך מכולת"
 
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2499
 msgid "Kiosk"
 msgstr "קיוסק"
@@ -19822,27 +20182,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Kiosk"
 msgstr "ערוך קיוסק"
 
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Book Store"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2507
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2512
 msgid "Travel Agency"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2513
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2518
 msgid "Vending machine"
 msgstr "מכונת ממכר"
@@ -19850,5 +20210,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Edit Vending machine"
 msgstr "ערוך מכונת ממכר"
@@ -19856,88 +20216,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_tickets"
 msgstr "כרטיסים לתחבורה ציבורית"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_plans"
 msgstr "מפות תחבורה ציבורית"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "parking_tickets"
 msgstr "כרטיסי חניה"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "food"
 msgstr "מזון"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "drinks"
 msgstr "משקאות"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "sweets"
 msgstr "ממתקים"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "cigarettes"
 msgstr "סיגריות"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "photos"
 msgstr "תמונות"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "animal_food"
 msgstr "מזון בע\"ח"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "news_papers"
 msgstr "עיתונים"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "toys"
 msgstr "צעצועים"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "stamps"
 msgstr "בולים"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "SIM-cards"
 msgstr "כרטיס SIM"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "telephone_vouchers"
 msgstr "שוברי טלפון"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "vouchers"
 msgstr "שוברים"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "condoms"
 msgstr "קונדומים"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "tampons"
 msgstr "טמפונים"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "excrement_bags"
 msgstr "שקיות צואה"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Butcher"
 msgstr "קצבייה"
@@ -19945,9 +20305,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2535
 msgid "Edit Butcher"
 msgstr "ערוך קצבייה"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2540
 msgid "Baker"
 msgstr "מאפייה"
@@ -19955,9 +20315,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2542
 msgid "Edit Baker"
 msgstr "ערוך מאפייה"
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2547
 msgid "Florist"
 msgstr "פרחים"
@@ -19965,18 +20325,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Florist"
 msgstr "ערוך חנות פרחים"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2554
 msgid "Organic"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Edit Organic Shop"
 msgstr "ערוך חנות אורגנית"
 
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2560
 msgid "Alcohol"
 msgstr ""
@@ -19984,54 +20344,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2562
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2567
 msgid "Beverages"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2568
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2573
 msgid "Computer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2574
 msgid "Edit Computer Shop"
 msgstr "ערוך חנות מחשבים"
 
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Electronics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2580
 msgid "Edit Electronics Shop"
 msgstr "ערוך חנות אלקטרוניקה"
 
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2585
 msgid "Hifi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2586
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2591
 msgid "Furniture"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Edit Furniture Shop"
 msgstr "ערוך חנות רהיטים"
 
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Garden Centre"
 msgstr ""
@@ -20039,9 +20399,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2599
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Hardware"
 msgstr ""
@@ -20049,9 +20409,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2606
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "Do-it-yourself-store"
 msgstr "חנות עשה-זאת-בעצמך"
@@ -20059,54 +20419,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2613
 msgid "Edit Do-it-yourself-store"
 msgstr "ערוך חנות עשה-זאת-בעצמך"
 
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2618
 msgid "Stationery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2619
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Hairdresser"
 msgstr "מספרה"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Hairdresser"
 msgstr "ערוך מספרה"
 
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Shoes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Shoe Shop"
 msgstr "ערוך חנות נעליים"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2636
 msgid "Toys"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit Toy Shop"
 msgstr "ערוך חנות צעצועים"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Video Shop"
 msgstr "ערוך חנות וידאו"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "Dry Cleaning"
 msgstr "ניקוי יבש"
@@ -20114,9 +20474,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2650
 msgid "Edit Dry Cleaning"
 msgstr "ערוך ניקוי יבש"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "Laundry"
 msgstr "מכבסה"
@@ -20124,9 +20484,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2657
 msgid "Edit Laundry"
 msgstr "ערוך מכבסה"
 
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2662
 msgid "Outdoor"
 msgstr ""
@@ -20134,32 +20494,28 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2664
 msgid "Edit Outdoor Shop"
 msgstr ""
 
-#: build/trans_presets.java:2658
-msgid "Sports"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2659
+#. item
+#: build/trans_presets.java:2670
 msgid "Edit Sports Shop"
 msgstr "ערוך חנות ספורט"
 
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Optician"
 msgstr "ערוך אופטיקאי"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2683
 msgid "Cash"
 msgstr "מזומן"
 
 #. group "Cash"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2684
 msgid "Bank"
 msgstr "בנק"
@@ -20167,14 +20523,14 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2686
 msgid "Edit Bank"
 msgstr "ערוך בנק"
 
-#: build/trans_presets.java:2680 build/trans_presets.java:2689
+#: build/trans_presets.java:2691 build/trans_presets.java:2700
 msgid "Automated Teller Machine"
 msgstr "כספומט"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2693
 msgid "Money Exchange"
 msgstr "החלפת כסף"
@@ -20182,5 +20538,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Edit Money Exchange"
 msgstr "ערוך החלפת כסף"
@@ -20188,15 +20544,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2691
+#: build/trans_presets.java:2702
 msgid "Edit Automated Teller Machine"
 msgstr "ערוך כספומט"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2707
 msgid "Health"
 msgstr "בריאות"
 
 #. group "Health"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2708
 msgid "Doctors"
 msgstr "רופאים"
@@ -20204,18 +20560,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2710
 msgid "Edit Doctors"
 msgstr "ערוך רופאים"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2715
 msgid "Dentist"
 msgstr "רופא שיניים"
 
 #. item
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Edit Dentist"
 msgstr "ערוך רופא שיניים"
 
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2721
 msgid "Pharmacy"
 msgstr "בית מרקחת"
@@ -20223,5 +20579,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Edit Pharmacy"
 msgstr "ערוך בית מרקחת"
@@ -20229,9 +20585,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2729
 msgid "Hospital"
 msgstr "בית חולים"
@@ -20239,10 +20595,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Edit Hospital"
 msgstr "ערוך בית חולים"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2735
 msgid "Emergency Access Point"
 msgstr "נקודת גישה בחירום"
@@ -20251,5 +20607,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:2727
+#: build/trans_presets.java:2738
 msgid "Edit Emergency Access Point"
 msgstr "ערוך נקודת גישה בחירום"
@@ -20258,20 +20614,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2741
 msgid "Point Number"
 msgstr "מספר נקודה"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2742
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Phone Number"
 msgstr "מספר טלפון"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(השתמש בקדומת בינלאומית, למשל +12-345-67890)"
@@ -20279,5 +20635,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2748
 msgid "Veterinary"
 msgstr "וטרינרי"
@@ -20286,55 +20642,59 @@
 #. <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:2740
+#: build/trans_presets.java:2751
 msgid "Edit Veterinary"
 msgstr "ערוך וטרינרי"
 
+#: build/trans_presets.java:2758
+msgid "Geography"
+msgstr ""
+
 #. group "Places"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2760
 msgid "Continent"
 msgstr "יבשת"
 
 #. item
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2761
 msgid "Edit Continent"
 msgstr "ערוך יבשת"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2766
 msgid "Country"
 msgstr "ארץ"
 
 #. item
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2767
 msgid "Edit Country"
 msgstr "ערוך ארץ"
 
 #. item "Places/Country" text "Name"
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2772
 msgid "State"
 msgstr "מדינה"
 
 #. item
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2773
 msgid "Edit State"
 msgstr "ערוך מדינה"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2778
 msgid "Region"
 msgstr "אזור"
 
 #. item
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2779
 msgid "Edit Region"
 msgstr "ערוך אזור"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2784
 msgid "County"
 msgstr "מחוז"
 
 #. item
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2785
 msgid "Edit County"
 msgstr "ערוך מחוז"
@@ -20342,15 +20702,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2791
 msgid "City"
 msgstr "עיר"
 
 #. item
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2792
 msgid "Edit City"
 msgstr "ערוך עיר"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2797
 msgid "Town"
 msgstr "עיירה"
@@ -20358,10 +20718,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2799
 msgid "Edit Town"
 msgstr "ערוך עיירה"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2804
 msgid "Suburb"
 msgstr "פרבר"
@@ -20369,25 +20729,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2806
 msgid "Edit Suburb"
 msgstr "ערוך פרבר"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2811
 msgid "Village"
 msgstr "כפר"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2812
 msgid "Edit Village"
 msgstr "ערוך כפר"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2817
 msgid "Hamlet"
 msgstr "כפר קטן"
 
 #. item
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2818
 msgid "Edit Hamlet"
 msgstr "ערוך כפר קטן"
@@ -20395,5 +20755,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2824
 msgid "Locality"
 msgstr "מקומיות"
@@ -20401,10 +20761,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2826
 msgid "Edit Locality"
 msgstr "ערוך מקומיות"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2831
 msgid "Island"
 msgstr "אי"
@@ -20412,10 +20772,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2833
 msgid "Edit Island"
 msgstr "ערוך אי"
 
 #. item "Places/Island" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2838
 msgid "Islet"
 msgstr ""
@@ -20423,5 +20783,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2840
 msgid "Edit Islet"
 msgstr ""
@@ -20429,5 +20789,5 @@
 #. item "Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2846
 msgid "Cave Entrance"
 msgstr "פתח מערה"
@@ -20435,10 +20795,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2848
 msgid "Edit Cave Entrance"
 msgstr "ערוך פתח מערה"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2852
 msgid "Peak"
 msgstr "פסגה"
@@ -20446,10 +20806,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2854
 msgid "Edit Peak"
 msgstr "ערוך פסגה"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2859
 msgid "Glacier"
 msgstr "קרחון"
@@ -20457,10 +20817,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2861
 msgid "Edit Glacier"
 msgstr "ערוך קרחון"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2854
+#: build/trans_presets.java:2866
 msgid "Volcano"
 msgstr "הר געש"
@@ -20468,70 +20828,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2868
 msgid "Edit Volcano"
 msgstr "ערוך הר געש"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2874
 msgid "Boundaries"
 msgstr "גבולות"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2875
 msgid "National"
 msgstr "לאומי"
 
 #. item
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2876
 msgid "Edit National Boundary"
 msgstr "ערוך גבול לאומי"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2881
 msgid "Administrative"
 msgstr "מנהלי"
 
 #. item
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2882
 msgid "Edit Administrative Boundary"
 msgstr "ערוך גבול מנהלי"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:2887
 msgid "Civil"
 msgstr "אזרחי"
 
 #. item
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2888
 msgid "Edit Civil Boundary"
 msgstr "ערוך תחום אזרחי"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2893
 msgid "Political"
 msgstr "פוליטי"
 
 #. item
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2894
 msgid "Edit Political Boundary"
 msgstr "ערוך תחום פוליטי"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2899
 msgid "National park"
 msgstr "גן לאומי"
 
 #. item
-#: build/trans_presets.java:2888
+#: build/trans_presets.java:2900
 msgid "Edit National Park Boundary"
 msgstr "ערוך תחום גן לאומי"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2906
 msgid "Land use"
 msgstr ""
 
 #. group "Land use"
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2907
 msgid "Tree"
 msgstr "עץ"
@@ -20540,15 +20900,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:2898
+#: build/trans_presets.java:2910
 msgid "Edit Tree"
 msgstr "ערוך עץ"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2915
 msgid "Botanical Name"
 msgstr "שם בוטני"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2917
 msgid "Wood"
 msgstr "חורש"
@@ -20557,5 +20917,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:2908
+#: build/trans_presets.java:2920
 msgid "Edit Wood"
 msgstr "ערוך חורש"
@@ -20563,17 +20923,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "coniferous"
 msgstr "מחטני"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "deciduous"
 msgstr "נשיר"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "mixed"
 msgstr "מעורב"
 
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2925
 msgid "Forest"
 msgstr "יער"
@@ -20582,14 +20942,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:2916
+#: build/trans_presets.java:2928
 msgid "Edit Forest Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2934
 msgid "Nature Reserve"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2935
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -20597,25 +20957,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2940
 msgid "Scree"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2941
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2945
 msgid "Scrub"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2946
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2950
 msgid "Fell"
 msgstr ""
@@ -20623,10 +20983,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2952
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2956
 msgid "Heath"
 msgstr "שדה-בור"
@@ -20634,5 +20994,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2958
 msgid "Edit Heath"
 msgstr "ערוך שדה-בור"
@@ -20640,5 +21000,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2963
 msgid "Farmyard"
 msgstr "חצר משק"
@@ -20647,45 +21007,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:2954
+#: build/trans_presets.java:2966
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2971
 msgid "Farmland"
 msgstr "אדמה חקלאית"
 
 #. item
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2972
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2977
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2978
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2983
 msgid "Vineyard"
 msgstr "כרם"
 
 #. item
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2984
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:2989
 msgid "Allotments"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2990
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -20693,25 +21053,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2996
 msgid "Garden"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2997
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3001
 msgid "Grass"
 msgstr "דשא"
 
 #. item
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3002
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3007
 msgid "Village Green"
 msgstr ""
@@ -20719,10 +21079,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3009
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3014
 msgid "Common"
 msgstr ""
@@ -20730,20 +21090,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3004
+#: build/trans_presets.java:3016
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3020
 msgid "Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3021
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3025
 msgid "Recreation Ground"
 msgstr ""
@@ -20751,5 +21111,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3027
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -20757,15 +21117,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3033
 msgid "Residential area"
 msgstr "אזור מגורים"
 
 #. item
-#: build/trans_presets.java:3022
+#: build/trans_presets.java:3034
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3039
 msgid "Graveyard"
 msgstr "בית-קברות"
@@ -20773,9 +21133,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3029
+#: build/trans_presets.java:3041
 msgid "Edit Graveyard"
 msgstr "ערוך בית-קברות"
 
-#: build/trans_presets.java:3035
+#: build/trans_presets.java:3047
 msgid "Cemetery"
 msgstr "בית עלמין"
@@ -20783,39 +21143,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3049
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3056
 msgid "Retail"
 msgstr "קמעוני"
 
 #. item
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3057
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3062
 msgid "Commercial"
 msgstr "מסחרי"
 
 #. item
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3063
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3056
+#: build/trans_presets.java:3068
 msgid "Industrial"
 msgstr "תעשייתי"
 
 #. item
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3069
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3074
 msgid "Railway land"
 msgstr ""
@@ -20823,15 +21183,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3076
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3081
 msgid "Military"
 msgstr "צבאי"
 
 #. item
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3082
 msgid "Edit Military Landuse"
 msgstr ""
@@ -20839,55 +21199,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3088
 msgid "Construction area"
 msgstr "אתר בניה"
 
 #. item
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3089
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3094
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3095
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3100
 msgid "Greenfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3101
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3106
 msgid "Landfill"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3107
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3112
 msgid "Quarry"
 msgstr "מחצבה"
 
 #. item
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3113
 msgid "Edit Quarry Landuse"
 msgstr ""
 
 #. group "Relations"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3122
 msgid "Multipolygon"
 msgstr ""
@@ -20897,5 +21257,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:3114
+#: build/trans_presets.java:3126
 msgid "Edit Multipolygon"
 msgstr ""
@@ -20904,10 +21264,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3132
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3133
 msgid "inner segment"
 msgstr ""
@@ -20915,5 +21275,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3136
 msgid "Turn restriction"
 msgstr ""
@@ -20922,5 +21282,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3139
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -20928,34 +21288,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_straight_on"
 msgstr ""
@@ -20964,15 +21324,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3146
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3147
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3148
 msgid "to way"
 msgstr ""
@@ -20980,5 +21340,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3151
 msgid "Route"
 msgstr ""
@@ -20987,5 +21347,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3154
 msgid "Edit Route"
 msgstr ""
@@ -20993,5 +21353,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "Route type"
 msgstr ""
@@ -21063,5 +21423,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3144 build/trans_style.java:233
+#: build/trans_presets.java:3156 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -21070,17 +21430,17 @@
 msgstr "אופניים"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "bus"
 msgstr "אוטובוס"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ski"
 msgstr ""
@@ -21133,5 +21493,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3144 build/trans_style.java:247
+#: build/trans_presets.java:3156 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -21140,13 +21500,13 @@
 msgstr "רגל"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "detour"
 msgstr ""
@@ -21160,10 +21520,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3144 build/trans_style.java:1206
+#: build/trans_presets.java:3156 build/trans_style.java:1206
 msgid "subway"
 msgstr "רכבת תחתית"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3159
 msgid "Symbol description"
 msgstr ""
@@ -21171,31 +21531,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3162
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "Color (hex)"
 msgstr ""
@@ -21204,30 +21564,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3168
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3169
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3170
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3171
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3172
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3173
 msgid "backward halt point"
 msgstr ""
@@ -21665,11 +22025,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3375 build/trans_style.java:3376
-#: build/trans_style.java:3946 build/trans_style.java:4254
-#: build/trans_style.java:4263 build/trans_style.java:4272
-#: build/trans_style.java:4281 build/trans_style.java:4290
-#: build/trans_style.java:4299 build/trans_style.java:4308
-#: build/trans_style.java:4309 build/trans_style.java:4318
-#: build/trans_style.java:4327
+#: build/trans_style.java:3383 build/trans_style.java:3384
+#: build/trans_style.java:3954 build/trans_style.java:4262
+#: build/trans_style.java:4271 build/trans_style.java:4280
+#: build/trans_style.java:4289 build/trans_style.java:4298
+#: build/trans_style.java:4307 build/trans_style.java:4316
+#: build/trans_style.java:4317 build/trans_style.java:4326
+#: build/trans_style.java:4335
 msgid "deprecated"
 msgstr "מיושן"
@@ -23693,5 +24053,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3294
+#: build/trans_style.java:3302
 msgid "light_water"
 msgstr ""
@@ -24373,8 +24733,17 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="boundary_stone"/>
+#. <icon annotate="true" src="historic/boundary_stone.png"/>
 #: build/trans_style.java:2990 build/trans_style.java:2998
 #: build/trans_style.java:3006 build/trans_style.java:3014
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
+#: build/trans_style.java:3054
 msgid "historic"
 msgstr "היסטורי"
@@ -24388,5 +24757,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3095
 msgid "quarry"
 msgstr "מחצבה"
@@ -24400,5 +24769,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "landfill"
 msgstr ""
@@ -24420,5 +24789,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3103 build/trans_style.java:3111
+#: build/trans_style.java:3111 build/trans_style.java:3119
 msgid "basin"
 msgstr ""
@@ -24432,5 +24801,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3127
 msgid "forest"
 msgstr "יער"
@@ -24444,5 +24813,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3159
 msgid "farmyard"
 msgstr ""
@@ -24465,5 +24834,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3160 build/trans_style.java:3168
+#: build/trans_style.java:3168 build/trans_style.java:3176
 msgid "retail"
 msgstr "קמעוני"
@@ -24477,5 +24846,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3176
+#: build/trans_style.java:3184
 msgid "industrial"
 msgstr "תעשייתי"
@@ -24489,5 +24858,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "brownfield"
 msgstr ""
@@ -24501,5 +24870,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "greenfield"
 msgstr ""
@@ -24513,5 +24882,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "railland"
 msgstr ""
@@ -24568,7 +24937,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3217 build/trans_style.java:3252
-#: build/trans_style.java:3260 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3225 build/trans_style.java:3260
+#: build/trans_style.java:3268 build/trans_style.java:3276
+#: build/trans_style.java:3284 build/trans_style.java:3292
 msgid "military"
 msgstr "צבאי"
@@ -24582,5 +24951,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3225
+#: build/trans_style.java:3233
 msgid "cemetery"
 msgstr "בית עלמין"
@@ -24593,5 +24962,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3301
+#: build/trans_style.java:3309
 msgid "peak"
 msgstr "פיסגה"
@@ -24606,5 +24975,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3310
+#: build/trans_style.java:3318
 msgid "glacier"
 msgstr "קרחון"
@@ -24618,5 +24987,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "volcano"
 msgstr "הר געש"
@@ -24671,8 +25040,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3326 build/trans_style.java:3327
-#: build/trans_style.java:3335 build/trans_style.java:3351
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440
+#: build/trans_style.java:3334 build/trans_style.java:3335
+#: build/trans_style.java:3343 build/trans_style.java:3359
+#: build/trans_style.java:3432 build/trans_style.java:3440
+#: build/trans_style.java:3448
 msgid "natural"
 msgstr "טבעי"
@@ -24686,5 +25055,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3343
+#: build/trans_style.java:3351
 msgid "scrub"
 msgstr ""
@@ -24698,5 +25067,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3359
+#: build/trans_style.java:3367
 msgid "heath"
 msgstr ""
@@ -24710,5 +25079,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3408
+#: build/trans_style.java:3416
 msgid "mud"
 msgstr "בוץ"
@@ -24722,5 +25091,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "beach"
 msgstr "חוף"
@@ -24798,8 +25167,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
-#: build/trans_style.java:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496 build/trans_style.java:3504
+#: build/trans_style.java:3512 build/trans_style.java:3520
 msgid "route"
 msgstr ""
@@ -24847,7 +25216,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3522 build/trans_style.java:3530
-#: build/trans_style.java:3538 build/trans_style.java:3546
-#: build/trans_style.java:3554
+#: build/trans_style.java:3530 build/trans_style.java:3538
+#: build/trans_style.java:3546 build/trans_style.java:3554
+#: build/trans_style.java:3562
 msgid "boundary"
 msgstr "גבול"
@@ -24997,11 +25366,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090
+#: build/trans_style.java:4002 build/trans_style.java:4010
+#: build/trans_style.java:4018 build/trans_style.java:4026
+#: build/trans_style.java:4034 build/trans_style.java:4042
+#: build/trans_style.java:4050 build/trans_style.java:4058
+#: build/trans_style.java:4066 build/trans_style.java:4074
+#: build/trans_style.java:4082 build/trans_style.java:4090
+#: build/trans_style.java:4098
 msgid "place"
 msgstr "מקום"
@@ -25049,6 +25418,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4207 build/trans_style.java:4214
-#: build/trans_style.java:4221 build/trans_style.java:4228
+#: build/trans_style.java:4215 build/trans_style.java:4222
+#: build/trans_style.java:4229 build/trans_style.java:4236
 msgid "address"
 msgstr "כתובת"
@@ -25356,12 +25725,50 @@
 msgstr ""
 
+#~ msgid "- running version is {0}"
+#~ msgstr "- הגירסה שרצה היא {0}"
+
+#~ msgid "Move"
+#~ msgstr "הזז"
+
+#~ msgid "Data Layer"
+#~ msgstr "שכבת נתונים"
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr "אין כל מסמך פתוח ולכן אין מה לשמור."
+
+#~ msgid "Unknown file extension."
+#~ msgstr "סיומת הקובץ אינה ידועה."
+
+#~ msgid "Email"
+#~ msgstr "דוא\"ל"
+
+#~ msgid "Resolve Conflicts"
+#~ msgstr "פתור התנגשויות"
+
+#~ msgid "There were conflicts during import."
+#~ msgstr "ארעו התנגשויות במהלך הייבוא."
+
+#~ msgid "Cannot open preferences directory: {0}"
+#~ msgstr "לא ניתן לפתוח את תיקיית ההעדפות: {0}"
+
+#~ msgid "their version:"
+#~ msgstr "הגירסה שלהם:"
+
+#~ msgid "resolved version:"
+#~ msgstr "הגירסה הפתורה:"
+
+#~ msgid "{0} object has conflicts:"
+#~ msgid_plural "{0} objects have conflicts:"
+#~ msgstr[0] "קיימות התנגשויות עם פריט {0}:"
+#~ msgstr[1] "קיימות התנגשויות עם {0} פריטים:"
+
+#~ msgid "my version:"
+#~ msgstr "הגירסה שלי:"
+
+#~ msgid "Object"
+#~ msgstr "פריט"
+
 #~ msgid "All the ways were empty"
 #~ msgstr "כל הדרכים היו ריקות"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "למזג צמתים בעלי חברויות שונות?"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "מזג בכל זאת"
 
 #~ msgid ""
@@ -25371,53 +25778,6 @@
 #~ "לצמתים האפשריים ישנן קשרי חברות שונים. האם אתה עדיין מעוניין למזג אותם?"
 
-#~ msgid "Unknown version"
-#~ msgstr "גרסה לא ידוע"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "נמצא <nd> שלא בתוך דרך."
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "ל <nd> אין התייחסות (ref)"
-
-#~ msgid "Move"
-#~ msgstr "הזז"
-
-#~ msgid "Data Layer"
-#~ msgstr "שכבת נתונים"
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "אין כל מסמך פתוח ולכן אין מה לשמור."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "סיומת הקובץ אינה ידועה."
-
-#~ msgid "Email"
-#~ msgstr "דוא\"ל"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "פתור התנגשויות"
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "ארעו התנגשויות במהלך הייבוא."
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "לא ניתן לפתוח את תיקיית ההעדפות: {0}"
-
-#~ msgid "their version:"
-#~ msgstr "הגירסה שלהם:"
-
-#~ msgid "resolved version:"
-#~ msgstr "הגירסה הפתורה:"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "קיימות התנגשויות עם פריט {0}:"
-#~ msgstr[1] "קיימות התנגשויות עם {0} פריטים:"
-
-#~ msgid "my version:"
-#~ msgstr "הגירסה שלי:"
-
-#~ msgid "Object"
-#~ msgstr "פריט"
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "למזג צמתים בעלי חברויות שונות?"
 
 #~ msgid "unnamed"
@@ -25442,6 +25802,12 @@
 #~ "השרת דיווח על שגיאה פנימית. נסה להקטין את השטח או נסה מחדש מאוחר יותר."
 
-#~ msgid "Commit comment"
-#~ msgstr "הערת ביצוע"
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "נמצא <nd> שלא בתוך דרך."
+
+#~ msgid "Unknown version"
+#~ msgstr "גרסה לא ידוע"
+
+#~ msgid "<nd> has zero ref"
+#~ msgstr "ל <nd> אין התייחסות (ref)"
 
 #~ msgid "Aborting..."
@@ -25456,7 +25822,4 @@
 #~ msgid "Occupied By"
 #~ msgstr "תפוס ע\"י"
-
-#~ msgid "Add Selected"
-#~ msgstr "הוסף את הנבחרים"
 
 #~ msgid "Cannot connect to server."
@@ -25597,4 +25960,7 @@
 #~ "</b></html>"
 
+#~ msgid "Merge Anyway"
+#~ msgstr "מזג בכל זאת"
+
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
@@ -25637,7 +26003,4 @@
 #~ msgid "Update failed"
 #~ msgstr "עדכון נכשל"
-
-#~ msgid "Delete mine"
-#~ msgstr "מחק את שלי"
 
 #~ msgid "Selection too big"
Index: applications/editors/josm/i18n/po/is.po
===================================================================
--- applications/editors/josm/i18n/po/is.po	(revision 17655)
+++ applications/editors/josm/i18n/po/is.po	(revision 17697)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-12 18:11+0200\n"
-"PO-Revision-Date: 2009-09-06 19:36+0000\n"
+"POT-Creation-Date: 2009-09-19 13:00+0200\n"
+"PO-Revision-Date: 2009-09-18 18:36+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-09-12 16:06+0000\n"
+"X-Launchpad-Export-Date: 2009-09-19 10:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -42,10 +42,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:543
 #: ../core/src/org/openstreetmap/josm/Main.java:551
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -70,5 +70,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -86,6 +86,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:358
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
@@ -101,6 +101,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
@@ -124,10 +124,10 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
 msgid "Save and Exit"
 msgstr "Vista og hætta"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
 msgid "Discard and Exit"
 msgstr "Hunsa og hætta"
@@ -138,4 +138,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
@@ -143,27 +144,28 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:296
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:258
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:613
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
@@ -171,5 +173,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -189,6 +191,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
@@ -205,17 +207,17 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:654
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1528
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -226,6 +228,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
@@ -278,9 +280,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:607
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:609
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -340,5 +342,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
 msgid "Plugins"
@@ -389,5 +391,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Sameina"
@@ -475,5 +477,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -486,4 +488,5 @@
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -519,6 +522,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
@@ -527,6 +530,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:346
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
@@ -634,4 +637,46 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#, fuzzy
+msgid "Close open changesets"
+msgstr "Loka núverandi breytingarsetti"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#, fuzzy
+msgid "Closes open changesets"
+msgstr "Loka núverandi breytingarsetti"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
+#: ../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:114
+#, java-format
+msgid "File: {0}"
+msgstr "Skrá: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
+#, fuzzy
+msgid "There are no open changesets"
+msgstr "Tögg fyrir nýtt breytingarsett"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
+#, fuzzy
+msgid "No open changesets"
+msgstr "Loka núverandi breytingarsetti"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
+#, fuzzy
+msgid "Downloading open changesets ..."
+msgstr "Loka breytingasetti..."
+
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
@@ -729,10 +774,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:123
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
@@ -775,31 +821,30 @@
 msgstr "Dreifa völdum hnútum á jöfnu millibili á línu."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
 msgid "Download from OSM..."
 msgstr "Niðurhala frá OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
 msgid "Download map data from the OSM server."
 msgstr "Niðurhala kortagögnum frá OSM þjóninum."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
-#, java-format
-msgid "File: {0}"
-msgstr "Skrá: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
 msgid "Download"
 msgstr "Niðurhala"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "Í lagi"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
 msgid "Please select at least one task to download"
 msgstr ""
@@ -820,5 +865,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1527
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307
@@ -838,6 +883,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:376
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1415
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
 msgid "Duplicate"
 msgstr "Tvöfalda"
@@ -909,10 +954,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
@@ -996,25 +1042,26 @@
 msgstr "Sameina það lag sem nú er valið öðru lagi"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 msgid "Merge Nodes"
 msgstr "Sameina hnúta"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
 msgid "Merge nodes into the oldest one."
 msgstr "Sameina valda hnúta á staðsetningu þess elsta."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
 msgid "Please select at least two nodes to merge."
 msgstr "Veldu minnst tvo hnúta til að sameina."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:394
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
@@ -1030,8 +1077,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -1057,6 +1104,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
@@ -1065,9 +1116,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr "Gat ekki sameinað hnúta: Hefði þurft að eyða veg sem enn er í notkun."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283
 #, java-format
 msgid "Merge {0} nodes"
@@ -1139,5 +1190,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "New"
 msgstr "Ný"
@@ -1409,14 +1460,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
 msgid "Status Report"
 msgstr "Stöðuskýrsla"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 msgid "Copy to clipboard and close"
 msgstr "Afrita á klemmuborðið og loka"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
@@ -1491,25 +1543,4 @@
 msgstr "Skipta veginum {0} í {1} hluta"
 
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24
-msgid "Close current changeset"
-msgstr "Loka núverandi breytingarsetti"
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-msgid "Close the current changeset ..."
-msgstr "Loka núverandi breytingarsetti ..."
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41
-msgid "There is currently no changeset open."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42
-msgid "No open changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60
-msgid "Closing changeset"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
@@ -1670,14 +1701,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Upphala til OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 msgid "Upload all changes to the OSM server."
 msgstr "Upphala öllum breytingum á OSM þjóninn."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
 #, java-format
 msgid ""
@@ -1686,23 +1717,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
 msgid "Nothing to upload. Get some data first."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 msgid "No changes to upload."
 msgstr "Engar  breytingar til að hlaða upp."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
 msgid "Synchronize entire dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
 #, java-format
 msgid ""
@@ -1716,17 +1747,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
 msgid "Conflict detected"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:267
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
 #, java-format
 msgid ""
@@ -1737,28 +1768,40 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
+msgid ""
+"<html>Uploading <strong>failed</strong> because you've been "
+"using<br>changeset {0} which was already closed at {1}.<br>Please upload "
+"again with a new or an existing open changeset."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+#, fuzzy
+msgid "Changeset closed"
+msgstr "Breyta eigindum"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
 msgid "Upload to OSM API failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1975,14 +2018,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:930
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:932
 msgid "Create new node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
 msgid "Select node under cursor."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939
 #, java-format
 msgid "Insert new node into way."
@@ -1991,14 +2034,14 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
 msgid "Start new way from last node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951
 msgid "Continue way from last node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:972
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:974
 msgid "Finish drawing."
 msgstr ""
@@ -2111,44 +2154,54 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Leita..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Leita að hlutum."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
 msgid "Can't search because there is no loaded data."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
+#, fuzzy
+msgid "Please enter a filter string."
+msgstr "Sláðu inn leitarstreng"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
 msgid "Please enter a search string."
 msgstr "Sláðu inn leitarstreng"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
 msgid "replace selection"
 msgstr "skipta út vali"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72
 msgid "add to selection"
 msgstr "bæta við val"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73
 msgid "remove from selection"
 msgstr "fjarlæga úr vali"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
+#, fuzzy
+msgid "find in selection"
+msgstr "bæta við val"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81
 msgid "case sensitive"
 msgstr "stafsetursnæmt"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82
 msgid "regular expression"
 msgstr "regluleg segð"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
 msgstr ""
@@ -2156,18 +2209,18 @@
 "gildi."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
 msgstr ""
 "<b>\"Gamla Hringbraut\"</b> - „Gamla Hringbraut“ í einhverjum lykli og gildi."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
 msgstr "<b>name:Gam</b> - „Gam“ kemur fyrir í nafninu."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
 msgstr "<b>type=route</b> - lykilinn „type“ með gildið „route“."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid ""
 "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
@@ -2177,17 +2230,17 @@
 "<b>*=gildi</b>, <b>type=</b>, <b>*=*</b> og <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
 msgstr "<b>-name:Gam</b> - „Gam“ kemur ekki fyrir í nafninu."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - Lykillinn „foot“ með eitthvað gildi."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
 msgid "<u>Special targets:</u>"
 msgstr "<u>Sérleitir:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
@@ -2196,47 +2249,47 @@
 "fyrir hnút, veg og vensl"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - Hlutir sem breytt hefur verið af gefnum notanda"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr "<b>id:</b>... - hlutur með þessa kennitölu (0 fyrir nýja hluti)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 msgid "<b>nodes:</b>... - object with given number of nodes"
 msgstr "<b>nodes:</b>... - Hlutur með gefið marga hnúta (t.d. „5“ eða „7-9“)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - Hlutum sem breytt hefur verið"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - Valdir hlutir"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - Ókláraðir hlutir"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - Hlutir án eiginda"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr "<b>child <i>segð</i></b> - allir undirhlutir sem passa við segðina"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr "<b>parent <i>segð</i></b> - allir yfirhlutir sem passa við segðina"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Notaðu <b>|</b> eða <b>OR</b> t.d. „A | B“ til að leita að A eða B"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
@@ -2244,46 +2297,63 @@
 "„:“ eða „ “"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Notaðu <b>(</b> og <b>)</b> til að sameina segðir"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
+msgid "Filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Leit"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
+msgid "Submit filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "Start Search"
 msgstr "Hefja leit"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#, java-format
+msgid "Nothing find in selection by searching for ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262
 #, java-format
 msgid "Found {0} matches"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CS"
 msgstr "stafsetursnæmt"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CI"
 msgstr "stafsetursónæmt"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283
 msgid "RX"
 msgstr ""
@@ -2467,5 +2537,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
 msgid "Double conflict"
 msgstr ""
@@ -2708,4 +2778,5 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:134
 msgid "Old value"
 msgstr ""
@@ -2869,27 +2940,58 @@
 
 #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
 msgid "E"
 msgstr "A"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:59
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:203
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
 msgid "Changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:323
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:325
-#, java-format
-msgid "paramete''{0}'' must not be null"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331
-#, fuzzy, java-format
-msgid "unsupported value ''{0}'' or parameter ''{1}''"
-msgstr "Nota forstillinguna „{0}“ í flokknum „{1}“"
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "H"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "Text"
+msgstr "Næsta"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "C"
+msgstr "stafsetursnæmt"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "I"
+msgstr "stafsetursónæmt"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "M"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+msgid "R"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+msgid "A"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+msgid "D"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+msgid "F"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
@@ -2903,29 +3005,29 @@
 msgstr "Viðvörun: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
 #, java-format
 msgid "expected id >= 0. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:257
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
 msgid "a primitive with id=0 can't be invisible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:293
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
 #, java-format
 msgid "id > 0 expected. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
 msgid "version > 0 expected. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
 msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
 msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
@@ -2992,9 +3094,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:247
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:249
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:478
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:482
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
@@ -3003,118 +3105,118 @@
 #. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
 #. TODO Remove useless nullcheck when RelationMember.member is encalupsed
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:851
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855
 msgid "Empty member in relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:853
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:864
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Óþekkt hlutverk \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652
 msgid "No \"via\" node or way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:885
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:943
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1032
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1044
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1097
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1123
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1327
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331
 msgid "untagged"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1328
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332
 msgid "text"
 msgstr ""
@@ -3135,5 +3237,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
@@ -3154,5 +3256,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
@@ -3201,5 +3303,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
 msgid "Lambert Zone (Estonia)"
 msgstr ""
@@ -3241,9 +3343,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:38
 msgid "Do not show again"
 msgstr "Ekki sýna þessi skilaboð aftur"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
 #, java-format
@@ -3251,31 +3353,31 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:91
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:116
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154
 msgid "incomplete"
 msgstr "óklárað"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
 msgid "highway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
-#: build/trans_presets.java:3144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: build/trans_presets.java:3156
 msgid "railway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
 msgid "waterway"
 msgstr "vatnsfarvegur"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "landuse"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:474
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
@@ -3285,5 +3387,5 @@
 msgstr[1] "{0} hnútar"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
 #, java-format
 msgid "{0} member"
@@ -3328,10 +3430,5 @@
 msgstr "Ekki var hægt að ná í skilaboð dagsins"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67
-#, java-format
-msgid "- running version is {0}"
-msgstr "{0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:95
 msgid "Downloading \"Message of the day\""
 msgstr ""
@@ -3397,10 +3494,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:162
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
 msgid "Username"
 msgstr "Notandanafn"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
 msgid "Password"
 msgstr "Lykilorð"
@@ -3521,5 +3618,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226
 msgid "Presets"
 msgstr "Forstillingar"
@@ -3593,38 +3690,49 @@
 msgstr "skali"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Lengdargráðan undir músabendlinum."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The name of the object at the mouse pointer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Breiddargráðan undir músabendlinum."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The angle between the previous and the current way segment."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The (compass) heading of the line segment being drawn."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The length of the new way segment being drawn."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199
+msgid ""
+"Middle click again to cycle through.<br>Hold CTRL to select directly from "
+"this list with the mouse.<hr>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290
 msgid "(no object)"
 msgstr "(enginn hlutur)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:301
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418
+#, fuzzy
+msgid "User:"
+msgstr "Notandanafn"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
 msgid "layer not in list."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:488
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3694,7 +3802,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:224
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Tags"
 msgstr "Tögg"
@@ -3709,5 +3817,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
@@ -3888,4 +3996,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
 msgid "Up"
 msgstr ""
@@ -3896,4 +4005,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Down"
 msgstr ""
@@ -3906,5 +4016,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
@@ -4327,22 +4437,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:236
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239
 msgid "No conflicts to resolve"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:295
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254
 msgid "Cancel conflict resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:310
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269
 msgid "Apply resolved conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Apply"
 msgstr "Vista"
@@ -4354,5 +4464,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "all"
 msgstr ""
@@ -4396,7 +4506,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
-msgid "not yet decided"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:213
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
@@ -4423,7 +4530,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
@@ -4433,7 +4540,7 @@
 msgstr[1] "{0} vegir"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:152
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
@@ -4443,20 +4550,20 @@
 msgstr[1] "{0} vensl"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "Paste ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "From ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:372
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "To ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:428
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
 #, java-format
 msgid "{0} tag"
@@ -4472,13 +4579,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
-#, fuzzy
 msgid "Remove this relation member from the relation"
-msgstr "Fjarlægja val úr venslunum"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-#, fuzzy
 msgid "Replace"
-msgstr "Eldstæði"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
@@ -4489,11 +4594,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
-#, fuzzy
 msgid "Undecided"
-msgstr "<óskilgreint>"
+msgstr ""
 
 #. --- role editing
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:56
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510
 msgid "Role:"
 msgstr "Hlutverk:"
@@ -4509,7 +4613,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70
-#, fuzzy
 msgid "Value:"
-msgstr "Gildi"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86
@@ -4526,7 +4629,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
-#, fuzzy
 msgid "Decision"
-msgstr "Útgáfa"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -4542,6 +4644,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
@@ -4630,169 +4733,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-msgid "History"
-msgstr "Breytingaskrá"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-msgid "Display the history of all selected items."
-msgstr "Sýna breytingarsögu valdra hluta."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
-#, java-format
-msgid "index out of bounds Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr "Hnútur {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
-msgid "History item"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Endurhlaða breytingaskrálistann með núverandi vali."
-
-#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
-msgid "Show"
-msgstr "Sýna"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
-msgstr "Sýna breytingasögu valdra hluta"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
-msgid "Dialog not created yet. Invoke createInstance() first"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
-msgid "Layers"
-msgstr "Lög"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-msgid "Open a list of all loaded layers."
-msgstr "Sýna lista yfir öll lög."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:297
-msgid "Delete the selected layer."
-msgstr "Eyða völdu lagi."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:367
-msgid "Show/Hide"
-msgstr "Sýna/Fela"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:378
-msgid "Toggle visible state of the selected layer."
-msgstr "Sýna eða fela valið lag."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:420
-msgid "Activate the selected layer"
-msgstr "Virkja valið lag"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:475
-msgid "Merge this layer into another layer"
-msgstr "Sameina þetta lag öðru lagi"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:581
-msgid "Move the selected layer one row up."
-msgstr "Færa valið lag upp í röðinni"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:600
-msgid "Move the selected layer one row down."
-msgstr "Færa valið lag niður í röðinni"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
-msgid "Information about layer"
-msgstr "Upplýsingar um lag"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
-#, java-format
-msgid "This will change up to {0} object."
-msgid_plural "This will change up to {0} objects."
-msgstr[0] "Allt að {0} hluti verður breytt."
-msgstr[1] "Allt að {0} hlutum verður breytt."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
-msgid "An empty value deletes the key."
-msgstr "Tómt gildi eyðir lyklinum"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
-msgid "<different>"
-msgstr "<mismunandi>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
-msgid "Change values?"
-msgstr "Breyta eigindum"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
-#, java-format
-msgid "Change properties of up to {0} object"
-msgid_plural "Change properties of up to {0} objects"
-msgstr[0] "Breyta eigindum allt að {0} hluts"
-msgstr[1] "Breyta eigindum allt að {0} hluta"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
-msgid "Please select a key"
-msgstr "Veldu lykil"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
-msgid "Please select a value"
-msgstr "Veldu gildi"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
-msgid "Please select the objects you want to change properties for."
-msgstr "Veldu hluti til að breyta eigindum þeirra."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
-msgid "Properties/Memberships"
-msgstr "Eigindi"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-msgid "Properties for selected objects."
-msgstr "Eigindi valdra hluta."
-
-#. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-msgid "Member Of"
-msgstr "Stak í"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
-msgid "Add Properties"
-msgstr "Bæti vað eigindum"
-
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+msgid "Filter objects and hide/disable them."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
@@ -4806,4 +4753,209 @@
 msgstr "Bæta við"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+msgid "Add filter."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
+#, fuzzy
+msgid "Edit filter."
+msgstr "Breyti bryggju"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#, fuzzy
+msgid "Delete filter."
+msgstr "Fjarlægja"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
+#, fuzzy
+msgid "Move filter up."
+msgstr "Færa upp"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
+#, fuzzy
+msgid "Move filter down."
+msgstr "Færa niður"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128
+msgid "Enable filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
+msgid "Hide elements"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
+msgid "Apply also for children"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
+msgid "Inverse filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
+msgid "Filter mode"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
+msgid "History"
+msgstr "Breytingaskrá"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+msgid "Display the history of all selected items."
+msgstr "Sýna breytingarsögu valdra hluta."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr "Hnútur {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
+msgid "History item"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
+msgid "Reload all currently selected objects and refresh the list."
+msgstr "Endurhlaða breytingaskrálistann með núverandi vali."
+
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
+msgid "Show"
+msgstr "Sýna"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
+msgid "Display the history of the selected primitive"
+msgstr "Sýna breytingasögu valdra hluta"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84
+msgid "Dialog not created yet. Invoke createInstance() first"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
+msgid "Layers"
+msgstr "Lög"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+msgid "Open a list of all loaded layers."
+msgstr "Sýna lista yfir öll lög."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294
+msgid "Delete the selected layer."
+msgstr "Eyða völdu lagi."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364
+msgid "Show/Hide"
+msgstr "Sýna/Fela"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375
+msgid "Toggle visible state of the selected layer."
+msgstr "Sýna eða fela valið lag."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgid "Activate"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417
+msgid "Activate the selected layer"
+msgstr "Virkja valið lag"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472
+msgid "Merge this layer into another layer"
+msgstr "Sameina þetta lag öðru lagi"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578
+msgid "Move the selected layer one row up."
+msgstr "Færa valið lag upp í röðinni"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597
+msgid "Move the selected layer one row down."
+msgstr "Færa valið lag niður í röðinni"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+msgid "Information about layer"
+msgstr "Upplýsingar um lag"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+#, java-format
+msgid "This will change up to {0} object."
+msgid_plural "This will change up to {0} objects."
+msgstr[0] "Allt að {0} hluti verður breytt."
+msgstr[1] "Allt að {0} hlutum verður breytt."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+msgid "An empty value deletes the key."
+msgstr "Tómt gildi eyðir lyklinum"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+msgid "<different>"
+msgstr "<mismunandi>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+msgid "Change values?"
+msgstr "Breyta eigindum"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#, java-format
+msgid "Change properties of up to {0} object"
+msgid_plural "Change properties of up to {0} objects"
+msgstr[0] "Breyta eigindum allt að {0} hluts"
+msgstr[1] "Breyta eigindum allt að {0} hluta"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+msgid "Please select a key"
+msgstr "Veldu lykil"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+msgid "Please select a value"
+msgstr "Veldu gildi"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
+msgid "Please select the objects you want to change properties for."
+msgstr "Veldu hluti til að breyta eigindum þeirra."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
+msgid "Properties/Memberships"
+msgstr "Eigindi"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+msgid "Properties for selected objects."
+msgstr "Eigindi valdra hluta."
+
+#. setting up the membership table
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+msgid "Member Of"
+msgstr "Stak í"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
+msgid "Add Properties"
+msgstr "Bæti vað eigindum"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574
 msgid "Add a new key/value pair to all objects"
@@ -4845,10 +4997,9 @@
 
 #. item "Land use/Quarry" text "Name"
-#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
-#: build/trans_presets.java:3109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168
+#: build/trans_presets.java:3121
 msgid "Relations"
 msgstr "Vensl"
@@ -4858,23 +5009,23 @@
 msgstr "Sýna lista yfir vensl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166
 #, java-format
 msgid "Relations: {0}"
 msgstr "Vensl: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276
 msgid "Open an editor for the selected relation"
 msgstr "Opna ritil til að breyta völdum venslum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
 msgid "Delete the selected relation"
 msgstr "Eyða völdum venslum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349
 msgid "Create a new relation"
 msgstr "Skapa ný vensl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:373
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1412
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "Afrita þessi vensl og opna breytingarglugga fyrir afritið"
@@ -4907,5 +5058,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4917,9 +5068,9 @@
 msgstr "Val: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441
 msgid "Undock the panel"
 msgstr "Opna þessa stiku sem glugga"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -4928,5 +5079,5 @@
 "vinstri tólastikunni."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:457
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Smelltu til að minnka/hámarka innihald stikunnar"
@@ -4987,5 +5138,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5009,5 +5160,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1502
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1370
 msgid "Download relation members"
 msgstr ""
@@ -5037,5 +5188,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -5043,18 +5194,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
 msgid "Tags and Members"
 msgstr "Stök og tögg þeirra"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:167
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5063,14 +5214,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613
 #, java-format
 msgid ""
@@ -5080,9 +5231,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid ""
@@ -5092,15 +5243,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5108,5 +5259,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5114,20 +5265,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849
 #, java-format
 msgid ""
@@ -5136,57 +5287,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:961
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909
 msgid "Move the currently selected members up"
 msgstr "Færa valda meðlimi upp"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:979
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:912
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928
 msgid "Move the currently selected members down"
 msgstr "Færa valda meðlimi niður"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:998
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:931
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5195,9 +5346,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1058
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
 #, java-format
 msgid ""
@@ -5206,56 +5357,41 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090
+msgid "Apply the current updates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123
+msgid "Apply the updates and close the dialog"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
-msgid "Apply the current updates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
-msgid "Apply the updates and close the dialog"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "Í lagi"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 msgid "Add an empty tag"
 msgstr "Bæta við tómu taggi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
-msgid "Delete the currently selected tags"
-msgstr "Eyða völdum töggum"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Hala niður öllum nóðum og vegum í þessum venslum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 msgid "Download Members"
 msgstr "Niðurhala meðlimum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1208
 msgid "Sets a role for the selected members"
 msgstr "Vistar hlutverk fyrir völd stök"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1211
 msgid "Apply Role"
 msgstr "Vista hlutverk"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1356
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 #, java-format
 msgid ""
@@ -5265,13 +5401,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1229
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1367
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
 msgid "Confirm empty role"
 msgstr ""
@@ -5358,37 +5494,37 @@
 msgstr "Bókamerki"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:82
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
 msgid "Please enter the desired coordinates first."
 msgstr "Sláðu inn hnitin fyrst"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
 msgid "Please enter a name for the location."
 msgstr "Sláðu inn nafn fyrir staðsetningu."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:107
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
 msgid "Select a bookmark first."
 msgstr "Veldu fyrst bókmerki"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
 msgid "min lat"
 msgstr "Minnsta breiddargráða"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
 msgid "min lon"
 msgstr "Minnsta lengdargráða"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid "max lat"
 msgstr "Mesta breiddargráða"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
 msgid "max lon"
 msgstr "Mesta lengdargráða"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5398,26 +5534,26 @@
 "svæðinu)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
 msgid "Bounding Box"
 msgstr "Afmarkað svæði"
 
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
 msgid "Data Sources and Types"
 msgstr "Gagnabankar"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
 msgid "Download as new layer"
 msgstr "Sækja sem nýtt lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
 msgid "Download Area"
 msgstr "Niðurhalssvæði"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
 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:219
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
 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"
@@ -5442,7 +5578,7 @@
 msgstr "Sláðu inn nafn á stað til að leita að"
 
-#. <separator/>
+#. group "Geography"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2759
 msgid "Places"
 msgstr "Staðir"
@@ -5489,21 +5625,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "type"
 msgstr "gerð"
@@ -5520,5 +5656,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-#, fuzzy
 msgid ""
 "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
@@ -5526,6 +5661,4 @@
 "Hold left mousebutton and draw a frame."
 msgstr ""
-"Þysja: Notið músarhjól eða tvísmellið. Færa kort: Hægrismellið og hreyfið "
-"músina. Velja: Smellið"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
@@ -5986,4 +6119,6 @@
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
 #. <key key="historic" value="wayside_shrine" />
+#. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
+#. <key key="historic" value="boundary_stone" />
 #. item "Leisure/Water Park" label "Edit Water Park"
 #. <key key="leisure" value="water_park" />
@@ -6355,153 +6490,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/trans_presets.java:66 build/trans_presets.java:102
-#: build/trans_presets.java:142 build/trans_presets.java:179
-#: build/trans_presets.java:199 build/trans_presets.java:217
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:272 build/trans_presets.java:305
-#: build/trans_presets.java:351 build/trans_presets.java:371
-#: build/trans_presets.java:386 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:463 build/trans_presets.java:482
-#: build/trans_presets.java:502 build/trans_presets.java:522
-#: build/trans_presets.java:543 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627 build/trans_presets.java:658
-#: build/trans_presets.java:679 build/trans_presets.java:692
-#: build/trans_presets.java:705 build/trans_presets.java:718
-#: build/trans_presets.java:731 build/trans_presets.java:744
-#: build/trans_presets.java:755 build/trans_presets.java:764
-#: build/trans_presets.java:811 build/trans_presets.java:832
-#: build/trans_presets.java:841 build/trans_presets.java:901
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1067 build/trans_presets.java:1075
-#: build/trans_presets.java:1085 build/trans_presets.java:1093
-#: build/trans_presets.java:1098 build/trans_presets.java:1105
-#: build/trans_presets.java:1112 build/trans_presets.java:1117
-#: build/trans_presets.java:1125 build/trans_presets.java:1134
-#: build/trans_presets.java:1140 build/trans_presets.java:1146
-#: build/trans_presets.java:1151 build/trans_presets.java:1157
-#: build/trans_presets.java:1163 build/trans_presets.java:1172
-#: build/trans_presets.java:1181 build/trans_presets.java:1188
-#: build/trans_presets.java:1196 build/trans_presets.java:1209
-#: build/trans_presets.java:1215 build/trans_presets.java:1224
-#: build/trans_presets.java:1230 build/trans_presets.java:1236
-#: build/trans_presets.java:1244 build/trans_presets.java:1299
-#: build/trans_presets.java:1346 build/trans_presets.java:1352
-#: build/trans_presets.java:1358 build/trans_presets.java:1364
-#: build/trans_presets.java:1370 build/trans_presets.java:1381
-#: build/trans_presets.java:1390 build/trans_presets.java:1405
-#: build/trans_presets.java:1412 build/trans_presets.java:1418
-#: build/trans_presets.java:1426 build/trans_presets.java:1433
-#: build/trans_presets.java:1442 build/trans_presets.java:1450
-#: build/trans_presets.java:1457 build/trans_presets.java:1468
-#: build/trans_presets.java:1478 build/trans_presets.java:1488
-#: build/trans_presets.java:1508 build/trans_presets.java:1520
-#: build/trans_presets.java:1531 build/trans_presets.java:1548
-#: build/trans_presets.java:1555 build/trans_presets.java:1570
-#: build/trans_presets.java:1577 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1594
-#: build/trans_presets.java:1599 build/trans_presets.java:1605
-#: build/trans_presets.java:1611 build/trans_presets.java:1619
-#: build/trans_presets.java:1627 build/trans_presets.java:1635
-#: build/trans_presets.java:1642 build/trans_presets.java:1648
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1670 build/trans_presets.java:1677
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1712 build/trans_presets.java:1719
-#: build/trans_presets.java:1736 build/trans_presets.java:1744
-#: build/trans_presets.java:1759 build/trans_presets.java:1769
-#: build/trans_presets.java:1781 build/trans_presets.java:1788
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:1809 build/trans_presets.java:1817
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1841
-#: build/trans_presets.java:1846 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1864
-#: build/trans_presets.java:1872 build/trans_presets.java:1881
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1908 build/trans_presets.java:1914
-#: build/trans_presets.java:1922 build/trans_presets.java:1928
-#: build/trans_presets.java:1934 build/trans_presets.java:1940
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2013
-#: build/trans_presets.java:2022 build/trans_presets.java:2030
-#: build/trans_presets.java:2036 build/trans_presets.java:2042
-#: build/trans_presets.java:2048 build/trans_presets.java:2054
-#: build/trans_presets.java:2060 build/trans_presets.java:2066
-#: build/trans_presets.java:2072 build/trans_presets.java:2078
-#: build/trans_presets.java:2084 build/trans_presets.java:2090
-#: build/trans_presets.java:2096 build/trans_presets.java:2102
-#: build/trans_presets.java:2108 build/trans_presets.java:2114
-#: build/trans_presets.java:2120 build/trans_presets.java:2126
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2158
-#: build/trans_presets.java:2165 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2186
-#: build/trans_presets.java:2192 build/trans_presets.java:2198
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2218 build/trans_presets.java:2225
-#: build/trans_presets.java:2232 build/trans_presets.java:2239
-#: build/trans_presets.java:2247 build/trans_presets.java:2279
-#: build/trans_presets.java:2284 build/trans_presets.java:2289
-#: build/trans_presets.java:2294 build/trans_presets.java:2300
-#: build/trans_presets.java:2306 build/trans_presets.java:2312
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2354
-#: build/trans_presets.java:2451 build/trans_presets.java:2458
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2485 build/trans_presets.java:2492
-#: build/trans_presets.java:2498 build/trans_presets.java:2504
-#: build/trans_presets.java:2526 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2553 build/trans_presets.java:2559
-#: build/trans_presets.java:2565 build/trans_presets.java:2571
-#: build/trans_presets.java:2577 build/trans_presets.java:2583
-#: build/trans_presets.java:2590 build/trans_presets.java:2597
-#: build/trans_presets.java:2604 build/trans_presets.java:2610
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2661
-#: build/trans_presets.java:2667 build/trans_presets.java:2677
-#: build/trans_presets.java:2686 build/trans_presets.java:2701
-#: build/trans_presets.java:2707 build/trans_presets.java:2715
-#: build/trans_presets.java:2722 build/trans_presets.java:2742
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2783
-#: build/trans_presets.java:2790 build/trans_presets.java:2797
-#: build/trans_presets.java:2803 build/trans_presets.java:2809
-#: build/trans_presets.java:2817 build/trans_presets.java:2824
-#: build/trans_presets.java:2831 build/trans_presets.java:2838
-#: build/trans_presets.java:2844 build/trans_presets.java:2851
-#: build/trans_presets.java:2858 build/trans_presets.java:2867
-#: build/trans_presets.java:2873 build/trans_presets.java:2879
-#: build/trans_presets.java:2885 build/trans_presets.java:2891
-#: build/trans_presets.java:2900 build/trans_presets.java:2910
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2948
-#: build/trans_presets.java:2957 build/trans_presets.java:2963
-#: build/trans_presets.java:2969 build/trans_presets.java:2975
-#: build/trans_presets.java:2981 build/trans_presets.java:2987
-#: build/trans_presets.java:2993 build/trans_presets.java:3000
-#: build/trans_presets.java:3006 build/trans_presets.java:3011
-#: build/trans_presets.java:3018 build/trans_presets.java:3025
-#: build/trans_presets.java:3031 build/trans_presets.java:3040
-#: build/trans_presets.java:3048 build/trans_presets.java:3054
-#: build/trans_presets.java:3060 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3080
-#: build/trans_presets.java:3086 build/trans_presets.java:3092
-#: build/trans_presets.java:3098 build/trans_presets.java:3104
-#: build/trans_presets.java:3117 build/trans_presets.java:3131
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:67 build/trans_presets.java:103
+#: build/trans_presets.java:143 build/trans_presets.java:180
+#: build/trans_presets.java:200 build/trans_presets.java:218
+#: build/trans_presets.java:235 build/trans_presets.java:253
+#: build/trans_presets.java:273 build/trans_presets.java:306
+#: build/trans_presets.java:352 build/trans_presets.java:372
+#: build/trans_presets.java:387 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:503 build/trans_presets.java:523
+#: build/trans_presets.java:544 build/trans_presets.java:565
+#: build/trans_presets.java:586 build/trans_presets.java:607
+#: build/trans_presets.java:628 build/trans_presets.java:659
+#: build/trans_presets.java:680 build/trans_presets.java:693
+#: build/trans_presets.java:706 build/trans_presets.java:719
+#: build/trans_presets.java:732 build/trans_presets.java:745
+#: build/trans_presets.java:756 build/trans_presets.java:765
+#: build/trans_presets.java:812 build/trans_presets.java:833
+#: build/trans_presets.java:842 build/trans_presets.java:902
+#: build/trans_presets.java:1053 build/trans_presets.java:1061
+#: build/trans_presets.java:1069 build/trans_presets.java:1077
+#: build/trans_presets.java:1087 build/trans_presets.java:1095
+#: build/trans_presets.java:1100 build/trans_presets.java:1107
+#: build/trans_presets.java:1114 build/trans_presets.java:1119
+#: build/trans_presets.java:1127 build/trans_presets.java:1136
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1153 build/trans_presets.java:1159
+#: build/trans_presets.java:1165 build/trans_presets.java:1174
+#: build/trans_presets.java:1183 build/trans_presets.java:1190
+#: build/trans_presets.java:1198 build/trans_presets.java:1211
+#: build/trans_presets.java:1217 build/trans_presets.java:1226
+#: build/trans_presets.java:1232 build/trans_presets.java:1238
+#: build/trans_presets.java:1246 build/trans_presets.java:1302
+#: build/trans_presets.java:1349 build/trans_presets.java:1355
+#: build/trans_presets.java:1361 build/trans_presets.java:1367
+#: build/trans_presets.java:1373 build/trans_presets.java:1384
+#: build/trans_presets.java:1393 build/trans_presets.java:1408
+#: build/trans_presets.java:1415 build/trans_presets.java:1421
+#: build/trans_presets.java:1429 build/trans_presets.java:1436
+#: build/trans_presets.java:1445 build/trans_presets.java:1453
+#: build/trans_presets.java:1460 build/trans_presets.java:1471
+#: build/trans_presets.java:1481 build/trans_presets.java:1491
+#: build/trans_presets.java:1511 build/trans_presets.java:1523
+#: build/trans_presets.java:1534 build/trans_presets.java:1551
+#: build/trans_presets.java:1558 build/trans_presets.java:1574
+#: build/trans_presets.java:1581 build/trans_presets.java:1586
+#: build/trans_presets.java:1592 build/trans_presets.java:1598
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1646 build/trans_presets.java:1652
+#: build/trans_presets.java:1659 build/trans_presets.java:1666
+#: build/trans_presets.java:1674 build/trans_presets.java:1681
+#: build/trans_presets.java:1689 build/trans_presets.java:1696
+#: build/trans_presets.java:1702 build/trans_presets.java:1709
+#: build/trans_presets.java:1716 build/trans_presets.java:1723
+#: build/trans_presets.java:1740 build/trans_presets.java:1748
+#: build/trans_presets.java:1763 build/trans_presets.java:1773
+#: build/trans_presets.java:1785 build/trans_presets.java:1792
+#: build/trans_presets.java:1798 build/trans_presets.java:1808
+#: build/trans_presets.java:1813 build/trans_presets.java:1821
+#: build/trans_presets.java:1828 build/trans_presets.java:1834
+#: build/trans_presets.java:1840 build/trans_presets.java:1845
+#: build/trans_presets.java:1850 build/trans_presets.java:1855
+#: build/trans_presets.java:1862 build/trans_presets.java:1868
+#: build/trans_presets.java:1873 build/trans_presets.java:1882
+#: build/trans_presets.java:1891 build/trans_presets.java:1900
+#: build/trans_presets.java:1909 build/trans_presets.java:1918
+#: build/trans_presets.java:1924 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 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:2023 build/trans_presets.java:2032
+#: build/trans_presets.java:2040 build/trans_presets.java:2046
+#: build/trans_presets.java:2052 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 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:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2150
+#: build/trans_presets.java:2156 build/trans_presets.java:2162
+#: build/trans_presets.java:2169 build/trans_presets.java:2176
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2197 build/trans_presets.java:2203
+#: build/trans_presets.java:2209 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2229
+#: build/trans_presets.java:2236 build/trans_presets.java:2243
+#: build/trans_presets.java:2250 build/trans_presets.java:2258
+#: build/trans_presets.java:2290 build/trans_presets.java:2295
+#: build/trans_presets.java:2300 build/trans_presets.java:2305
+#: build/trans_presets.java:2311 build/trans_presets.java:2317
+#: build/trans_presets.java:2323 build/trans_presets.java:2331
+#: build/trans_presets.java:2337 build/trans_presets.java:2343
+#: build/trans_presets.java:2349 build/trans_presets.java:2355
+#: build/trans_presets.java:2365 build/trans_presets.java:2462
+#: build/trans_presets.java:2469 build/trans_presets.java:2483
+#: build/trans_presets.java:2489 build/trans_presets.java:2496
+#: build/trans_presets.java:2503 build/trans_presets.java:2509
+#: build/trans_presets.java:2515 build/trans_presets.java:2537
+#: build/trans_presets.java:2544 build/trans_presets.java:2551
+#: build/trans_presets.java:2557 build/trans_presets.java:2564
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2594 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2615
+#: build/trans_presets.java:2621 build/trans_presets.java:2627
+#: build/trans_presets.java:2633 build/trans_presets.java:2639
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2672 build/trans_presets.java:2678
+#: build/trans_presets.java:2688 build/trans_presets.java:2697
+#: build/trans_presets.java:2712 build/trans_presets.java:2718
+#: build/trans_presets.java:2726 build/trans_presets.java:2733
+#: build/trans_presets.java:2753 build/trans_presets.java:2764
+#: build/trans_presets.java:2770 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2788
+#: build/trans_presets.java:2795 build/trans_presets.java:2802
+#: build/trans_presets.java:2809 build/trans_presets.java:2815
+#: build/trans_presets.java:2821 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2912
+#: build/trans_presets.java:2922 build/trans_presets.java:2931
+#: build/trans_presets.java:2937 build/trans_presets.java:2943
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 build/trans_presets.java:2981
+#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:2999 build/trans_presets.java:3005
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3023 build/trans_presets.java:3030
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3066 build/trans_presets.java:3072
+#: build/trans_presets.java:3079 build/trans_presets.java:3085
+#: build/trans_presets.java:3092 build/trans_presets.java:3098
+#: build/trans_presets.java:3104 build/trans_presets.java:3110
+#: build/trans_presets.java:3116 build/trans_presets.java:3129
+#: build/trans_presets.java:3143 build/trans_presets.java:3157
 msgid "Name"
 msgstr "Heiti"
@@ -6535,4 +6671,58 @@
 msgid "Version"
 msgstr "Útgáfa"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
+#, fuzzy
+msgid "Changeset id:"
+msgstr "Breyta venslum"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
+#, fuzzy
+msgid "Created at:"
+msgstr "Búa til svæði"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
+#, fuzzy
+msgid "Changeset comment:"
+msgstr "Breyta venslum"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
+msgid "No open changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48
+#, fuzzy
+msgid "<html>Please select the changesets you want to close</html>"
+msgstr "Veldu hluti til að breyta eigindum þeirra."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
+#, fuzzy
+msgid "Open changesets"
+msgstr "Bý til breytingarsett..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101
+#, fuzzy
+msgid "Close changesets"
+msgstr "Loka breytingasetti..."
+
+#. putValue(SMALL_ICON, ImageProvider.get("cancel"));
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
+#, fuzzy
+msgid "Close the selected open changesets"
+msgstr "Loka núverandi breytingarsetti ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126
+#, fuzzy
+msgid "Cancel closeing of changesets"
+msgstr "Loka breytingasetti..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37
+msgid "Closing changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77
+#, fuzzy, java-format
+msgid "Closing changeset {0}"
+msgstr "Loka breytingasetti..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
@@ -6561,5 +6751,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be uploaded"
+msgid "Layer ''{0}'' has no modifications to be uploaded."
 msgstr ""
 
@@ -6567,5 +6757,5 @@
 #, java-format
 msgid ""
-"Layer ''{0}'' has modifications which should be saved to its assoicated file "
+"Layer ''{0}'' has modifications which should be saved to its associated file "
 "''{1}''."
 msgstr ""
@@ -6573,5 +6763,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be saved"
+msgid "Layer ''{0}'' has no modifications to be saved."
 msgstr ""
 
@@ -6605,17 +6795,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113
 msgid "Unsaved changes - Save/Upload before exiting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194
 #, java-format
 msgid ""
@@ -6628,9 +6818,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205
 msgid "Unsaved data and conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212
 #, java-format
 msgid ""
@@ -6644,9 +6834,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223
 msgid "Unsaved data and missing associated file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230
 #, java-format
 msgid ""
@@ -6661,42 +6851,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243
 msgid "Unsaved data non-writable files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
 msgid "Close this dialog and resume editing in JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322
 msgid "Discard and Delete"
 msgstr "Gleyma og eyða"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354
 msgid "Save and Delete"
 msgstr "Vista og eyða"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
 msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402
 #, java-format
 msgid "Preparing layer ''{0}'' for upload ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
@@ -6704,5 +6894,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491
 msgid "Incomplete upload and/or save"
 msgstr ""
@@ -6742,21 +6932,21 @@
 #. item "Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:200
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:278
-#: build/trans_presets.java:311 build/trans_presets.java:357
-#: build/trans_presets.java:372 build/trans_presets.java:387
-#: build/trans_presets.java:409 build/trans_presets.java:429
-#: build/trans_presets.java:450 build/trans_presets.java:470
-#: build/trans_presets.java:489 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:549
-#: build/trans_presets.java:570 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:633
-#: build/trans_presets.java:664 build/trans_presets.java:1060
-#: build/trans_presets.java:1068 build/trans_presets.java:1076
-#: build/trans_presets.java:1086 build/trans_presets.java:1305
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:242
+#: build/trans_presets.java:260 build/trans_presets.java:279
+#: build/trans_presets.java:312 build/trans_presets.java:358
+#: build/trans_presets.java:373 build/trans_presets.java:388
+#: build/trans_presets.java:410 build/trans_presets.java:430
+#: build/trans_presets.java:451 build/trans_presets.java:471
+#: build/trans_presets.java:490 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:665 build/trans_presets.java:1062
+#: build/trans_presets.java:1070 build/trans_presets.java:1078
+#: build/trans_presets.java:1088 build/trans_presets.java:1308
 msgid "Layer"
 msgstr "Lag"
@@ -6775,73 +6965,32 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:200
 msgid "Upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-msgid "Use a new changeset and close it"
-msgstr "Opna nýtt breytingarsett og loka því strax"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
-msgid ""
-"Select to upload the data using a new changeset and to close the changeset "
-"after the upload"
-msgstr ""
-"Nýtt breytingarsett verður búið til og því lokað eftir að breytingunni hefur "
-"verið upphlaðið"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
-msgid "Use a new changeset and leave it open"
-msgstr "Opna nýtt breytingarsett og skilja það eftir opið"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
-msgid ""
-"Select to upload the data using a new changeset and to leave the changeset "
-"open after the upload"
-msgstr ""
-"Nýtt breytingarsett verður búið til og það skilið eftir opið svo hægt sé að "
-"bæta við frekari breytingum síðar meir"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
-msgid "Upload to a new or to an existing changeset?"
-msgstr "Hlaða upp sem nýju breytingarsetti eða bæta við eldra?"
-
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
-msgid "upload all changes in one request"
-msgstr "senda allar breytingarnar í einu á þjónin"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
-msgid ""
-"Enable to upload all changes in one request, disable to use one request per "
-"changed primitive"
-msgstr ""
-"Ef þetta er valið verða allar breytingarnar sendar í einni fyrirspurn. En ef "
-"ekki verður gerð ein fyrirspurn fyrir hvern hlut sem breytt var"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "Breytingarágrip (stutt lýsing á breytingunum sem þú gerðir)"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:216
 msgid "Settings"
 msgstr "Stillingar"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908
 msgid "Tags of new changeset"
 msgstr "Tögg fyrir nýtt breytingarsett"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:221
 msgid "Objects to add:"
 msgstr "Hlutum sem verður bætt við:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:227
 msgid "Objects to modify:"
 msgstr "Hlutum sem verður breytt:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:233
 msgid "Objects to delete:"
 msgstr "Hlutum sem verður eytt:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
 #, java-format
 msgid "{0} object to add:"
@@ -6850,5 +6999,5 @@
 msgstr[1] "{0} hlutum verður bætt við:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:277
 #, java-format
 msgid "{0} object to modifiy:"
@@ -6857,5 +7006,5 @@
 msgstr[1] "{0} hlutum verður breytt:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:286
 #, java-format
 msgid "{0} object to delete:"
@@ -6864,57 +7013,94 @@
 msgstr[1] "{0} hlutum verður eytt:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422
-#, java-format
-msgid "Use the existing changeset {0} and close it after upload"
-msgstr "Nota opið breytingarsett #{0} og loka því"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:423
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to close the changeset "
-"after this upload"
-msgstr ""
-"Breytingunni verður bætt við breytingarsett #{0} og því lokað eftir að "
-"breytingunni hefur verið upphlaðið"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426
-#, java-format
-msgid "Use the existing changeset {0} and leave it open"
-msgstr "Nota opið breytingarsett #{0} og skilja það eftir opið"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:427
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to leave the changeset "
-"open for further uploads"
-msgstr ""
-"Breytingunni verður bætt við breytingarsett #{0} og það skilið eftir opið "
-"svo hægt sé að bæta við frekari breytingum síðar meir"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:470
+msgid "Upload Changes"
+msgstr "Hlaða upp breytingum"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472
+msgid "Upload the changed primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
+msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:479
+msgid "Illegal upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
+msgid "Cancel the upload and resume editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606
+#, fuzzy
+msgid "Upload all changes in one request"
+msgstr "senda allar breytingarnar í einu á þjónin"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607
+msgid ""
+"Enable to upload all changes in one request, disable to use one request per "
+"changed primitive"
+msgstr ""
+"Ef þetta er valið verða allar breytingarnar sendar í einni fyrirspurn. En ef "
+"ekki verður gerð ein fyrirspurn fyrir hvern hlut sem breytt var"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:617
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "Breytingarágrip (stutt lýsing á breytingunum sem þú gerðir)"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672
+#, fuzzy
+msgid "Open a new changeset"
+msgstr "Tögg fyrir nýtt breytingarsett"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
+#, fuzzy
+msgid "Open a new changeset and use it in the next upload"
+msgstr "Opna nýtt breytingarsett og skilja það eftir opið"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
+#, fuzzy
+msgid "Use an open changeset"
+msgstr "Loka núverandi breytingarsetti"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
+#, fuzzy
+msgid "Upload data to an already opened changeset"
+msgstr "Hlaða upp sem nýju breytingarsetti eða bæta við eldra?"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
+#, fuzzy
+msgid "Close changeset after upload"
+msgstr "Engar  breytingar til að hlaða upp."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
+#, fuzzy
+msgid "Select to close the changeset after the next upload"
+msgstr ""
+"Nýtt breytingarsett verður búið til og því lokað eftir að breytingunni hefur "
+"verið upphlaðið"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922
 #, java-format
 msgid "Tags of changeset {0}"
 msgstr "Tögg á breytingarsetti #{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584
-msgid "Upload Changes"
-msgstr "Hlaða upp breytingum"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
 #, fuzzy
-msgid "Upload the changed primitives"
-msgstr "Hlaða upp breytingum?"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592
+msgid "Load the list of your open changesets from the server"
+msgstr "Hlaða JOSM stillingum þínum upp á OSM þjóninn"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
 #, fuzzy
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "Sláðu inn nafn fyrir staðsetningu."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:593
-msgid "Illegal upload comment"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
-msgid "Cancel the upload and resume editing"
+msgid "Close the currently selected open changeset"
+msgstr "Eyða völdum töggum"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
+#, java-format
+msgid "changeset id > 0 expected. Got {1}"
 msgstr ""
 
@@ -6993,5 +7179,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
@@ -7029,5 +7215,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
@@ -7035,30 +7221,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
 msgid "Customize line drawing"
 msgstr "Sérsníða teikningu lína"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
 msgid "Use global settings."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Draw lines between points for this layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Do not draw lines between points for this layer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 msgid "Select line drawing options"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7066,5 +7252,5 @@
 msgstr "Sérsníða liti"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7073,5 +7259,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7080,38 +7266,75 @@
 msgstr "Veldu lit"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
 msgid "Import Audio"
 msgstr "Flytja inn hljóð"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
 msgid "Wave Audio files (*.wav)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #, java-format
 msgid "Audio markers from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
 msgid "Import images"
 msgstr "Flytja inn myndir"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#, java-format
+msgid "Name: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#, java-format
+msgid "Description: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#, fuzzy, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
 msgstr[0] "{0} ferill, "
 msgstr[1] "{0} ferlar, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
+#: build/trans_presets.java:3160
+msgid "Description"
+msgstr "Lýsing"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#, fuzzy
+msgid "Timespan"
+msgstr "Tímaspan: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#, fuzzy
+msgid "Length"
+msgstr "Lengd: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
+msgid "URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+msgid "Length: "
+msgstr "Lengd: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
 #, java-format
 msgid "{0} route, "
@@ -7120,5 +7343,5 @@
 msgstr[1] "{0} leiðir, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 #, java-format
 msgid "{0} waypoint"
@@ -7127,29 +7350,10 @@
 msgstr[1] "{0} punktar"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
-#, java-format
-msgid "Name: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
-#, java-format
-msgid "Description: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
-msgid "Timespan: "
-msgstr "Tímaspan: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
-msgid "Length: "
-msgstr "Lengd: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Breyta í gagnalag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7157,10 +7361,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -7171,29 +7375,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
 msgid "Download from OSM along this track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
 msgid "Download everything within:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
 #, java-format
 msgid "{0} meters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 msgid "Maximum area per request:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
 #, java-format
 msgid ""
@@ -7202,13 +7406,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
 msgid "Download data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7216,5 +7420,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7271,21 +7475,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "track"
 msgid_plural "tracks"
@@ -7416,4 +7620,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
@@ -7640,13 +7845,18 @@
 msgstr "Teikna stóra GPS punkta."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+msgid "Draw a circle form HDOP value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Hraði (rauður = hægari, grænn = hraðari)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -7654,6 +7864,6 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1374
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:1377
 msgid "Car"
 msgstr "Bíll"
@@ -7674,14 +7884,14 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:324 build/trans_presets.java:650
-#: build/trans_presets.java:857 build/trans_presets.java:876
-#: build/trans_presets.java:890 build/trans_presets.java:912
-#: build/trans_presets.java:949 build/trans_presets.java:962
-#: build/trans_presets.java:974 build/trans_presets.java:986
-#: build/trans_presets.java:998 build/trans_presets.java:1010
-#: build/trans_presets.java:1020 build/trans_presets.java:1029
-#: build/trans_presets.java:1038 build/trans_presets.java:1437
-#: build/trans_presets.java:1510
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:325 build/trans_presets.java:651
+#: build/trans_presets.java:858 build/trans_presets.java:877
+#: build/trans_presets.java:891 build/trans_presets.java:913
+#: build/trans_presets.java:950 build/trans_presets.java:963
+#: build/trans_presets.java:975 build/trans_presets.java:987
+#: build/trans_presets.java:999 build/trans_presets.java:1011
+#: build/trans_presets.java:1021 build/trans_presets.java:1030
+#: build/trans_presets.java:1039 build/trans_presets.java:1440
+#: build/trans_presets.java:1513
 msgid "Bicycle"
 msgstr "Hjól"
@@ -7714,62 +7924,62 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:325 build/trans_presets.java:649
-#: build/trans_presets.java:856 build/trans_presets.java:875
-#: build/trans_presets.java:889 build/trans_presets.java:911
-#: build/trans_presets.java:948 build/trans_presets.java:961
-#: build/trans_presets.java:973 build/trans_presets.java:985
-#: build/trans_presets.java:997 build/trans_presets.java:1009
-#: build/trans_presets.java:1019 build/trans_presets.java:1028
-#: build/trans_presets.java:1037
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:326 build/trans_presets.java:650
+#: build/trans_presets.java:857 build/trans_presets.java:876
+#: build/trans_presets.java:890 build/trans_presets.java:912
+#: build/trans_presets.java:949 build/trans_presets.java:962
+#: build/trans_presets.java:974 build/trans_presets.java:986
+#: build/trans_presets.java:998 build/trans_presets.java:1010
+#: build/trans_presets.java:1020 build/trans_presets.java:1029
+#: build/trans_presets.java:1038
 msgid "Foot"
 msgstr "Fótgangandi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr ""
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
-msgid "Only interesting direction hints (e.g. with oneway tag)."
-msgstr ""
-
-#. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+msgid "Only interesting direction hints (e.g. with oneway tag)."
+msgstr ""
+
+#. only on the head of a way
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Only on the head of a way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:82
 msgid "Draw lines between raw GPS points"
 msgstr "Teikna línu á milli GPS punkta"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -7779,9 +7989,9 @@
 "milli þeirra. Stilltu þetta á „-1“ til að teikna allar línur."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
 msgid "Maximum length for local files (meters)"
 msgstr "Hámarkslengd lína fyrir staðværar skrár (í metrum)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
@@ -7790,25 +8000,25 @@
 "þetta á „-1“ til að teikna allar línur."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length (meters)"
 msgstr "Hámarkslengt milli punkta (í metrum)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:129
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:135
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:141
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -7816,13 +8026,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:144
 msgid "Minimum distance (pixels)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Draw larger dots for the GPS points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -7830,9 +8040,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -7840,46 +8050,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202
 msgid "GPS Points"
 msgstr "GPS punktar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:237
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257
 msgid "Draw the inactive data layers in a different color."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "OSM Data"
 msgstr "OSM gögn"
@@ -7958,45 +8168,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Configure available plugins."
 msgstr "Stillingar fyrir viðbætur."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50
+#. buttons at the bottom
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
 msgid "Download List"
 msgstr "Hala niður uppfærðum lista"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:100
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 msgid "Update"
 msgstr "Uppfæra"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Configure Sites..."
 msgstr "Stilla viðbótarþjóna..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:125
 msgid "Add JOSM Plugin description URL."
 msgstr "Bæta við viðbótarþjóni."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:126
 msgid "Enter URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:162
 msgid "Please select an entry."
 msgstr "Vinsamlegast veldu viðbótarþjón til að fjarlægja."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:147
 msgid "Edit JOSM Plugin description URL."
 msgstr "Breyta viðbótarþjóni."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:148
 msgid "JOSM Plugin description URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:175
 msgid "Configure Plugin Sites"
 msgstr "Stilla viðbótarþjóna"
@@ -8325,6 +8536,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:369
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341
 #, java-format
 msgid "Remove old keys from up to {0} object"
@@ -8333,9 +8544,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135
 msgid "Add a new tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160
 msgid "Delete the selection in the tag table"
 msgstr ""
@@ -8370,7 +8581,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:68
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:75
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -8414,4 +8625,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24
+#, fuzzy, java-format
+msgid "Preset group ''{0}'' of group ''{1}''"
+msgstr "Nota forstillinguna „{0}“ í flokknum „{1}“"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
 #, java-format
 msgid "Preset group ''{0}''"
@@ -8432,4 +8648,10 @@
 msgstr "Hala niður punktum {0} til {1}..."
 
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, java-format
+msgid "parameter ''{0}'' > 0 expected. Got {1}"
+msgstr ""
+
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8534,5 +8756,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
 msgid "Parse error: invalid document structure for gpx document"
 msgstr ""
@@ -8652,10 +8874,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -8663,75 +8886,79 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315
 msgid "Creating changeset..."
 msgstr "Bý til breytingarsett..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
 #, java-format
 msgid "Successfully opened changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#, java-format
+msgid "id of changeset > 0 required. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
-#, java-format
-msgid "Changeset {0} is unchanged. Skipping update."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
 #, java-format
 msgid "Updating changeset {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
-msgid ""
-"Failed to update changeset. Either there is no current changeset or the id "
-"of the current changeset is 0"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
 msgid "Closing changeset..."
 msgstr "Loka breytingasetti..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
-#, java-format
-msgid "Closing changeset {0}..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
-#, java-format
-msgid "Leaving changeset {0} open..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
 msgid "No changeset present for diff upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414
 msgid "Preparing..."
 msgstr "Undirbý..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419
 msgid "Uploading..."
 msgstr "Hleð upp gögnum..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438
 msgid "Waiting 10 seconds ... "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449
 msgid "OK - trying again."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:485
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517
 #, java-format
 msgid "Starting retry {0} of {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
+msgid "current changeset is null. Can't upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
+#, java-format
+msgid "id of current changeset > required. Current id is {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
+#, java-format
+msgid "Open changeset expected. Got closed changeset with id {0}"
 msgstr ""
 
@@ -8757,33 +8984,92 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
+#, java-format
+msgid "missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:128
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:134
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
+#, java-format
+msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
+#, java-format
+msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
+#, java-format
+msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#, java-format
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#, java-format
+msgid "Unsupported version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:176
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Aborting."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#, java-format
+msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
+#, fuzzy
+msgid "Parsing list of changesets..."
+msgstr "Loka breytingasetti..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
 msgid "Incorrect password or username."
 msgstr "Rangt lykilorð eða notandanafn"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:168
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 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:172
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Save user and password (unencrypted)"
 msgstr "Vista notandanafn og lykilorð (ódulkóðað)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
 msgid "Enter Password"
 msgstr "Sláðu inn lykilorð"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 msgid "Login"
 msgstr "Innskrá"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:242
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
 msgid "The base URL for the OSM server (REST API)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
 msgid "Login name (e-mail) to the OSM account."
 msgstr "Notandanafn (eða netfang) á OSM þjóninum."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -8791,17 +9077,17 @@
 "Lykilorð á OSM þjóninum. Hafðu þetta óútfyllt til að vista ekki lykilorðið."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
 msgid "Base Server URL"
 msgstr "Slóð OSM þjóns"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
 msgid "OSM username (e-mail)"
 msgstr "OSM notandanafn (netfang)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
 msgid "OSM password"
 msgstr "OSM lykilorð"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -8810,5 +9096,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:51
+#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #, java-format
 msgid "(at line {0}, column {1})"
@@ -8898,20 +9184,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124
-#, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
-#, fuzzy, java-format
-msgid "Missing mandatory attribute ''{0}''"
-msgstr "Atriði merkt \"{0}\" vantar"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
-#, fuzzy, java-format
-msgid "Unsupported version: {0}"
-msgstr "Óþekkt útgáfa: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:155
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -8920,38 +9191,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
 msgid "found XML element <nd> element not as direct child of element <way>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
 msgid "Found XML element <member> not as direct child of element <relation>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
 #, java-format
 msgid ""
@@ -8959,24 +9230,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
 msgid "Incomplete <member> specification with ref=0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
-#, java-format
-msgid "Warning: Undefined element ''{0}'' found in input stream. Skipping."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
-#, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Skipping."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
 msgid "Illegal object with id=0"
 msgstr "Ógildur hlutur með kenni=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #, java-format
 msgid ""
@@ -8984,5 +9250,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:303
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
 #, java-format
 msgid ""
@@ -8991,5 +9257,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
 #, java-format
 msgid ""
@@ -8998,5 +9264,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
@@ -9006,25 +9272,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:316
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#, java-format
 msgid "Unknown or unsupported API version. Got {0}"
-msgstr "Óþekkt útgáfa: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with id {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#, java-format
 msgid "Missing required attribute ''{0}''."
-msgstr "Atriði merkt \"{0}\" vantar"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
 #, java-format
 msgid ""
@@ -9032,5 +9298,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
 #, java-format
 msgid ""
@@ -9039,5 +9305,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
 #, java-format
 msgid ""
@@ -9045,5 +9311,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
 #, java-format
 msgid ""
@@ -9052,17 +9318,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
 msgid "Prepare OSM data..."
 msgstr "Undirbý OSM gögn..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 msgid "Parsing OSM data..."
-msgstr "Undirbý OSM gögn..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
 msgid "Preparing data set..."
-msgstr "Undirbý gögn..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
@@ -9083,4 +9347,24 @@
 msgid "Downloading referring relations ..."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51
+#, fuzzy
+msgid "Reading changesets..."
+msgstr "Bý til breytingarsett..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
+#, fuzzy
+msgid "Downloading changesets ..."
+msgstr "Loka breytingasetti..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85
+#, fuzzy, java-format
+msgid "Reading changeset {0} ..."
+msgstr "Bý til breytingarsett..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91
+#, fuzzy, java-format
+msgid "Downloading changeset {0} ..."
+msgstr "Niðurhel {0}..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
@@ -9097,10 +9381,14 @@
 msgstr "Hef samband við þjóninn..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
 msgid "Failed to open connection to API {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
+msgid "Error: failed to add authentication credentials to the connection."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -9108,33 +9396,52 @@
 "Gat ekki tengst OSM þjóninum. Vinsamlegast athugaðu nettenginguna þína."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+msgid "XML tag <user> is missing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
+#, fuzzy, java-format
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgstr "Nota forstillinguna „{0}“ í flokknum „{1}“"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
+#, java-format
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
 msgid "Starting to upload with one request per primitive ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
 msgid "Starting to upload in one request ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:171
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135
 msgid "Uploading data ..."
-msgstr "Hleð upp gögnum..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:178
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
 msgid ""
 "WARNING: no API version defined for data to upload. Falling back to version "
@@ -9142,5 +9449,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147
 #, java-format
 msgid ""
@@ -9150,10 +9457,10 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
 msgid "Update Plugins"
 msgstr "Uppfæra viðbætur"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 msgid "Download Plugins"
 msgstr "Hala niður viðbótum"
@@ -9310,5 +9617,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -9317,18 +9624,18 @@
 msgstr[1] "Halaði niður lista yfir viðbætur frá {0} þjónum"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
 msgid "No plugin information found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:93
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
 msgid "All installed plugins are up to date."
 msgstr "Allar innsettar viðbætur eru af nýjustu útgáfu."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
 #, java-format
 msgid ""
@@ -9341,9 +9648,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
 msgid "Download missing plugins"
 msgstr "Hala niður nýjum viðbótum"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
 #, java-format
 msgid ""
@@ -9358,43 +9665,43 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
 msgid "unknown"
 msgstr "óskilgreint"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Útgáfa {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 msgid "Plugin bundled with JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:357
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -9711,10 +10018,4 @@
 msgid "(What does that mean?)"
 msgstr ""
-
-#. item "Relations/Route" text "Symbol description"
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3148
-msgid "Description"
-msgstr "Lýsing"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
@@ -10464,5 +10765,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
-msgid "Set "
+#, java-format
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
@@ -10530,6 +10832,6 @@
 msgid "Simplify Way (remove {0} node)"
 msgid_plural "Simplify Way (remove {0} nodes)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Einfalda veg (fjarlægja {0} hnút)"
+msgstr[1] "Einfalda veg (fjarlægja {0} hnúta)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:19
@@ -11081,6 +11383,6 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 #: build/trans_style.java:990 build/trans_style.java:1007
-#: build/trans_style.java:1023 build/trans_style.java:3392
-#: build/trans_style.java:3400
+#: build/trans_style.java:1023 build/trans_style.java:3400
+#: build/trans_style.java:3408
 msgid "water"
 msgstr "vatn"
@@ -11365,4 +11667,55 @@
 msgstr "Mælingar"
 
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Michigan Left"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Adds no left turn for sets of 4 or 5 ways."
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45
+#, fuzzy
+msgid "Please select 4 or 5 ways to assign no left turns."
+msgstr "Vinsamlegast veldu a.m.k. tvo vegi til að sameina."
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61
+#, fuzzy, java-format
+msgid "{0} extrem nodes."
+msgstr "{0} hnútur"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69
+#, java-format
+msgid "Via node {0}, {1}"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75
+#, fuzzy, java-format
+msgid "{0} via nodes."
+msgstr "{0} hnútur"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78
+msgid "Unable to find via nodes. Please check your selection"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98
+#, fuzzy, java-format
+msgid "MIddle way: {0}"
+msgstr "Kort: {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121
+msgid "Create Michigan left turn restriction"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129
+#, fuzzy, java-format
+msgid "Processing {0}"
+msgstr "Útgáfa {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142
+#, fuzzy, java-format
+msgid "Relation: from {0} to {1} via {2}"
+msgstr "Útgáfa {0} búin til {1} af {2}"
+
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
 msgid "OpenLayers"
@@ -11508,7 +11861,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
-#, fuzzy
 msgid "create new objects"
-msgstr "Eyða völdum hlutum."
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
@@ -11828,5 +12180,5 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:158
 msgid "JOSM Tag Editor Plugin"
 msgstr ""
@@ -11836,5 +12188,5 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:370
 #, java-format
 msgid "Updating properties of up to {0} object"
@@ -11843,18 +12195,4 @@
 msgstr[1] ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44
-msgid "INFO: entering compatibilty mode for JOSM with Main.ds"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47
-msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49
-msgid ""
-"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-"found."
-msgstr ""
-
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
 msgid "Group"
@@ -11863,9 +12201,4 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
 msgid "Item"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-msgid "Filter"
 msgstr ""
 
@@ -11952,5 +12285,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2272
 msgid "Street name"
 msgstr "Nafn götu"
@@ -12113,8 +12446,4 @@
 msgstr ""
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
-msgid "URL"
-msgstr ""
-
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 msgid "Jump there"
@@ -12135,5 +12464,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
 msgid "Simplify Way"
-msgstr ""
+msgstr "Einfalda veg"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:34
@@ -12143,5 +12472,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:83
 msgid "Please select at least one way to simplify."
-msgstr ""
+msgstr "Veldu í það minnsta einn veg til að einfalda."
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:88
@@ -12150,6 +12479,7 @@
 msgid_plural ""
 "The selection contains {0} ways. Are you sure you want to simplify them all?"
-msgstr[0] ""
+msgstr[0] "Þú ert með {0} veg valinn. Ertu viss um að þú viljir einfalda hann?"
 msgstr[1] ""
+"Þú ert með {0} vegi valda. Ertu viss um að þú viljir einfalda þá alla?"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91
@@ -12316,7 +12646,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501
-#, fuzzy
 msgid "Updating map ..."
-msgstr "Uppfæri gögn"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69
@@ -12800,7 +13129,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
-#: build/trans_style.java:4179
+#: build/trans_style.java:4159 build/trans_style.java:4166
+#: build/trans_style.java:4173 build/trans_style.java:4180
+#: build/trans_style.java:4187
 msgid "building"
 msgstr "bygging"
@@ -12814,5 +13143,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4186
+#: build/trans_style.java:4194
 msgid "area"
 msgstr ""
@@ -12939,10 +13268,10 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:148
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:155
 msgid "Reached a junction"
 msgstr ""
@@ -13382,6 +13711,11 @@
 msgstr ""
 
+#. Plugin michigan_left
+#: build/trans_plugins.java:35
+msgid "Adds no left turn for sets of 4 or 5 ways"
+msgstr ""
+
 #. Plugin nearclick
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid ""
 "Simulates a click when you do a small and short drag. This is usefull for "
@@ -13391,15 +13725,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13407,5 +13741,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13413,5 +13747,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13420,15 +13754,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13437,10 +13771,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13449,15 +13783,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -13467,10 +13801,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin usertools
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -13479,5 +13813,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -13486,5 +13820,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -13493,5 +13827,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -13500,10 +13834,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -13559,4 +13893,9 @@
 #. <annotations>
 #: build/trans_presets.java:57
+msgid "Highways"
+msgstr ""
+
+#. group "Highways"
+#: build/trans_presets.java:58
 msgid "Streets"
 msgstr "Stræti"
@@ -13567,5 +13906,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:58 build/trans_surveyor.java:72
+#: build/trans_presets.java:59 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Hraðbraut"
@@ -13574,5 +13913,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:61
+#: build/trans_presets.java:62
 msgid "Edit Motorway"
 msgstr "Breyti hraðbraut"
@@ -13599,8 +13938,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:120 build/trans_presets.java:140
-#: build/trans_presets.java:177 build/trans_presets.java:197
-#: build/trans_presets.java:1557 build/trans_presets.java:3146
+#: build/trans_presets.java:65 build/trans_presets.java:101
+#: build/trans_presets.java:121 build/trans_presets.java:141
+#: build/trans_presets.java:178 build/trans_presets.java:198
+#: build/trans_presets.java:1560 build/trans_presets.java:3158
 msgid "Reference"
 msgstr "Tilvísun"
@@ -13614,8 +13953,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:358
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:359
 msgid "Lanes"
 msgstr "Akreinar"
@@ -13632,15 +13971,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:224 build/trans_presets.java:280
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:373 build/trans_presets.java:388
-#: build/trans_presets.java:412 build/trans_presets.java:431
-#: build/trans_presets.java:452 build/trans_presets.java:472
-#: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1307
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:225 build/trans_presets.java:281
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:374 build/trans_presets.java:389
+#: build/trans_presets.java:413 build/trans_presets.java:432
+#: build/trans_presets.java:453 build/trans_presets.java:473
+#: build/trans_presets.java:511 build/trans_presets.java:667
+#: build/trans_presets.java:1310
 msgid "Max. speed (km/h)"
 msgstr "Hámarkshraði (km/klst)"
@@ -13677,16 +14016,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:293 build/trans_presets.java:306
-#: build/trans_presets.java:320 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:464
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:659 build/trans_presets.java:1300
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:294 build/trans_presets.java:307
+#: build/trans_presets.java:321 build/trans_presets.java:353
+#: build/trans_presets.java:405 build/trans_presets.java:425
+#: build/trans_presets.java:445 build/trans_presets.java:465
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:660 build/trans_presets.java:1303
 msgid "Oneway"
 msgstr "Einstefnuvegur"
@@ -13728,19 +14067,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:353
-#: build/trans_presets.java:362 build/trans_presets.java:405
-#: build/trans_presets.java:425 build/trans_presets.java:445
-#: build/trans_presets.java:465 build/trans_presets.java:485
-#: build/trans_presets.java:504 build/trans_presets.java:523
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:586 build/trans_presets.java:607
-#: build/trans_presets.java:628 build/trans_presets.java:660
-#: build/trans_presets.java:1301 build/trans_surveyor.java:12
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:354
+#: build/trans_presets.java:363 build/trans_presets.java:406
+#: build/trans_presets.java:426 build/trans_presets.java:446
+#: build/trans_presets.java:466 build/trans_presets.java:486
+#: build/trans_presets.java:505 build/trans_presets.java:524
+#: build/trans_presets.java:545 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629 build/trans_presets.java:661
+#: build/trans_presets.java:1304 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Brú"
@@ -13776,19 +14115,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:354
-#: build/trans_presets.java:378 build/trans_presets.java:406
-#: build/trans_presets.java:426 build/trans_presets.java:446
-#: build/trans_presets.java:466 build/trans_presets.java:486
-#: build/trans_presets.java:505 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629 build/trans_presets.java:661
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:355
+#: build/trans_presets.java:379 build/trans_presets.java:407
+#: build/trans_presets.java:427 build/trans_presets.java:447
+#: build/trans_presets.java:467 build/trans_presets.java:487
+#: build/trans_presets.java:506 build/trans_presets.java:525
+#: build/trans_presets.java:546 build/trans_presets.java:567
+#: build/trans_presets.java:588 build/trans_presets.java:609
+#: build/trans_presets.java:630 build/trans_presets.java:662
+#: build/trans_presets.java:1305
 msgid "Tunnel"
 msgstr "Göng"
@@ -13822,18 +14161,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:73 build/trans_presets.java:90
-#: build/trans_presets.java:110 build/trans_presets.java:129
-#: build/trans_presets.java:150 build/trans_presets.java:166
-#: build/trans_presets.java:186 build/trans_presets.java:205
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:355
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:467
-#: build/trans_presets.java:487 build/trans_presets.java:506
-#: build/trans_presets.java:525 build/trans_presets.java:546
-#: build/trans_presets.java:567 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:630
-#: build/trans_presets.java:662 build/trans_presets.java:1303
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:356
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:468
+#: build/trans_presets.java:488 build/trans_presets.java:507
+#: build/trans_presets.java:526 build/trans_presets.java:547
+#: build/trans_presets.java:568 build/trans_presets.java:589
+#: build/trans_presets.java:610 build/trans_presets.java:631
+#: build/trans_presets.java:663 build/trans_presets.java:1306
 msgid "Cutting"
 msgstr "Niðurgrafinn"
@@ -13867,18 +14206,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:74 build/trans_presets.java:91
-#: build/trans_presets.java:111 build/trans_presets.java:130
-#: build/trans_presets.java:151 build/trans_presets.java:167
-#: build/trans_presets.java:187 build/trans_presets.java:206
-#: build/trans_presets.java:222 build/trans_presets.java:240
-#: build/trans_presets.java:258 build/trans_presets.java:277
-#: build/trans_presets.java:310 build/trans_presets.java:356
-#: build/trans_presets.java:408 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:468
-#: build/trans_presets.java:488 build/trans_presets.java:507
-#: build/trans_presets.java:526 build/trans_presets.java:547
-#: build/trans_presets.java:568 build/trans_presets.java:589
-#: build/trans_presets.java:610 build/trans_presets.java:631
-#: build/trans_presets.java:663 build/trans_presets.java:1304
+#: build/trans_presets.java:75 build/trans_presets.java:92
+#: build/trans_presets.java:112 build/trans_presets.java:131
+#: build/trans_presets.java:152 build/trans_presets.java:168
+#: build/trans_presets.java:188 build/trans_presets.java:207
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:357
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:469
+#: build/trans_presets.java:489 build/trans_presets.java:508
+#: build/trans_presets.java:527 build/trans_presets.java:548
+#: build/trans_presets.java:569 build/trans_presets.java:590
+#: build/trans_presets.java:611 build/trans_presets.java:632
+#: build/trans_presets.java:664 build/trans_presets.java:1307
 msgid "Embankment"
 msgstr "Upphækkun"
@@ -13886,5 +14225,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Motorway Link"
 msgstr "Tengibraut á hraðbraut"
@@ -13893,5 +14232,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:80
+#: build/trans_presets.java:81
 msgid "Edit Motorway Link"
 msgstr "Breyti tengibraut á hraðbraut"
@@ -13899,5 +14238,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:94
+#: build/trans_presets.java:95
 msgid "Trunk"
 msgstr "Stofnvegur"
@@ -13906,5 +14245,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:97
+#: build/trans_presets.java:98
 msgid "Edit Trunk"
 msgstr "Breyti stofnveg"
@@ -13914,6 +14253,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
 msgid "Motorroad"
 msgstr "Hraðbrautarlíkar aðgangstakmarkanir"
@@ -13921,5 +14260,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:114
+#: build/trans_presets.java:115
 msgid "Trunk Link"
 msgstr "Tengivegur á stofnveg"
@@ -13928,5 +14267,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:117
+#: build/trans_presets.java:118
 msgid "Edit Trunk Link"
 msgstr "Breyti tengiveg á stofnveg"
@@ -13939,5 +14278,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:134 build/trans_surveyor.java:76
+#: build/trans_presets.java:135 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Fyrsta stigs"
@@ -13946,5 +14285,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:137
+#: build/trans_presets.java:138
 msgid "Edit Primary Road"
 msgstr "Breyti fyrsta stigs veg"
@@ -13952,10 +14291,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:154
+#: build/trans_presets.java:155
 msgid "Primary Link"
 msgstr "Tengivegur á fyrsta stigs veg"
 
 #. item
-#: build/trans_presets.java:155
+#: build/trans_presets.java:156
 msgid "Edit Primary Link"
 msgstr ""
@@ -13967,5 +14306,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:170 build/trans_surveyor.java:80
+#: build/trans_presets.java:171 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Annars stigs vegur"
@@ -13975,5 +14314,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:174
+#: build/trans_presets.java:175
 msgid "Edit Secondary Road"
 msgstr "Breyti annars stigs veg"
@@ -13981,5 +14320,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:190
+#: build/trans_presets.java:191
 msgid "Tertiary"
 msgstr "Þriðja stigs vegur"
@@ -13989,5 +14328,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:194
+#: build/trans_presets.java:195
 msgid "Edit Tertiary Road"
 msgstr "Breyti þriðja stigs veg"
@@ -13999,5 +14338,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:209 build/trans_surveyor.java:84
+#: build/trans_presets.java:210 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Óflokkaður"
@@ -14007,5 +14346,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:213
+#: build/trans_presets.java:214
 msgid "Edit Unclassified Road"
 msgstr "Breyti óflokkuðum veg"
@@ -14032,19 +14371,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:225 build/trans_presets.java:243
-#: build/trans_presets.java:261 build/trans_presets.java:281
-#: build/trans_presets.java:314 build/trans_presets.java:359
-#: build/trans_presets.java:375 build/trans_presets.java:389
-#: build/trans_presets.java:413 build/trans_presets.java:432
-#: build/trans_presets.java:453 build/trans_presets.java:473
-#: build/trans_presets.java:491 build/trans_presets.java:511
-#: build/trans_presets.java:532 build/trans_presets.java:553
-#: build/trans_presets.java:574 build/trans_presets.java:595
-#: build/trans_presets.java:616 build/trans_presets.java:637
-#: build/trans_presets.java:667 build/trans_presets.java:680
-#: build/trans_presets.java:693 build/trans_presets.java:706
-#: build/trans_presets.java:719 build/trans_presets.java:732
-#: build/trans_presets.java:745 build/trans_presets.java:1308
-#: build/trans_presets.java:1498 build/trans_presets.java:1540
+#: build/trans_presets.java:226 build/trans_presets.java:244
+#: build/trans_presets.java:262 build/trans_presets.java:282
+#: build/trans_presets.java:315 build/trans_presets.java:360
+#: build/trans_presets.java:376 build/trans_presets.java:390
+#: build/trans_presets.java:414 build/trans_presets.java:433
+#: build/trans_presets.java:454 build/trans_presets.java:474
+#: build/trans_presets.java:492 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:554
+#: build/trans_presets.java:575 build/trans_presets.java:596
+#: build/trans_presets.java:617 build/trans_presets.java:638
+#: build/trans_presets.java:668 build/trans_presets.java:681
+#: build/trans_presets.java:694 build/trans_presets.java:707
+#: build/trans_presets.java:720 build/trans_presets.java:733
+#: build/trans_presets.java:746 build/trans_presets.java:1311
+#: build/trans_presets.java:1501 build/trans_presets.java:1543
 msgid "Width (meters)"
 msgstr "Breidd (í metrum)"
@@ -14056,5 +14395,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:228 build/trans_surveyor.java:88
+#: build/trans_presets.java:229 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Íbúðargata"
@@ -14063,5 +14402,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:231
+#: build/trans_presets.java:232
 msgid "Edit Residential Street"
 msgstr "Breyti íbúðargötu"
@@ -14086,14 +14425,14 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:611
-#: build/trans_presets.java:632 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "Surface"
 msgstr "Slitlag"
@@ -14114,53 +14453,53 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paved"
 msgstr "malbikaður"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "unpaved"
 msgstr "ómalbikaður"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
 msgid "metal"
 msgstr ""
@@ -14174,22 +14513,22 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
-#: build/trans_style.java:3367
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
+#: build/trans_style.java:3375
 msgid "wood"
 msgstr "skógur"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paving_stones"
 msgstr ""
@@ -14197,77 +14536,77 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "cobblestone"
 msgstr "götusteinn"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "gravel"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "grass"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "sand"
 msgstr ""
@@ -14275,13 +14614,13 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "ground"
 msgstr ""
@@ -14289,5 +14628,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:246
+#: build/trans_presets.java:247
 msgid "Living Street"
 msgstr "Vistgata"
@@ -14296,5 +14635,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:249
+#: build/trans_presets.java:250
 msgid "Edit Living Street"
 msgstr "Breyti vistgötu"
@@ -14302,5 +14641,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:264
+#: build/trans_presets.java:265
 msgid "Service"
 msgstr "Þjónustuvegur"
@@ -14309,5 +14648,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:267
+#: build/trans_presets.java:268
 msgid "Edit Serviceway"
 msgstr "Breyta þjónustuveg"
@@ -14317,18 +14656,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "Serviceway type"
 msgstr "Gerð þjónustuvegs"
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "alley"
 msgstr "port"
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "driveway"
 msgstr "heimreið"
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "parking_aisle"
 msgstr "bílastæðavegur"
@@ -14336,5 +14675,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:284
+#: build/trans_presets.java:285
 msgid "Parking Aisle"
 msgstr "Bílastæðavegur"
@@ -14344,5 +14683,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:288
+#: build/trans_presets.java:289
 msgid "Edit Parking Aisle"
 msgstr "Breyti bílastæðaveg"
@@ -14350,5 +14689,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:298
+#: build/trans_presets.java:299
 msgid "Road (Unknown Type)"
 msgstr "Vegur (óþekkt flokkun)"
@@ -14357,5 +14696,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Edit Road of unknown type"
 msgstr "Breyti veg af óþekktri flokkun"
@@ -14364,20 +14703,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:318
+#: build/trans_presets.java:319
 msgid "Road Restrictions"
 msgstr "Vegtakmarkanir"
 
 #. item
-#: build/trans_presets.java:319
+#: build/trans_presets.java:320
 msgid "Edit Road Restrictions"
 msgstr "Breyti vegtakmörkunum"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:321
+#: build/trans_presets.java:322
 msgid "Toll"
 msgstr "Tollur"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:322
+#: build/trans_presets.java:323
 msgid "No exit (cul-de-sac)"
 msgstr ""
@@ -14390,8 +14729,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:323 build/trans_presets.java:529
-#: build/trans_presets.java:550 build/trans_presets.java:571
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:634
+#: build/trans_presets.java:324 build/trans_presets.java:530
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:593 build/trans_presets.java:614
+#: build/trans_presets.java:635
 msgid "Access"
 msgstr "Aðgangur"
@@ -14445,29 +14784,29 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1397
-#: build/trans_presets.java:1398 build/trans_presets.java:1399
-#: build/trans_presets.java:1763 build/trans_presets.java:1773
-#: build/trans_presets.java:2397 build/trans_presets.java:2433
-#: build/trans_presets.java:2442 build/trans_presets.java:2443
-#: build/trans_presets.java:2444 build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:1396
+#: build/trans_presets.java:1397 build/trans_presets.java:1400
+#: build/trans_presets.java:1401 build/trans_presets.java:1402
+#: build/trans_presets.java:1767 build/trans_presets.java:1777
+#: build/trans_presets.java:2408 build/trans_presets.java:2444
+#: build/trans_presets.java:2453 build/trans_presets.java:2454
+#: build/trans_presets.java:2455 build/trans_presets.java:2725
 msgid "yes"
 msgstr "já"
@@ -14480,40 +14819,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:212
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:212
 msgid "private"
 msgstr "einkavegur"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655
 msgid "designated"
 msgstr ""
@@ -14526,19 +14865,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:219
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:219
 msgid "destination"
 msgstr ""
@@ -14561,71 +14900,71 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:205
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:205
 msgid "permissive"
 msgstr "leyfður"
 
-#: build/trans_presets.java:323 build/trans_presets.java:327
-#: build/trans_presets.java:330 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636
+#: build/trans_presets.java:324 build/trans_presets.java:328
+#: build/trans_presets.java:331 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637
 msgid "agricultural"
 msgstr "í landbúnaðarskyni"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
-#: build/trans_presets.java:2433 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1396 build/trans_presets.java:1397
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
+#: build/trans_presets.java:2444 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
+#: build/trans_presets.java:2725
 msgid "no"
 msgstr "nei"
 
-#: build/trans_presets.java:326
+#: build/trans_presets.java:327
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:327
+#: build/trans_presets.java:328
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -14640,10 +14979,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:328 build/trans_presets.java:651
-#: build/trans_presets.java:858 build/trans_presets.java:891
-#: build/trans_presets.java:913 build/trans_presets.java:950
-#: build/trans_presets.java:963 build/trans_presets.java:975
-#: build/trans_presets.java:987 build/trans_presets.java:999
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:329 build/trans_presets.java:652
+#: build/trans_presets.java:859 build/trans_presets.java:892
+#: build/trans_presets.java:914 build/trans_presets.java:951
+#: build/trans_presets.java:964 build/trans_presets.java:976
+#: build/trans_presets.java:988 build/trans_presets.java:1000
+#: build/trans_presets.java:1040
 msgid "Horse"
 msgstr "Hestar"
@@ -14659,13 +14998,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:329 build/trans_presets.java:530
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:635 build/trans_presets.java:859
-#: build/trans_presets.java:877 build/trans_presets.java:892
-#: build/trans_presets.java:914 build/trans_presets.java:951
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:330 build/trans_presets.java:531
+#: build/trans_presets.java:552 build/trans_presets.java:573
+#: build/trans_presets.java:594 build/trans_presets.java:615
+#: build/trans_presets.java:636 build/trans_presets.java:860
+#: build/trans_presets.java:878 build/trans_presets.java:893
+#: build/trans_presets.java:915 build/trans_presets.java:952
+#: build/trans_presets.java:965 build/trans_presets.java:977
+#: build/trans_presets.java:989 build/trans_presets.java:1001
+#: build/trans_presets.java:1041
 msgid "Motorcycle"
 msgstr "Vélhjól"
@@ -14680,30 +15019,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:330 build/trans_presets.java:531
-#: build/trans_presets.java:552 build/trans_presets.java:573
-#: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:636 build/trans_presets.java:654
-#: build/trans_presets.java:878 build/trans_presets.java:893
-#: build/trans_presets.java:915 build/trans_presets.java:952
-#: build/trans_presets.java:965 build/trans_presets.java:977
-#: build/trans_presets.java:989 build/trans_presets.java:1001
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:331 build/trans_presets.java:532
+#: build/trans_presets.java:553 build/trans_presets.java:574
+#: build/trans_presets.java:595 build/trans_presets.java:616
+#: build/trans_presets.java:637 build/trans_presets.java:655
+#: build/trans_presets.java:879 build/trans_presets.java:894
+#: build/trans_presets.java:916 build/trans_presets.java:953
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1042
 msgid "Motorcar"
 msgstr "Bifreið"
 
-#: build/trans_presets.java:331
+#: build/trans_presets.java:332
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
-#: build/trans_presets.java:332
+#: build/trans_presets.java:333
 msgid "Motorboat"
 msgstr ""
 
-#: build/trans_presets.java:333
+#: build/trans_presets.java:334
 msgid "Boat"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:336
 msgid "Min. speed (km/h)"
 msgstr "Lámarkshraði (km/klst)"
@@ -14711,25 +15050,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:336 build/trans_presets.java:374
+#: build/trans_presets.java:337 build/trans_presets.java:375
 msgid "Max. weight (tonnes)"
 msgstr "Hámarksþyngt (í tonnum)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:337
+#: build/trans_presets.java:338
 msgid "Max. Height (meters)"
 msgstr "Hámarkshæð (í metrum)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Max. Width (meters)"
 msgstr "Hámarksbreidd (í metrum)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:339
+#: build/trans_presets.java:340
 msgid "Max. Length (meters)"
 msgstr "Hámarkslengd (í metrum)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:341
+#: build/trans_presets.java:342
 msgid "Roundabout"
 msgstr "Hringtorg"
@@ -14740,5 +15079,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:346
+#: build/trans_presets.java:347
 msgid "Edit Junction"
 msgstr "Breyti hringtorgi"
@@ -14760,9 +15099,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:349 build/trans_presets.java:648
-#: build/trans_presets.java:788 build/trans_presets.java:1135
-#: build/trans_presets.java:1392 build/trans_presets.java:2353
-#: build/trans_presets.java:2901 build/trans_presets.java:2911
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:350 build/trans_presets.java:649
+#: build/trans_presets.java:789 build/trans_presets.java:1137
+#: build/trans_presets.java:1395 build/trans_presets.java:2364
+#: build/trans_presets.java:2913 build/trans_presets.java:2923
+#: build/trans_presets.java:2932
 msgid "Type"
 msgstr "Gerð"
@@ -14782,10 +15121,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:547
+#: build/trans_presets.java:350 build/trans_style.java:547
 #: build/trans_style.java:555
 msgid "motorway"
 msgstr "hraðbraut"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "motorway_link"
 msgstr "tengibraut á hraðbraut"
@@ -14807,10 +15146,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:563
+#: build/trans_presets.java:350 build/trans_style.java:563
 #: build/trans_style.java:571
 msgid "trunk"
 msgstr "stofnvegur"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "trunk_link"
 msgstr ""
@@ -14832,10 +15171,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:579
+#: build/trans_presets.java:350 build/trans_style.java:579
 #: build/trans_style.java:587
 msgid "primary"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "primary_link"
 msgstr ""
@@ -14857,5 +15196,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:595
+#: build/trans_presets.java:350 build/trans_style.java:595
 #: build/trans_style.java:603
 msgid "secondary"
@@ -14870,9 +15209,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:349 build/trans_style.java:611
+#: build/trans_presets.java:350 build/trans_style.java:611
 msgid "tertiary"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "unclassified"
 msgstr "óflokkaður"
@@ -14886,9 +15225,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:349 build/trans_style.java:3143
+#: build/trans_presets.java:350 build/trans_style.java:3151
 msgid "residential"
 msgstr "íbúðargata"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "living_street"
 msgstr "vistgata"
@@ -14918,10 +15257,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:349 build/trans_style.java:667
-#: build/trans_style.java:4244
+#: build/trans_presets.java:350 build/trans_style.java:667
+#: build/trans_style.java:4252
 msgid "service"
 msgstr "þjónustuvegur"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "bus_guideway"
 msgstr ""
@@ -14951,6 +15290,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:349 build/trans_style.java:877
-#: build/trans_style.java:3208 build/trans_style.java:3209
+#: build/trans_presets.java:350 build/trans_style.java:877
+#: build/trans_style.java:3216 build/trans_style.java:3217
 msgid "construction"
 msgstr "byggingarsvæði"
@@ -14961,10 +15300,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Edit Bridge"
 msgstr "Breyti brú"
 
 #. item
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "Edit Tunnel"
 msgstr "Breyti göngum"
@@ -14972,19 +15311,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:393
+#: build/trans_presets.java:394
 msgid "Ways"
 msgstr "Vegir"
 
 #. group "Ways"
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Construction"
 msgstr "Í byggingu"
 
 #. item
-#: build/trans_presets.java:395
+#: build/trans_presets.java:396
 msgid "Edit Highway Under Construction"
 msgstr "Breyti veg í byggingu"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "Junction"
 msgstr "Hringtorg"
@@ -15000,5 +15339,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:411 build/trans_style.java:895
+#: build/trans_presets.java:412 build/trans_style.java:895
 msgid "roundabout"
 msgstr "hringtorg"
@@ -15007,5 +15346,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:417
+#: build/trans_presets.java:418
 msgid "Bridleway"
 msgstr "Reiðstígur"
@@ -15013,5 +15352,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:419
+#: build/trans_presets.java:420
 msgid "Edit Bridleway"
 msgstr "Breyti reiðstíg"
@@ -15019,5 +15358,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:435
+#: build/trans_presets.java:436
 msgid "Cycleway"
 msgstr "Hjólastígur"
@@ -15027,10 +15366,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:439
+#: build/trans_presets.java:440
 msgid "Edit Cycleway"
 msgstr "Breyti hjólastíg"
 
 #. item "Ways/Cycleway" check "Embankment"
-#: build/trans_presets.java:449
+#: build/trans_presets.java:450
 msgid "Pedestrians"
 msgstr ""
@@ -15038,5 +15377,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Footway"
 msgstr "Göngustígur"
@@ -15045,10 +15384,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Footway"
 msgstr "Breyti göngustíg"
 
 #. item "Ways/Footway" check "Embankment"
-#: build/trans_presets.java:469
+#: build/trans_presets.java:470
 msgid "Bikes"
 msgstr ""
@@ -15056,5 +15395,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:476
+#: build/trans_presets.java:477
 msgid "Pedestrian"
 msgstr "Göngugata"
@@ -15063,5 +15402,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Edit Pedestrian Street"
 msgstr "Breyti göngugötu"
@@ -15069,5 +15408,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:494
+#: build/trans_presets.java:495
 msgid "Steps"
 msgstr "Stigi"
@@ -15077,5 +15416,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:498
+#: build/trans_presets.java:499
 msgid "Edit Flight of Steps"
 msgstr "Breyti stiga"
@@ -15084,5 +15423,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:515
+#: build/trans_presets.java:516
 msgid "Track"
 msgstr ""
@@ -15091,5 +15430,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:518
+#: build/trans_presets.java:519
 msgid "Edit Track"
 msgstr ""
@@ -15097,5 +15436,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:535
+#: build/trans_presets.java:536
 msgid "Track Grade 1"
 msgstr ""
@@ -15104,5 +15443,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:538
+#: build/trans_presets.java:539
 msgid "Edit Track of grade 1"
 msgstr ""
@@ -15110,5 +15449,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:556
+#: build/trans_presets.java:557
 msgid "Track Grade 2"
 msgstr ""
@@ -15117,5 +15456,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:559
+#: build/trans_presets.java:560
 msgid "Edit Track of grade 2"
 msgstr ""
@@ -15123,5 +15462,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:577
+#: build/trans_presets.java:578
 msgid "Track Grade 3"
 msgstr ""
@@ -15130,5 +15469,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:580
+#: build/trans_presets.java:581
 msgid "Edit Track of grade 3"
 msgstr ""
@@ -15136,5 +15475,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:598
+#: build/trans_presets.java:599
 msgid "Track Grade 4"
 msgstr ""
@@ -15143,5 +15482,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:601
+#: build/trans_presets.java:602
 msgid "Edit Track of grade 4"
 msgstr ""
@@ -15149,5 +15488,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:619
+#: build/trans_presets.java:620
 msgid "Track Grade 5"
 msgstr ""
@@ -15156,5 +15495,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:622
+#: build/trans_presets.java:623
 msgid "Edit Track of grade 5"
 msgstr ""
@@ -15163,5 +15502,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:641
+#: build/trans_presets.java:642
 msgid "Path"
 msgstr ""
@@ -15170,13 +15509,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:644
+#: build/trans_presets.java:645
 msgid "Edit Path"
 msgstr ""
 
-#: build/trans_presets.java:652
+#: build/trans_presets.java:653
 msgid "Ski"
 msgstr ""
 
-#: build/trans_presets.java:653
+#: build/trans_presets.java:654
 msgid "Snowmobile"
 msgstr ""
@@ -15186,6 +15525,6 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:670 build/trans_presets.java:1725
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:671 build/trans_presets.java:1729
+#: build/trans_presets.java:1752
 msgid "Hiking"
 msgstr ""
@@ -15195,5 +15534,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:674
+#: build/trans_presets.java:675
 msgid "Edit Hiking"
 msgstr ""
@@ -15201,5 +15540,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:683
+#: build/trans_presets.java:684
 msgid "Mountain Hiking"
 msgstr ""
@@ -15209,5 +15548,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:687
+#: build/trans_presets.java:688
 msgid "Edit Mountain Hiking"
 msgstr ""
@@ -15215,5 +15554,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:696
+#: build/trans_presets.java:697
 msgid "Demanding Mountain Hiking"
 msgstr ""
@@ -15223,5 +15562,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:700
+#: build/trans_presets.java:701
 msgid "Edit Demanding Mountain Hiking"
 msgstr ""
@@ -15229,5 +15568,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:709
+#: build/trans_presets.java:710
 msgid "Alpine Hiking"
 msgstr ""
@@ -15237,5 +15576,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:713
+#: build/trans_presets.java:714
 msgid "Edit Alpine Hiking"
 msgstr ""
@@ -15243,5 +15582,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:723
 msgid "Demanding Alpine Hiking"
 msgstr ""
@@ -15251,5 +15590,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:726
+#: build/trans_presets.java:727
 msgid "Edit Demanding Alpine Hiking"
 msgstr ""
@@ -15257,5 +15596,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:735
+#: build/trans_presets.java:736
 msgid "Difficult Alpine Hiking"
 msgstr ""
@@ -15265,5 +15604,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:739
+#: build/trans_presets.java:740
 msgid "Edit Difficult Alpine Hiking"
 msgstr ""
@@ -15271,10 +15610,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:749
+#: build/trans_presets.java:750
 msgid "Waypoints"
 msgstr "Vegpunktar"
 
 #. group "Waypoints"
-#: build/trans_presets.java:750
+#: build/trans_presets.java:751
 msgid "Motorway Junction"
 msgstr ""
@@ -15282,15 +15621,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:752
+#: build/trans_presets.java:753
 msgid "Edit Motorway Junction"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:757
 msgid "Number"
 msgstr "Tilvísun"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:759
 msgid "Services"
 msgstr ""
@@ -15298,5 +15637,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:761
 msgid "Edit Service Station"
 msgstr ""
@@ -15334,15 +15673,15 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:765 build/trans_presets.java:902
-#: build/trans_presets.java:1382 build/trans_presets.java:1406
-#: build/trans_presets.java:1413 build/trans_presets.java:1419
-#: build/trans_presets.java:1427 build/trans_presets.java:1434
-#: build/trans_presets.java:1761 build/trans_presets.java:1771
-#: build/trans_presets.java:2361 build/trans_presets.java:2368
-#: build/trans_presets.java:2384 build/trans_presets.java:2395
-#: build/trans_presets.java:2403 build/trans_presets.java:2410
-#: build/trans_presets.java:2464 build/trans_presets.java:2512
-#: build/trans_presets.java:2678 build/trans_presets.java:2693
-#: build/trans_presets.java:2732 build/trans_presets.java:3151
+#: build/trans_presets.java:766 build/trans_presets.java:903
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
+#: build/trans_presets.java:1416 build/trans_presets.java:1422
+#: build/trans_presets.java:1430 build/trans_presets.java:1437
+#: build/trans_presets.java:1765 build/trans_presets.java:1775
+#: build/trans_presets.java:2372 build/trans_presets.java:2379
+#: build/trans_presets.java:2395 build/trans_presets.java:2406
+#: build/trans_presets.java:2414 build/trans_presets.java:2421
+#: build/trans_presets.java:2475 build/trans_presets.java:2523
+#: build/trans_presets.java:2689 build/trans_presets.java:2704
+#: build/trans_presets.java:2743 build/trans_presets.java:3163
 msgid "Operator"
 msgstr "Rekstraraðili"
@@ -15351,5 +15690,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:769
+#: build/trans_presets.java:770
 msgid "Traffic Signal"
 msgstr "Umferðarljós"
@@ -15359,5 +15698,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:774
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -15366,27 +15705,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "island"
 msgstr "eyja"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:774 build/trans_presets.java:790
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:775 build/trans_presets.java:791
+#: build/trans_presets.java:1334
 msgid "Cross on horseback"
 msgstr ""
@@ -15394,6 +15733,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:775 build/trans_presets.java:789
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:776 build/trans_presets.java:790
+#: build/trans_presets.java:1335
 msgid "Cross by bicycle"
 msgstr ""
@@ -15402,11 +15741,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:776 build/trans_presets.java:791
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:1336
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:778
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -15414,30 +15753,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:780
+#: build/trans_presets.java:781
 msgid "Stop"
 msgstr ""
@@ -15445,5 +15784,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:783
+#: build/trans_presets.java:784
 msgid "Pedestrian Crossing"
 msgstr "Gangbraut"
@@ -15452,14 +15791,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:786
+#: build/trans_presets.java:787
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:793
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:795
 msgid "Mini-roundabout"
 msgstr "Smáhringtorg"
@@ -15470,14 +15809,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "Direction"
 msgstr "Átt"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "clockwise"
 msgstr "réttsælis"
 
-#: build/trans_presets.java:801
+#: build/trans_presets.java:802
 msgid "Turning Circle"
 msgstr "Beygjuhringur"
@@ -15487,20 +15826,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:806
+#: build/trans_presets.java:807
 msgid "City Limit"
 msgstr "Borgarmörk"
 
 #. item
-#: build/trans_presets.java:807
+#: build/trans_presets.java:808
 msgid "Edit City Limit Sign"
 msgstr "Breyti borgarmarkaskilti"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:812
+#: build/trans_presets.java:813
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:814
+#: build/trans_presets.java:815
 msgid "Speed Camera"
 msgstr "Hraðamyndavél"
@@ -15508,5 +15847,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:817
+#: build/trans_presets.java:818
 msgid "Emergency Phone"
 msgstr "Neyðarsími"
@@ -15514,5 +15853,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:820
+#: build/trans_presets.java:821
 msgid "Incline"
 msgstr ""
@@ -15520,5 +15859,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:823
+#: build/trans_presets.java:824
 msgid "Incline Steep"
 msgstr ""
@@ -15527,10 +15866,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:827
+#: build/trans_presets.java:828
 msgid "Ford"
 msgstr "Vað"
 
 #. item
-#: build/trans_presets.java:828
+#: build/trans_presets.java:829
 msgid "Edit Ford"
 msgstr "Breyti vaði"
@@ -15538,5 +15877,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:835
+#: build/trans_presets.java:836
 msgid "Mountain Pass"
 msgstr "Skarð"
@@ -15544,5 +15883,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:837
+#: build/trans_presets.java:838
 msgid "Edit Mountain Pass"
 msgstr "Breyti skarði"
@@ -15554,7 +15893,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:842 build/trans_presets.java:1600
-#: build/trans_presets.java:1745 build/trans_presets.java:2845
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:843 build/trans_presets.java:1604
+#: build/trans_presets.java:1749 build/trans_presets.java:2857
+#: build/trans_presets.java:2864 build/trans_presets.java:2871
 msgid "Elevation"
 msgstr "Hæð (y/s)"
@@ -15562,5 +15901,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:846
+#: build/trans_presets.java:847
 msgid "Barriers"
 msgstr "Tálmar"
@@ -15568,5 +15907,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:849
+#: build/trans_presets.java:850
 msgid "Bollard"
 msgstr ""
@@ -15574,5 +15913,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:852
 msgid "Edit Bollard"
 msgstr ""
@@ -15617,16 +15956,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:854 build/trans_presets.java:873
-#: build/trans_presets.java:887 build/trans_presets.java:909
-#: build/trans_presets.java:946 build/trans_presets.java:959
-#: build/trans_presets.java:971 build/trans_presets.java:983
-#: build/trans_presets.java:995 build/trans_presets.java:1007
-#: build/trans_presets.java:1017 build/trans_presets.java:1026
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:855 build/trans_presets.java:874
+#: build/trans_presets.java:888 build/trans_presets.java:910
+#: build/trans_presets.java:947 build/trans_presets.java:960
+#: build/trans_presets.java:972 build/trans_presets.java:984
+#: build/trans_presets.java:996 build/trans_presets.java:1008
+#: build/trans_presets.java:1018 build/trans_presets.java:1027
+#: build/trans_presets.java:1036
 msgid "Allowed traffic:"
 msgstr "Leyfileg umferð:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:861
+#: build/trans_presets.java:862
 msgid "Cycle Barrier"
 msgstr ""
@@ -15635,5 +15974,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:865
+#: build/trans_presets.java:866
 msgid "Block"
 msgstr ""
@@ -15641,5 +15980,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:868
+#: build/trans_presets.java:869
 msgid "Cattle Grid"
 msgstr "Rimlahlið"
@@ -15647,10 +15986,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:870
+#: build/trans_presets.java:871
 msgid "Edit Cattle Grid"
 msgstr "Breyti rimlahliði"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:880
+#: build/trans_presets.java:881
 msgid "Bus Trap"
 msgstr ""
@@ -15658,15 +15997,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:883
+#: build/trans_presets.java:884
 msgid "Spikes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:884
+#: build/trans_presets.java:885
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:896
 msgid "Toll Booth"
 msgstr "Tollskýli"
@@ -15674,5 +16013,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:897
+#: build/trans_presets.java:898
 msgid "Edit Toll Booth"
 msgstr "Breyti tollskýli"
@@ -15680,10 +16019,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:905
+#: build/trans_presets.java:906
 msgid "Border Control"
 msgstr "Landamæraeftirlit"
 
 #. item
-#: build/trans_presets.java:906
+#: build/trans_presets.java:907
 msgid "Edit Border Control"
 msgstr "Breyti landamæraeftirliti"
@@ -15693,5 +16032,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:920
+#: build/trans_presets.java:921
 msgid "Hedge"
 msgstr "Limgerði"
@@ -15700,5 +16039,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:925
 msgid "Fence"
 msgstr ""
@@ -15707,5 +16046,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:929
 msgid "Wall"
 msgstr ""
@@ -15713,5 +16052,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:931
+#: build/trans_presets.java:932
 msgid "City Wall"
 msgstr "Borgarveggur"
@@ -15720,5 +16059,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:935
+#: build/trans_presets.java:936
 msgid "Retaining Wall"
 msgstr ""
@@ -15730,15 +16069,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:942
+#: build/trans_presets.java:943
 msgid "Entrance"
 msgstr "Inngangur"
 
 #. item
-#: build/trans_presets.java:943
+#: build/trans_presets.java:944
 msgid "Edit Entrance"
 msgstr "Breyti inngang"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:954
+#: build/trans_presets.java:955
 msgid "Gate"
 msgstr "Hlið"
@@ -15746,50 +16085,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:956
+#: build/trans_presets.java:957
 msgid "Edit Gate"
 msgstr "Breyti hliði"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:967
+#: build/trans_presets.java:968
 msgid "Lift Gate"
 msgstr "Liftuhlið"
 
 #. item
-#: build/trans_presets.java:968
+#: build/trans_presets.java:969
 msgid "Edit Lift Gate"
 msgstr "Breyti liftuhliði"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:979
+#: build/trans_presets.java:980
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:980
+#: build/trans_presets.java:981
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:991
+#: build/trans_presets.java:992
 msgid "Bump Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:992
+#: build/trans_presets.java:993
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:1003
+#: build/trans_presets.java:1004
 msgid "Kissing Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1004
+#: build/trans_presets.java:1005
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1013
 msgid "Stile"
 msgstr ""
@@ -15797,25 +16136,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1014
+#: build/trans_presets.java:1015
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1023
 msgid "Turnstile"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1024
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1032
 msgid "Sally Port"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1033
 msgid "Edit Sally Port"
 msgstr ""
@@ -15823,13 +16162,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #.
-#. <separator/>
+#. group "Water"
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1046 build/trans_presets.java:1089
+#: build/trans_presets.java:1047 build/trans_presets.java:1048
+#: build/trans_presets.java:1091
 msgid "Water"
 msgstr "Vatn"
 
 #. group "Water"
-#: build/trans_presets.java:1047
+#: build/trans_presets.java:1049
 msgid "Spring"
 msgstr "Goshver"
@@ -15837,5 +16177,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1049
+#: build/trans_presets.java:1051
 msgid "Edit Spring"
 msgstr "Breyti goshver"
@@ -15843,5 +16183,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1056
 msgid "Drain"
 msgstr "Frárennsli"
@@ -15849,10 +16189,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1058
 msgid "Edit Drain"
 msgstr "Breyti frárennsli"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1064
 msgid "Stream"
 msgstr "Lækur"
@@ -15860,10 +16200,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1066
 msgid "Edit Stream"
 msgstr "Breyti læk"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1072
 msgid "Canal"
 msgstr "Skipaskurður"
@@ -15871,10 +16211,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1074
 msgid "Edit Canal"
 msgstr "Breyti skipaskurð"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1080
 msgid "River"
 msgstr "Á"
@@ -15884,5 +16224,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1084
 msgid "Edit River"
 msgstr "Breyti á"
@@ -15890,15 +16230,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1093
 msgid "Edit Water"
 msgstr "Breyti vatni"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1097
 msgid "Land"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1098
 msgid "Edit Land"
 msgstr "Breyti landi"
@@ -15906,15 +16246,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1103
 msgid "Basin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1104
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1109
 msgid "Reservoir"
 msgstr ""
@@ -15922,15 +16262,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1109
+#: build/trans_presets.java:1111
 msgid "Edit Reservoir Landuse"
 msgstr ""
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1116
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1117
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -15938,5 +16278,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1120
+#: build/trans_presets.java:1122
 msgid "Riverbank"
 msgstr "Árbakki"
@@ -15945,10 +16285,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1125
 msgid "Edit Riverbank"
 msgstr "Breyti árbakka"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1127
+#: build/trans_presets.java:1129
 msgid "Wetland"
 msgstr "Votlendi"
@@ -15959,14 +16299,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1134
 msgid "Edit Wetland"
 msgstr "Breyti votlendi"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "swamp"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "bog"
 msgstr ""
@@ -15980,35 +16320,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1135 build/trans_style.java:3384
+#: build/trans_presets.java:1137 build/trans_style.java:3392
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1139
 msgid "Mud"
 msgstr "Leðja"
 
 #. item
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1140
 msgid "Edit Mud"
 msgstr "Breyti leðju"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1144
 msgid "Beach"
 msgstr "Strönd"
@@ -16016,20 +16356,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1144
+#: build/trans_presets.java:1146
 msgid "Edit Beach"
 msgstr "Breyti strönd"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1150
 msgid "Bay"
 msgstr "Flói"
 
 #. item
-#: build/trans_presets.java:1149
+#: build/trans_presets.java:1151
 msgid "Edit Bay"
 msgstr "Breyti flóa"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1155
 msgid "Cliff"
 msgstr "Klettur"
@@ -16037,10 +16377,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1157
 msgid "Edit Cliff"
 msgstr "Breyti klett"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1159
+#: build/trans_presets.java:1161
 msgid "Coastline"
 msgstr "Strandlengja"
@@ -16048,5 +16388,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1163
 msgid "Edit Coastline"
 msgstr "Breyti strandlengju"
@@ -16054,5 +16394,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1168
 msgid "Ferry Route"
 msgstr "Siglingarleið ferju"
@@ -16060,5 +16400,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1170
 msgid "Edit Ferry"
 msgstr ""
@@ -16067,5 +16407,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1176
+#: build/trans_presets.java:1178
 msgid "Boatyard"
 msgstr ""
@@ -16073,10 +16413,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:1180
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1185
 msgid "Dock"
 msgstr "Skipakví"
@@ -16084,5 +16424,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1187
 msgid "Edit Dock"
 msgstr "Breyti skipakví"
@@ -16090,5 +16430,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1193
 msgid "Dam"
 msgstr "Stífla"
@@ -16096,15 +16436,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1195
 msgid "Edit Dam"
 msgstr "Breyti stíflu"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1199
+#: build/trans_presets.java:1201
 msgid "Waterway Point"
 msgstr "Vatnspunktar"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1202
 msgid "Lock Gate"
 msgstr ""
@@ -16113,5 +16453,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1206
 msgid "Weir"
 msgstr ""
@@ -16119,20 +16459,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1208
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1213
 msgid "Waterfall"
 msgstr "Foss"
 
 #. item
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1214
 msgid "Edit Waterfall"
 msgstr "Breyti fossi"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1219
 msgid "Turning Point"
 msgstr ""
@@ -16141,15 +16481,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1221
+#: build/trans_presets.java:1223
 msgid "Marina"
 msgstr "Smábátahöfn"
 
 #. item
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1224
 msgid "Edit Marina"
 msgstr "Breyti smábátahöfn"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1228
 msgid "Pier"
 msgstr "Bryggja"
@@ -16157,10 +16497,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1230
 msgid "Edit Pier"
 msgstr "Breyti bryggju"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1234
 msgid "Ferry Terminal"
 msgstr ""
@@ -16168,10 +16508,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1236
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1240
 msgid "Slipway"
 msgstr ""
@@ -16181,16 +16521,21 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1244
 msgid "Edit Slipway"
 msgstr ""
 
 #. item "Waterway Point/Slipway" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1250
+#, fuzzy
+msgid "Transport"
+msgstr "Almenningssamgöngur"
+
+#. group "Transport"
+#: build/trans_presets.java:1251
 msgid "Railway"
 msgstr ""
 
 #. group "Railway"
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1252
 msgid "Rail"
 msgstr ""
@@ -16198,5 +16543,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:1254
 msgid "Edit Rail"
 msgstr ""
@@ -16226,8 +16571,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "Optional Types"
 msgstr ""
@@ -16241,35 +16586,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1259
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1257
+#: build/trans_presets.java:1260
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1265
 msgid "Monorail"
 msgstr ""
@@ -16277,45 +16622,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1267
 msgid "Edit Monorail"
 msgstr ""
 
-#: build/trans_presets.java:1269
+#: build/trans_presets.java:1272
 msgid "Preserved"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1273
 msgid "Edit Preserved Railway"
 msgstr ""
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1278
 msgid "Light Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1279
 msgid "Edit Light Rail"
 msgstr ""
 
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1284
 msgid "Subway"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1285
 msgid "Edit Subway"
 msgstr ""
 
-#: build/trans_presets.java:1287
+#: build/trans_presets.java:1290
 msgid "Tram"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1291
 msgid "Edit Tram"
 msgstr ""
 
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1296
 msgid "Bus Guideway"
 msgstr ""
@@ -16323,5 +16668,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1295
+#: build/trans_presets.java:1298
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -16330,14 +16675,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1315
 msgid "Disused Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1313
+#: build/trans_presets.java:1316
 msgid "Edit Disused Railway"
 msgstr ""
 
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1321
 msgid "Abandoned Rail"
 msgstr ""
@@ -16346,5 +16691,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1325
 msgid "Level Crossing"
 msgstr ""
@@ -16353,5 +16698,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1329
 msgid "Crossing"
 msgstr ""
@@ -16361,5 +16706,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1333
 msgid "Crossing type"
 msgstr ""
@@ -16367,5 +16712,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1339
 msgid "Turntable"
 msgstr ""
@@ -16374,10 +16719,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1344
 msgid "Aerialway"
 msgstr "Skíðalyfta"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1345
 msgid "Chair Lift"
 msgstr "Stólalyfta"
@@ -16385,10 +16730,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1347
 msgid "Edit Chair Lift"
 msgstr "Breyti stólalyftu"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1351
 msgid "Drag Lift"
 msgstr "Toglyfta"
@@ -16396,10 +16741,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1353
 msgid "Edit Drag Lift"
 msgstr "Breyti toglyftu"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1357
 msgid "Cable Car"
 msgstr ""
@@ -16407,10 +16752,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1359
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1360
+#: build/trans_presets.java:1363
 msgid "Gondola"
 msgstr ""
@@ -16418,5 +16763,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1365
 msgid "Edit Gondola"
 msgstr ""
@@ -16424,5 +16769,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1366 build/trans_presets.java:1461
+#: build/trans_presets.java:1369 build/trans_presets.java:1464
 msgid "Station"
 msgstr ""
@@ -16433,10 +16778,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1368 build/trans_presets.java:1464
+#: build/trans_presets.java:1371 build/trans_presets.java:1467
 msgid "Edit Station"
 msgstr ""
 
 #. group "Car"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1378
 msgid "Fuel"
 msgstr "Bensínstöð"
@@ -16446,5 +16791,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1382
 msgid "Edit Fuel"
 msgstr "Breyti bensínstöð"
@@ -16502,32 +16847,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1671 build/trans_presets.java:1678
-#: build/trans_presets.java:1686 build/trans_presets.java:1699
-#: build/trans_presets.java:1713 build/trans_presets.java:1810
-#: build/trans_presets.java:1818 build/trans_presets.java:1909
-#: build/trans_presets.java:1915 build/trans_presets.java:2226
-#: build/trans_presets.java:2250 build/trans_presets.java:2465
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1703
+#: build/trans_presets.java:1717 build/trans_presets.java:1814
+#: build/trans_presets.java:1822 build/trans_presets.java:1919
+#: build/trans_presets.java:1925 build/trans_presets.java:2237
+#: build/trans_presets.java:2261 build/trans_presets.java:2476
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Opening Hours"
 msgstr "Opnunartími"
@@ -16586,91 +16931,91 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -16685,5 +17030,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1385 build/trans_presets.java:1438
+#: build/trans_presets.java:1388 build/trans_presets.java:1441
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -16693,5 +17038,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1391
 msgid "Edit Parking"
 msgstr "Breyti stæði"
@@ -16702,24 +17047,24 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1391 build/trans_presets.java:1762
-#: build/trans_presets.java:1772 build/trans_presets.java:2396
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:1394 build/trans_presets.java:1766
+#: build/trans_presets.java:1776 build/trans_presets.java:2407
+#: build/trans_presets.java:2524
 msgid "Reference number"
 msgstr "Tilvísun"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "surface"
 msgstr "slitlag"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1396
 msgid "Park and Ride"
 msgstr ""
@@ -16728,38 +17073,38 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1394 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
+#: build/trans_presets.java:1397 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
 msgid "Fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1396
+#: build/trans_presets.java:1399
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1400
 msgid "Spaces for Disabled"
 msgstr ""
 
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1401
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1402
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1403
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1405
 msgid "Wash"
 msgstr "Bílaþvottastöð"
 
 #. item
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1406
 msgid "Edit Car Wash"
 msgstr "Breyti bílaþvottastöð"
@@ -16767,5 +17112,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1408 build/trans_presets.java:1452
+#: build/trans_presets.java:1411 build/trans_presets.java:1455
 msgid "Shop"
 msgstr "Búð"
@@ -16773,15 +17118,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1413
 msgid "Edit Car Shop"
 msgstr "Breyti bílabúð"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1418
 msgid "Repair"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1419
 msgid "Edit Car Repair"
 msgstr ""
@@ -16789,5 +17134,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1421 build/trans_presets.java:1445
+#: build/trans_presets.java:1424 build/trans_presets.java:1448
 msgid "Rental"
 msgstr "Leiga"
@@ -16796,10 +17141,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1427
 msgid "Edit Car Rental"
 msgstr "Breyti bílaleigu"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1432
 msgid "Sharing"
 msgstr ""
@@ -16807,5 +17152,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1434
 msgid "Edit Car Sharing"
 msgstr ""
@@ -16813,10 +17158,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Parking"
 msgstr "Breyti hjólastæði"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1446
 msgid "Capacity"
 msgstr ""
@@ -16825,5 +17170,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1448
+#: build/trans_presets.java:1451
 msgid "Edit Bicycle Rental"
 msgstr "Breyti hjólaleigu"
@@ -16832,15 +17177,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1458
 msgid "Edit Bicycle Shop"
 msgstr "Breyti hjólabúð"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1463
 msgid "Public Transport"
 msgstr "Almenningssamgöngur"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:1472
 msgid "UIC-Reference"
 msgstr "UIC-Tilvísun"
@@ -16848,5 +17193,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1475
 msgid "Railway Halt"
 msgstr ""
@@ -16854,5 +17199,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1477
 msgid "Edit Halt"
 msgstr ""
@@ -16860,5 +17205,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1484
 msgid "Tram Stop"
 msgstr ""
@@ -16867,5 +17212,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1484
+#: build/trans_presets.java:1487
 msgid "Edit Tram Stop"
 msgstr ""
@@ -16873,5 +17218,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1494
 msgid "Railway Platform"
 msgstr ""
@@ -16880,5 +17225,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1497
 msgid "Edit Railway Platform"
 msgstr ""
@@ -16890,5 +17235,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1497 build/trans_presets.java:1539
+#: build/trans_presets.java:1500 build/trans_presets.java:1542
 msgid "Reference (track number)"
 msgstr ""
@@ -16896,10 +17241,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1499 build/trans_presets.java:1541
+#: build/trans_presets.java:1502 build/trans_presets.java:1544
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1504
 msgid "Subway Entrance"
 msgstr ""
@@ -16908,10 +17253,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1507
 msgid "Edit Subway Entrance"
 msgstr ""
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1512
 msgid "Wheelchair"
 msgstr ""
@@ -16920,5 +17265,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1517
 msgid "Bus Station"
 msgstr "Strætóstöð"
@@ -16927,5 +17272,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1520
 msgid "Edit Bus Station"
 msgstr "Breyti strætóstöð"
@@ -16933,5 +17278,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1526
 msgid "Bus Stop"
 msgstr "Strætóstopp"
@@ -16941,5 +17286,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1530
 msgid "Edit Bus Stop"
 msgstr "Breyti strætóstoppi"
@@ -16948,6 +17293,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1532 build/trans_presets.java:1785
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:1535 build/trans_presets.java:1789
+#: build/trans_presets.java:2453
 msgid "Shelter"
 msgstr "Skýli"
@@ -16955,10 +17300,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1538
 msgid "Bus Platform"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1539
 msgid "Edit Bus Platform"
 msgstr ""
@@ -16966,5 +17311,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1547
 msgid "Taxi"
 msgstr "Leigubílastöð"
@@ -16972,5 +17317,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1549
 msgid "Edit Taxi station"
 msgstr "Breyti leigubílastöð"
@@ -16978,5 +17323,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1554
 msgid "Airport"
 msgstr "Flugvöllur"
@@ -16984,15 +17329,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1556
 msgid "Edit Airport"
 msgstr "Breyti flugvelli"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1561
 msgid "IATA"
 msgstr ""
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1559
+#: build/trans_presets.java:1562
 msgid "ICAO"
 msgstr ""
@@ -17000,6 +17345,11 @@
 #. item "Public Transport/Airport" text "ICAO"
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1567
+#, fuzzy
+msgid "Travel"
+msgstr "Vista"
+
+#. group "Travel"
+#: build/trans_presets.java:1568
 msgid "Accomodation"
 msgstr "Gisting"
@@ -17011,5 +17361,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1565 build/trans_surveyor.java:43
+#: build/trans_presets.java:1569 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hótel"
@@ -17018,15 +17368,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:1568
+#: build/trans_presets.java:1572
 msgid "Edit Hotel"
 msgstr "Breyti hóteli"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1575
 msgid "Stars"
 msgstr "Stjörnur"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1577
 msgid "Motel"
 msgstr "Vegahótel"
@@ -17034,20 +17384,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1579
 msgid "Edit Motel"
 msgstr "Breyti vegahóteli"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1583
 msgid "Guest House"
 msgstr "Gistiheimili"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1584
 msgid "Edit Guest House"
 msgstr "Breyti gistiheimili"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1588
 msgid "Chalet"
 msgstr "Fjallakofi (e. Chalet)"
@@ -17055,10 +17405,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1590
 msgid "Edit Chalet"
 msgstr "Breyti fjallakofa í svissneskum stíl (e. Chalet)"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1594
 msgid "Hostel"
 msgstr "Farfuglaheimili"
@@ -17066,30 +17416,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1592
+#: build/trans_presets.java:1596
 msgid "Edit Hostel"
 msgstr "Breyti farfuglaheimili"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1600
 msgid "Alpine Hut"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1601
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1606
 msgid "Caravan Site"
 msgstr "Húsbílastæði"
 
 #. item
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1607
 msgid "Edit Caravan Site"
 msgstr "Breyti húsbílastæði"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1611
 msgid "Camping Site"
 msgstr "Tjaldstæði"
@@ -17097,10 +17447,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1613
 msgid "Edit Camping Site"
 msgstr "Breyti tjaldstæði"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1618
 msgid "Food+Drinks"
 msgstr "Matur & Drykkur"
@@ -17111,5 +17461,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1615 build/trans_surveyor.java:47
+#: build/trans_presets.java:1619 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Veitingastaður"
@@ -17117,5 +17467,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1621
 msgid "Edit Restaurant"
 msgstr "Breyti veitingastað"
@@ -17123,5 +17473,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "Cuisine"
 msgstr "Matargerð"
@@ -17129,61 +17479,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "italian"
 msgstr "ítölsk"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "chinese"
 msgstr "kínversk"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "burger"
 msgstr "hamborgarar"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "greek"
 msgstr "grísk"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "german"
 msgstr "þýsk"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "indian"
 msgstr "indversk"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "regional"
 msgstr "að hætti heimamanna"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "turkish"
 msgstr "tyrknesk"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "asian"
 msgstr "asísk"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "thai"
 msgstr "tælensk"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "mexican"
 msgstr "mexíkósk"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "japanese"
 msgstr "japönsk"
 
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1627
 msgid "Fast Food"
 msgstr "Skyndibiti"
@@ -17191,9 +17541,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1629
 msgid "Edit Fast Food Restaurant"
 msgstr "Breyti skyndibitastað"
 
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1635
 msgid "Cafe"
 msgstr "Kaffihús"
@@ -17201,9 +17551,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1633
+#: build/trans_presets.java:1637
 msgid "Edit Cafe"
 msgstr "Breyti kaffihúsi"
 
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1642
 msgid "Pub"
 msgstr "Bar"
@@ -17211,18 +17561,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1644
 msgid "Edit Pub"
 msgstr "Breyti bar"
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1649
 msgid "Biergarten"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1646
+#: build/trans_presets.java:1650
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1655
 msgid "Bar"
 msgstr ""
@@ -17230,9 +17580,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1657
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1662
 msgid "Nightclub"
 msgstr "Næturklúbbur"
@@ -17240,24 +17590,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1664
 msgid "Edit Nightclub"
 msgstr "Breyti næturklúbb"
 
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1670
 msgid "Tourism"
 msgstr "Ferðamennska"
 
 #. group "Tourism"
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1671
 msgid "Attraction"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1672
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1677
 msgid "Museum"
 msgstr "Safn"
@@ -17265,9 +17615,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1679
 msgid "Edit Museum"
 msgstr "Breyti safni"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1684
 msgid "Zoo"
 msgstr "Dýragarður"
@@ -17276,9 +17626,9 @@
 #. <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:1683
+#: build/trans_presets.java:1687
 msgid "Edit Zoo"
 msgstr "Breyti dýragarð"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1692
 msgid "Viewpoint"
 msgstr "Útsýnisstaður"
@@ -17286,24 +17636,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1694
 msgid "Edit Viewpoint"
 msgstr "Breyti útsýnisstað"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1697
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1699
 msgid "Theme Park"
 msgstr "Skemmtigarður"
 
 #. item
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1700
 msgid "Edit Theme Park"
 msgstr "Breyti skemmtigarð"
 
-#: build/trans_presets.java:1701
+#: build/trans_presets.java:1705
 msgid "Artwork"
 msgstr "Listaverk"
@@ -17311,5 +17661,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1707
 msgid "Edit Artwork"
 msgstr "Breyti listaverki"
@@ -17317,19 +17667,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1712
 msgid "Information Office"
 msgstr "Upplýsingamiðstöð"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1719
 msgid "Map"
 msgstr "Kort"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "topo"
 msgstr ""
@@ -17367,5 +17717,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1720 build/trans_style.java:619
+#: build/trans_presets.java:1724 build/trans_style.java:619
 #: build/trans_style.java:635 build/trans_style.java:651
 #: build/trans_style.java:659
@@ -17373,28 +17723,28 @@
 msgstr "stræti"
 
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1722 build/trans_presets.java:1738
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1726 build/trans_presets.java:1742
+#: build/trans_presets.java:1786
 msgid "Closer Description"
 msgstr "Nánari lýsing"
@@ -17404,5 +17754,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1724 build/trans_presets.java:1747
+#: build/trans_presets.java:1728 build/trans_presets.java:1751
 msgid "Routes shown for:"
 msgstr ""
@@ -17410,6 +17760,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1726 build/trans_presets.java:1749
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1965
 msgid "Cycling"
 msgstr ""
@@ -17417,5 +17767,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1727 build/trans_presets.java:1750
+#: build/trans_presets.java:1731 build/trans_presets.java:1754
 msgid "Mountainbiking"
 msgstr ""
@@ -17423,6 +17773,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1728 build/trans_presets.java:1751
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:1732 build/trans_presets.java:1755
+#: build/trans_presets.java:2019
 msgid "Skiing"
 msgstr "Skíði"
@@ -17430,5 +17780,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1729 build/trans_presets.java:1752
+#: build/trans_presets.java:1733 build/trans_presets.java:1756
 msgid "Riding"
 msgstr ""
@@ -17436,46 +17786,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1734 build/trans_presets.java:1757
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1736
 msgid "Information Board"
 msgstr "Fræðsluskilti"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "history"
 msgstr "sagnfræði"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "nature"
 msgstr "náttúran"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "wildlife"
 msgstr "dýralíf"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1744
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1759
 msgid "Information Terminal"
 msgstr ""
@@ -17483,29 +17833,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1760 build/trans_presets.java:1770
+#: build/trans_presets.java:1764 build/trans_presets.java:1774
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1769
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1779
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1780
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1778
+#: build/trans_presets.java:1782
 msgid "Other Information Points"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1790
 msgid "Edit Shelter"
 msgstr "Breyti skýli"
@@ -17513,25 +17863,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1789 build/trans_presets.java:1795
+#: build/trans_presets.java:1793 build/trans_presets.java:1799
 msgid "Fireplace"
 msgstr "Eldstæði"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1791
+#: build/trans_presets.java:1795
 msgid "Picnic Site"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1796
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1802
 msgid "Historic Places"
 msgstr "Sögustaðir"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1799
+#: build/trans_presets.java:1803
 msgid "Castle"
 msgstr "Kastali"
@@ -17540,19 +17890,19 @@
 #. <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:1802
+#: build/trans_presets.java:1806
 msgid "Edit Castle"
 msgstr "Breyti kastala"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1810
 msgid "Ruins"
 msgstr "Rústir"
 
 #. item
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1811
 msgid "Edit Ruins"
 msgstr "Breyti rústum"
 
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1816
 msgid "Archaeological Site"
 msgstr "Fornleifasvæði"
@@ -17561,9 +17911,9 @@
 #. <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:1815
+#: build/trans_presets.java:1819
 msgid "Edit Archaeological Site"
 msgstr "Breyti fornleifasvæði"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1824
 msgid "Battlefield"
 msgstr "Vígvöllur"
@@ -17571,5 +17921,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1826
 msgid "Edit Battlefield"
 msgstr "Breyti vígvelli"
@@ -17577,15 +17927,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1831
 msgid "Monument"
 msgstr "Minnismerki"
 
 #. item
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1832
 msgid "Edit Monument"
 msgstr "Breyti minnismerki"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1836
 msgid "Memorial"
 msgstr "Minnisvarði"
@@ -17593,45 +17943,57 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1838
 msgid "Edit Memorial"
 msgstr "Breyti minnisvarða"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1842
 msgid "Wayside Cross"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1843
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1847
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1848
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1852
+#, fuzzy
+msgid "Boundary Stone"
+msgstr "Landamæri"
+
+#. item
+#: build/trans_presets.java:1853
+#, fuzzy
+msgid "Edit Boundary Stone"
+msgstr "Breyti strætóstoppi"
+
+#. item "Historic Places/Boundary Stone" text "Name"
+#: build/trans_presets.java:1858
 msgid "Leisure"
 msgstr "Frístundir"
 
 #. group "Leisure"
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1859
 msgid "Water Park"
 msgstr "Vatnsleikjagarður"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1860
 msgid "Edit Water Park"
 msgstr "Breyti vatnsleikjagarð"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1864
 msgid "Playground"
 msgstr "Leikvöllur"
@@ -17639,31 +18001,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1866
 msgid "Edit Playground"
 msgstr "Breyti leikvöll"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1870
 msgid "Fishing"
 msgstr "Fiskveiðar"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1871
 msgid "Edit Fishing"
 msgstr "Breyti fiskveiðum"
 
 #. item "Leisure/Fishing" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1877 build/trans_presets.java:2669
+msgid "Sports"
+msgstr ""
+
+#. group "Sports"
+#: build/trans_presets.java:1878
 msgid "Sport Facilities"
 msgstr "Íþróttamannvirki"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1879
 msgid "Stadium"
 msgstr "Íþróttaleikvangur"
 
 #. item
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1880
 msgid "Edit Stadium"
 msgstr "Breyti íþróttaleikvang"
@@ -17677,6 +18043,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1874 build/trans_presets.java:1883
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1902 build/trans_presets.java:1911
 msgid "select sport:"
 msgstr "veldu íþrótt:"
@@ -18068,30 +18434,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884 build/trans_style.java:3892
-#: build/trans_style.java:3900 build/trans_style.java:3908
-#: build/trans_style.java:3916 build/trans_style.java:3924
-#: build/trans_style.java:3932
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_style.java:3572 build/trans_style.java:3580
+#: build/trans_style.java:3588 build/trans_style.java:3596
+#: build/trans_style.java:3604 build/trans_style.java:3612
+#: build/trans_style.java:3620 build/trans_style.java:3628
+#: build/trans_style.java:3636 build/trans_style.java:3644
+#: build/trans_style.java:3652 build/trans_style.java:3660
+#: build/trans_style.java:3668 build/trans_style.java:3676
+#: build/trans_style.java:3684 build/trans_style.java:3692
+#: build/trans_style.java:3700 build/trans_style.java:3708
+#: build/trans_style.java:3716 build/trans_style.java:3724
+#: build/trans_style.java:3732 build/trans_style.java:3740
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3764 build/trans_style.java:3772
+#: build/trans_style.java:3780 build/trans_style.java:3788
+#: build/trans_style.java:3796 build/trans_style.java:3804
+#: build/trans_style.java:3812 build/trans_style.java:3820
+#: build/trans_style.java:3828 build/trans_style.java:3836
+#: build/trans_style.java:3844 build/trans_style.java:3852
+#: build/trans_style.java:3860 build/trans_style.java:3868
+#: build/trans_style.java:3876 build/trans_style.java:3884
+#: build/trans_style.java:3892 build/trans_style.java:3900
+#: build/trans_style.java:3908 build/trans_style.java:3916
+#: build/trans_style.java:3924 build/trans_style.java:3932
+#: build/trans_style.java:3940
 msgid "sport"
 msgstr "íþrótt"
@@ -18101,225 +18467,225 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "archery"
 msgstr "bogfimi"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "australian_football"
 msgstr "ástralskur fótbolti"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "baseball"
 msgstr "hafnabolti"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "basketball"
 msgstr "körfubolti"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "climbing"
 msgstr "klifur"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "football"
 msgstr "fótbolti"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "golf"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "hockey"
 msgstr "hokkí"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "rugby"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "shooting"
 msgstr "skotfimi"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skating"
 msgstr "skautar"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skiing"
 msgstr "skíði"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "soccer"
 msgstr "fótbolti"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "swimming"
 msgstr "sund"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "table_tennis"
 msgstr "borðtennis"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "tennis"
 msgstr ""
 
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1888
 msgid "Sports Centre"
 msgstr "Íþróttamiðstöð"
 
 #. item
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1889
 msgid "Edit Sports Centre"
 msgstr "Breyti íþróttamiðstöð"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1897
 msgid "Pitch"
 msgstr "Völlur"
 
 #. item
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1898
 msgid "Edit Pitch"
 msgstr "Breyti velli"
 
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1906
 msgid "Racetrack"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1907
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1915
 msgid "Golf Course"
 msgstr "Golfvöllur"
 
 #. item
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1916
 msgid "Edit Golf Course"
 msgstr "Breyti golfvelli"
 
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1921
 msgid "Miniature Golf"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1922
 msgid "Edit Miniature Golf"
 msgstr ""
 
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1928
 msgid "Sport"
 msgstr "Íþróttir"
 
 #. group "Sport"
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1929
 msgid "Multi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1930
 msgid "Edit Multi"
 msgstr ""
@@ -18358,183 +18724,183 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "pitch"
 msgstr "völlur"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "sports_centre"
 msgstr "íþróttamiðstöð"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "stadium"
 msgstr "íþróttaleikvangur"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1935
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1936
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1941
 msgid "Athletics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1942
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1947
 msgid "Archery"
 msgstr "Bogfimi"
 
 #. item
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1948
 msgid "Edit Archery"
 msgstr "Breyti bogfimi"
 
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1953
 msgid "Climbing"
 msgstr "Klifur"
 
 #. item
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:1954
 msgid "Edit Climbing"
 msgstr "Breyti klifri"
 
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1959
 msgid "Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1960
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1966
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1971
 msgid "Dog Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1972
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1977
 msgid "Equestrian"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1978
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1983
 msgid "Horse Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1984
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1989
 msgid "Gymnastics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1990
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1995
 msgid "Motor Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1996
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2001
 msgid "Skating"
 msgstr "Skautar"
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2002
 msgid "Edit Skating"
 msgstr "Breyti skautum"
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2007
 msgid "Skateboard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2008
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2013
 msgid "Swimming"
 msgstr "Sund"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2014
 msgid "Edit Swimming"
 msgstr "Breyti sundi"
@@ -18542,56 +18908,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2021
 msgid "Edit Skiing"
 msgstr "Breyti skíðasvæði"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2028
 msgid "Shooting"
 msgstr "Skotfimi"
@@ -18599,178 +18965,183 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2030
 msgid "Edit Shooting"
 msgstr "Breyti skotfimi"
 
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2036
 msgid "Sport (Ball)"
 msgstr "Boltaíþróttir"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2037
 msgid "Soccer"
 msgstr "Fótbolti"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2038
 msgid "Edit Soccer"
 msgstr "Breyti fótbolta"
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2043
 msgid "Football"
 msgstr "Amerískur fótbolti"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2044
 msgid "Edit Football"
 msgstr "Breyti Amerískum fótbolta"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2049
 msgid "Australian Football"
 msgstr "Ástralskur fótbolti"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2050
 msgid "Edit Australian Football"
 msgstr "Breyti Áströlskum fótbolta"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2055
 msgid "Baseball"
 msgstr "Hafnabolti"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2056
 msgid "Edit Baseball"
 msgstr "Breyti hafnabolta"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2061
 msgid "Basketball"
 msgstr "Körfubolti"
 
 #. item
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2062
 msgid "Edit Basketball"
 msgstr "Breyti körfubolta"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2067
 msgid "Golf"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2068
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2071
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2073
 msgid "Boule"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2074
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2079
 msgid "Bowls"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2080
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2085
 msgid "Cricket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2086
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2091
 msgid "Cricket Nets"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2092
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2097
 msgid "Croquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2098
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2103
 msgid "Hockey"
 msgstr "Hokkí"
 
 #. item
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2104
 msgid "Edit Hockey"
 msgstr "Breyti hokkí"
 
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2109
 msgid "Pelota"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2110
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2105
+#: build/trans_presets.java:2115
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2116
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2121
 msgid "Rugby"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2122
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2127
 msgid "Table Tennis"
 msgstr "Borðtennis"
 
 #. item
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2128
 msgid "Edit Table Tennis"
 msgstr "Breyti borðtennis"
 
-#: build/trans_presets.java:2123
+#: build/trans_presets.java:2133
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2134
 msgid "Edit Tennis"
 msgstr "Breyti tennis"
 
-#. <separator/>
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2141
+#, fuzzy
+msgid "Man-Made"
+msgstr "Mannvirki"
+
+#. group "Man-Made"
+#: build/trans_presets.java:2142
 msgid "Buildings"
 msgstr "Byggingar"
 
 #. group "Buildings"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2143
 msgid "Building"
 msgstr "Bygging"
@@ -18778,5 +19149,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Public Building"
 msgstr "Opinber bygging"
@@ -18784,10 +19155,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2148
 msgid "Edit Public Building"
 msgstr "Breyti opinberri byggingu"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2152
 msgid "Town hall"
 msgstr "Ráðhús"
@@ -18795,10 +19166,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2154
 msgid "Edit Town hall"
 msgstr "Breyti ráðhúsi"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:2158
 msgid "Embassy"
 msgstr "Sendiráð"
@@ -18806,10 +19177,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Edit Embassy"
 msgstr "Breyti sendiráði"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2164
 msgid "Courthouse"
 msgstr "Dómshús"
@@ -18818,10 +19189,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:2156
+#: build/trans_presets.java:2167
 msgid "Edit Courthouse"
 msgstr "Breyti dómshúsi"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2171
 msgid "Prison"
 msgstr "Fangelsi"
@@ -18830,10 +19201,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:2163
+#: build/trans_presets.java:2174
 msgid "Edit Prison"
 msgstr "Breyti fangelsi"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2178
 msgid "Police"
 msgstr "Lögreglustöð"
@@ -18843,10 +19214,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:2171
+#: build/trans_presets.java:2182
 msgid "Edit Police"
 msgstr "Breyti lögreglustöð"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2186
 msgid "Fire Station"
 msgstr "Slökkvistöð"
@@ -18855,10 +19226,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:2178
+#: build/trans_presets.java:2189
 msgid "Edit Fire Station"
 msgstr "Breyti slökkvistöð"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "Post Office"
 msgstr "Pósthús"
@@ -18866,5 +19237,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Edit Post Office"
 msgstr "Breyti pósthúsi"
@@ -18872,15 +19243,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2200
 msgid "Kindergarten"
 msgstr "Leikskóli"
 
 #. item
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Kindergarten"
 msgstr "Breyti leikskóla"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2205
 msgid "School"
 msgstr "Skóli"
@@ -18888,10 +19259,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Edit School"
 msgstr "Breyti skóla"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2211
 msgid "University"
 msgstr "Háskóli"
@@ -18899,10 +19270,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit University"
 msgstr "Breyti háskóla"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "College"
 msgstr "Menntaskóli"
@@ -18910,5 +19281,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2219
 msgid "Edit College"
 msgstr "Breyti menntaskóla"
@@ -18916,5 +19287,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2224
 msgid "Cinema"
 msgstr "Kvikmyndahús"
@@ -18923,10 +19294,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:2216
+#: build/trans_presets.java:2227
 msgid "Edit Cinema"
 msgstr "Breyti kvikmyndahúsi"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2231
 msgid "Library"
 msgstr "Bókasafn"
@@ -18935,9 +19306,9 @@
 #. <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:2223
+#: build/trans_presets.java:2234
 msgid "Edit Library"
 msgstr "Breyti bókasafni"
 
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Arts Centre"
 msgstr "Listamiðstöð"
@@ -18945,10 +19316,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Arts Centre"
 msgstr "Breyti listamiðstöð"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Theatre"
 msgstr "Leikhús"
@@ -18957,10 +19328,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:2237
+#: build/trans_presets.java:2248
 msgid "Edit Theatre"
 msgstr "Breyti leikhúsi"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2252
 msgid "Place of Worship"
 msgstr "Helgistaður"
@@ -18970,5 +19341,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:2245
+#: build/trans_presets.java:2256
 msgid "Edit Place of Worship"
 msgstr "Breyti helgistað"
@@ -18977,6 +19348,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "Religion"
 msgstr ""
@@ -18985,66 +19356,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "Denomination"
 msgstr ""
@@ -19053,81 +19424,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2264
 msgid "Addresses"
 msgstr "Heimilisfang"
@@ -19136,5 +19507,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:2256
+#: build/trans_presets.java:2267
 msgid "Edit Address Information"
 msgstr "Breyti heimilisfangi"
@@ -19142,5 +19513,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2269
 msgid "House number"
 msgstr "Húsnúmer"
@@ -19148,20 +19519,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "House name"
 msgstr "Nafn húss"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "City name"
 msgstr "Nafn bæjar"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2274
 msgid "Post code"
 msgstr "Póstnúmer"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2275
 msgid "Country code"
 msgstr "Landskóði"
@@ -19169,5 +19540,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Address Interpolation"
 msgstr ""
@@ -19176,5 +19547,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:2270
+#: build/trans_presets.java:2281
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -19182,67 +19553,67 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "odd"
 msgstr ""
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "even"
 msgstr ""
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2286
 msgid "Man Made"
 msgstr "Mannvirki"
 
 #. group "Man Made"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Works"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2288
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2292
 msgid "Tower"
 msgstr "Turn"
 
 #. item
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2293
 msgid "Edit Tower"
 msgstr "Breyti turni"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Water Tower"
 msgstr "Vatnsturn"
 
 #. item
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2298
 msgid "Edit Water Tower"
 msgstr "Breyti vatnsturni"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Gasometer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2303
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Lighthouse"
 msgstr "Viti"
@@ -19250,10 +19621,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2309
 msgid "Edit Lighthouse"
 msgstr "Breyti vita"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Windmill"
 msgstr "Vindmylla"
@@ -19261,10 +19632,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2315
 msgid "Edit Windmill"
 msgstr "Breyti vindmyllu"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2319
 msgid "Pipeline"
 msgstr "Leiðsla"
@@ -19272,10 +19643,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Edit Pipeline"
 msgstr "Breyti leiðslu"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2325
 msgid "Wastewater Plant"
 msgstr ""
@@ -19285,10 +19656,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:2318
+#: build/trans_presets.java:2329
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2333
 msgid "Crane"
 msgstr "Krani"
@@ -19296,10 +19667,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2335
 msgid "Edit Crane"
 msgstr "Breyti krana"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Beacon"
 msgstr ""
@@ -19307,10 +19678,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2341
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2345
 msgid "Survey Point"
 msgstr ""
@@ -19318,10 +19689,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2351
 msgid "Surveillance"
 msgstr "Eftirlitsmyndavél"
@@ -19329,5 +19700,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2353
 msgid "Edit Surveillance Camera"
 msgstr "Breyti eftirlitsmyndavél"
@@ -19335,5 +19706,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Power Generator"
 msgstr "Rafall"
@@ -19343,39 +19714,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:2351
+#: build/trans_presets.java:2362
 msgid "Edit Power Generator"
 msgstr "Breyti rafli"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "photovoltaic"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "gas"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2367
 msgid "Power Station"
 msgstr "Orkuver"
@@ -19384,10 +19755,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:2359
+#: build/trans_presets.java:2370
 msgid "Edit Power Station"
 msgstr "Breyti orkuveri"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2374
 msgid "Power Sub Station"
 msgstr "Spennustöð"
@@ -19396,5 +19767,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:2366
+#: build/trans_presets.java:2377
 msgid "Edit Power Sub Station"
 msgstr "Breyti spennustöð"
@@ -19402,10 +19773,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2369 build/trans_presets.java:2385
+#: build/trans_presets.java:2380 build/trans_presets.java:2396
 msgid "Line reference"
 msgstr "Tilvísunarnúmer línunnar"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2382
 msgid "Power Tower"
 msgstr "Háspennustaur"
@@ -19416,5 +19787,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:2376
+#: build/trans_presets.java:2387
 msgid "Edit Power Tower"
 msgstr "Breyti háspennustaur"
@@ -19422,5 +19793,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2390
 msgid "Power Line"
 msgstr "Raflína"
@@ -19429,40 +19800,40 @@
 #. <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:2382
+#: build/trans_presets.java:2393
 msgid "Edit Power Line"
 msgstr "Breyti raflínu"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Voltage"
 msgstr "Volt"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2398
 msgid "Amount of Wires"
 msgstr "Fjöldi víra"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2402
 msgid "Toilets"
 msgstr "Salerni"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2398 build/trans_presets.java:2514
+#: build/trans_presets.java:2409 build/trans_presets.java:2525
 msgid "Note"
 msgstr "Athugasemd"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2411
 msgid "Post Box"
 msgstr "Póstkassi"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2416
 msgid "Telephone"
 msgstr "Almenningssími"
@@ -19471,5 +19842,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:2408
+#: build/trans_presets.java:2419
 msgid "Edit Telephone"
 msgstr "Breyti almenningssíma"
@@ -19477,5 +19848,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2411 build/trans_presets.java:2515
+#: build/trans_presets.java:2422 build/trans_presets.java:2526
 msgid "Coins"
 msgstr "Mynt"
@@ -19483,5 +19854,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2412 build/trans_presets.java:2516
+#: build/trans_presets.java:2423 build/trans_presets.java:2527
 msgid "Notes"
 msgstr "Athugasemd"
@@ -19489,5 +19860,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2413 build/trans_presets.java:2517
+#: build/trans_presets.java:2424 build/trans_presets.java:2528
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -19495,5 +19866,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2414 build/trans_presets.java:2518
+#: build/trans_presets.java:2425 build/trans_presets.java:2529
 msgid "Debit cards"
 msgstr "Debetkort"
@@ -19501,15 +19872,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2415 build/trans_presets.java:2519
+#: build/trans_presets.java:2426 build/trans_presets.java:2530
 msgid "Credit cards"
 msgstr "Kreditkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2427
 msgid "Telephone cards"
 msgstr "Símakort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2429
 msgid "Recycling"
 msgstr "Endurvinnsla"
@@ -19518,5 +19889,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:2421
+#: build/trans_presets.java:2432
 msgid "Edit Recycling station"
 msgstr "Breyti endurvinnslustöð"
@@ -19524,35 +19895,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Batteries"
 msgstr "Rafhlöður"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2435
 msgid "Cans"
 msgstr "Dósir"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Clothes"
 msgstr "Föt"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2437
 msgid "Glass"
 msgstr "Gler"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2438
 msgid "Paper"
 msgstr "Pappír"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2439
 msgid "Scrap Metal"
 msgstr "Brotajárn"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2441
 msgid "Bench"
 msgstr "Bekkur"
@@ -19561,40 +19932,33 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2433
-#, fuzzy
+#: build/trans_presets.java:2444
 msgid "Backrest"
-msgstr "Tálmar"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "Material"
-msgstr "Minnisvarði"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2434
-#, fuzzy
+#: build/trans_presets.java:2445
 msgid "stone"
-msgstr "Aldrei"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "plastic"
-msgstr "Grunnupplýsingar"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "Colour"
-msgstr "Litur"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "black"
-msgstr "strönd"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "brown"
-msgstr "Bær"
+msgstr ""
 
 #. color historic
@@ -19663,38 +20027,35 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2435 build/trans_style.java:3055
-#: build/trans_style.java:3063 build/trans_style.java:3071
-#: build/trans_style.java:3079 build/trans_style.java:3127
-#: build/trans_style.java:3135 build/trans_style.java:3233
-#: build/trans_style.java:3241
+#: build/trans_presets.java:2446 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3135
+#: build/trans_style.java:3143 build/trans_style.java:3241
+#: build/trans_style.java:3249
 msgid "green"
 msgstr ""
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2446
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "blue"
-msgstr "Gildi"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "white"
-msgstr "vatn"
-
-#: build/trans_presets.java:2436
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2447
 msgid "Amount of Seats"
-msgstr "Fjöldi víra"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2449
 msgid "Hunting Stand"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2450
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -19703,30 +20064,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2441 build/trans_presets.java:2902
+#: build/trans_presets.java:2452 build/trans_presets.java:2914
 msgid "Height"
 msgstr "Hæð"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2454
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2455
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Fountain"
 msgstr "Gosbrunnur"
@@ -19735,10 +20096,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:2449
+#: build/trans_presets.java:2460
 msgid "Edit Fountain"
 msgstr "Breyti gosbrunn"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2464
 msgid "Drinking Water"
 msgstr "Drykkjarvatn"
@@ -19747,10 +20108,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:2456
+#: build/trans_presets.java:2467
 msgid "Edit Drinking Water"
 msgstr "Breyti drykkjarvatni"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2471
 msgid "Baby Hatch"
 msgstr "Barnalúga"
@@ -19758,33 +20119,33 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Baby Hatch"
 msgstr "Breyti barnalúgu"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2479
 msgid "Shops"
 msgstr "Verslanir"
 
 #. group "Shops"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2480
 msgid "Supermarket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2481
 msgid "Edit Supermarket"
 msgstr ""
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2486
 msgid "Chemist"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2487
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2492
 msgid "Convenience Store"
 msgstr ""
@@ -19792,9 +20153,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2499
 msgid "Kiosk"
 msgstr "Sjoppa"
@@ -19802,27 +20163,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Kiosk"
 msgstr "Breyti sjoppu"
 
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Book Store"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2507
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2512
 msgid "Travel Agency"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2513
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2518
 msgid "Vending machine"
 msgstr "Sjálfsali"
@@ -19830,5 +20191,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Edit Vending machine"
 msgstr ""
@@ -19836,88 +20197,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "drinks"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "news_papers"
 msgstr "dagblöð"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "toys"
 msgstr "dót"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "SIM-cards"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Butcher"
 msgstr "Slátrari"
@@ -19925,9 +20286,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2535
 msgid "Edit Butcher"
 msgstr "Breyti slátrara"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2540
 msgid "Baker"
 msgstr "Bakarí"
@@ -19935,9 +20296,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2542
 msgid "Edit Baker"
 msgstr "Breyti bakaríi"
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2547
 msgid "Florist"
 msgstr "Blómabúð"
@@ -19945,18 +20306,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Florist"
 msgstr "Breyti blómabúð"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2554
 msgid "Organic"
 msgstr "Lífræn búð"
 
 #. item
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Edit Organic Shop"
 msgstr "Breyti lífrænni búð"
 
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2560
 msgid "Alcohol"
 msgstr ""
@@ -19964,54 +20325,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2562
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2567
 msgid "Beverages"
 msgstr "Vínbúð"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2568
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2573
 msgid "Computer"
 msgstr "Tölvubúð"
 
 #. item
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2574
 msgid "Edit Computer Shop"
 msgstr "Breyti tölvubúð"
 
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Electronics"
 msgstr "Raftækjabúð"
 
 #. item
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2580
 msgid "Edit Electronics Shop"
 msgstr "Breyti raftækjabúð"
 
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2585
 msgid "Hifi"
 msgstr "Hljómtækjaverslun"
 
 #. item
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2586
 msgid "Edit Hifi Shop"
 msgstr "Breyti hljómtækjaverslun"
 
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2591
 msgid "Furniture"
 msgstr "Húsgagnaverslun"
 
 #. item
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Edit Furniture Shop"
 msgstr "Breyti húsgagnaverslun"
 
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Garden Centre"
 msgstr ""
@@ -20019,9 +20380,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2599
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Hardware"
 msgstr ""
@@ -20029,9 +20390,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2606
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -20039,54 +20400,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2613
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2618
 msgid "Stationery"
 msgstr "Skrifstofuvörur"
 
 #. item
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2619
 msgid "Edit Stationery Shop"
 msgstr "Breyti skrifstofuvörum"
 
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Hairdresser"
 msgstr "Hársnyrtir"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Hairdresser"
 msgstr "Breyti hársnyrti"
 
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Shoes"
 msgstr "Skóbúð"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Shoe Shop"
 msgstr "Breyti skóbúð"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2636
 msgid "Toys"
 msgstr "Dótabúð"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit Toy Shop"
 msgstr "Breyti dótabúð"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "Dry Cleaning"
 msgstr "Efnalaug"
@@ -20094,9 +20455,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2650
 msgid "Edit Dry Cleaning"
 msgstr "Breyti efnalaug"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "Laundry"
 msgstr "Þvottahús"
@@ -20104,9 +20465,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2657
 msgid "Edit Laundry"
 msgstr "Breyti þvottahúsi"
 
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2662
 msgid "Outdoor"
 msgstr "Útivistarbúð"
@@ -20114,32 +20475,28 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2664
 msgid "Edit Outdoor Shop"
 msgstr "Breyti útivistarbúð"
 
-#: build/trans_presets.java:2658
-msgid "Sports"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2659
+#. item
+#: build/trans_presets.java:2670
 msgid "Edit Sports Shop"
 msgstr ""
 
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Optician"
 msgstr "Breyti sjóntækjasmið"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2683
 msgid "Cash"
 msgstr "Fjármál"
 
 #. group "Cash"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2684
 msgid "Bank"
 msgstr "Banki"
@@ -20147,14 +20504,14 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2686
 msgid "Edit Bank"
 msgstr "Breyti banka"
 
-#: build/trans_presets.java:2680 build/trans_presets.java:2689
+#: build/trans_presets.java:2691 build/trans_presets.java:2700
 msgid "Automated Teller Machine"
 msgstr "Hraðbanki"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2693
 msgid "Money Exchange"
 msgstr "Gjaldeyrisskipti"
@@ -20162,5 +20519,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Edit Money Exchange"
 msgstr "Breyti gjaldeyrisskiptum"
@@ -20168,15 +20525,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2691
+#: build/trans_presets.java:2702
 msgid "Edit Automated Teller Machine"
 msgstr "Breyti hraðbanka"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2707
 msgid "Health"
 msgstr "Heilsa"
 
 #. group "Health"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2708
 msgid "Doctors"
 msgstr "Læknir"
@@ -20184,18 +20541,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2710
 msgid "Edit Doctors"
 msgstr "Breyti lækni"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2715
 msgid "Dentist"
 msgstr "Tannlæknir"
 
 #. item
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Edit Dentist"
 msgstr "Breyti tannlækni"
 
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2721
 msgid "Pharmacy"
 msgstr "Apótek"
@@ -20203,5 +20560,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Edit Pharmacy"
 msgstr "Apótek"
@@ -20209,9 +20566,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2729
 msgid "Hospital"
 msgstr "Spítali"
@@ -20219,10 +20576,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Edit Hospital"
 msgstr "Breyti spítala"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2735
 msgid "Emergency Access Point"
 msgstr ""
@@ -20231,5 +20588,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:2727
+#: build/trans_presets.java:2738
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -20238,20 +20595,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2741
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2742
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Phone Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -20259,5 +20616,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2748
 msgid "Veterinary"
 msgstr "Dýralæknir"
@@ -20266,55 +20623,59 @@
 #. <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:2740
+#: build/trans_presets.java:2751
 msgid "Edit Veterinary"
 msgstr "Breyti dýralækni"
 
+#: build/trans_presets.java:2758
+msgid "Geography"
+msgstr ""
+
 #. group "Places"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2760
 msgid "Continent"
 msgstr "Heimsálfa"
 
 #. item
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2761
 msgid "Edit Continent"
 msgstr "Breyti heimsálfu"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2766
 msgid "Country"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2767
 msgid "Edit Country"
 msgstr "Breyti landi"
 
 #. item "Places/Country" text "Name"
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2772
 msgid "State"
 msgstr "Fylki"
 
 #. item
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2773
 msgid "Edit State"
 msgstr "Breyti fylki"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2778
 msgid "Region"
 msgstr "Svæði"
 
 #. item
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2779
 msgid "Edit Region"
 msgstr "Breyti svæði"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2784
 msgid "County"
 msgstr "Sýsla"
 
 #. item
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2785
 msgid "Edit County"
 msgstr "Breyti sýslu"
@@ -20322,15 +20683,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2791
 msgid "City"
 msgstr "Borg"
 
 #. item
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2792
 msgid "Edit City"
 msgstr "Breyti borg"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2797
 msgid "Town"
 msgstr "Bær"
@@ -20338,10 +20699,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2799
 msgid "Edit Town"
 msgstr "Breyti bæ"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2804
 msgid "Suburb"
 msgstr "Hverfi"
@@ -20349,25 +20710,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2806
 msgid "Edit Suburb"
 msgstr "Breyti hverfi"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2811
 msgid "Village"
 msgstr "Þorp"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2812
 msgid "Edit Village"
 msgstr "Breyti þorpi"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2817
 msgid "Hamlet"
 msgstr "Smáþorp"
 
 #. item
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2818
 msgid "Edit Hamlet"
 msgstr "Breyti smáþorpi"
@@ -20375,5 +20736,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2824
 msgid "Locality"
 msgstr ""
@@ -20381,10 +20742,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2826
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2831
 msgid "Island"
 msgstr "Eyja"
@@ -20392,10 +20753,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2833
 msgid "Edit Island"
 msgstr "Breyti eyju"
 
 #. item "Places/Island" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2838
 msgid "Islet"
 msgstr ""
@@ -20403,5 +20764,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2840
 msgid "Edit Islet"
 msgstr ""
@@ -20409,5 +20770,5 @@
 #. item "Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2846
 msgid "Cave Entrance"
 msgstr "Hellismunni"
@@ -20415,10 +20776,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2848
 msgid "Edit Cave Entrance"
 msgstr "Breyti hellismunna"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2852
 msgid "Peak"
 msgstr "Tindur"
@@ -20426,10 +20787,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2854
 msgid "Edit Peak"
 msgstr "Breyti tind"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2859
 msgid "Glacier"
 msgstr "Jökull"
@@ -20437,10 +20798,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2861
 msgid "Edit Glacier"
 msgstr "Breyti jökli"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2854
+#: build/trans_presets.java:2866
 msgid "Volcano"
 msgstr "Eldfjall"
@@ -20448,70 +20809,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2868
 msgid "Edit Volcano"
 msgstr "Breyti eldfjalli"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2874
 msgid "Boundaries"
 msgstr "Landamæri"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2875
 msgid "National"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2876
 msgid "Edit National Boundary"
 msgstr ""
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2881
 msgid "Administrative"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2882
 msgid "Edit Administrative Boundary"
 msgstr ""
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:2887
 msgid "Civil"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2888
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2893
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2894
 msgid "Edit Political Boundary"
 msgstr ""
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2899
 msgid "National park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2888
+#: build/trans_presets.java:2900
 msgid "Edit National Park Boundary"
 msgstr "Breyti landamærum þjóðgarðs"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2906
 msgid "Land use"
 msgstr "Landnýting"
 
 #. group "Land use"
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2907
 msgid "Tree"
 msgstr "Tré"
@@ -20520,15 +20881,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:2898
+#: build/trans_presets.java:2910
 msgid "Edit Tree"
 msgstr "Breyti tré"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2915
 msgid "Botanical Name"
 msgstr "Fræðiheiti"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2917
 msgid "Wood"
 msgstr "Skógur"
@@ -20537,5 +20898,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:2908
+#: build/trans_presets.java:2920
 msgid "Edit Wood"
 msgstr "Breyti skóg"
@@ -20543,17 +20904,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "coniferous"
 msgstr "barrskógur"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "deciduous"
 msgstr "laufskógur"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "mixed"
 msgstr "blandaður"
 
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2925
 msgid "Forest"
 msgstr "Skógur (ræktaður)"
@@ -20562,14 +20923,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:2916
+#: build/trans_presets.java:2928
 msgid "Edit Forest Landuse"
 msgstr "Breyti ræktuðum skóg"
 
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2934
 msgid "Nature Reserve"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2935
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -20577,25 +20938,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2940
 msgid "Scree"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2941
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2945
 msgid "Scrub"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2946
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2950
 msgid "Fell"
 msgstr ""
@@ -20603,10 +20964,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2952
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2956
 msgid "Heath"
 msgstr ""
@@ -20614,5 +20975,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2958
 msgid "Edit Heath"
 msgstr ""
@@ -20620,5 +20981,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2963
 msgid "Farmyard"
 msgstr ""
@@ -20627,45 +20988,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:2954
+#: build/trans_presets.java:2966
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2971
 msgid "Farmland"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2972
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2977
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2978
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2983
 msgid "Vineyard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2984
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:2989
 msgid "Allotments"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2990
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -20673,25 +21034,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2996
 msgid "Garden"
 msgstr "Garður"
 
 #. item
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2997
 msgid "Edit Garden"
 msgstr "Breyti garði"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3001
 msgid "Grass"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3002
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3007
 msgid "Village Green"
 msgstr ""
@@ -20699,10 +21060,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3009
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3014
 msgid "Common"
 msgstr ""
@@ -20710,20 +21071,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3004
+#: build/trans_presets.java:3016
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3020
 msgid "Park"
 msgstr "Almenningsgarður"
 
 #. item
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3021
 msgid "Edit Park"
 msgstr "Breyti almenningsgarð"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3025
 msgid "Recreation Ground"
 msgstr ""
@@ -20731,5 +21092,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3027
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -20737,15 +21098,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3033
 msgid "Residential area"
 msgstr "Íbúðarsvæði"
 
 #. item
-#: build/trans_presets.java:3022
+#: build/trans_presets.java:3034
 msgid "Edit Residential Landuse"
 msgstr "Breyti íbúðarlandnýtingu"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3039
 msgid "Graveyard"
 msgstr "Grafreitur"
@@ -20753,9 +21114,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3029
+#: build/trans_presets.java:3041
 msgid "Edit Graveyard"
 msgstr "Breyti grafreit"
 
-#: build/trans_presets.java:3035
+#: build/trans_presets.java:3047
 msgid "Cemetery"
 msgstr ""
@@ -20763,39 +21124,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3049
 msgid "Edit Cemetery Landuse"
 msgstr "Breyti kirkjugarðslandnýtingu"
 
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3056
 msgid "Retail"
 msgstr "Smásala"
 
 #. item
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3057
 msgid "Edit Retail Landuse"
 msgstr "Breyti smásölulandnýtingu"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3062
 msgid "Commercial"
 msgstr "Skrifstofur"
 
 #. item
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3063
 msgid "Edit Commercial Landuse"
 msgstr "Breyti skrifstofulandnýtingu"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3056
+#: build/trans_presets.java:3068
 msgid "Industrial"
 msgstr "Iðnaður"
 
 #. item
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3069
 msgid "Edit Industrial Landuse"
 msgstr "Breyti iðnaðarlandnýtingu"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3074
 msgid "Railway land"
 msgstr ""
@@ -20803,15 +21164,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3076
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3081
 msgid "Military"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3082
 msgid "Edit Military Landuse"
 msgstr ""
@@ -20819,55 +21180,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3088
 msgid "Construction area"
 msgstr "Byggingarsvæði"
 
 #. item
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3089
 msgid "Edit Construction Landuse"
 msgstr "Breyti byggingarsvæðislandnýtingu"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3094
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3095
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3100
 msgid "Greenfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3101
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3106
 msgid "Landfill"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3107
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3112
 msgid "Quarry"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3113
 msgid "Edit Quarry Landuse"
 msgstr ""
 
 #. group "Relations"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3122
 msgid "Multipolygon"
 msgstr ""
@@ -20877,5 +21238,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:3114
+#: build/trans_presets.java:3126
 msgid "Edit Multipolygon"
 msgstr ""
@@ -20884,10 +21245,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3132
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3133
 msgid "inner segment"
 msgstr ""
@@ -20895,5 +21256,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3136
 msgid "Turn restriction"
 msgstr ""
@@ -20902,5 +21263,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3139
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -20908,34 +21269,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_straight_on"
 msgstr "aðeins_beint_fram"
@@ -20944,15 +21305,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3146
 msgid "from way"
 msgstr "af vegi"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3147
 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:3136
+#: build/trans_presets.java:3148
 msgid "to way"
 msgstr "að vegi"
@@ -20960,5 +21321,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3151
 msgid "Route"
 msgstr ""
@@ -20967,5 +21328,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3154
 msgid "Edit Route"
 msgstr ""
@@ -20973,5 +21334,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "Route type"
 msgstr ""
@@ -21043,5 +21404,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3144 build/trans_style.java:233
+#: build/trans_presets.java:3156 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -21050,17 +21411,17 @@
 msgstr "hjól"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ski"
 msgstr ""
@@ -21113,5 +21474,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3144 build/trans_style.java:247
+#: build/trans_presets.java:3156 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -21120,13 +21481,13 @@
 msgstr "fótgangandi"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "detour"
 msgstr ""
@@ -21140,10 +21501,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3144 build/trans_style.java:1206
+#: build/trans_presets.java:3156 build/trans_style.java:1206
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3159
 msgid "Symbol description"
 msgstr ""
@@ -21151,31 +21512,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3162
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "Color (hex)"
 msgstr ""
@@ -21184,30 +21545,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3168
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3169
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3170
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3171
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3172
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3173
 msgid "backward halt point"
 msgstr ""
@@ -21645,11 +22006,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3375 build/trans_style.java:3376
-#: build/trans_style.java:3946 build/trans_style.java:4254
-#: build/trans_style.java:4263 build/trans_style.java:4272
-#: build/trans_style.java:4281 build/trans_style.java:4290
-#: build/trans_style.java:4299 build/trans_style.java:4308
-#: build/trans_style.java:4309 build/trans_style.java:4318
-#: build/trans_style.java:4327
+#: build/trans_style.java:3383 build/trans_style.java:3384
+#: build/trans_style.java:3954 build/trans_style.java:4262
+#: build/trans_style.java:4271 build/trans_style.java:4280
+#: build/trans_style.java:4289 build/trans_style.java:4298
+#: build/trans_style.java:4307 build/trans_style.java:4316
+#: build/trans_style.java:4317 build/trans_style.java:4326
+#: build/trans_style.java:4335
 msgid "deprecated"
 msgstr ""
@@ -23673,5 +24034,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3294
+#: build/trans_style.java:3302
 msgid "light_water"
 msgstr ""
@@ -24353,8 +24714,17 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="boundary_stone"/>
+#. <icon annotate="true" src="historic/boundary_stone.png"/>
 #: build/trans_style.java:2990 build/trans_style.java:2998
 #: build/trans_style.java:3006 build/trans_style.java:3014
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
+#: build/trans_style.java:3054
 msgid "historic"
 msgstr ""
@@ -24368,5 +24738,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3095
 msgid "quarry"
 msgstr ""
@@ -24380,5 +24750,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "landfill"
 msgstr ""
@@ -24400,5 +24770,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3103 build/trans_style.java:3111
+#: build/trans_style.java:3111 build/trans_style.java:3119
 msgid "basin"
 msgstr ""
@@ -24412,5 +24782,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3127
 msgid "forest"
 msgstr "skógur (ræktaður)"
@@ -24424,5 +24794,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3159
 msgid "farmyard"
 msgstr ""
@@ -24445,5 +24815,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3160 build/trans_style.java:3168
+#: build/trans_style.java:3168 build/trans_style.java:3176
 msgid "retail"
 msgstr "smásala"
@@ -24457,5 +24827,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3176
+#: build/trans_style.java:3184
 msgid "industrial"
 msgstr "iðnaður"
@@ -24469,5 +24839,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "brownfield"
 msgstr ""
@@ -24481,5 +24851,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "greenfield"
 msgstr ""
@@ -24493,5 +24863,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "railland"
 msgstr ""
@@ -24548,7 +24918,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3217 build/trans_style.java:3252
-#: build/trans_style.java:3260 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3225 build/trans_style.java:3260
+#: build/trans_style.java:3268 build/trans_style.java:3276
+#: build/trans_style.java:3284 build/trans_style.java:3292
 msgid "military"
 msgstr ""
@@ -24562,5 +24932,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3225
+#: build/trans_style.java:3233
 msgid "cemetery"
 msgstr ""
@@ -24573,5 +24943,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3301
+#: build/trans_style.java:3309
 msgid "peak"
 msgstr "tindur"
@@ -24586,5 +24956,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3310
+#: build/trans_style.java:3318
 msgid "glacier"
 msgstr "jökul"
@@ -24598,5 +24968,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "volcano"
 msgstr "eldfjall"
@@ -24651,8 +25021,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3326 build/trans_style.java:3327
-#: build/trans_style.java:3335 build/trans_style.java:3351
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440
+#: build/trans_style.java:3334 build/trans_style.java:3335
+#: build/trans_style.java:3343 build/trans_style.java:3359
+#: build/trans_style.java:3432 build/trans_style.java:3440
+#: build/trans_style.java:3448
 msgid "natural"
 msgstr ""
@@ -24666,5 +25036,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3343
+#: build/trans_style.java:3351
 msgid "scrub"
 msgstr ""
@@ -24678,5 +25048,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3359
+#: build/trans_style.java:3367
 msgid "heath"
 msgstr ""
@@ -24690,5 +25060,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3408
+#: build/trans_style.java:3416
 msgid "mud"
 msgstr "leðja"
@@ -24702,5 +25072,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "beach"
 msgstr "strönd"
@@ -24778,8 +25148,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
-#: build/trans_style.java:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496 build/trans_style.java:3504
+#: build/trans_style.java:3512 build/trans_style.java:3520
 msgid "route"
 msgstr ""
@@ -24827,7 +25197,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3522 build/trans_style.java:3530
-#: build/trans_style.java:3538 build/trans_style.java:3546
-#: build/trans_style.java:3554
+#: build/trans_style.java:3530 build/trans_style.java:3538
+#: build/trans_style.java:3546 build/trans_style.java:3554
+#: build/trans_style.java:3562
 msgid "boundary"
 msgstr ""
@@ -24977,11 +25347,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090
+#: build/trans_style.java:4002 build/trans_style.java:4010
+#: build/trans_style.java:4018 build/trans_style.java:4026
+#: build/trans_style.java:4034 build/trans_style.java:4042
+#: build/trans_style.java:4050 build/trans_style.java:4058
+#: build/trans_style.java:4066 build/trans_style.java:4074
+#: build/trans_style.java:4082 build/trans_style.java:4090
+#: build/trans_style.java:4098
 msgid "place"
 msgstr ""
@@ -25029,6 +25399,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4207 build/trans_style.java:4214
-#: build/trans_style.java:4221 build/trans_style.java:4228
+#: build/trans_style.java:4215 build/trans_style.java:4222
+#: build/trans_style.java:4229 build/trans_style.java:4236
 msgid "address"
 msgstr ""
@@ -25336,6 +25706,93 @@
 msgstr ""
 
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Sameina hnúta sem eru stak í mismunandi venslum?"
+#~ msgid "- running version is {0}"
+#~ msgstr "{0}"
+
+#~ msgid "Use a new changeset and close it"
+#~ msgstr "Opna nýtt breytingarsett og loka því strax"
+
+#~ msgid ""
+#~ "Select to upload the data using a new changeset and to leave the "
+#~ "changeset open after the upload"
+#~ msgstr ""
+#~ "Nýtt breytingarsett verður búið til og það skilið eftir opið svo hægt sé "
+#~ "að bæta við frekari breytingum síðar meir"
+
+#~ msgid "Use the existing changeset {0} and close it after upload"
+#~ msgstr "Nota opið breytingarsett #{0} og loka því"
+
+#~ msgid ""
+#~ "Select to upload to the existing changeset {0} and to close the changeset "
+#~ "after this upload"
+#~ msgstr ""
+#~ "Breytingunni verður bætt við breytingarsett #{0} og því lokað eftir að "
+#~ "breytingunni hefur verið upphlaðið"
+
+#~ msgid "Use the existing changeset {0} and leave it open"
+#~ msgstr "Nota opið breytingarsett #{0} og skilja það eftir opið"
+
+#~ msgid ""
+#~ "Select to upload to the existing changeset {0} and to leave the changeset "
+#~ "open for further uploads"
+#~ msgstr ""
+#~ "Breytingunni verður bætt við breytingarsett #{0} og það skilið eftir opið "
+#~ "svo hægt sé að bæta við frekari breytingum síðar meir"
+
+#~ msgid "Aborting..."
+#~ msgstr "Hætti við..."
+
+#~ msgid "Plugin requires JOSM update: {0}."
+#~ msgstr "Uppfæra þarf JOSM til að viðbótin „{0}“ geti verið notuð."
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM notandanafn (getur verið tölvupóstfang)"
+
+#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
+#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
+#~ msgstr[0] "{0} viðbót var uppfærð. Vinsamlegast endurræstu JOSM."
+#~ msgstr[1] "{0} viðbætur voru uppfærðar. Vinsamlegast endurræstu JOSM."
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Óþekkt skráarending"
+
+#~ msgid "Could not download plugin: {0} from {1}"
+#~ msgstr "Gat ekki halað niður viðbótinni {0} frá {1}"
+
+#~ 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 "Unknown version"
+#~ msgstr "Óþekkt útgáfa"
+
+#~ msgid "Email"
+#~ msgstr "Netfang"
+
+#~ 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 "Add all currently selected objects as members"
+#~ msgstr "Bæta völdum hlutum við venslin"
+
+#~ msgid "unnamed"
+#~ msgstr "ónefnt"
+
+#~ msgid "Conflicts: {0}"
+#~ msgstr "Árekstrar: {0}"
+
+#~ msgid "{0} object has conflicts:"
+#~ msgid_plural "{0} objects have conflicts:"
+#~ msgstr[0] "{0} hlutur hefur árekstra:"
+#~ msgstr[1] "{0} hlutir hafa árekstra:"
+
+#~ msgid "sports"
+#~ msgstr "íþróttir"
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "Illa-formað kenni á hnút"
 
 #~ msgid ""
@@ -25346,72 +25803,6 @@
 #~ "fyrir það?"
 
-#~ msgid "Unknown version"
-#~ msgstr "Óþekkt útgáfa"
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Illa-formað kenni á hnút"
-
-#~ msgid "Aborting..."
-#~ msgstr "Hætti við..."
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "Uppfæra þarf JOSM til að viðbótin „{0}“ geti verið notuð."
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM notandanafn (getur verið tölvupóstfang)"
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] "{0} viðbót var uppfærð. Vinsamlegast endurræstu JOSM."
-#~ msgstr[1] "{0} viðbætur voru uppfærðar. Vinsamlegast endurræstu JOSM."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Óþekkt skráarending"
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Gat ekki halað niður viðbótinni {0} frá {1}"
-
-#~ 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 "Email"
-#~ msgstr "Netfang"
-
-#~ 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 "Add all currently selected objects as members"
-#~ msgstr "Bæta völdum hlutum við venslin"
-
-#~ msgid "unnamed"
-#~ msgstr "ónefnt"
-
-#~ msgid "Conflicts: {0}"
-#~ msgstr "Árekstrar: {0}"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} hlutur hefur árekstra:"
-#~ msgstr[1] "{0} hlutir hafa árekstra:"
-
-#~ msgid "Server does not support changesets"
-#~ msgstr "Þjónn styður ekki breytingasett"
-
-#~ msgid "Commit comment"
-#~ msgstr "Staðfesta umsögn"
-
-#~ msgid "sports"
-#~ msgstr "íþróttir"
-
 #~ msgid "Tags (empty value deletes tag)"
 #~ msgstr "Eigindi (tómt gildi eyðir eigindunum)"
-
-#~ msgid "Add Selected"
-#~ msgstr "Bæta við vali"
 
 #~ msgid "Remove Selected"
@@ -25503,4 +25894,4 @@
 #~ msgstr "Ert þú viss um að þú viljir eyða laginu „{0}“?"
 
-#~ msgid "Delete all"
-#~ msgstr "Eyða öllum lögunum"
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "Sameina hnúta sem eru stak í mismunandi venslum?"
Index: applications/editors/josm/i18n/po/it.po
===================================================================
--- applications/editors/josm/i18n/po/it.po	(revision 17655)
+++ applications/editors/josm/i18n/po/it.po	(revision 17697)
@@ -5,6 +5,6 @@
 "Project-Id-Version: josm 20081003\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-12 18:11+0200\n"
-"PO-Revision-Date: 2009-09-11 18:38+0000\n"
+"POT-Creation-Date: 2009-09-19 13:00+0200\n"
+"PO-Revision-Date: 2009-09-15 02:45+0000\n"
 "Last-Translator: FabC <f.carrai@iol.it>\n"
 "Language-Team: Italian <talk-it@lists.openstreetmap.org>\n"
@@ -13,5 +13,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-09-12 16:04+0000\n"
+"X-Launchpad-Export-Date: 2009-09-19 10:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -40,10 +40,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:543
 #: ../core/src/org/openstreetmap/josm/Main.java:551
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -68,5 +68,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -84,6 +84,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:358
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
@@ -99,6 +99,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
@@ -126,10 +126,10 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
 msgid "Save and Exit"
 msgstr "Salva ed Esci"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
 msgid "Discard and Exit"
 msgstr "Annulla ed Esci"
@@ -140,4 +140,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
@@ -145,27 +146,28 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:296
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:258
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:613
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
@@ -173,5 +175,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -191,6 +193,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
@@ -207,17 +209,17 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:654
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1528
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -228,6 +230,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
@@ -280,9 +282,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:607
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:609
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -342,5 +344,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
 msgid "Plugins"
@@ -397,5 +399,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Unisci"
@@ -484,5 +486,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -495,4 +497,5 @@
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -528,6 +531,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
@@ -536,6 +539,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:346
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
@@ -651,4 +654,46 @@
 msgstr "Nessun conflitto da ingrandire"
 
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#, fuzzy
+msgid "Close open changesets"
+msgstr "Nessun changeset aperto"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#, fuzzy
+msgid "Closes open changesets"
+msgstr "Nessun changeset aperto"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
+#: ../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:114
+#, java-format
+msgid "File: {0}"
+msgstr "File: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
+#, fuzzy
+msgid "There are no open changesets"
+msgstr "Nessun changeset aperto"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
+#, fuzzy
+msgid "No open changesets"
+msgstr "Nessun changeset aperto"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
+#, fuzzy
+msgid "Downloading open changesets ..."
+msgstr "Chiusura del gruppo di modifiche..."
+
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
@@ -748,10 +793,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:123
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
@@ -794,31 +840,30 @@
 msgstr "Disponi i nodi a distanze regolari lungo una linea"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
 msgid "Download from OSM..."
 msgstr "Scarica da OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
 msgid "Download map data from the OSM server."
 msgstr "Scarica i dati della mappa dal server OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
-#, java-format
-msgid "File: {0}"
-msgstr "File: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
 msgid "Download"
 msgstr "Scarica"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
 msgid "Please select at least one task to download"
 msgstr "Selezionare almeno un compito per scaricare"
@@ -841,5 +886,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1527
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307
@@ -859,6 +904,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:376
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1415
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
 msgid "Duplicate"
 msgstr "Duplica"
@@ -930,10 +975,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
@@ -1022,25 +1068,26 @@
 msgstr "Unisci il livello corrente con un altro livello"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 msgid "Merge Nodes"
 msgstr "Fondi nodi"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
 msgid "Merge nodes into the oldest one."
 msgstr "Unisci i nuovi nodi in quello più vecchio."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
 msgid "Please select at least two nodes to merge."
 msgstr "Seleziona almeno due nodi da unire."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:394
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
@@ -1056,8 +1103,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -1083,6 +1130,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
@@ -1091,9 +1142,9 @@
 msgstr "il parametro ''{0}'' non deve essere nullo"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr "Impossibile unire i nodi. Cancellare un percorso attualmente usato."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283
 #, java-format
 msgid "Merge {0} nodes"
@@ -1165,5 +1216,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "New"
 msgstr "Nuovo"
@@ -1442,14 +1493,15 @@
 msgstr "Aiuto: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
 msgid "Status Report"
 msgstr "Rapporto dello stato"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 msgid "Copy to clipboard and close"
 msgstr "Copia negli appunti e chiudi"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
@@ -1535,25 +1587,4 @@
 msgstr "Dividi il percorso {0} in {1} parti"
 
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24
-msgid "Close current changeset"
-msgstr "Chiude il changeset corrente"
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-msgid "Close the current changeset ..."
-msgstr "Chiude il changeset corrente ..."
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41
-msgid "There is currently no changeset open."
-msgstr "Attualmente non ci sono changeset aperti."
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42
-msgid "No open changeset"
-msgstr "Nessun changeset aperto"
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60
-msgid "Closing changeset"
-msgstr "Changeset in chiusura"
-
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
@@ -1725,41 +1756,39 @@
 msgstr "Selezione vuota"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Carica su OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 msgid "Upload all changes to the OSM server."
 msgstr "Carica tutti i cambiamenti sul server OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#, java-format
 msgid ""
 "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
 "resolve them first.</html>"
 msgstr ""
-"<html>Ci sono conflitti non risolti sul layer ''{0}''.<br>Prima devi "
-"risolverli.<html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
 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:166
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 msgid "No changes to upload."
 msgstr "Nessun cambiamento da caricare."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Sincronizza solamente {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
 msgid "Synchronize entire dataset"
 msgstr "Sincronizza l'intero dataset"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
 #, java-format
 msgid ""
@@ -1782,17 +1811,17 @@
 "<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
 msgid "Conflict detected"
 msgstr "Rilevato un conflitto"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr "Valore di ritorno inatteso. Ottenuto {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:267
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
 #, java-format
 msgid ""
@@ -1808,5 +1837,17 @@
 "continuare ad apportare delle modifiche.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
+msgid ""
+"<html>Uploading <strong>failed</strong> because you've been "
+"using<br>changeset {0} which was already closed at {1}.<br>Please upload "
+"again with a new or an existing open changeset."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+#, fuzzy
+msgid "Changeset closed"
+msgstr "gruppi di modifiche"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
@@ -1815,5 +1856,5 @@
 "atteso \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
@@ -1821,18 +1862,18 @@
 "L'header dell'errore \"{0}\" non corrisponde allo schema atteso \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr "<html>Upload <strong>fallito</strong>.<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
 msgid "Upload to OSM API failed"
 msgstr "Invio alle API di OSM fallito"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
 msgid "Updating primitive"
 msgstr "Aggiornamento della primitiva"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -2052,14 +2093,14 @@
 msgstr "Aggiungi un nodo al percorso e connetti"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:930
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:932
 msgid "Create new node."
 msgstr "Crea un nuovo nodo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
 msgid "Select node under cursor."
 msgstr "Seleziona il nodo sotto il cursore."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939
 #, java-format
 msgid "Insert new node into way."
@@ -2068,14 +2109,14 @@
 msgstr[1] "Inserisci un nuovo nodo nei {0} percorsi."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
 msgid "Start new way from last node."
 msgstr "Inizia un nuovo percorso dall'ultimo nodo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951
 msgid "Continue way from last node."
 msgstr "Continua un percorso dall'ultimo nodo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:972
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:974
 msgid "Finish drawing."
 msgstr "Termina tracciamento."
@@ -2205,63 +2246,73 @@
 "di ingrandimento con il tasto destro"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Cerca..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Cerca degli oggetti."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
 msgid "Can't search because there is no loaded data."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
+#, fuzzy
+msgid "Please enter a filter string."
+msgstr "Inserire una stringa di ricerca."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
 msgid "Please enter a search string."
 msgstr "Inserire una stringa di ricerca."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
 msgid "replace selection"
 msgstr "Sostituisci la selezione"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72
 msgid "add to selection"
 msgstr "Aggiungi alla selezione"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73
 msgid "remove from selection"
 msgstr "Rimuovi dalla selezione"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
+#, fuzzy
+msgid "find in selection"
+msgstr "Aggiungi alla selezione"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81
 msgid "case sensitive"
 msgstr "Distingui maiuscole"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82
 msgid "regular expression"
 msgstr "espressione regolare"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
 msgstr ""
 "<b>Via Nazionale</b> - ''Via'' e ''Nazionale'' in qualunque chiave o nome."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
 msgstr ""
 "<b>\"Via Nazionale\"</b> - ''Via Nazionale'' in qualunque chiave o nome."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
 msgstr "<b>name:Naz</b> - ''Naz'' in qualunque punto del nome."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
 msgstr ""
 "<b>type=route</b> - chiave 'type' che contiene esattamente il valore 'route'."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid ""
 "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
@@ -2271,17 +2322,17 @@
 "<b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
 msgstr "<b>-name:Naz</b> - ''Naz'' non presente all''interno del nome."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - chiave=foot impostata con qualunque valore."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
 msgid "<u>Special targets:</u>"
 msgstr "<u>Ricerche speciali:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
@@ -2289,33 +2340,33 @@
 "<b>type:</b> - tipo dell''oggetto (<b>node</b>, <b>way</b>, <b>relation</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - tutti gli oggetti modificati dall''utente"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 msgid "<b>nodes:</b>... - object with given number of nodes"
 msgstr "<b>nodes:</b>... - oggetto con un dato numero di nodi"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - tutti gli oggetti modificati"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - tutti gli oggetti selezionati"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - tutti gli oggetti incompleti"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - tutti gli oggetti provi di proprietà"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2324,5 +2375,5 @@
 "corrispondenti all'espressione"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2331,5 +2382,5 @@
 "corrispondenti all'espressione"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
@@ -2337,5 +2388,5 @@
 "logico ''or''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
@@ -2343,46 +2394,63 @@
 "contiene :)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Utilizzare <b>(</b> e <b>)</b> per raggruppare le espressioni"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
+msgid "Filter"
+msgstr "Filtro"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Cerca"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
+msgid "Submit filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "Start Search"
 msgstr "Inizia Ricerca"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Nessuna corrispondenza trovata per ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Nulla è stato aggiunto alla selezione cercando ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Nulla è stato rimosso dalla selezione cercando ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#, fuzzy, java-format
+msgid "Nothing find in selection by searching for ''{0}''"
+msgstr "Nulla è stato aggiunto alla selezione cercando ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262
 #, java-format
 msgid "Found {0} matches"
 msgstr "Trovate {0} corrispondenze"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283
 msgid "RX"
 msgstr "RX"
@@ -2574,5 +2642,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
 msgid "Double conflict"
 msgstr "Doppio conflitto"
@@ -2820,4 +2888,5 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:134
 msgid "Old value"
 msgstr "Valore precedente"
@@ -2981,27 +3050,59 @@
 
 #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
 msgid "E"
 msgstr "E"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:59
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:203
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
 msgid "Changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:323
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
 msgstr "è richiesto il parametro {0} > 0. Ottenuto {1}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:325
-#, fuzzy, java-format
-msgid "paramete''{0}'' must not be null"
-msgstr "il parametro ''{0}'' non deve essere nullo"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331
-#, fuzzy, java-format
-msgid "unsupported value ''{0}'' or parameter ''{1}''"
-msgstr "Regola ''{0}'' non utile per il percorso ''{1}''."
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "H"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "Text"
+msgstr "testo"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "C"
+msgstr "CS"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "I"
+msgstr "CI"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "M"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#, fuzzy
+msgid "R"
+msgstr "RX"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+msgid "A"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+msgid "D"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+msgid "F"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
@@ -3015,29 +3116,29 @@
 msgstr "Attenzione: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
+#, java-format
 msgid "expected id >= 0. Got {0}"
-msgstr "indice di colonna non atteso. Ottenuto {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:257
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
 msgid "a primitive with id=0 can't be invisible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:293
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
+#, java-format
 msgid "id > 0 expected. Got {0}"
-msgstr "Token inaspettato: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
+#, java-format
 msgid "version > 0 expected. Got {0}"
-msgstr "Token inaspettato: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
 msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
 msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
@@ -3104,9 +3205,9 @@
 msgstr "il parametro {0} non è nell''intervallo 0..{1}, ottenuto {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:247
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:249
 msgid "Area style way is not closed."
 msgstr "Il percorso dello stile dell''area non è chiuso."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:478
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:482
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
@@ -3115,118 +3216,118 @@
 #. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
 #. TODO Remove useless nullcheck when RelationMember.member is encalupsed
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:851
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855
 msgid "Empty member in relation."
 msgstr "Membro vuoto nella relazione."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:853
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Eliminato il membro ''{0}'' nella relazione."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:864
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Percorso ''{0}'' con meno di due punti."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "More than one \"from\" way found."
 msgstr "E' stato trovato più di un percorso \"from\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "More than one \"to\" way found."
 msgstr "E' stato trovato più di un percorso \"to\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "More than one \"via\" found."
 msgstr "E' stata trovata più di una \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Ruolo ''{0}'' sconosciuto."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Tipo di membro sconosciuto per ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"from\" way found."
 msgstr "Non è stato trovato un percorso \"from\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"to\" way found."
 msgstr "Non è stato trovato un percorso \"to\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652
 msgid "No \"via\" node or way found."
 msgstr "Non è stato trovato alcun nodo o percorso \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "Il percorso \"from\" non inizia o non finisce su un nodo \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "Il percorso \"to\" non inizia o finisce su un nodo \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "Il percorso \"from\" non inizia o finisce sul percorso \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "Il percorso \"to\" non inizia o finisce sul percorso \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Non è stato trovato lo stile per la restrizione {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Regola ''{0}'' non utile per il percorso ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:885
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Non-percorso ''{0}'' nel multi-poligono."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:943
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Nessun percorso esterno per il multi-poligono ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1032
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Intersezione tra i percorsi ''{0}'' e ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1044
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Il percorso interno ''{0}'' è esterno."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1097
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Lo stile per il percorso interno ''{0}'' è uguale al multi-poligono."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1123
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Lo stile per il percorso esterno ''{0}'' è discordante."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1327
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331
 msgid "untagged"
 msgstr "senza etichetta"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1328
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332
 msgid "text"
 msgstr "testo"
@@ -3247,5 +3348,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
@@ -3266,5 +3367,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
@@ -3318,5 +3419,5 @@
 msgstr "Zona di Lambert (Francia)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
 msgid "Lambert Zone (Estonia)"
 msgstr "Zona di Lambert (Estonia)"
@@ -3358,9 +3459,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:38
 msgid "Do not show again"
 msgstr "Non mostrare di nuovo"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
 #, java-format
@@ -3368,31 +3469,31 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:91
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:116
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154
 msgid "incomplete"
 msgstr "incompleto"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
 msgid "highway"
 msgstr "strada"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
-#: build/trans_presets.java:3144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: build/trans_presets.java:3156
 msgid "railway"
 msgstr "ferrovia"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
 msgid "waterway"
 msgstr "corso d'acqua"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "landuse"
 msgstr "tipologia di area"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:474
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
@@ -3402,5 +3503,5 @@
 msgstr[1] "{0} nodi"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
 #, java-format
 msgid "{0} member"
@@ -3430,7 +3531,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
-#, fuzzy
 msgid "Bad Request"
-msgstr "Modifica racquet"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144
@@ -3446,10 +3546,5 @@
 msgstr "Il messaggio del giorno non è disponibile"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67
-#, java-format
-msgid "- running version is {0}"
-msgstr "- la versione in esecuzione è {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:95
 msgid "Downloading \"Message of the day\""
 msgstr "Scaricamento del \"messaggio del giorno\""
@@ -3521,10 +3616,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:162
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
 msgid "Username"
 msgstr "Nome utente"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
 msgid "Password"
 msgstr "Password"
@@ -3650,5 +3745,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226
 msgid "Presets"
 msgstr "Preimpostati"
@@ -3722,38 +3817,49 @@
 msgstr "scala"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
 msgid "The geographic longitude at the mouse pointer."
 msgstr "La longitudine geografica del puntatore del mouse."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The name of the object at the mouse pointer."
 msgstr "Il nome dell'oggetto sul puntatore del mouse."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The geographic latitude at the mouse pointer."
 msgstr "La latitudine geografica del puntatore del mouse."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The angle between the previous and the current way segment."
 msgstr "L'angolo tra il segmento di percorso corrente e quello precedente."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "Direzione della bussola del segmento che si sta disegnando."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The length of the new way segment being drawn."
 msgstr "Lunghezza del segmento di percorso che si sta disegnando."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199
+msgid ""
+"Middle click again to cycle through.<br>Hold CTRL to select directly from "
+"this list with the mouse.<hr>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290
 msgid "(no object)"
 msgstr "(nessun oggetto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:301
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418
+#, fuzzy
+msgid "User:"
+msgstr "Utente"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
 msgid "layer not in list."
 msgstr "livello non in lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:488
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3824,7 +3930,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:224
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Tags"
 msgstr "Etichette"
@@ -3839,5 +3945,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
@@ -4040,4 +4146,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
 msgid "Up"
 msgstr "Su"
@@ -4048,4 +4155,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Down"
 msgstr "Giù"
@@ -4058,5 +4166,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
@@ -4500,23 +4608,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:236
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239
 msgid "No conflicts to resolve"
-msgstr "Non c'è alcun conflitto di etichette in attesa di risoluzione"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:295
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254
 msgid "Cancel conflict resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:310
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269
 msgid "Apply resolved conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Apply"
 msgstr "Applica"
@@ -4528,5 +4635,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "all"
 msgstr "tutti"
@@ -4570,7 +4677,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
-msgid "not yet decided"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:213
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
@@ -4597,7 +4701,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
@@ -4607,7 +4711,7 @@
 msgstr[1] "{0} percorsi"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:152
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
@@ -4617,20 +4721,20 @@
 msgstr[1] "{0} relazioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "Paste ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "From ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:372
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "To ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:428
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
 #, java-format
 msgid "{0} tag"
@@ -4646,14 +4750,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
-#, fuzzy
 msgid "Remove this relation member from the relation"
 msgstr ""
-"Cancella il membro dalla riga della tabella utilizzata da questa relazione"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-#, fuzzy
 msgid "Replace"
-msgstr "luogo"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
@@ -4664,11 +4765,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
-#, fuzzy
 msgid "Undecided"
-msgstr "Irrisolto"
+msgstr ""
 
 #. --- role editing
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:56
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510
 msgid "Role:"
 msgstr "Ruolo:"
@@ -4684,7 +4784,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70
-#, fuzzy
 msgid "Value:"
-msgstr "Valore"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86
@@ -4697,12 +4796,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51
-#, fuzzy
 msgid "Orig. Way"
-msgstr "Senso unico"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
-#, fuzzy
 msgid "Decision"
-msgstr "Revisione"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -4719,6 +4816,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
@@ -4809,169 +4907,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-msgid "History"
-msgstr "Cronologia"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-msgid "Display the history of all selected items."
-msgstr "Visualizza la cronologia di tutti gli oggetti selezionati."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
-#, java-format
-msgid "index out of bounds Got {0}"
-msgstr "indice fuori dai limiti Ottenuto {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr "Nodo {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
-msgid "History item"
-msgstr "Elemento dello storico"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Carica nuovamente tutti gli oggetti selezionati e aggiorna la lista."
-
-#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
-msgid "Show"
-msgstr "Visualizza"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
-msgstr "Visualizza lo storico della primitiva selezionata"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
-msgid "Dialog not created yet. Invoke createInstance() first"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
-msgid "Layers"
-msgstr "Livelli"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-msgid "Open a list of all loaded layers."
-msgstr "Apre la lista di tutti i livello caricati."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:297
-msgid "Delete the selected layer."
-msgstr "Cancella il livello selezionato."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:367
-msgid "Show/Hide"
-msgstr "Mostra/Nascondi"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:378
-msgid "Toggle visible state of the selected layer."
-msgstr "Inverte la visibilità del livello selezionato."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414
-msgid "Activate"
-msgstr "Attiva"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:420
-msgid "Activate the selected layer"
-msgstr "Attiva il livello selezionato"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:475
-msgid "Merge this layer into another layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:581
-msgid "Move the selected layer one row up."
-msgstr "Sposta il livello selezionato in su."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:600
-msgid "Move the selected layer one row down."
-msgstr "Sposta il layer selezionato in giù."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
-msgid "Information about layer"
-msgstr "Informazioni sul livello"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
-#, java-format
-msgid "This will change up to {0} object."
-msgid_plural "This will change up to {0} objects."
-msgstr[0] "Questo cambierà {0} oggetto."
-msgstr[1] "Questo cambierà {0} oggetti."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
-msgid "An empty value deletes the key."
-msgstr "Un valore vuoto cancella la chiave."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
-msgid "<different>"
-msgstr "<diverso>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
-msgid "Change values?"
-msgstr "Cambiare i valori?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
-#, java-format
-msgid "Change properties of up to {0} object"
-msgid_plural "Change properties of up to {0} objects"
-msgstr[0] "Cambia le proprietà di al massimo {0} oggetto"
-msgstr[1] "Cambia le proprietà di al massimo {0} oggetti"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
-msgid "Please select a key"
-msgstr "Seleziona una chiave"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
-msgid "Please select a value"
-msgstr "Seleziona un valore"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
-msgid "Please select the objects you want to change properties for."
-msgstr "Seleziona gli oggetti di cui vuoi cambiare le proprietà."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
-msgid "Properties/Memberships"
-msgstr "Proprietà/Appartenenze"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-msgid "Properties for selected objects."
-msgstr "Proprietà per gli oggetti selezionati."
-
-#. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-msgid "Member Of"
-msgstr "Membro di"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
-msgid "Add Properties"
-msgstr "Aggiungi proprietà"
-
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+msgid "Filter objects and hide/disable them."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
@@ -4985,4 +4927,212 @@
 msgstr "Aggiungi"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#, fuzzy
+msgid "Add filter."
+msgstr "Aggiungi la selezione"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
+#, fuzzy
+msgid "Edit filter."
+msgstr "Modifica passerella"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#, fuzzy
+msgid "Delete filter."
+msgstr "Elimina livello"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
+#, fuzzy
+msgid "Move filter up."
+msgstr "Sposta in alto"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
+#, fuzzy
+msgid "Move filter down."
+msgstr "Sposta in basso"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128
+msgid "Enable filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
+#, fuzzy
+msgid "Hide elements"
+msgstr "Elementi singoli"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
+msgid "Apply also for children"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
+msgid "Inverse filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
+#, fuzzy
+msgid "Filter mode"
+msgstr "Filtro"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
+msgid "History"
+msgstr "Cronologia"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+msgid "Display the history of all selected items."
+msgstr "Visualizza la cronologia di tutti gli oggetti selezionati."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr "indice fuori dai limiti Ottenuto {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr "Nodo {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
+msgid "History item"
+msgstr "Elemento dello storico"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
+msgid "Reload all currently selected objects and refresh the list."
+msgstr "Carica nuovamente tutti gli oggetti selezionati e aggiorna la lista."
+
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
+msgid "Show"
+msgstr "Visualizza"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
+msgid "Display the history of the selected primitive"
+msgstr "Visualizza lo storico della primitiva selezionata"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84
+msgid "Dialog not created yet. Invoke createInstance() first"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
+msgid "Layers"
+msgstr "Livelli"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+msgid "Open a list of all loaded layers."
+msgstr "Apre la lista di tutti i livello caricati."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294
+msgid "Delete the selected layer."
+msgstr "Cancella il livello selezionato."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364
+msgid "Show/Hide"
+msgstr "Mostra/Nascondi"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375
+msgid "Toggle visible state of the selected layer."
+msgstr "Inverte la visibilità del livello selezionato."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgid "Activate"
+msgstr "Attiva"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417
+msgid "Activate the selected layer"
+msgstr "Attiva il livello selezionato"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472
+msgid "Merge this layer into another layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578
+msgid "Move the selected layer one row up."
+msgstr "Sposta il livello selezionato in su."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597
+msgid "Move the selected layer one row down."
+msgstr "Sposta il layer selezionato in giù."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+msgid "Information about layer"
+msgstr "Informazioni sul livello"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+#, java-format
+msgid "This will change up to {0} object."
+msgid_plural "This will change up to {0} objects."
+msgstr[0] "Questo cambierà {0} oggetto."
+msgstr[1] "Questo cambierà {0} oggetti."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+msgid "An empty value deletes the key."
+msgstr "Un valore vuoto cancella la chiave."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+msgid "<different>"
+msgstr "<diverso>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+msgid "Change values?"
+msgstr "Cambiare i valori?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#, java-format
+msgid "Change properties of up to {0} object"
+msgid_plural "Change properties of up to {0} objects"
+msgstr[0] "Cambia le proprietà di al massimo {0} oggetto"
+msgstr[1] "Cambia le proprietà di al massimo {0} oggetti"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+msgid "Please select a key"
+msgstr "Seleziona una chiave"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+msgid "Please select a value"
+msgstr "Seleziona un valore"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
+msgid "Please select the objects you want to change properties for."
+msgstr "Seleziona gli oggetti di cui vuoi cambiare le proprietà."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
+msgid "Properties/Memberships"
+msgstr "Proprietà/Appartenenze"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+msgid "Properties for selected objects."
+msgstr "Proprietà per gli oggetti selezionati."
+
+#. setting up the membership table
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+msgid "Member Of"
+msgstr "Membro di"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
+msgid "Add Properties"
+msgstr "Aggiungi proprietà"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574
 msgid "Add a new key/value pair to all objects"
@@ -5024,10 +5174,9 @@
 
 #. item "Land use/Quarry" text "Name"
-#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
-#: build/trans_presets.java:3109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168
+#: build/trans_presets.java:3121
 msgid "Relations"
 msgstr "Relazioni"
@@ -5037,23 +5186,23 @@
 msgstr "Apri tutte le relazioni in una lista"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relazioni: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276
 msgid "Open an editor for the selected relation"
 msgstr "Apri le relazioni selezionate in un editor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
 msgid "Delete the selected relation"
 msgstr "Cancella le relazioni selezionate"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349
 msgid "Create a new relation"
 msgstr "Crea una nuova relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:373
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1412
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
@@ -5086,5 +5235,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5096,9 +5245,9 @@
 msgstr "Selezione: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441
 msgid "Undock the panel"
 msgstr "Stacca il pannello"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5107,5 +5256,5 @@
 "degli strumenti a sinistra."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:457
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Cliccare per minimizzare/massimizzare il contenuto del pannello"
@@ -5168,5 +5317,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5190,5 +5339,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1502
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1370
 msgid "Download relation members"
 msgstr "Scarica i membri della relazione"
@@ -5218,5 +5367,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -5224,18 +5373,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
 msgid "Tags and Members"
 msgstr "Etichette e Membri"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:167
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5244,14 +5393,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
 msgid "Remove them, clean up relation"
 msgstr "Rimuovili, ripulisci la relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
 msgid "Ignore them, leave relation as is"
 msgstr "Ignorali, mantieni la relazione com'è"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613
 #, java-format
 msgid ""
@@ -5261,9 +5410,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid ""
@@ -5273,15 +5422,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5289,5 +5438,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5295,20 +5444,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849
 #, java-format
 msgid ""
@@ -5317,57 +5466,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:961
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909
 msgid "Move the currently selected members up"
 msgstr "Sposta in alto i membri attualmente selezionati"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:979
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:912
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928
 msgid "Move the currently selected members down"
 msgstr "Sposta in basso i membri attualmente selezionati"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:998
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:931
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050
 msgid "No, continue editing"
 msgstr "No, continua la modifica"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5376,9 +5525,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1058
 msgid "Conflict in data"
 msgstr "Conflitto nei dati"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
 #, java-format
 msgid ""
@@ -5387,56 +5536,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090
 msgid "Apply the current updates"
 msgstr "Applica gli aggiornamenti correnti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123
 msgid "Apply the updates and close the dialog"
 msgstr "Applica gli aggiornamenti e chiudi la finestra"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Cancel the updates and close the dialog"
 msgstr "Annulla gli aggiornamenti e chiudi la finestra"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 msgid "Add an empty tag"
 msgstr "Aggiungi una etichetta vuota"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
-msgid "Delete the currently selected tags"
-msgstr "elimina le etichette correntemente selezionate"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Scarica tutti i percorsi ed i nodi incompleti di questa relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 msgid "Download Members"
 msgstr "Scarica i membri"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1208
 msgid "Sets a role for the selected members"
 msgstr "Imposta un ruolo ai membri selezionati"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1211
 msgid "Apply Role"
 msgstr "Applica Ruolo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1356
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 #, java-format
 msgid ""
@@ -5446,13 +5580,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228
 msgid "Yes, apply it"
 msgstr "Si, applica"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1229
 msgid "No, don't apply"
 msgstr "No, non applicare"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1367
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
 msgid "Confirm empty role"
 msgstr "Conferma ruolo vuoto"
@@ -5539,37 +5673,37 @@
 msgstr "Segnalibri"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:82
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
 msgid "Please enter the desired coordinates first."
 msgstr "Per prima cosa inserisci le coordinate della località."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
 msgid "Please enter a name for the location."
 msgstr "Inserisci il nome della località."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:107
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
 msgid "Select a bookmark first."
 msgstr "Per prima cosa, scegli un segnalibro."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
 msgid "min lat"
 msgstr "Lat min"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
 msgid "min lon"
 msgstr "Lon min"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid "max lat"
 msgstr "Lat max"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
 msgid "max lon"
 msgstr "Lon max"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5579,22 +5713,22 @@
 "indirizzo URL qui per scaricare l'area)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
 msgid "Bounding Box"
 msgstr "Riquadro di selezione"
 
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
 msgid "Data Sources and Types"
 msgstr "Sorgenti di dati e tipi"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
 msgid "Download as new layer"
 msgstr "Scarica come nuovo layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
 msgid "Download Area"
 msgstr "Area da scaricare"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
 msgid "Download area too large; will probably be rejected by server"
 msgstr ""
@@ -5602,5 +5736,5 @@
 "dal server"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
 msgid "Download area ok, size probably acceptable to server"
 msgstr "Area da scaricare corretta, sarà probabilmente accettata dal server"
@@ -5625,7 +5759,7 @@
 msgstr "Inserire il nome di un luogo da cercare:"
 
-#. <separator/>
+#. group "Geography"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2759
 msgid "Places"
 msgstr "Luoghi"
@@ -5672,21 +5806,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "type"
 msgstr "tipo"
@@ -5703,5 +5837,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-#, fuzzy
 msgid ""
 "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
@@ -5709,6 +5842,4 @@
 "Hold left mousebutton and draw a frame."
 msgstr ""
-"Zoom: Rotella del mouse o doppio click. Spostamento della mappa: muovere il "
-"mouse tenendo premuto il tasto destro. Selezionare: click."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
@@ -6171,4 +6302,6 @@
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
 #. <key key="historic" value="wayside_shrine" />
+#. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
+#. <key key="historic" value="boundary_stone" />
 #. item "Leisure/Water Park" label "Edit Water Park"
 #. <key key="leisure" value="water_park" />
@@ -6540,153 +6673,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/trans_presets.java:66 build/trans_presets.java:102
-#: build/trans_presets.java:142 build/trans_presets.java:179
-#: build/trans_presets.java:199 build/trans_presets.java:217
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:272 build/trans_presets.java:305
-#: build/trans_presets.java:351 build/trans_presets.java:371
-#: build/trans_presets.java:386 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:463 build/trans_presets.java:482
-#: build/trans_presets.java:502 build/trans_presets.java:522
-#: build/trans_presets.java:543 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627 build/trans_presets.java:658
-#: build/trans_presets.java:679 build/trans_presets.java:692
-#: build/trans_presets.java:705 build/trans_presets.java:718
-#: build/trans_presets.java:731 build/trans_presets.java:744
-#: build/trans_presets.java:755 build/trans_presets.java:764
-#: build/trans_presets.java:811 build/trans_presets.java:832
-#: build/trans_presets.java:841 build/trans_presets.java:901
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1067 build/trans_presets.java:1075
-#: build/trans_presets.java:1085 build/trans_presets.java:1093
-#: build/trans_presets.java:1098 build/trans_presets.java:1105
-#: build/trans_presets.java:1112 build/trans_presets.java:1117
-#: build/trans_presets.java:1125 build/trans_presets.java:1134
-#: build/trans_presets.java:1140 build/trans_presets.java:1146
-#: build/trans_presets.java:1151 build/trans_presets.java:1157
-#: build/trans_presets.java:1163 build/trans_presets.java:1172
-#: build/trans_presets.java:1181 build/trans_presets.java:1188
-#: build/trans_presets.java:1196 build/trans_presets.java:1209
-#: build/trans_presets.java:1215 build/trans_presets.java:1224
-#: build/trans_presets.java:1230 build/trans_presets.java:1236
-#: build/trans_presets.java:1244 build/trans_presets.java:1299
-#: build/trans_presets.java:1346 build/trans_presets.java:1352
-#: build/trans_presets.java:1358 build/trans_presets.java:1364
-#: build/trans_presets.java:1370 build/trans_presets.java:1381
-#: build/trans_presets.java:1390 build/trans_presets.java:1405
-#: build/trans_presets.java:1412 build/trans_presets.java:1418
-#: build/trans_presets.java:1426 build/trans_presets.java:1433
-#: build/trans_presets.java:1442 build/trans_presets.java:1450
-#: build/trans_presets.java:1457 build/trans_presets.java:1468
-#: build/trans_presets.java:1478 build/trans_presets.java:1488
-#: build/trans_presets.java:1508 build/trans_presets.java:1520
-#: build/trans_presets.java:1531 build/trans_presets.java:1548
-#: build/trans_presets.java:1555 build/trans_presets.java:1570
-#: build/trans_presets.java:1577 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1594
-#: build/trans_presets.java:1599 build/trans_presets.java:1605
-#: build/trans_presets.java:1611 build/trans_presets.java:1619
-#: build/trans_presets.java:1627 build/trans_presets.java:1635
-#: build/trans_presets.java:1642 build/trans_presets.java:1648
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1670 build/trans_presets.java:1677
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1712 build/trans_presets.java:1719
-#: build/trans_presets.java:1736 build/trans_presets.java:1744
-#: build/trans_presets.java:1759 build/trans_presets.java:1769
-#: build/trans_presets.java:1781 build/trans_presets.java:1788
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:1809 build/trans_presets.java:1817
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1841
-#: build/trans_presets.java:1846 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1864
-#: build/trans_presets.java:1872 build/trans_presets.java:1881
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1908 build/trans_presets.java:1914
-#: build/trans_presets.java:1922 build/trans_presets.java:1928
-#: build/trans_presets.java:1934 build/trans_presets.java:1940
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2013
-#: build/trans_presets.java:2022 build/trans_presets.java:2030
-#: build/trans_presets.java:2036 build/trans_presets.java:2042
-#: build/trans_presets.java:2048 build/trans_presets.java:2054
-#: build/trans_presets.java:2060 build/trans_presets.java:2066
-#: build/trans_presets.java:2072 build/trans_presets.java:2078
-#: build/trans_presets.java:2084 build/trans_presets.java:2090
-#: build/trans_presets.java:2096 build/trans_presets.java:2102
-#: build/trans_presets.java:2108 build/trans_presets.java:2114
-#: build/trans_presets.java:2120 build/trans_presets.java:2126
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2158
-#: build/trans_presets.java:2165 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2186
-#: build/trans_presets.java:2192 build/trans_presets.java:2198
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2218 build/trans_presets.java:2225
-#: build/trans_presets.java:2232 build/trans_presets.java:2239
-#: build/trans_presets.java:2247 build/trans_presets.java:2279
-#: build/trans_presets.java:2284 build/trans_presets.java:2289
-#: build/trans_presets.java:2294 build/trans_presets.java:2300
-#: build/trans_presets.java:2306 build/trans_presets.java:2312
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2354
-#: build/trans_presets.java:2451 build/trans_presets.java:2458
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2485 build/trans_presets.java:2492
-#: build/trans_presets.java:2498 build/trans_presets.java:2504
-#: build/trans_presets.java:2526 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2553 build/trans_presets.java:2559
-#: build/trans_presets.java:2565 build/trans_presets.java:2571
-#: build/trans_presets.java:2577 build/trans_presets.java:2583
-#: build/trans_presets.java:2590 build/trans_presets.java:2597
-#: build/trans_presets.java:2604 build/trans_presets.java:2610
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2661
-#: build/trans_presets.java:2667 build/trans_presets.java:2677
-#: build/trans_presets.java:2686 build/trans_presets.java:2701
-#: build/trans_presets.java:2707 build/trans_presets.java:2715
-#: build/trans_presets.java:2722 build/trans_presets.java:2742
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2783
-#: build/trans_presets.java:2790 build/trans_presets.java:2797
-#: build/trans_presets.java:2803 build/trans_presets.java:2809
-#: build/trans_presets.java:2817 build/trans_presets.java:2824
-#: build/trans_presets.java:2831 build/trans_presets.java:2838
-#: build/trans_presets.java:2844 build/trans_presets.java:2851
-#: build/trans_presets.java:2858 build/trans_presets.java:2867
-#: build/trans_presets.java:2873 build/trans_presets.java:2879
-#: build/trans_presets.java:2885 build/trans_presets.java:2891
-#: build/trans_presets.java:2900 build/trans_presets.java:2910
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2948
-#: build/trans_presets.java:2957 build/trans_presets.java:2963
-#: build/trans_presets.java:2969 build/trans_presets.java:2975
-#: build/trans_presets.java:2981 build/trans_presets.java:2987
-#: build/trans_presets.java:2993 build/trans_presets.java:3000
-#: build/trans_presets.java:3006 build/trans_presets.java:3011
-#: build/trans_presets.java:3018 build/trans_presets.java:3025
-#: build/trans_presets.java:3031 build/trans_presets.java:3040
-#: build/trans_presets.java:3048 build/trans_presets.java:3054
-#: build/trans_presets.java:3060 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3080
-#: build/trans_presets.java:3086 build/trans_presets.java:3092
-#: build/trans_presets.java:3098 build/trans_presets.java:3104
-#: build/trans_presets.java:3117 build/trans_presets.java:3131
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:67 build/trans_presets.java:103
+#: build/trans_presets.java:143 build/trans_presets.java:180
+#: build/trans_presets.java:200 build/trans_presets.java:218
+#: build/trans_presets.java:235 build/trans_presets.java:253
+#: build/trans_presets.java:273 build/trans_presets.java:306
+#: build/trans_presets.java:352 build/trans_presets.java:372
+#: build/trans_presets.java:387 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:503 build/trans_presets.java:523
+#: build/trans_presets.java:544 build/trans_presets.java:565
+#: build/trans_presets.java:586 build/trans_presets.java:607
+#: build/trans_presets.java:628 build/trans_presets.java:659
+#: build/trans_presets.java:680 build/trans_presets.java:693
+#: build/trans_presets.java:706 build/trans_presets.java:719
+#: build/trans_presets.java:732 build/trans_presets.java:745
+#: build/trans_presets.java:756 build/trans_presets.java:765
+#: build/trans_presets.java:812 build/trans_presets.java:833
+#: build/trans_presets.java:842 build/trans_presets.java:902
+#: build/trans_presets.java:1053 build/trans_presets.java:1061
+#: build/trans_presets.java:1069 build/trans_presets.java:1077
+#: build/trans_presets.java:1087 build/trans_presets.java:1095
+#: build/trans_presets.java:1100 build/trans_presets.java:1107
+#: build/trans_presets.java:1114 build/trans_presets.java:1119
+#: build/trans_presets.java:1127 build/trans_presets.java:1136
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1153 build/trans_presets.java:1159
+#: build/trans_presets.java:1165 build/trans_presets.java:1174
+#: build/trans_presets.java:1183 build/trans_presets.java:1190
+#: build/trans_presets.java:1198 build/trans_presets.java:1211
+#: build/trans_presets.java:1217 build/trans_presets.java:1226
+#: build/trans_presets.java:1232 build/trans_presets.java:1238
+#: build/trans_presets.java:1246 build/trans_presets.java:1302
+#: build/trans_presets.java:1349 build/trans_presets.java:1355
+#: build/trans_presets.java:1361 build/trans_presets.java:1367
+#: build/trans_presets.java:1373 build/trans_presets.java:1384
+#: build/trans_presets.java:1393 build/trans_presets.java:1408
+#: build/trans_presets.java:1415 build/trans_presets.java:1421
+#: build/trans_presets.java:1429 build/trans_presets.java:1436
+#: build/trans_presets.java:1445 build/trans_presets.java:1453
+#: build/trans_presets.java:1460 build/trans_presets.java:1471
+#: build/trans_presets.java:1481 build/trans_presets.java:1491
+#: build/trans_presets.java:1511 build/trans_presets.java:1523
+#: build/trans_presets.java:1534 build/trans_presets.java:1551
+#: build/trans_presets.java:1558 build/trans_presets.java:1574
+#: build/trans_presets.java:1581 build/trans_presets.java:1586
+#: build/trans_presets.java:1592 build/trans_presets.java:1598
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1646 build/trans_presets.java:1652
+#: build/trans_presets.java:1659 build/trans_presets.java:1666
+#: build/trans_presets.java:1674 build/trans_presets.java:1681
+#: build/trans_presets.java:1689 build/trans_presets.java:1696
+#: build/trans_presets.java:1702 build/trans_presets.java:1709
+#: build/trans_presets.java:1716 build/trans_presets.java:1723
+#: build/trans_presets.java:1740 build/trans_presets.java:1748
+#: build/trans_presets.java:1763 build/trans_presets.java:1773
+#: build/trans_presets.java:1785 build/trans_presets.java:1792
+#: build/trans_presets.java:1798 build/trans_presets.java:1808
+#: build/trans_presets.java:1813 build/trans_presets.java:1821
+#: build/trans_presets.java:1828 build/trans_presets.java:1834
+#: build/trans_presets.java:1840 build/trans_presets.java:1845
+#: build/trans_presets.java:1850 build/trans_presets.java:1855
+#: build/trans_presets.java:1862 build/trans_presets.java:1868
+#: build/trans_presets.java:1873 build/trans_presets.java:1882
+#: build/trans_presets.java:1891 build/trans_presets.java:1900
+#: build/trans_presets.java:1909 build/trans_presets.java:1918
+#: build/trans_presets.java:1924 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 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:2023 build/trans_presets.java:2032
+#: build/trans_presets.java:2040 build/trans_presets.java:2046
+#: build/trans_presets.java:2052 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 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:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2150
+#: build/trans_presets.java:2156 build/trans_presets.java:2162
+#: build/trans_presets.java:2169 build/trans_presets.java:2176
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2197 build/trans_presets.java:2203
+#: build/trans_presets.java:2209 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2229
+#: build/trans_presets.java:2236 build/trans_presets.java:2243
+#: build/trans_presets.java:2250 build/trans_presets.java:2258
+#: build/trans_presets.java:2290 build/trans_presets.java:2295
+#: build/trans_presets.java:2300 build/trans_presets.java:2305
+#: build/trans_presets.java:2311 build/trans_presets.java:2317
+#: build/trans_presets.java:2323 build/trans_presets.java:2331
+#: build/trans_presets.java:2337 build/trans_presets.java:2343
+#: build/trans_presets.java:2349 build/trans_presets.java:2355
+#: build/trans_presets.java:2365 build/trans_presets.java:2462
+#: build/trans_presets.java:2469 build/trans_presets.java:2483
+#: build/trans_presets.java:2489 build/trans_presets.java:2496
+#: build/trans_presets.java:2503 build/trans_presets.java:2509
+#: build/trans_presets.java:2515 build/trans_presets.java:2537
+#: build/trans_presets.java:2544 build/trans_presets.java:2551
+#: build/trans_presets.java:2557 build/trans_presets.java:2564
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2594 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2615
+#: build/trans_presets.java:2621 build/trans_presets.java:2627
+#: build/trans_presets.java:2633 build/trans_presets.java:2639
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2672 build/trans_presets.java:2678
+#: build/trans_presets.java:2688 build/trans_presets.java:2697
+#: build/trans_presets.java:2712 build/trans_presets.java:2718
+#: build/trans_presets.java:2726 build/trans_presets.java:2733
+#: build/trans_presets.java:2753 build/trans_presets.java:2764
+#: build/trans_presets.java:2770 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2788
+#: build/trans_presets.java:2795 build/trans_presets.java:2802
+#: build/trans_presets.java:2809 build/trans_presets.java:2815
+#: build/trans_presets.java:2821 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2912
+#: build/trans_presets.java:2922 build/trans_presets.java:2931
+#: build/trans_presets.java:2937 build/trans_presets.java:2943
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 build/trans_presets.java:2981
+#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:2999 build/trans_presets.java:3005
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3023 build/trans_presets.java:3030
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3066 build/trans_presets.java:3072
+#: build/trans_presets.java:3079 build/trans_presets.java:3085
+#: build/trans_presets.java:3092 build/trans_presets.java:3098
+#: build/trans_presets.java:3104 build/trans_presets.java:3110
+#: build/trans_presets.java:3116 build/trans_presets.java:3129
+#: build/trans_presets.java:3143 build/trans_presets.java:3157
 msgid "Name"
 msgstr "Nome"
@@ -6720,4 +6854,58 @@
 msgid "Version"
 msgstr "Versione"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
+#, fuzzy
+msgid "Changeset id:"
+msgstr "gruppi di modifiche"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
+#, fuzzy
+msgid "Created at:"
+msgstr "Crea aree"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
+#, fuzzy
+msgid "Changeset comment:"
+msgstr "Inserisci commento"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
+msgid "No open changeset"
+msgstr "Nessun changeset aperto"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48
+#, fuzzy
+msgid "<html>Please select the changesets you want to close</html>"
+msgstr "Selezionare quali cambiamenti alle proprietà si vogliono applicare."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
+#, fuzzy
+msgid "Open changesets"
+msgstr "Nessun changeset aperto"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101
+#, fuzzy
+msgid "Close changesets"
+msgstr "Changeset in chiusura"
+
+#. putValue(SMALL_ICON, ImageProvider.get("cancel"));
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
+#, fuzzy
+msgid "Close the selected open changesets"
+msgstr "Chiude il changeset corrente ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126
+#, fuzzy
+msgid "Cancel closeing of changesets"
+msgstr "Changeset in chiusura"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37
+msgid "Closing changeset"
+msgstr "Changeset in chiusura"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77
+#, fuzzy, java-format
+msgid "Closing changeset {0}"
+msgstr "Changeset in chiusura"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
@@ -6746,5 +6934,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be uploaded"
+msgid "Layer ''{0}'' has no modifications to be uploaded."
 msgstr ""
 
@@ -6752,5 +6940,5 @@
 #, java-format
 msgid ""
-"Layer ''{0}'' has modifications which should be saved to its assoicated file "
+"Layer ''{0}'' has modifications which should be saved to its associated file "
 "''{1}''."
 msgstr ""
@@ -6758,5 +6946,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be saved"
+msgid "Layer ''{0}'' has no modifications to be saved."
 msgstr ""
 
@@ -6790,17 +6978,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113
 msgid "Unsaved changes - Save/Upload before exiting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194
 #, java-format
 msgid ""
@@ -6813,10 +7001,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205
 msgid "Unsaved data and conflicts"
-msgstr "Risolvi conflitti"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212
 #, java-format
 msgid ""
@@ -6830,9 +7017,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223
 msgid "Unsaved data and missing associated file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230
 #, java-format
 msgid ""
@@ -6847,42 +7034,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243
 msgid "Unsaved data non-writable files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
 msgid "Close this dialog and resume editing in JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322
+msgid "Discard and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
-msgid "Discard and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354
+msgid "Save and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
-msgid "Save and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
 msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402
 #, java-format
 msgid "Preparing layer ''{0}'' for upload ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
@@ -6890,5 +7077,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491
 msgid "Incomplete upload and/or save"
 msgstr ""
@@ -6928,21 +7115,21 @@
 #. item "Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:200
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:278
-#: build/trans_presets.java:311 build/trans_presets.java:357
-#: build/trans_presets.java:372 build/trans_presets.java:387
-#: build/trans_presets.java:409 build/trans_presets.java:429
-#: build/trans_presets.java:450 build/trans_presets.java:470
-#: build/trans_presets.java:489 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:549
-#: build/trans_presets.java:570 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:633
-#: build/trans_presets.java:664 build/trans_presets.java:1060
-#: build/trans_presets.java:1068 build/trans_presets.java:1076
-#: build/trans_presets.java:1086 build/trans_presets.java:1305
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:242
+#: build/trans_presets.java:260 build/trans_presets.java:279
+#: build/trans_presets.java:312 build/trans_presets.java:358
+#: build/trans_presets.java:373 build/trans_presets.java:388
+#: build/trans_presets.java:410 build/trans_presets.java:430
+#: build/trans_presets.java:451 build/trans_presets.java:471
+#: build/trans_presets.java:490 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:665 build/trans_presets.java:1062
+#: build/trans_presets.java:1070 build/trans_presets.java:1078
+#: build/trans_presets.java:1088 build/trans_presets.java:1308
 msgid "Layer"
 msgstr "Layer"
@@ -6961,74 +7148,32 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:200
 msgid "Upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-msgid "Use a new changeset and close it"
-msgstr "Usare un nuovo changset a chiuderlo."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
-msgid ""
-"Select to upload the data using a new changeset and to close the changeset "
-"after the upload"
-msgstr ""
-"Selezionare per caricare i dati usando un nuovo changeset e per chiudere il "
-"changeset dopo il caricamento"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
-msgid "Use a new changeset and leave it open"
-msgstr "Usare un nuovo changset e lasciarlo aperto"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
-msgid ""
-"Select to upload the data using a new changeset and to leave the changeset "
-"open after the upload"
-msgstr ""
-"Selezionare per caricare i dati usando un nuovo changeset e per chiudere il "
-"changeset dopo il caricamento"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
-msgid "Upload to a new or to an existing changeset?"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
-msgid "upload all changes in one request"
-msgstr "carica tutte le modifiche in una sola richiesta"
+msgid "Settings"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
-msgid ""
-"Enable to upload all changes in one request, disable to use one request per "
-"changed primitive"
-msgstr ""
-"Abilitare per caricare tutte le modifiche in una sola richiesta, "
-"disabilitare per utilizzare una richiesta per ogni singola primitiva "
-"modificata"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171
-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/gui/io/UploadDialog.java:216
-msgid "Settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908
 msgid "Tags of new changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:221
 msgid "Objects to add:"
 msgstr "Oggetti da aggiungere:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:227
 msgid "Objects to modify:"
 msgstr "Oggetti da modificare:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:233
 msgid "Objects to delete:"
 msgstr "Oggetti da eliminare:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
 #, java-format
 msgid "{0} object to add:"
@@ -7037,5 +7182,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:277
 #, java-format
 msgid "{0} object to modifiy:"
@@ -7044,5 +7189,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:286
 #, java-format
 msgid "{0} object to delete:"
@@ -7051,55 +7196,95 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422
-#, java-format
-msgid "Use the existing changeset {0} and close it after upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:423
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to close the changeset "
-"after this upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426
-#, java-format
-msgid "Use the existing changeset {0} and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:427
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to leave the changeset "
-"open for further uploads"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
-#, java-format
-msgid "Tags of changeset {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:470
 msgid "Upload Changes"
 msgstr "Carica le modifiche"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472
+msgid "Upload the changed primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
+msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:479
+msgid "Illegal upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
+msgid "Cancel the upload and resume editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606
 #, fuzzy
-msgid "Upload the changed primitives"
-msgstr "Caricare questi cambiamenti?"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592
+msgid "Upload all changes in one request"
+msgstr "carica tutte le modifiche in una sola richiesta"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607
+msgid ""
+"Enable to upload all changes in one request, disable to use one request per "
+"changed primitive"
+msgstr ""
+"Abilitare per caricare tutte le modifiche in una sola richiesta, "
+"disabilitare per utilizzare una richiesta per ogni singola primitiva "
+"modificata"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:617
+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/gui/io/UploadDialog.java:672
 #, fuzzy
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "Inserisci il nome della località."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:593
-msgid "Illegal upload comment"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
+msgid "Open a new changeset"
+msgstr "Nessun changeset aperto"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
 #, fuzzy
-msgid "Cancel the upload and resume editing"
-msgstr "Annulla gli aggiornamenti e chiudi la finestra"
+msgid "Open a new changeset and use it in the next upload"
+msgstr "Usare un nuovo changset e lasciarlo aperto"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
+#, fuzzy
+msgid "Use an open changeset"
+msgstr "Nessun changeset aperto"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
+msgid "Upload data to an already opened changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
+#, fuzzy
+msgid "Close changeset after upload"
+msgstr "Nessun cambiamento da caricare."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
+#, fuzzy
+msgid "Select to close the changeset after the next upload"
+msgstr ""
+"Selezionare per caricare i dati usando un nuovo changeset e per chiudere il "
+"changeset dopo il caricamento"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922
+#, java-format
+msgid "Tags of changeset {0}"
+msgstr ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
+#, fuzzy
+msgid "Load the list of your open changesets from the server"
+msgstr "Carica sul server le attuali preferenze"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
+#, fuzzy
+msgid "Close the currently selected open changeset"
+msgstr "elimina le etichette correntemente selezionate"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
+#, fuzzy, java-format
+msgid "changeset id > 0 expected. Got {1}"
+msgstr "era atteso il parametro ''{0}'' > 0, ottenuto ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63
@@ -7177,5 +7362,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
@@ -7213,5 +7398,5 @@
 msgstr "Impossibile decodificare l'orario inserito."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
@@ -7219,30 +7404,30 @@
 msgstr "punto GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
 msgid "Customize line drawing"
 msgstr "Personalizza disegno linee"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
 msgid "Use global settings."
 msgstr "Usa le impostazioni globali."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Draw lines between points for this layer."
 msgstr "Disegna le linee tra i punti di questo livello."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Do not draw lines between points for this layer."
 msgstr "Non disegnare le linee tra i punti di questo livello."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 msgid "Select line drawing options"
 msgstr "Seleziona le opzioni per il disegno delle linee"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7250,5 +7435,5 @@
 msgstr "Personalizza colori"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7257,5 +7442,5 @@
 msgstr "Predefinito"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7264,38 +7449,75 @@
 msgstr "Scegli un colore"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
 msgid "Markers From Named Points"
 msgstr "Crea marcatori dai punti con nome"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Nomina i punti del percorso da {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
 msgid "Import Audio"
 msgstr "Importa l'audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
 msgid "Wave Audio files (*.wav)"
 msgstr "Files audio Wave (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Marcatori audio da {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
 msgid "Import images"
 msgstr "Importa immagini"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#, java-format
+msgid "Name: {0}"
+msgstr "Nome: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#, java-format
+msgid "Description: {0}"
+msgstr "Descrizione: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#, fuzzy, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
 msgstr[0] "{0} percorso, "
 msgstr[1] "{0} percorsi, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
+#: build/trans_presets.java:3160
+msgid "Description"
+msgstr "Descrizione"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#, fuzzy
+msgid "Timespan"
+msgstr "Timespan/Arco di tempo: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#, fuzzy
+msgid "Length"
+msgstr "Lunghezza: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
+msgid "URL"
+msgstr "Indirizzo URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+msgid "Length: "
+msgstr "Lunghezza: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
 #, java-format
 msgid "{0} route, "
@@ -7304,5 +7526,5 @@
 msgstr[1] "{0} percorsi, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 #, java-format
 msgid "{0} waypoint"
@@ -7311,29 +7533,10 @@
 msgstr[1] "{0} punti del percorso"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
-#, java-format
-msgid "Name: {0}"
-msgstr "Nome: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
-#, java-format
-msgid "Description: {0}"
-msgstr "Descrizione: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
-msgid "Timespan: "
-msgstr "Timespan/Arco di tempo: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
-msgid "Length: "
-msgstr "Lunghezza: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Converti in livello dati"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7343,10 +7546,10 @@
 "considerato dannoso.<br>Se si desidera caricare delle tracce, vedere qui:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -7357,29 +7560,29 @@
 msgstr "Convertito da: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
 msgid "Download from OSM along this track"
 msgstr "Scarica da OSM lungo questo tracciato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
 msgid "Download everything within:"
 msgstr "Scarica tutto entro:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metri"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 msgid "Maximum area per request:"
 msgstr "Area massima per richiesta:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km quadrati"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
 #, java-format
 msgid ""
@@ -7390,13 +7593,13 @@
 "vuole procedere?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
 msgid "Download data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
 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:1143
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7407,5 +7610,5 @@
 "all'inizio."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7460,30 +7663,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
-#, fuzzy
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
 "<br>If you want to upload traces, look here:</html>"
 msgstr ""
-"<html>Il caricamento di dati GPS non elaborati come dati di mappa è "
-"considerato dannoso.<br>Se si desidera caricare delle tracce, vedere qui:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "track"
 msgid_plural "tracks"
@@ -7619,4 +7819,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
@@ -7867,14 +8068,19 @@
 msgstr "Disegna dei punti GPS grandi."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+msgid "Draw a circle form HDOP value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Velocità (rosso = lento, verde = veloce)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 "Diluizione della precisione (rosso = alta, verde = bassa, se disponibile)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Singolo colore (può essere personalizzato per i livelli con nome)"
@@ -7882,6 +8088,6 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1374
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:1377
 msgid "Car"
 msgstr "Automobile"
@@ -7902,14 +8108,14 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:324 build/trans_presets.java:650
-#: build/trans_presets.java:857 build/trans_presets.java:876
-#: build/trans_presets.java:890 build/trans_presets.java:912
-#: build/trans_presets.java:949 build/trans_presets.java:962
-#: build/trans_presets.java:974 build/trans_presets.java:986
-#: build/trans_presets.java:998 build/trans_presets.java:1010
-#: build/trans_presets.java:1020 build/trans_presets.java:1029
-#: build/trans_presets.java:1038 build/trans_presets.java:1437
-#: build/trans_presets.java:1510
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:325 build/trans_presets.java:651
+#: build/trans_presets.java:858 build/trans_presets.java:877
+#: build/trans_presets.java:891 build/trans_presets.java:913
+#: build/trans_presets.java:950 build/trans_presets.java:963
+#: build/trans_presets.java:975 build/trans_presets.java:987
+#: build/trans_presets.java:999 build/trans_presets.java:1011
+#: build/trans_presets.java:1021 build/trans_presets.java:1030
+#: build/trans_presets.java:1039 build/trans_presets.java:1440
+#: build/trans_presets.java:1513
 msgid "Bicycle"
 msgstr "Bicicletta"
@@ -7942,63 +8148,63 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:325 build/trans_presets.java:649
-#: build/trans_presets.java:856 build/trans_presets.java:875
-#: build/trans_presets.java:889 build/trans_presets.java:911
-#: build/trans_presets.java:948 build/trans_presets.java:961
-#: build/trans_presets.java:973 build/trans_presets.java:985
-#: build/trans_presets.java:997 build/trans_presets.java:1009
-#: build/trans_presets.java:1019 build/trans_presets.java:1028
-#: build/trans_presets.java:1037
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:326 build/trans_presets.java:650
+#: build/trans_presets.java:857 build/trans_presets.java:876
+#: build/trans_presets.java:890 build/trans_presets.java:912
+#: build/trans_presets.java:949 build/trans_presets.java:962
+#: build/trans_presets.java:974 build/trans_presets.java:986
+#: build/trans_presets.java:998 build/trans_presets.java:1010
+#: build/trans_presets.java:1020 build/trans_presets.java:1029
+#: build/trans_presets.java:1038
 msgid "Foot"
 msgstr "Pedone"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Disegna le linee di direzione"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Disegno veloce (appare più brutto)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
-msgid "Only interesting direction hints (e.g. with oneway tag)."
-msgstr ""
-"Solo suggerimenti di direzioni interessanti (es. con etichetta oneway)."
-
-#. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+msgid "Only interesting direction hints (e.g. with oneway tag)."
+msgstr ""
+"Solo suggerimenti di direzioni interessanti (es. con etichetta oneway)."
+
+#. only on the head of a way
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Only on the head of a way."
 msgstr "Solo sull''estremità di un percorso."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Disegna i numeri d'ordine dei segmenti"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Disegna i confini dei dati scaricati"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Disegna dei nodi virtuali nella modalità selezione"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Disegna con altri colori i layer non attivi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Grafica della mappa migliorata (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:82
 msgid "Draw lines between raw GPS points"
 msgstr "Disegna le linee tra i punti GPS grezzi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -8010,9 +8216,9 @@
 "draw all lines."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
 msgid "Maximum length for local files (meters)"
 msgstr "Massima lunghezza per files locali (metri)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
@@ -8021,10 +8227,10 @@
 "permettere qualsiasi lunghezza."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length (meters)"
 msgstr "Lunghezza massima (metri)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -8033,5 +8239,5 @@
 "sulle linee."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:129
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
@@ -8039,5 +8245,5 @@
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:135
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -8046,5 +8252,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:141
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -8052,13 +8258,13 @@
 msgstr "Non disegnare le frecce se non sono distanti dalla precedente almeno"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:144
 msgid "Minimum distance (pixels)"
 msgstr "Distanza minima (in pixel)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Draw larger dots for the GPS points."
 msgstr "Disegna dei cerchi più grandi per i punti GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -8068,9 +8274,9 @@
 "personalizzato nel Gestore dei Livelli."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Colors points and track segments by velocity."
 msgstr "Colora i punti e i segmenti del tracciato in base alla velocità."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -8081,5 +8287,5 @@
 "di acquisizione registri queste informazioni."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
@@ -8087,18 +8293,18 @@
 "velocità medie."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid "Track and Point Coloring"
 msgstr "Colorazione del tracciato e del punto"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202
 msgid "GPS Points"
 msgstr "Punti GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "Draw direction hints for way segments."
 msgstr "Disegna il verso sui segmenti dei percorsi."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:237
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
@@ -8106,5 +8312,5 @@
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -8112,10 +8318,10 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Disegna i confini dei dati scaricati dal server."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -8124,9 +8330,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257
 msgid "Draw the inactive data layers in a different color."
 msgstr "Disegna con un colore diverso i layer non attivi."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "OSM Data"
 msgstr "Dati OSM"
@@ -8205,45 +8411,46 @@
 msgstr "Stile usato"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Configure available plugins."
 msgstr "Configura le estensioni disponibili."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50
+#. buttons at the bottom
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
 msgid "Download List"
 msgstr "Scarica la lista"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:100
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 msgid "Update"
 msgstr "Aggiorna"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Configure Sites..."
 msgstr "Configura i siti..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:125
 msgid "Add JOSM Plugin description URL."
 msgstr "Aggiungi indirizzo URL di descrizione dell'estensione JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:126
 msgid "Enter URL"
 msgstr "Inserire l'indirizzo URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:162
 msgid "Please select an entry."
 msgstr "Seleziona una voce."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:147
 msgid "Edit JOSM Plugin description URL."
 msgstr "Modifica indirizzo URL di descrizione dell'estensione JOSM."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:148
 msgid "JOSM Plugin description URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:175
 msgid "Configure Plugin Sites"
 msgstr "Configura i siti delle estensioni"
@@ -8605,6 +8812,6 @@
 msgstr "<multiplo>"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:369
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341
 #, java-format
 msgid "Remove old keys from up to {0} object"
@@ -8613,9 +8820,9 @@
 msgstr[1] "Rimuovi le vecchie chiavi da {0} oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135
 msgid "Add a new tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160
 msgid "Delete the selection in the tag table"
 msgstr ""
@@ -8650,7 +8857,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:68
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:75
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -8694,4 +8901,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24
+#, fuzzy, java-format
+msgid "Preset group ''{0}'' of group ''{1}''"
+msgstr "Usa la preimpostazione \"{0}\" del gruppo \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
 #, java-format
 msgid "Preset group ''{0}''"
@@ -8712,4 +8924,10 @@
 msgstr "Scaricamento dei punti da {0} a {1} in corso..."
 
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, fuzzy, java-format
+msgid "parameter ''{0}'' > 0 expected. Got {1}"
+msgstr "era atteso il parametro ''{0}'' > 0, ottenuto ''{1}''"
+
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8818,5 +9036,5 @@
 msgstr "Analisi del file \"{0}\" fallita"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
 msgid "Parse error: invalid document structure for gpx document"
 msgstr ""
@@ -8944,10 +9162,11 @@
 "protocollo"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -8955,76 +9174,80 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315
 msgid "Creating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
 #, java-format
 msgid "Successfully opened changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#, fuzzy, java-format
+msgid "id of changeset > 0 required. Got {0}"
+msgstr "è richiesto il parametro {0} > 0. Ottenuto {1}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
-#, java-format
-msgid "Changeset {0} is unchanged. Skipping update."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
 #, java-format
 msgid "Updating changeset {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
-msgid ""
-"Failed to update changeset. Either there is no current changeset or the id "
-"of the current changeset is 0"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
 msgid "Closing changeset..."
 msgstr "Chiusura del gruppo di modifiche..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
-#, java-format
-msgid "Closing changeset {0}..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
-#, java-format
-msgid "Leaving changeset {0} open..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
 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:379
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414
 msgid "Preparing..."
 msgstr "Preparazione in corso..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419
 msgid "Uploading..."
 msgstr "Invio in corso..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438
 msgid "Waiting 10 seconds ... "
 msgstr "Attesa di 10 secondi ... "
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449
 msgid "OK - trying again."
 msgstr "OK - nuovo tentativo."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:485
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517
 #, java-format
 msgid "Starting retry {0} of {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
+msgid "current changeset is null. Can't upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
+#, java-format
+msgid "id of current changeset > required. Current id is {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
+#, java-format
+msgid "Open changeset expected. Got closed changeset with id {0}"
 msgstr ""
 
@@ -9050,33 +9273,98 @@
 msgstr "File bz2 non valido."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
+#, fuzzy, java-format
+msgid "missing mandatory attribute ''{0}''"
+msgstr "attributo obbligatorio ''{0}'' mancante"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:128
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:134
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
+#, fuzzy, java-format
+msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+"valore non valido per attributo obbligatorio ''{0}'' di tipo int, ricevuto "
+"''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
+#, fuzzy, java-format
+msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+"valore non valido per attributo obbligatorio ''{0}'' di tipo int, ricevuto "
+"''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
+#, fuzzy, java-format
+msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+"valore non valido per attributo obbligatorio ''{0}'' di tipo int, ricevuto "
+"''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#, java-format
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#, java-format
+msgid "Unsupported version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:176
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Aborting."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#, java-format
+msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
+#, fuzzy
+msgid "Parsing list of changesets..."
+msgstr "Chiusura del gruppo di modifiche..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
 msgid "Incorrect password or username."
 msgstr "Nome utente o password errati."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:168
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Attenzione: la password è trasferita non cifrata."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Save user and password (unencrypted)"
 msgstr "Salva nome utente e password (non cifrata)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
 msgid "Enter Password"
 msgstr "Inserire la password"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 msgid "Login"
 msgstr "Login"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:242
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
 msgid "The base URL for the OSM server (REST API)"
 msgstr "L'URL di base per il server OSM (API REST)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
 msgid "Login name (e-mail) to the OSM account."
 msgstr "Nome di accesso (e-mail) al profilo OSM."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -9085,17 +9373,17 @@
 "password."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
 msgid "Base Server URL"
 msgstr "URL di base per il server"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
 msgid "OSM username (e-mail)"
 msgstr "Nome utente OSM (e-mail)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
 msgid "OSM password"
 msgstr "Password OSM"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -9107,5 +9395,5 @@
 "all'interno dell'URL.<br><b>Non usare una password di valore.</b></html>"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:51
+#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #, java-format
 msgid "(at line {0}, column {1})"
@@ -9207,20 +9495,5 @@
 msgstr "Errore nella scansione."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124
-#, fuzzy, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr "attributo obbligatorio ''{0}'' mancante"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
-#, fuzzy, java-format
-msgid "Missing mandatory attribute ''{0}''"
-msgstr "attributo obbligatorio ''{0}'' mancante"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
-#, fuzzy, java-format
-msgid "Unsupported version: {0}"
-msgstr "Versione sconosciuta: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:155
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -9229,79 +9502,64 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
 msgid "found XML element <nd> element not as direct child of element <way>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
-msgstr "attributo obbligatorio ''{0}'' mancante"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
 msgstr ""
-"Valore non permesso per l''attributo \"ref\" sul membro della relazione {0}, "
-"ottenuto {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
 msgid "Found XML element <member> not as direct child of element <relation>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}"
-msgstr "Manca l''attributo \"ref\" sul membro della relazione {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
-"Valore non permesso per l''attributo \"ref\" sul membro della relazione {0}, "
-"ottenuto {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
-#, fuzzy, java-format
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}"
-msgstr "Manca l''attributo \"type\" sul membro {0} della relazione {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#, java-format
 msgid ""
 "Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}."
 msgstr ""
-"Valore non permesso per l''attributo \"ref\" sul membro della relazione {0}, "
-"ottenuto {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
 msgid "Incomplete <member> specification with ref=0"
 msgstr "<member> incompleto, specificazione con ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
-#, java-format
-msgid "Warning: Undefined element ''{0}'' found in input stream. Skipping."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
-#, fuzzy, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
-msgstr ""
-"valore non valido per attributo obbligatorio ''{0}'' di tipo int, ricevuto "
-"''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Skipping."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
 msgid "Illegal object with id=0"
 msgstr "Oggetto illegale con id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#, java-format
 msgid ""
 "Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
 msgstr ""
-"Valore non permesso per l''attributo \"version\" sulla primitiva OSM con id "
-"{0}, ottenuto {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:303
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
 #, java-format
 msgid ""
@@ -9310,5 +9568,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
 #, java-format
 msgid ""
@@ -9317,5 +9575,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
@@ -9325,27 +9583,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:316
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#, java-format
 msgid "Unknown or unsupported API version. Got {0}"
-msgstr "Versione sconosciuta: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#, java-format
 msgid "Missing attribute ''version'' on OSM primitive with id {0}"
-msgstr "Missing attribute \"version\" on OSM primitive with id {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#, java-format
 msgid "Missing required attribute ''{0}''."
-msgstr "Attributo richiesto mancante \"{0}\""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
 msgstr ""
-"valore non valido per attributo obbligatorio ''{0}'' di tipo int, ricevuto "
-"''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
 #, java-format
 msgid ""
@@ -9353,5 +9609,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
 #, java-format
 msgid ""
@@ -9360,5 +9616,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
 #, java-format
 msgid ""
@@ -9366,5 +9622,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
 #, java-format
 msgid ""
@@ -9373,17 +9629,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
 msgid "Prepare OSM data..."
 msgstr "Preparazione dati OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 msgid "Parsing OSM data..."
-msgstr "Preparazione dati OSM..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
 msgid "Preparing data set..."
-msgstr "Preparazione dei dati in corso..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
@@ -9405,4 +9659,24 @@
 msgstr "Scaricamento delle relazioni collegate ..."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51
+#, fuzzy
+msgid "Reading changesets..."
+msgstr "Chiusura del gruppo di modifiche..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
+#, fuzzy
+msgid "Downloading changesets ..."
+msgstr "Chiusura del gruppo di modifiche..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85
+#, fuzzy, java-format
+msgid "Reading changeset {0} ..."
+msgstr "Lettura di {0}..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91
+#, fuzzy, java-format
+msgid "Downloading changeset {0} ..."
+msgstr "Scaricamento estensione {0}..."
+
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
@@ -9418,10 +9692,14 @@
 msgstr "Connessione al server in corso..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
 msgid "Failed to open connection to API {0}"
 msgstr "E' fallita l'apertura della connessione alle API {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
+msgid "Error: failed to add authentication credentials to the connection."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -9430,33 +9708,54 @@
 "internet."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+msgid "XML tag <user> is missing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
+#, fuzzy, java-format
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgstr "Usa la preimpostazione \"{0}\" del gruppo \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
+#, fuzzy, java-format
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgstr ""
+"valore non valido per attributo obbligatorio ''{0}'' di tipo int, ricevuto "
+"''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
 msgid "Starting to upload with one request per primitive ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
 msgid "Starting to upload in one request ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:171
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135
 msgid "Uploading data ..."
-msgstr "Invio in corso..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:178
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
 msgid ""
 "WARNING: no API version defined for data to upload. Falling back to version "
@@ -9464,5 +9763,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147
 #, java-format
 msgid ""
@@ -9472,10 +9771,10 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
 msgid "Update Plugins"
 msgstr "Aggiorna estensioni"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 msgid "Download Plugins"
 msgstr "Scarica Estensioni"
@@ -9643,5 +9942,5 @@
 msgstr "Maggiori dettagli"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -9650,18 +9949,18 @@
 msgstr[1] "Informazioni sulle estensioni scaricate da {0} siti"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
 msgid "No plugin information found."
 msgstr "Non è stata trovata alcuna informazione sulle estensioni."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr "L''estensione con nome {0} non è disponibile. Aggiornamento ignorato."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:93
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
 msgid "All installed plugins are up to date."
 msgstr "Tutte le estensioni sono state aggiornate."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
 #, java-format
 msgid ""
@@ -9674,9 +9973,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
 msgid "Download missing plugins"
 msgstr "Scarica le estensioni mancanti"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
 #, java-format
 msgid ""
@@ -9691,43 +9990,43 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Versione {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 msgid "Plugin bundled with JOSM"
 msgstr "Estensioni fornite con JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:357
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -9853,5 +10152,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:165
-#, fuzzy
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -9859,7 +10157,4 @@
 "community."
 msgstr ""
-"La dimensione massima del bbox è 0.25, e la tua richiesta risulta troppo "
-"ampia. Effettuare una richiesta di minori dimensioni oppure usare il file "
-"planet.osm"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:168
@@ -10063,10 +10358,4 @@
 msgid "(What does that mean?)"
 msgstr ""
-
-#. item "Relations/Route" text "Symbol description"
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3148
-msgid "Description"
-msgstr "Descrizione"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
@@ -10858,6 +11147,7 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
-msgid "Set "
-msgstr ""
+#, fuzzy, java-format
+msgid "Set {0} Lambert coordinates"
+msgstr "Imposta le coordinate di Lambert"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -11490,6 +11780,6 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 #: build/trans_style.java:990 build/trans_style.java:1007
-#: build/trans_style.java:1023 build/trans_style.java:3392
-#: build/trans_style.java:3400
+#: build/trans_style.java:1023 build/trans_style.java:3400
+#: build/trans_style.java:3408
 msgid "water"
 msgstr "acqua"
@@ -11793,4 +12083,55 @@
 msgstr "Misure"
 
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Michigan Left"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Adds no left turn for sets of 4 or 5 ways."
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45
+#, fuzzy
+msgid "Please select 4 or 5 ways to assign no left turns."
+msgstr "Selezionare uno o più percorsi chiusi di almeno quattro nodi."
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61
+#, fuzzy, java-format
+msgid "{0} extrem nodes."
+msgstr "{0} nodo"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69
+#, java-format
+msgid "Via node {0}, {1}"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75
+#, fuzzy, java-format
+msgid "{0} via nodes."
+msgstr "{0} nodo"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78
+msgid "Unable to find via nodes. Please check your selection"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98
+#, fuzzy, java-format
+msgid "MIddle way: {0}"
+msgstr "Modalità: {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121
+msgid "Create Michigan left turn restriction"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129
+#, fuzzy, java-format
+msgid "Processing {0}"
+msgstr "Versione {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142
+#, fuzzy, java-format
+msgid "Relation: from {0} to {1} via {2}"
+msgstr "Versione {0} creata il {1} da {2}"
+
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
 msgid "OpenLayers"
@@ -11950,7 +12291,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
-#, fuzzy
 msgid "create new objects"
-msgstr "Crea un nuovo nodo."
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
@@ -12016,7 +12356,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
-#, fuzzy
 msgid "Remote Control has been asked to create a new node."
-msgstr "Il controllo remoto ha richiesto il caricamento dei dati dalle API."
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
@@ -12280,5 +12619,5 @@
 msgstr "Apre la finestra per la modifica delle etichette"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:158
 msgid "JOSM Tag Editor Plugin"
 msgstr "Estensione JOSM per la modifica delle etichette"
@@ -12288,5 +12627,5 @@
 msgstr "In evidenza"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:370
 #, java-format
 msgid "Updating properties of up to {0} object"
@@ -12295,18 +12634,4 @@
 msgstr[1] "Aggiorna le proprietà di {0} oggetti"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44
-msgid "INFO: entering compatibilty mode for JOSM with Main.ds"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47
-msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49
-msgid ""
-"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-"found."
-msgstr ""
-
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
 msgid "Group"
@@ -12316,9 +12641,4 @@
 msgid "Item"
 msgstr "Elemento"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-msgid "Filter"
-msgstr "Filtro"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63
@@ -12409,5 +12729,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2272
 msgid "Street name"
 msgstr "Nome Strada"
@@ -12579,8 +12899,4 @@
 msgid "Zoom (in metres)"
 msgstr "Zoom (in metri)"
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
-msgid "URL"
-msgstr "Indirizzo URL"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -12785,7 +13101,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:460
-#, fuzzy
 msgid "Fixing errors ..."
-msgstr "Attesa di 10 secondi ... "
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:484
@@ -12795,7 +13110,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501
-#, fuzzy
 msgid "Updating map ..."
-msgstr "Aggiornamento dei dati"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69
@@ -13301,7 +13615,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
-#: build/trans_style.java:4179
+#: build/trans_style.java:4159 build/trans_style.java:4166
+#: build/trans_style.java:4173 build/trans_style.java:4180
+#: build/trans_style.java:4187
 msgid "building"
 msgstr "building"
@@ -13315,5 +13629,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4186
+#: build/trans_style.java:4194
 msgid "area"
 msgstr "area"
@@ -13451,10 +13765,10 @@
 msgstr "Selezionare un nodo iniziale alla fine di un percorso"
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:148
 msgid "Reached the end of the line"
 msgstr "E' stata raggiunta la fine della linea"
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:155
 msgid "Reached a junction"
 msgstr "E' stato raggiunto un incrocio"
@@ -13776,12 +14090,10 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
-#, fuzzy
 msgid "% of east:"
-msgstr "% di lat:"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
-#, fuzzy
 msgid "% of north:"
-msgstr "% di lat:"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -13961,6 +14273,11 @@
 "da un livello gps)."
 
+#. Plugin michigan_left
+#: build/trans_plugins.java:35
+msgid "Adds no left turn for sets of 4 or 5 ways"
+msgstr ""
+
 #. Plugin nearclick
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid ""
 "Simulates a click when you do a small and short drag. This is usefull for "
@@ -13974,15 +14291,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid "Displays an OpenLayers background image"
 msgstr "Visualizza una immagine di sfondo OpenLayers"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importa le segnalazioni da OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13992,5 +14309,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -14000,5 +14317,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -14009,15 +14326,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Il grande aspetto e stile JGoodies Plastic."
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Let other applications send commands to JOSM."
 msgstr "Permetti alle altre applicazioni di inviare comandi a JOSM."
 
 #. Plugin routes
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -14029,10 +14346,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Provides routing capabilities."
 msgstr "Fornisce funzioni di navigazione"
 
 #. Plugin slippymap
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -14043,15 +14360,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Permetti l'aggiunta di marcatori/nodi alle posizioni gps correnti."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Fornisce un'interfaccia per l'editing dei tag in forma tabulare"
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -14065,10 +14382,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Make terraced houses out of single blocks."
 msgstr "Costruisce degli edifici a schiera a partire da singoli blocchi."
 
 #. Plugin usertools
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -14080,5 +14397,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -14089,5 +14406,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -14099,5 +14416,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -14106,5 +14423,5 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
@@ -14112,5 +14429,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -14168,4 +14485,10 @@
 #. <annotations>
 #: build/trans_presets.java:57
+#, fuzzy
+msgid "Highways"
+msgstr "strada"
+
+#. group "Highways"
+#: build/trans_presets.java:58
 msgid "Streets"
 msgstr "Strade"
@@ -14176,5 +14499,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:58 build/trans_surveyor.java:72
+#: build/trans_presets.java:59 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Motorway"
@@ -14183,5 +14506,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:61
+#: build/trans_presets.java:62
 msgid "Edit Motorway"
 msgstr "Modifica Motorway"
@@ -14208,8 +14531,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:120 build/trans_presets.java:140
-#: build/trans_presets.java:177 build/trans_presets.java:197
-#: build/trans_presets.java:1557 build/trans_presets.java:3146
+#: build/trans_presets.java:65 build/trans_presets.java:101
+#: build/trans_presets.java:121 build/trans_presets.java:141
+#: build/trans_presets.java:178 build/trans_presets.java:198
+#: build/trans_presets.java:1560 build/trans_presets.java:3158
 msgid "Reference"
 msgstr "Riferimento"
@@ -14223,8 +14546,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:358
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:359
 msgid "Lanes"
 msgstr "Corsie"
@@ -14241,15 +14564,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:224 build/trans_presets.java:280
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:373 build/trans_presets.java:388
-#: build/trans_presets.java:412 build/trans_presets.java:431
-#: build/trans_presets.java:452 build/trans_presets.java:472
-#: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1307
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:225 build/trans_presets.java:281
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:374 build/trans_presets.java:389
+#: build/trans_presets.java:413 build/trans_presets.java:432
+#: build/trans_presets.java:453 build/trans_presets.java:473
+#: build/trans_presets.java:511 build/trans_presets.java:667
+#: build/trans_presets.java:1310
 msgid "Max. speed (km/h)"
 msgstr "Velocità massima (km/h)"
@@ -14286,16 +14609,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:293 build/trans_presets.java:306
-#: build/trans_presets.java:320 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:464
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:659 build/trans_presets.java:1300
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:294 build/trans_presets.java:307
+#: build/trans_presets.java:321 build/trans_presets.java:353
+#: build/trans_presets.java:405 build/trans_presets.java:425
+#: build/trans_presets.java:445 build/trans_presets.java:465
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:660 build/trans_presets.java:1303
 msgid "Oneway"
 msgstr "Senso unico"
@@ -14337,19 +14660,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:353
-#: build/trans_presets.java:362 build/trans_presets.java:405
-#: build/trans_presets.java:425 build/trans_presets.java:445
-#: build/trans_presets.java:465 build/trans_presets.java:485
-#: build/trans_presets.java:504 build/trans_presets.java:523
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:586 build/trans_presets.java:607
-#: build/trans_presets.java:628 build/trans_presets.java:660
-#: build/trans_presets.java:1301 build/trans_surveyor.java:12
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:354
+#: build/trans_presets.java:363 build/trans_presets.java:406
+#: build/trans_presets.java:426 build/trans_presets.java:446
+#: build/trans_presets.java:466 build/trans_presets.java:486
+#: build/trans_presets.java:505 build/trans_presets.java:524
+#: build/trans_presets.java:545 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629 build/trans_presets.java:661
+#: build/trans_presets.java:1304 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Ponte"
@@ -14385,19 +14708,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:354
-#: build/trans_presets.java:378 build/trans_presets.java:406
-#: build/trans_presets.java:426 build/trans_presets.java:446
-#: build/trans_presets.java:466 build/trans_presets.java:486
-#: build/trans_presets.java:505 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629 build/trans_presets.java:661
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:355
+#: build/trans_presets.java:379 build/trans_presets.java:407
+#: build/trans_presets.java:427 build/trans_presets.java:447
+#: build/trans_presets.java:467 build/trans_presets.java:487
+#: build/trans_presets.java:506 build/trans_presets.java:525
+#: build/trans_presets.java:546 build/trans_presets.java:567
+#: build/trans_presets.java:588 build/trans_presets.java:609
+#: build/trans_presets.java:630 build/trans_presets.java:662
+#: build/trans_presets.java:1305
 msgid "Tunnel"
 msgstr "Galleria/tunnel"
@@ -14431,18 +14754,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:73 build/trans_presets.java:90
-#: build/trans_presets.java:110 build/trans_presets.java:129
-#: build/trans_presets.java:150 build/trans_presets.java:166
-#: build/trans_presets.java:186 build/trans_presets.java:205
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:355
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:467
-#: build/trans_presets.java:487 build/trans_presets.java:506
-#: build/trans_presets.java:525 build/trans_presets.java:546
-#: build/trans_presets.java:567 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:630
-#: build/trans_presets.java:662 build/trans_presets.java:1303
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:356
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:468
+#: build/trans_presets.java:488 build/trans_presets.java:507
+#: build/trans_presets.java:526 build/trans_presets.java:547
+#: build/trans_presets.java:568 build/trans_presets.java:589
+#: build/trans_presets.java:610 build/trans_presets.java:631
+#: build/trans_presets.java:663 build/trans_presets.java:1306
 msgid "Cutting"
 msgstr "Sbancamento"
@@ -14476,18 +14799,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:74 build/trans_presets.java:91
-#: build/trans_presets.java:111 build/trans_presets.java:130
-#: build/trans_presets.java:151 build/trans_presets.java:167
-#: build/trans_presets.java:187 build/trans_presets.java:206
-#: build/trans_presets.java:222 build/trans_presets.java:240
-#: build/trans_presets.java:258 build/trans_presets.java:277
-#: build/trans_presets.java:310 build/trans_presets.java:356
-#: build/trans_presets.java:408 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:468
-#: build/trans_presets.java:488 build/trans_presets.java:507
-#: build/trans_presets.java:526 build/trans_presets.java:547
-#: build/trans_presets.java:568 build/trans_presets.java:589
-#: build/trans_presets.java:610 build/trans_presets.java:631
-#: build/trans_presets.java:663 build/trans_presets.java:1304
+#: build/trans_presets.java:75 build/trans_presets.java:92
+#: build/trans_presets.java:112 build/trans_presets.java:131
+#: build/trans_presets.java:152 build/trans_presets.java:168
+#: build/trans_presets.java:188 build/trans_presets.java:207
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:357
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:469
+#: build/trans_presets.java:489 build/trans_presets.java:508
+#: build/trans_presets.java:527 build/trans_presets.java:548
+#: build/trans_presets.java:569 build/trans_presets.java:590
+#: build/trans_presets.java:611 build/trans_presets.java:632
+#: build/trans_presets.java:664 build/trans_presets.java:1307
 msgid "Embankment"
 msgstr "Terrapieno"
@@ -14495,5 +14818,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Motorway Link"
 msgstr "Motorway Link"
@@ -14502,5 +14825,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:80
+#: build/trans_presets.java:81
 msgid "Edit Motorway Link"
 msgstr "Modifica Motorway Link"
@@ -14508,5 +14831,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:94
+#: build/trans_presets.java:95
 msgid "Trunk"
 msgstr "Trunk"
@@ -14515,5 +14838,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:97
+#: build/trans_presets.java:98
 msgid "Edit Trunk"
 msgstr "Modifica Trunk"
@@ -14523,6 +14846,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
 msgid "Motorroad"
 msgstr "Superstrada"
@@ -14530,5 +14853,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:114
+#: build/trans_presets.java:115
 msgid "Trunk Link"
 msgstr "Trunk Link"
@@ -14537,5 +14860,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:117
+#: build/trans_presets.java:118
 msgid "Edit Trunk Link"
 msgstr "Modifica Trunk Link"
@@ -14548,5 +14871,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:134 build/trans_surveyor.java:76
+#: build/trans_presets.java:135 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Primary"
@@ -14555,5 +14878,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:137
+#: build/trans_presets.java:138
 msgid "Edit Primary Road"
 msgstr "Modifica Primary"
@@ -14561,10 +14884,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:154
+#: build/trans_presets.java:155
 msgid "Primary Link"
 msgstr "Primary Link"
 
 #. item
-#: build/trans_presets.java:155
+#: build/trans_presets.java:156
 msgid "Edit Primary Link"
 msgstr "Modifica Primary Link"
@@ -14576,5 +14899,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:170 build/trans_surveyor.java:80
+#: build/trans_presets.java:171 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Secondary"
@@ -14584,5 +14907,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:174
+#: build/trans_presets.java:175
 msgid "Edit Secondary Road"
 msgstr "Modifica una Secondary"
@@ -14590,5 +14913,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:190
+#: build/trans_presets.java:191
 msgid "Tertiary"
 msgstr "Tertiary"
@@ -14598,5 +14921,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:194
+#: build/trans_presets.java:195
 msgid "Edit Tertiary Road"
 msgstr "Modifica Tertiary"
@@ -14608,5 +14931,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:209 build/trans_surveyor.java:84
+#: build/trans_presets.java:210 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Unclassified"
@@ -14616,5 +14939,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:213
+#: build/trans_presets.java:214
 msgid "Edit Unclassified Road"
 msgstr "Modifica una strada unclassified"
@@ -14641,19 +14964,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:225 build/trans_presets.java:243
-#: build/trans_presets.java:261 build/trans_presets.java:281
-#: build/trans_presets.java:314 build/trans_presets.java:359
-#: build/trans_presets.java:375 build/trans_presets.java:389
-#: build/trans_presets.java:413 build/trans_presets.java:432
-#: build/trans_presets.java:453 build/trans_presets.java:473
-#: build/trans_presets.java:491 build/trans_presets.java:511
-#: build/trans_presets.java:532 build/trans_presets.java:553
-#: build/trans_presets.java:574 build/trans_presets.java:595
-#: build/trans_presets.java:616 build/trans_presets.java:637
-#: build/trans_presets.java:667 build/trans_presets.java:680
-#: build/trans_presets.java:693 build/trans_presets.java:706
-#: build/trans_presets.java:719 build/trans_presets.java:732
-#: build/trans_presets.java:745 build/trans_presets.java:1308
-#: build/trans_presets.java:1498 build/trans_presets.java:1540
+#: build/trans_presets.java:226 build/trans_presets.java:244
+#: build/trans_presets.java:262 build/trans_presets.java:282
+#: build/trans_presets.java:315 build/trans_presets.java:360
+#: build/trans_presets.java:376 build/trans_presets.java:390
+#: build/trans_presets.java:414 build/trans_presets.java:433
+#: build/trans_presets.java:454 build/trans_presets.java:474
+#: build/trans_presets.java:492 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:554
+#: build/trans_presets.java:575 build/trans_presets.java:596
+#: build/trans_presets.java:617 build/trans_presets.java:638
+#: build/trans_presets.java:668 build/trans_presets.java:681
+#: build/trans_presets.java:694 build/trans_presets.java:707
+#: build/trans_presets.java:720 build/trans_presets.java:733
+#: build/trans_presets.java:746 build/trans_presets.java:1311
+#: build/trans_presets.java:1501 build/trans_presets.java:1543
 msgid "Width (meters)"
 msgstr "Larghezza (metri)"
@@ -14665,5 +14988,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:228 build/trans_surveyor.java:88
+#: build/trans_presets.java:229 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Residential"
@@ -14672,5 +14995,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:231
+#: build/trans_presets.java:232
 msgid "Edit Residential Street"
 msgstr "Modifica Residential"
@@ -14695,14 +15018,14 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:611
-#: build/trans_presets.java:632 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "Surface"
 msgstr "Superficie"
@@ -14723,53 +15046,53 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paved"
 msgstr "pavimentata"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "unpaved"
 msgstr "non pavimentata"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "concrete"
 msgstr "calcestruzzo"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
 msgid "metal"
 msgstr ""
@@ -14783,22 +15106,22 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
-#: build/trans_style.java:3367
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
+#: build/trans_style.java:3375
 msgid "wood"
 msgstr "bosco"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paving_stones"
 msgstr ""
@@ -14806,77 +15129,77 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "cobblestone"
 msgstr "ciottoli (pavé)"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "gravel"
 msgstr "ghiaia"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "grass"
 msgstr "erba"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "sand"
 msgstr "sabbia"
@@ -14884,13 +15207,13 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "ground"
 msgstr "terra"
@@ -14898,5 +15221,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:246
+#: build/trans_presets.java:247
 msgid "Living Street"
 msgstr "Living Street"
@@ -14905,5 +15228,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:249
+#: build/trans_presets.java:250
 msgid "Edit Living Street"
 msgstr "Modifica Living Street"
@@ -14911,5 +15234,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:264
+#: build/trans_presets.java:265
 msgid "Service"
 msgstr "Service"
@@ -14918,5 +15241,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:267
+#: build/trans_presets.java:268
 msgid "Edit Serviceway"
 msgstr "Modifica Serviceway"
@@ -14926,18 +15249,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "Serviceway type"
 msgstr "Tipo di strada di servizio"
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "alley"
 msgstr "vicolo"
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "driveway"
 msgstr "driveway"
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "parking_aisle"
 msgstr "corsia interna a parcheggio"
@@ -14945,5 +15268,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:284
+#: build/trans_presets.java:285
 msgid "Parking Aisle"
 msgstr "Corsia interna a parcheggio"
@@ -14953,5 +15276,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:288
+#: build/trans_presets.java:289
 msgid "Edit Parking Aisle"
 msgstr "Modifica corsia interna a parcheggio"
@@ -14959,5 +15282,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:298
+#: build/trans_presets.java:299
 msgid "Road (Unknown Type)"
 msgstr "Road (Tipo Sconosciuto)"
@@ -14966,5 +15289,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Edit Road of unknown type"
 msgstr "Modifica Road (Tipo Sconosciuto)"
@@ -14973,20 +15296,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:318
+#: build/trans_presets.java:319
 msgid "Road Restrictions"
 msgstr "Restrizioni e divieti"
 
 #. item
-#: build/trans_presets.java:319
+#: build/trans_presets.java:320
 msgid "Edit Road Restrictions"
 msgstr "Modifica restrizioni e divieti"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:321
+#: build/trans_presets.java:322
 msgid "Toll"
 msgstr "Pedaggio"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:322
+#: build/trans_presets.java:323
 msgid "No exit (cul-de-sac)"
 msgstr "Senza uscita (cul-de-sac)"
@@ -14999,8 +15322,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:323 build/trans_presets.java:529
-#: build/trans_presets.java:550 build/trans_presets.java:571
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:634
+#: build/trans_presets.java:324 build/trans_presets.java:530
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:593 build/trans_presets.java:614
+#: build/trans_presets.java:635
 msgid "Access"
 msgstr "Permesso di accesso"
@@ -15054,29 +15377,29 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1397
-#: build/trans_presets.java:1398 build/trans_presets.java:1399
-#: build/trans_presets.java:1763 build/trans_presets.java:1773
-#: build/trans_presets.java:2397 build/trans_presets.java:2433
-#: build/trans_presets.java:2442 build/trans_presets.java:2443
-#: build/trans_presets.java:2444 build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:1396
+#: build/trans_presets.java:1397 build/trans_presets.java:1400
+#: build/trans_presets.java:1401 build/trans_presets.java:1402
+#: build/trans_presets.java:1767 build/trans_presets.java:1777
+#: build/trans_presets.java:2408 build/trans_presets.java:2444
+#: build/trans_presets.java:2453 build/trans_presets.java:2454
+#: build/trans_presets.java:2455 build/trans_presets.java:2725
 msgid "yes"
 msgstr "si"
@@ -15089,40 +15412,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:212
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:212
 msgid "private"
 msgstr "privato"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655
 msgid "designated"
 msgstr "specifico"
@@ -15135,19 +15458,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:219
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:219
 msgid "destination"
 msgstr "destinazione"
@@ -15170,71 +15493,71 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:205
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:205
 msgid "permissive"
 msgstr "permesso"
 
-#: build/trans_presets.java:323 build/trans_presets.java:327
-#: build/trans_presets.java:330 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636
+#: build/trans_presets.java:324 build/trans_presets.java:328
+#: build/trans_presets.java:331 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637
 msgid "agricultural"
 msgstr "Agricolo"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
-#: build/trans_presets.java:2433 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1396 build/trans_presets.java:1397
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
+#: build/trans_presets.java:2444 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
+#: build/trans_presets.java:2725
 msgid "no"
 msgstr "no"
 
-#: build/trans_presets.java:326
+#: build/trans_presets.java:327
 msgid "Goods"
 msgstr "Carico e scarico merci"
 
-#: build/trans_presets.java:327
+#: build/trans_presets.java:328
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Merci pesanti/Trasporti eccezionali"
@@ -15249,10 +15572,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:328 build/trans_presets.java:651
-#: build/trans_presets.java:858 build/trans_presets.java:891
-#: build/trans_presets.java:913 build/trans_presets.java:950
-#: build/trans_presets.java:963 build/trans_presets.java:975
-#: build/trans_presets.java:987 build/trans_presets.java:999
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:329 build/trans_presets.java:652
+#: build/trans_presets.java:859 build/trans_presets.java:892
+#: build/trans_presets.java:914 build/trans_presets.java:951
+#: build/trans_presets.java:964 build/trans_presets.java:976
+#: build/trans_presets.java:988 build/trans_presets.java:1000
+#: build/trans_presets.java:1040
 msgid "Horse"
 msgstr "Cavallo"
@@ -15268,13 +15591,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:329 build/trans_presets.java:530
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:635 build/trans_presets.java:859
-#: build/trans_presets.java:877 build/trans_presets.java:892
-#: build/trans_presets.java:914 build/trans_presets.java:951
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:330 build/trans_presets.java:531
+#: build/trans_presets.java:552 build/trans_presets.java:573
+#: build/trans_presets.java:594 build/trans_presets.java:615
+#: build/trans_presets.java:636 build/trans_presets.java:860
+#: build/trans_presets.java:878 build/trans_presets.java:893
+#: build/trans_presets.java:915 build/trans_presets.java:952
+#: build/trans_presets.java:965 build/trans_presets.java:977
+#: build/trans_presets.java:989 build/trans_presets.java:1001
+#: build/trans_presets.java:1041
 msgid "Motorcycle"
 msgstr "Motocicletta"
@@ -15289,30 +15612,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:330 build/trans_presets.java:531
-#: build/trans_presets.java:552 build/trans_presets.java:573
-#: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:636 build/trans_presets.java:654
-#: build/trans_presets.java:878 build/trans_presets.java:893
-#: build/trans_presets.java:915 build/trans_presets.java:952
-#: build/trans_presets.java:965 build/trans_presets.java:977
-#: build/trans_presets.java:989 build/trans_presets.java:1001
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:331 build/trans_presets.java:532
+#: build/trans_presets.java:553 build/trans_presets.java:574
+#: build/trans_presets.java:595 build/trans_presets.java:616
+#: build/trans_presets.java:637 build/trans_presets.java:655
+#: build/trans_presets.java:879 build/trans_presets.java:894
+#: build/trans_presets.java:916 build/trans_presets.java:953
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1042
 msgid "Motorcar"
 msgstr "Automobile"
 
-#: build/trans_presets.java:331
+#: build/trans_presets.java:332
 msgid "Public Service Vehicles (psv)"
 msgstr "Veicolo di servizio pubblico (psv)"
 
-#: build/trans_presets.java:332
+#: build/trans_presets.java:333
 msgid "Motorboat"
 msgstr "Barca a motore"
 
-#: build/trans_presets.java:333
+#: build/trans_presets.java:334
 msgid "Boat"
 msgstr "Barca"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:336
 msgid "Min. speed (km/h)"
 msgstr "Velocità minima (km/h)"
@@ -15320,25 +15643,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:336 build/trans_presets.java:374
+#: build/trans_presets.java:337 build/trans_presets.java:375
 msgid "Max. weight (tonnes)"
 msgstr "Peso massimo (tonnellate)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:337
+#: build/trans_presets.java:338
 msgid "Max. Height (meters)"
 msgstr "Altezza massima (metri)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Max. Width (meters)"
 msgstr "Larghezza massima (metri)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:339
+#: build/trans_presets.java:340
 msgid "Max. Length (meters)"
 msgstr "Lunghezza massima (metri)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:341
+#: build/trans_presets.java:342
 msgid "Roundabout"
 msgstr "Rotatoria"
@@ -15349,5 +15672,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:346
+#: build/trans_presets.java:347
 msgid "Edit Junction"
 msgstr "Modifica un incrocio"
@@ -15369,9 +15692,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:349 build/trans_presets.java:648
-#: build/trans_presets.java:788 build/trans_presets.java:1135
-#: build/trans_presets.java:1392 build/trans_presets.java:2353
-#: build/trans_presets.java:2901 build/trans_presets.java:2911
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:350 build/trans_presets.java:649
+#: build/trans_presets.java:789 build/trans_presets.java:1137
+#: build/trans_presets.java:1395 build/trans_presets.java:2364
+#: build/trans_presets.java:2913 build/trans_presets.java:2923
+#: build/trans_presets.java:2932
 msgid "Type"
 msgstr "Tipo"
@@ -15391,10 +15714,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:547
+#: build/trans_presets.java:350 build/trans_style.java:547
 #: build/trans_style.java:555
 msgid "motorway"
 msgstr "motorway"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "motorway_link"
 msgstr "motorway_link"
@@ -15416,10 +15739,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:563
+#: build/trans_presets.java:350 build/trans_style.java:563
 #: build/trans_style.java:571
 msgid "trunk"
 msgstr "trunk"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "trunk_link"
 msgstr "trunk_link"
@@ -15441,10 +15764,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:579
+#: build/trans_presets.java:350 build/trans_style.java:579
 #: build/trans_style.java:587
 msgid "primary"
 msgstr "primary"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "primary_link"
 msgstr "primary_link"
@@ -15466,5 +15789,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:595
+#: build/trans_presets.java:350 build/trans_style.java:595
 #: build/trans_style.java:603
 msgid "secondary"
@@ -15479,9 +15802,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:349 build/trans_style.java:611
+#: build/trans_presets.java:350 build/trans_style.java:611
 msgid "tertiary"
 msgstr "tertiary"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "unclassified"
 msgstr "unclassified"
@@ -15495,9 +15818,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:349 build/trans_style.java:3143
+#: build/trans_presets.java:350 build/trans_style.java:3151
 msgid "residential"
 msgstr "residential"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "living_street"
 msgstr "living_street"
@@ -15527,10 +15850,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:349 build/trans_style.java:667
-#: build/trans_style.java:4244
+#: build/trans_presets.java:350 build/trans_style.java:667
+#: build/trans_style.java:4252
 msgid "service"
 msgstr "service"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "bus_guideway"
 msgstr "autobus_guidato"
@@ -15560,6 +15883,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:349 build/trans_style.java:877
-#: build/trans_style.java:3208 build/trans_style.java:3209
+#: build/trans_presets.java:350 build/trans_style.java:877
+#: build/trans_style.java:3216 build/trans_style.java:3217
 msgid "construction"
 msgstr "construction"
@@ -15570,10 +15893,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Edit Bridge"
 msgstr "Modifica ponte"
 
 #. item
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "Edit Tunnel"
 msgstr "Modifica un Tunnel"
@@ -15581,19 +15904,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:393
+#: build/trans_presets.java:394
 msgid "Ways"
 msgstr "Percorsi"
 
 #. group "Ways"
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Construction"
 msgstr "Construction"
 
 #. item
-#: build/trans_presets.java:395
+#: build/trans_presets.java:396
 msgid "Edit Highway Under Construction"
 msgstr "Modifica una strada in costruzione"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "Junction"
 msgstr "Svincolo"
@@ -15609,5 +15932,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:411 build/trans_style.java:895
+#: build/trans_presets.java:412 build/trans_style.java:895
 msgid "roundabout"
 msgstr "rotatoria"
@@ -15616,5 +15939,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:417
+#: build/trans_presets.java:418
 msgid "Bridleway"
 msgstr "Percorso per equitazione"
@@ -15622,5 +15945,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:419
+#: build/trans_presets.java:420
 msgid "Edit Bridleway"
 msgstr "Modifica un percorso per equitazione"
@@ -15628,5 +15951,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:435
+#: build/trans_presets.java:436
 msgid "Cycleway"
 msgstr "Cycleway"
@@ -15636,10 +15959,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:439
+#: build/trans_presets.java:440
 msgid "Edit Cycleway"
 msgstr "Modifica Cycleway"
 
 #. item "Ways/Cycleway" check "Embankment"
-#: build/trans_presets.java:449
+#: build/trans_presets.java:450
 msgid "Pedestrians"
 msgstr ""
@@ -15647,5 +15970,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Footway"
 msgstr "Footway"
@@ -15654,10 +15977,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Footway"
 msgstr "Modifica Footway"
 
 #. item "Ways/Footway" check "Embankment"
-#: build/trans_presets.java:469
+#: build/trans_presets.java:470
 msgid "Bikes"
 msgstr ""
@@ -15665,5 +15988,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:476
+#: build/trans_presets.java:477
 msgid "Pedestrian"
 msgstr "Pedestrian"
@@ -15672,5 +15995,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Edit Pedestrian Street"
 msgstr "Modifica Pedestrian"
@@ -15678,5 +16001,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:494
+#: build/trans_presets.java:495
 msgid "Steps"
 msgstr "Rampa di scale"
@@ -15686,5 +16009,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:498
+#: build/trans_presets.java:499
 msgid "Edit Flight of Steps"
 msgstr "Modifica una rampa di scale"
@@ -15693,5 +16016,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:515
+#: build/trans_presets.java:516
 msgid "Track"
 msgstr "Track"
@@ -15700,5 +16023,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:518
+#: build/trans_presets.java:519
 msgid "Edit Track"
 msgstr "Modifica Track"
@@ -15706,5 +16029,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:535
+#: build/trans_presets.java:536
 msgid "Track Grade 1"
 msgstr "Track Grade 1"
@@ -15713,5 +16036,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:538
+#: build/trans_presets.java:539
 msgid "Edit Track of grade 1"
 msgstr "Modifica Track Grade 1"
@@ -15719,5 +16042,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:556
+#: build/trans_presets.java:557
 msgid "Track Grade 2"
 msgstr "Track Grade 2"
@@ -15726,5 +16049,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:559
+#: build/trans_presets.java:560
 msgid "Edit Track of grade 2"
 msgstr "Modifica Track Grade 2"
@@ -15732,5 +16055,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:577
+#: build/trans_presets.java:578
 msgid "Track Grade 3"
 msgstr "Track Grade 3"
@@ -15739,5 +16062,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:580
+#: build/trans_presets.java:581
 msgid "Edit Track of grade 3"
 msgstr "Modifica Track Grade 3"
@@ -15745,5 +16068,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:598
+#: build/trans_presets.java:599
 msgid "Track Grade 4"
 msgstr "Track Grade 4"
@@ -15752,5 +16075,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:601
+#: build/trans_presets.java:602
 msgid "Edit Track of grade 4"
 msgstr "Modifica Track Grade 4"
@@ -15758,5 +16081,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:619
+#: build/trans_presets.java:620
 msgid "Track Grade 5"
 msgstr "Track Grade 5"
@@ -15765,5 +16088,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:622
+#: build/trans_presets.java:623
 msgid "Edit Track of grade 5"
 msgstr "Modifica Track Grade 5"
@@ -15772,5 +16095,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:641
+#: build/trans_presets.java:642
 msgid "Path"
 msgstr "Percorso"
@@ -15779,13 +16102,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:644
+#: build/trans_presets.java:645
 msgid "Edit Path"
 msgstr "Modifica percorso"
 
-#: build/trans_presets.java:652
+#: build/trans_presets.java:653
 msgid "Ski"
 msgstr "Sci"
 
-#: build/trans_presets.java:653
+#: build/trans_presets.java:654
 msgid "Snowmobile"
 msgstr "Motoslitta"
@@ -15795,6 +16118,6 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:670 build/trans_presets.java:1725
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:671 build/trans_presets.java:1729
+#: build/trans_presets.java:1752
 msgid "Hiking"
 msgstr "Percorso escursionistico"
@@ -15804,5 +16127,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:674
+#: build/trans_presets.java:675
 msgid "Edit Hiking"
 msgstr "Modifica percorso escursionistico"
@@ -15810,5 +16133,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:683
+#: build/trans_presets.java:684
 msgid "Mountain Hiking"
 msgstr "Percorso escursionistico montano"
@@ -15818,5 +16141,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:687
+#: build/trans_presets.java:688
 msgid "Edit Mountain Hiking"
 msgstr "Modifica percorso escursionistico montano"
@@ -15824,5 +16147,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:696
+#: build/trans_presets.java:697
 msgid "Demanding Mountain Hiking"
 msgstr "Percorso escursionistico montano difficile"
@@ -15832,5 +16155,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:700
+#: build/trans_presets.java:701
 msgid "Edit Demanding Mountain Hiking"
 msgstr "Modifica percorso escursionistico montano difficile"
@@ -15838,5 +16161,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:709
+#: build/trans_presets.java:710
 msgid "Alpine Hiking"
 msgstr "Percorso escursionistico alpino"
@@ -15846,5 +16169,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:713
+#: build/trans_presets.java:714
 msgid "Edit Alpine Hiking"
 msgstr "Modifica percorso escursionistico alpino"
@@ -15852,5 +16175,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:723
 msgid "Demanding Alpine Hiking"
 msgstr "Percorso escursionistico alpino difficile"
@@ -15860,5 +16183,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:726
+#: build/trans_presets.java:727
 msgid "Edit Demanding Alpine Hiking"
 msgstr "Modifica percorso escursionistico alpino difficile"
@@ -15866,5 +16189,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:735
+#: build/trans_presets.java:736
 msgid "Difficult Alpine Hiking"
 msgstr "Percorso escursionistico alpino molto difficile"
@@ -15874,5 +16197,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:739
+#: build/trans_presets.java:740
 msgid "Edit Difficult Alpine Hiking"
 msgstr "Modifica un percorso escursionistico alpino molto difficile"
@@ -15880,10 +16203,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:749
+#: build/trans_presets.java:750
 msgid "Waypoints"
 msgstr "Punti del percorso"
 
 #. group "Waypoints"
-#: build/trans_presets.java:750
+#: build/trans_presets.java:751
 msgid "Motorway Junction"
 msgstr "Motorway Junction"
@@ -15891,15 +16214,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:752
+#: build/trans_presets.java:753
 msgid "Edit Motorway Junction"
 msgstr "Modifica Motorway Junction"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:757
 msgid "Number"
 msgstr "Numero"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:759
 msgid "Services"
 msgstr "Services"
@@ -15907,5 +16230,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:761
 msgid "Edit Service Station"
 msgstr "Modifica Service Station"
@@ -15943,15 +16266,15 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:765 build/trans_presets.java:902
-#: build/trans_presets.java:1382 build/trans_presets.java:1406
-#: build/trans_presets.java:1413 build/trans_presets.java:1419
-#: build/trans_presets.java:1427 build/trans_presets.java:1434
-#: build/trans_presets.java:1761 build/trans_presets.java:1771
-#: build/trans_presets.java:2361 build/trans_presets.java:2368
-#: build/trans_presets.java:2384 build/trans_presets.java:2395
-#: build/trans_presets.java:2403 build/trans_presets.java:2410
-#: build/trans_presets.java:2464 build/trans_presets.java:2512
-#: build/trans_presets.java:2678 build/trans_presets.java:2693
-#: build/trans_presets.java:2732 build/trans_presets.java:3151
+#: build/trans_presets.java:766 build/trans_presets.java:903
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
+#: build/trans_presets.java:1416 build/trans_presets.java:1422
+#: build/trans_presets.java:1430 build/trans_presets.java:1437
+#: build/trans_presets.java:1765 build/trans_presets.java:1775
+#: build/trans_presets.java:2372 build/trans_presets.java:2379
+#: build/trans_presets.java:2395 build/trans_presets.java:2406
+#: build/trans_presets.java:2414 build/trans_presets.java:2421
+#: build/trans_presets.java:2475 build/trans_presets.java:2523
+#: build/trans_presets.java:2689 build/trans_presets.java:2704
+#: build/trans_presets.java:2743 build/trans_presets.java:3163
 msgid "Operator"
 msgstr "Operatore"
@@ -15960,5 +16283,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:769
+#: build/trans_presets.java:770
 msgid "Traffic Signal"
 msgstr "Semaforo"
@@ -15968,5 +16291,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:774
 msgid "Pedestrian crossing type"
 msgstr "Tipo di attraversamento pedonale"
@@ -15975,27 +16298,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "uncontrolled"
 msgstr "non presidiato"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "traffic_signals"
 msgstr "Semaforo"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "island"
 msgstr "isola spartitraffico"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "unmarked"
 msgstr "non marcato"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:774 build/trans_presets.java:790
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:775 build/trans_presets.java:791
+#: build/trans_presets.java:1334
 msgid "Cross on horseback"
 msgstr "attraversamento a cavallo"
@@ -16003,6 +16326,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:775 build/trans_presets.java:789
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:776 build/trans_presets.java:790
+#: build/trans_presets.java:1335
 msgid "Cross by bicycle"
 msgstr "attraversamento ciclabile"
@@ -16011,11 +16334,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:776 build/trans_presets.java:791
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:1336
 msgid "Crossing attendant"
 msgstr "Attraversamento controllato"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:778
 msgid "Crossing type name (UK)"
 msgstr "Nome del tipo di attraversamento (UK)"
@@ -16023,30 +16346,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "zebra"
 msgstr "strisce pedonali"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pelican"
 msgstr "attraversamento pedonale regolato da semaforo"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "toucan"
 msgstr "toucan"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "puffin"
 msgstr "puffin"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pegasus"
 msgstr "pegasus"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "tiger"
 msgstr "tiger"
 
 #. </optional>
-#: build/trans_presets.java:780
+#: build/trans_presets.java:781
 msgid "Stop"
 msgstr "Stop"
@@ -16054,5 +16377,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:783
+#: build/trans_presets.java:784
 msgid "Pedestrian Crossing"
 msgstr "Attraversamento pedonale"
@@ -16061,14 +16384,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:786
+#: build/trans_presets.java:787
 msgid "Edit Crossing"
 msgstr "Modifica attraversamento pedonale"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:793
 msgid "Type name (UK)"
 msgstr "Nome del tipo (UK)"
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:795
 msgid "Mini-roundabout"
 msgstr "mini-rotatoria"
@@ -16079,14 +16402,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "Direction"
 msgstr "Direzione"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "clockwise"
 msgstr "senso orario"
 
-#: build/trans_presets.java:801
+#: build/trans_presets.java:802
 msgid "Turning Circle"
 msgstr "Slargo per inversione di marcia"
@@ -16096,20 +16419,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:806
+#: build/trans_presets.java:807
 msgid "City Limit"
 msgstr "City Limit"
 
 #. item
-#: build/trans_presets.java:807
+#: build/trans_presets.java:808
 msgid "Edit City Limit Sign"
 msgstr "Modifica City Limit"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:812
+#: build/trans_presets.java:813
 msgid "Second Name"
 msgstr "Secondo nome"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:814
+#: build/trans_presets.java:815
 msgid "Speed Camera"
 msgstr "Speed Camera"
@@ -16117,5 +16440,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:817
+#: build/trans_presets.java:818
 msgid "Emergency Phone"
 msgstr "Telefono di emergenza"
@@ -16123,5 +16446,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:820
+#: build/trans_presets.java:821
 msgid "Incline"
 msgstr "Rampa"
@@ -16129,5 +16452,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:823
+#: build/trans_presets.java:824
 msgid "Incline Steep"
 msgstr "Rampa ripida"
@@ -16136,10 +16459,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:827
+#: build/trans_presets.java:828
 msgid "Ford"
 msgstr "Guado"
 
 #. item
-#: build/trans_presets.java:828
+#: build/trans_presets.java:829
 msgid "Edit Ford"
 msgstr "Modifica guado"
@@ -16147,5 +16470,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:835
+#: build/trans_presets.java:836
 msgid "Mountain Pass"
 msgstr "Passo montano"
@@ -16153,5 +16476,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:837
+#: build/trans_presets.java:838
 msgid "Edit Mountain Pass"
 msgstr "Modifica passo montano"
@@ -16163,7 +16486,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:842 build/trans_presets.java:1600
-#: build/trans_presets.java:1745 build/trans_presets.java:2845
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:843 build/trans_presets.java:1604
+#: build/trans_presets.java:1749 build/trans_presets.java:2857
+#: build/trans_presets.java:2864 build/trans_presets.java:2871
 msgid "Elevation"
 msgstr "Elevazione"
@@ -16171,5 +16494,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:846
+#: build/trans_presets.java:847
 msgid "Barriers"
 msgstr "Barriere"
@@ -16177,5 +16500,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:849
+#: build/trans_presets.java:850
 msgid "Bollard"
 msgstr "Colonnina"
@@ -16183,5 +16506,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:852
 msgid "Edit Bollard"
 msgstr "Modifica colonnina"
@@ -16226,16 +16549,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:854 build/trans_presets.java:873
-#: build/trans_presets.java:887 build/trans_presets.java:909
-#: build/trans_presets.java:946 build/trans_presets.java:959
-#: build/trans_presets.java:971 build/trans_presets.java:983
-#: build/trans_presets.java:995 build/trans_presets.java:1007
-#: build/trans_presets.java:1017 build/trans_presets.java:1026
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:855 build/trans_presets.java:874
+#: build/trans_presets.java:888 build/trans_presets.java:910
+#: build/trans_presets.java:947 build/trans_presets.java:960
+#: build/trans_presets.java:972 build/trans_presets.java:984
+#: build/trans_presets.java:996 build/trans_presets.java:1008
+#: build/trans_presets.java:1018 build/trans_presets.java:1027
+#: build/trans_presets.java:1036
 msgid "Allowed traffic:"
 msgstr "Traffico permesso:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:861
+#: build/trans_presets.java:862
 msgid "Cycle Barrier"
 msgstr "Barriera per biciclette"
@@ -16244,5 +16567,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:865
+#: build/trans_presets.java:866
 msgid "Block"
 msgstr "Blocco"
@@ -16250,5 +16573,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:868
+#: build/trans_presets.java:869
 msgid "Cattle Grid"
 msgstr "Griglia"
@@ -16256,10 +16579,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:870
+#: build/trans_presets.java:871
 msgid "Edit Cattle Grid"
 msgstr "Modifica griglia"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:880
+#: build/trans_presets.java:881
 msgid "Bus Trap"
 msgstr "Trappola bus"
@@ -16267,15 +16590,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:883
+#: build/trans_presets.java:884
 msgid "Spikes"
 msgstr "Spunzoni"
 
 #. item
-#: build/trans_presets.java:884
+#: build/trans_presets.java:885
 msgid "Edit Spikes"
 msgstr "Modifica spunzoni"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:896
 msgid "Toll Booth"
 msgstr "Casello (per pedaggio)"
@@ -16283,5 +16606,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:897
+#: build/trans_presets.java:898
 msgid "Edit Toll Booth"
 msgstr "Modifica casello (per pedaggio)"
@@ -16289,10 +16612,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:905
+#: build/trans_presets.java:906
 msgid "Border Control"
 msgstr "Dogana"
 
 #. item
-#: build/trans_presets.java:906
+#: build/trans_presets.java:907
 msgid "Edit Border Control"
 msgstr "Modifica dogana"
@@ -16302,5 +16625,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:920
+#: build/trans_presets.java:921
 msgid "Hedge"
 msgstr "Siepe"
@@ -16309,5 +16632,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:925
 msgid "Fence"
 msgstr "Recinto"
@@ -16316,5 +16639,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:929
 msgid "Wall"
 msgstr "Muro"
@@ -16322,5 +16645,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:931
+#: build/trans_presets.java:932
 msgid "City Wall"
 msgstr "Cinta muraria"
@@ -16329,5 +16652,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:935
+#: build/trans_presets.java:936
 msgid "Retaining Wall"
 msgstr "Muro di contenimento"
@@ -16339,15 +16662,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:942
+#: build/trans_presets.java:943
 msgid "Entrance"
 msgstr "Punto di accesso"
 
 #. item
-#: build/trans_presets.java:943
+#: build/trans_presets.java:944
 msgid "Edit Entrance"
 msgstr "Modifica punto di accesso"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:954
+#: build/trans_presets.java:955
 msgid "Gate"
 msgstr "Cancello"
@@ -16355,50 +16678,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:956
+#: build/trans_presets.java:957
 msgid "Edit Gate"
 msgstr "Modifica cancello"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:967
+#: build/trans_presets.java:968
 msgid "Lift Gate"
 msgstr "Cancello a sollevamento"
 
 #. item
-#: build/trans_presets.java:968
+#: build/trans_presets.java:969
 msgid "Edit Lift Gate"
 msgstr "Modifica cancello a sollevamento"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:979
+#: build/trans_presets.java:980
 msgid "Hampshire Gate"
 msgstr "Cancello di filo spinato"
 
 #. item
-#: build/trans_presets.java:980
+#: build/trans_presets.java:981
 msgid "Edit Hampshire Gate"
 msgstr "Modifica cancello di filo spinato"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:991
+#: build/trans_presets.java:992
 msgid "Bump Gate"
 msgstr "Bump Gate"
 
 #. item
-#: build/trans_presets.java:992
+#: build/trans_presets.java:993
 msgid "Edit Bump Gate"
 msgstr "Modifica un Bump Gate"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:1003
+#: build/trans_presets.java:1004
 msgid "Kissing Gate"
 msgstr "Kissing Gate"
 
 #. item
-#: build/trans_presets.java:1004
+#: build/trans_presets.java:1005
 msgid "Edit Kissing Gate"
 msgstr "Modifica un Kissing Gate"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1013
 msgid "Stile"
 msgstr "Stile"
@@ -16406,25 +16729,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1014
+#: build/trans_presets.java:1015
 msgid "Edit Stile"
 msgstr "Modifica scaletta"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1023
 msgid "Turnstile"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1024
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1032
 msgid "Sally Port"
 msgstr "Porta di cinta muraria"
 
 #. item
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1033
 msgid "Edit Sally Port"
 msgstr "Modifica porta di cinta muraria"
@@ -16432,13 +16755,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #.
-#. <separator/>
+#. group "Water"
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1046 build/trans_presets.java:1089
+#: build/trans_presets.java:1047 build/trans_presets.java:1048
+#: build/trans_presets.java:1091
 msgid "Water"
 msgstr "Acqua"
 
 #. group "Water"
-#: build/trans_presets.java:1047
+#: build/trans_presets.java:1049
 msgid "Spring"
 msgstr "Sorgente"
@@ -16446,5 +16770,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1049
+#: build/trans_presets.java:1051
 msgid "Edit Spring"
 msgstr "Modifica sorgente"
@@ -16452,5 +16776,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1056
 msgid "Drain"
 msgstr "Canale di scolo"
@@ -16458,10 +16782,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1058
 msgid "Edit Drain"
 msgstr "Modifica un canale di scolo"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1064
 msgid "Stream"
 msgstr "Torrente"
@@ -16469,10 +16793,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1066
 msgid "Edit Stream"
 msgstr "Modifica un torrente"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1072
 msgid "Canal"
 msgstr "Canale"
@@ -16480,10 +16804,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1074
 msgid "Edit Canal"
 msgstr "Modifica un canale"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1080
 msgid "River"
 msgstr "Fiume"
@@ -16493,5 +16817,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1084
 msgid "Edit River"
 msgstr "Modifica un fiume"
@@ -16499,15 +16823,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1093
 msgid "Edit Water"
 msgstr "Modifica acqua"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1097
 msgid "Land"
 msgstr "Terraferma"
 
 #. item
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1098
 msgid "Edit Land"
 msgstr "Modifica terraferma"
@@ -16515,15 +16839,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1103
 msgid "Basin"
 msgstr "Bacino"
 
 #. item
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1104
 msgid "Edit Basin Landuse"
 msgstr "Modifica area di bacino"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1109
 msgid "Reservoir"
 msgstr "Serbatoio"
@@ -16531,15 +16855,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1109
+#: build/trans_presets.java:1111
 msgid "Edit Reservoir Landuse"
 msgstr "Modifica area di riserva d'acqua"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1116
 msgid "Covered Reservoir"
 msgstr "Bacino coperto"
 
 #. item
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1117
 msgid "Edit Covered Reservoir"
 msgstr "Modifica bacino coperto"
@@ -16547,5 +16871,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1120
+#: build/trans_presets.java:1122
 msgid "Riverbank"
 msgstr "Argine"
@@ -16554,10 +16878,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1125
 msgid "Edit Riverbank"
 msgstr "Modifica un argine"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1127
+#: build/trans_presets.java:1129
 msgid "Wetland"
 msgstr "Zona umida"
@@ -16568,14 +16892,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1134
 msgid "Edit Wetland"
 msgstr "Modifica zona umida"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "swamp"
 msgstr "palude"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "bog"
 msgstr "torbiera"
@@ -16589,35 +16913,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1135 build/trans_style.java:3384
+#: build/trans_presets.java:1137 build/trans_style.java:3392
 msgid "marsh"
 msgstr "palude alluvionale"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "reedbed"
 msgstr "canneto"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "saltmarsh"
 msgstr "palude salata"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "tidalflat"
 msgstr "barena"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "mangrove"
 msgstr "mangrovie"
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1139
 msgid "Mud"
 msgstr "Zona fangosa (sabbie mobili)"
 
 #. item
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1140
 msgid "Edit Mud"
 msgstr "Modifica zona fangosa (sabbie mobili)"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1144
 msgid "Beach"
 msgstr "Spiaggia"
@@ -16625,20 +16949,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1144
+#: build/trans_presets.java:1146
 msgid "Edit Beach"
 msgstr "Modifica spiaggia"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1150
 msgid "Bay"
 msgstr "Baia"
 
 #. item
-#: build/trans_presets.java:1149
+#: build/trans_presets.java:1151
 msgid "Edit Bay"
 msgstr "Modifica baia"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1155
 msgid "Cliff"
 msgstr "Rupe"
@@ -16646,10 +16970,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1157
 msgid "Edit Cliff"
 msgstr "Modifica Rupe"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1159
+#: build/trans_presets.java:1161
 msgid "Coastline"
 msgstr "Linea di costa"
@@ -16657,5 +16981,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1163
 msgid "Edit Coastline"
 msgstr "Modifica linea di costa"
@@ -16663,5 +16987,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1168
 msgid "Ferry Route"
 msgstr "Linea traghetto"
@@ -16669,5 +16993,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1170
 msgid "Edit Ferry"
 msgstr "Modifica una linea traghetto"
@@ -16676,5 +17000,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1176
+#: build/trans_presets.java:1178
 msgid "Boatyard"
 msgstr "Cantiere navale"
@@ -16682,10 +17006,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:1180
 msgid "Edit Boatyard"
 msgstr "Modifica cantiere navale"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1185
 msgid "Dock"
 msgstr "Darsena/bacino navale"
@@ -16693,5 +17017,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1187
 msgid "Edit Dock"
 msgstr "Modifica una darsena/bacino navale"
@@ -16699,5 +17023,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1193
 msgid "Dam"
 msgstr "Diga"
@@ -16705,15 +17029,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1195
 msgid "Edit Dam"
 msgstr "Modifica una diga"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1199
+#: build/trans_presets.java:1201
 msgid "Waterway Point"
 msgstr "Punto di corso d'acqua"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1202
 msgid "Lock Gate"
 msgstr "Chiusa (non blocca la navigazione)"
@@ -16722,5 +17046,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1206
 msgid "Weir"
 msgstr "Sbarramento"
@@ -16728,20 +17052,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1208
 msgid "Edit Weir"
 msgstr "Modifica sbarramento"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1213
 msgid "Waterfall"
 msgstr "Cascata"
 
 #. item
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1214
 msgid "Edit Waterfall"
 msgstr "Modifica una cascata"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1219
 msgid "Turning Point"
 msgstr "Punto di inversione di marcia"
@@ -16750,15 +17074,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1221
+#: build/trans_presets.java:1223
 msgid "Marina"
 msgstr "Porto turistico"
 
 #. item
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1224
 msgid "Edit Marina"
 msgstr "Modifica un porto turistico"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1228
 msgid "Pier"
 msgstr "Passerella"
@@ -16766,10 +17090,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1230
 msgid "Edit Pier"
 msgstr "Modifica passerella"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1234
 msgid "Ferry Terminal"
 msgstr "Terminal traghetti"
@@ -16777,10 +17101,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1236
 msgid "Edit Ferry Terminal"
 msgstr "Modifica terminal traghetti"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1240
 msgid "Slipway"
 msgstr "Rampa per la messa in acqua di imbarcazioni"
@@ -16790,16 +17114,21 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1244
 msgid "Edit Slipway"
 msgstr "Modifica una rampa per la messa in acqua di imbarcazioni"
 
 #. item "Waterway Point/Slipway" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1250
+#, fuzzy
+msgid "Transport"
+msgstr "Trasporto pubblico"
+
+#. group "Transport"
+#: build/trans_presets.java:1251
 msgid "Railway"
 msgstr "Ferrovia"
 
 #. group "Railway"
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1252
 msgid "Rail"
 msgstr "Ferrovia"
@@ -16807,5 +17136,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:1254
 msgid "Edit Rail"
 msgstr "Modifica una ferrovia"
@@ -16835,8 +17164,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "Optional Types"
 msgstr "Tipi opzionali"
@@ -16850,35 +17179,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "yard"
 msgstr "tratto per lo smistamento delle merci"
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "siding"
 msgstr "tratto parallelo ad una ferrovia principale"
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "spur"
 msgstr "tratto per una società o ente"
 
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1259
 msgid "Narrow Gauge Rail"
 msgstr "Ferrovia a scartamento ridotto"
 
 #. item
-#: build/trans_presets.java:1257
+#: build/trans_presets.java:1260
 msgid "Edit Narrow Gauge Rail"
 msgstr "Modifica una ferrovia a scartamento ridotto"
 
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1265
 msgid "Monorail"
 msgstr "Monorotaia"
@@ -16886,45 +17215,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1267
 msgid "Edit Monorail"
 msgstr "Modifica una monorotaia"
 
-#: build/trans_presets.java:1269
+#: build/trans_presets.java:1272
 msgid "Preserved"
 msgstr "Ferrovia storica"
 
 #. item
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1273
 msgid "Edit Preserved Railway"
 msgstr "Modifica una ferrovia storica"
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1278
 msgid "Light Rail"
 msgstr "Metropolitana di superficie"
 
 #. item
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1279
 msgid "Edit Light Rail"
 msgstr "Modifica una metropolitana di superficie"
 
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1284
 msgid "Subway"
 msgstr "Metropolitana"
 
 #. item
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1285
 msgid "Edit Subway"
 msgstr "Modifica una metropolitana"
 
-#: build/trans_presets.java:1287
+#: build/trans_presets.java:1290
 msgid "Tram"
 msgstr "Tramvia"
 
 #. item
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1291
 msgid "Edit Tram"
 msgstr "Modifica una tramvia"
 
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1296
 msgid "Bus Guideway"
 msgstr "Rotaie del bus"
@@ -16932,5 +17261,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1295
+#: build/trans_presets.java:1298
 msgid "Edit Bus Guideway"
 msgstr "Modificare le rotaie del bus"
@@ -16939,14 +17268,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1315
 msgid "Disused Rail"
 msgstr "Ferrovia in disuso"
 
 #. item
-#: build/trans_presets.java:1313
+#: build/trans_presets.java:1316
 msgid "Edit Disused Railway"
 msgstr "Modifica una ferrovia in disuso"
 
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1321
 msgid "Abandoned Rail"
 msgstr "Ferrovia abbandonata"
@@ -16955,5 +17284,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1325
 msgid "Level Crossing"
 msgstr "Passaggio a livello"
@@ -16962,5 +17291,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1329
 msgid "Crossing"
 msgstr "Crossing"
@@ -16970,5 +17299,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1333
 msgid "Crossing type"
 msgstr "Tipo di attraversamento"
@@ -16976,5 +17305,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1339
 msgid "Turntable"
 msgstr "Piattaforma ferroviaria girevole"
@@ -16983,10 +17312,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1344
 msgid "Aerialway"
 msgstr "Impianto di risalita"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1345
 msgid "Chair Lift"
 msgstr "Seggiovia"
@@ -16994,10 +17323,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1347
 msgid "Edit Chair Lift"
 msgstr "Modifica una seggiovia"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1351
 msgid "Drag Lift"
 msgstr "Ski-lift"
@@ -17005,10 +17334,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1353
 msgid "Edit Drag Lift"
 msgstr "Modifica uno ski-lift"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1357
 msgid "Cable Car"
 msgstr "Cabinovia"
@@ -17016,10 +17345,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1359
 msgid "Edit Cable Car"
 msgstr "Modifica una cabinovia"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1360
+#: build/trans_presets.java:1363
 msgid "Gondola"
 msgstr "Cabinovia"
@@ -17027,5 +17356,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1365
 msgid "Edit Gondola"
 msgstr "Modifica cabinovia"
@@ -17033,5 +17362,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1366 build/trans_presets.java:1461
+#: build/trans_presets.java:1369 build/trans_presets.java:1464
 msgid "Station"
 msgstr "Stazione"
@@ -17042,10 +17371,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1368 build/trans_presets.java:1464
+#: build/trans_presets.java:1371 build/trans_presets.java:1467
 msgid "Edit Station"
 msgstr "Modifica stazione"
 
 #. group "Car"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1378
 msgid "Fuel"
 msgstr "Stazione di rifornimento"
@@ -17055,5 +17384,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1382
 msgid "Edit Fuel"
 msgstr "Modifica una stazione di rifornimento"
@@ -17111,32 +17440,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1671 build/trans_presets.java:1678
-#: build/trans_presets.java:1686 build/trans_presets.java:1699
-#: build/trans_presets.java:1713 build/trans_presets.java:1810
-#: build/trans_presets.java:1818 build/trans_presets.java:1909
-#: build/trans_presets.java:1915 build/trans_presets.java:2226
-#: build/trans_presets.java:2250 build/trans_presets.java:2465
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1703
+#: build/trans_presets.java:1717 build/trans_presets.java:1814
+#: build/trans_presets.java:1822 build/trans_presets.java:1919
+#: build/trans_presets.java:1925 build/trans_presets.java:2237
+#: build/trans_presets.java:2261 build/trans_presets.java:2476
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Opening Hours"
 msgstr "Orario di apertura"
@@ -17195,91 +17524,91 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -17294,5 +17623,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1385 build/trans_presets.java:1438
+#: build/trans_presets.java:1388 build/trans_presets.java:1441
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -17302,5 +17631,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1391
 msgid "Edit Parking"
 msgstr "Modifica parcheggio"
@@ -17311,24 +17640,24 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1391 build/trans_presets.java:1762
-#: build/trans_presets.java:1772 build/trans_presets.java:2396
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:1394 build/trans_presets.java:1766
+#: build/trans_presets.java:1776 build/trans_presets.java:2407
+#: build/trans_presets.java:2524
 msgid "Reference number"
 msgstr "Numero di riferimento"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "multi-storey"
 msgstr "multi-piano"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "surface"
 msgstr "superficie"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "underground"
 msgstr "sotterraneo"
 
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1396
 msgid "Park and Ride"
 msgstr ""
@@ -17337,38 +17666,38 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1394 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
+#: build/trans_presets.java:1397 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
 msgid "Fee"
 msgstr "Tariffa"
 
 #. <space />
-#: build/trans_presets.java:1396
+#: build/trans_presets.java:1399
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1400
 msgid "Spaces for Disabled"
 msgstr "Spazi per disabili"
 
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1401
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1402
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1403
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1405
 msgid "Wash"
 msgstr "Autolavaggio"
 
 #. item
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1406
 msgid "Edit Car Wash"
 msgstr "Modifica autolavaggio"
@@ -17376,5 +17705,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1408 build/trans_presets.java:1452
+#: build/trans_presets.java:1411 build/trans_presets.java:1455
 msgid "Shop"
 msgstr "Negozio"
@@ -17382,15 +17711,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1413
 msgid "Edit Car Shop"
 msgstr "Concessionaria"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1418
 msgid "Repair"
 msgstr "Autofficina"
 
 #. item
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1419
 msgid "Edit Car Repair"
 msgstr "Modifica autofficina"
@@ -17398,5 +17727,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1421 build/trans_presets.java:1445
+#: build/trans_presets.java:1424 build/trans_presets.java:1448
 msgid "Rental"
 msgstr "Noleggio"
@@ -17405,10 +17734,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1427
 msgid "Edit Car Rental"
 msgstr "Modifica noleggio automobili"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1432
 msgid "Sharing"
 msgstr "Condivisione"
@@ -17416,5 +17745,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1434
 msgid "Edit Car Sharing"
 msgstr "Modifica condivisione automobili"
@@ -17422,10 +17751,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Parking"
 msgstr "Modifica parcheggio per biciclette"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1446
 msgid "Capacity"
 msgstr "Capacità"
@@ -17434,5 +17763,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1448
+#: build/trans_presets.java:1451
 msgid "Edit Bicycle Rental"
 msgstr "Modifica noleggio biciclette"
@@ -17441,15 +17770,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1458
 msgid "Edit Bicycle Shop"
 msgstr "Modifica negozio di biciclette"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1463
 msgid "Public Transport"
 msgstr "Trasporto pubblico"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:1472
 msgid "UIC-Reference"
 msgstr "Riferimento UIC"
@@ -17457,5 +17786,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1475
 msgid "Railway Halt"
 msgstr "Stazione ferroviaria non presidiata"
@@ -17463,5 +17792,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1477
 msgid "Edit Halt"
 msgstr "Modifica stazione non presidiata"
@@ -17469,5 +17798,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1484
 msgid "Tram Stop"
 msgstr "Fermata del tram"
@@ -17476,5 +17805,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1484
+#: build/trans_presets.java:1487
 msgid "Edit Tram Stop"
 msgstr "Modifica fermata del tram"
@@ -17482,5 +17811,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1494
 msgid "Railway Platform"
 msgstr "Piattaforma ferroviaria"
@@ -17489,5 +17818,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1497
 msgid "Edit Railway Platform"
 msgstr "Modifica una piattaforma ferroviaria"
@@ -17499,5 +17828,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1497 build/trans_presets.java:1539
+#: build/trans_presets.java:1500 build/trans_presets.java:1542
 msgid "Reference (track number)"
 msgstr "Riferimento (numero del tracciato)"
@@ -17505,10 +17834,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1499 build/trans_presets.java:1541
+#: build/trans_presets.java:1502 build/trans_presets.java:1544
 msgid "Area"
 msgstr "Area"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1504
 msgid "Subway Entrance"
 msgstr "Ingresso metropolitana"
@@ -17517,10 +17846,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1507
 msgid "Edit Subway Entrance"
 msgstr "Modifica ingresso metropolitana"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1512
 msgid "Wheelchair"
 msgstr "Sedia a rotelle"
@@ -17529,5 +17858,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1517
 msgid "Bus Station"
 msgstr "Stazione degli autobus"
@@ -17536,5 +17865,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1520
 msgid "Edit Bus Station"
 msgstr "Modifica una stazione degli autobus"
@@ -17542,5 +17871,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1526
 msgid "Bus Stop"
 msgstr "Fermata dell'autobus"
@@ -17550,5 +17879,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1530
 msgid "Edit Bus Stop"
 msgstr "Modifica fermata dell'autobus"
@@ -17557,6 +17886,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1532 build/trans_presets.java:1785
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:1535 build/trans_presets.java:1789
+#: build/trans_presets.java:2453
 msgid "Shelter"
 msgstr "Pensilina/ricovero"
@@ -17564,10 +17893,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1538
 msgid "Bus Platform"
 msgstr "Piattaforma fermata bus"
 
 #. item
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1539
 msgid "Edit Bus Platform"
 msgstr "Modifica una piattaforma degli autobus"
@@ -17575,5 +17904,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1547
 msgid "Taxi"
 msgstr "Taxi"
@@ -17581,5 +17910,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1549
 msgid "Edit Taxi station"
 msgstr "Stazione dei taxi"
@@ -17587,5 +17916,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1554
 msgid "Airport"
 msgstr "Aeroporto"
@@ -17593,15 +17922,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1556
 msgid "Edit Airport"
 msgstr "Modifica aeroporto"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1561
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1559
+#: build/trans_presets.java:1562
 msgid "ICAO"
 msgstr "ICAO"
@@ -17609,6 +17938,11 @@
 #. item "Public Transport/Airport" text "ICAO"
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1567
+#, fuzzy
+msgid "Travel"
+msgstr "ghiaia"
+
+#. group "Travel"
+#: build/trans_presets.java:1568
 msgid "Accomodation"
 msgstr "Alloggiamento"
@@ -17620,5 +17954,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1565 build/trans_surveyor.java:43
+#: build/trans_presets.java:1569 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -17627,15 +17961,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:1568
+#: build/trans_presets.java:1572
 msgid "Edit Hotel"
 msgstr "Modifica hotel"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1575
 msgid "Stars"
 msgstr "Stelle"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1577
 msgid "Motel"
 msgstr "Motel"
@@ -17643,20 +17977,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1579
 msgid "Edit Motel"
 msgstr "Modifica Motel"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1583
 msgid "Guest House"
 msgstr "Guest House"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1584
 msgid "Edit Guest House"
 msgstr "Modifica Guest House"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1588
 msgid "Chalet"
 msgstr "Casetta (chalet)"
@@ -17664,10 +17998,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1590
 msgid "Edit Chalet"
 msgstr "Modifica casetta (chalet)"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1594
 msgid "Hostel"
 msgstr "Ostello"
@@ -17675,30 +18009,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1592
+#: build/trans_presets.java:1596
 msgid "Edit Hostel"
 msgstr "Modifica ostello"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1600
 msgid "Alpine Hut"
 msgstr "Rifugio alpino"
 
 #. item
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1601
 msgid "Edit Alpine Hut"
 msgstr "Modifica rifugio alpino"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1606
 msgid "Caravan Site"
 msgstr "Area caravan e camper"
 
 #. item
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1607
 msgid "Edit Caravan Site"
 msgstr "Modifica area caravan e camper"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1611
 msgid "Camping Site"
 msgstr "Campeggio"
@@ -17706,10 +18040,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1613
 msgid "Edit Camping Site"
 msgstr "Modifica campeggio"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1618
 msgid "Food+Drinks"
 msgstr "Cibo+bevande"
@@ -17720,5 +18054,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1615 build/trans_surveyor.java:47
+#: build/trans_presets.java:1619 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Ristorante"
@@ -17726,5 +18060,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1621
 msgid "Edit Restaurant"
 msgstr "Modifica ristorante"
@@ -17732,5 +18066,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "Cuisine"
 msgstr "Cucina"
@@ -17738,61 +18072,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "italian"
 msgstr "italiana"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "chinese"
 msgstr "cinese"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "greek"
 msgstr "greca"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "german"
 msgstr "tedesca"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "indian"
 msgstr "indiana"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "regional"
 msgstr "regionale"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "turkish"
 msgstr "turca"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "asian"
 msgstr "asiatica"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "thai"
 msgstr "tailandese"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "mexican"
 msgstr "messicana"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "japanese"
 msgstr "giapponese"
 
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1627
 msgid "Fast Food"
 msgstr "Fast food"
@@ -17800,9 +18134,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1629
 msgid "Edit Fast Food Restaurant"
 msgstr "Modifica fast food"
 
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1635
 msgid "Cafe"
 msgstr "Caffetteria"
@@ -17810,9 +18144,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1633
+#: build/trans_presets.java:1637
 msgid "Edit Cafe"
 msgstr "Caffetteria"
 
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1642
 msgid "Pub"
 msgstr "Pub"
@@ -17820,18 +18154,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1644
 msgid "Edit Pub"
 msgstr "Modifica Pub"
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1649
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item
-#: build/trans_presets.java:1646
+#: build/trans_presets.java:1650
 msgid "Edit Biergarten"
 msgstr "Modifica Biergarten"
 
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1655
 msgid "Bar"
 msgstr "Bar"
@@ -17839,9 +18173,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1657
 msgid "Edit Bar"
 msgstr "Modifica Bar"
 
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1662
 msgid "Nightclub"
 msgstr "Club notturno"
@@ -17849,24 +18183,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1664
 msgid "Edit Nightclub"
 msgstr "Modifica club notturno"
 
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1670
 msgid "Tourism"
 msgstr "Turismo"
 
 #. group "Tourism"
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1671
 msgid "Attraction"
 msgstr "Attrazione turistica"
 
 #. item
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1672
 msgid "Edit Attraction"
 msgstr "Modifica attrazione turistica"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1677
 msgid "Museum"
 msgstr "Museo"
@@ -17874,9 +18208,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1679
 msgid "Edit Museum"
 msgstr "Modifica museo"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1684
 msgid "Zoo"
 msgstr "Zoo"
@@ -17885,9 +18219,9 @@
 #. <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:1683
+#: build/trans_presets.java:1687
 msgid "Edit Zoo"
 msgstr "Modifica zoo"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1692
 msgid "Viewpoint"
 msgstr "Punto panoramico"
@@ -17895,24 +18229,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1694
 msgid "Edit Viewpoint"
 msgstr "Modifica punto panoramico"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1697
 msgid "Look-Out Tower"
 msgstr "Torre di avvistamento"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1699
 msgid "Theme Park"
 msgstr "Parco divertimenti"
 
 #. item
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1700
 msgid "Edit Theme Park"
 msgstr "Modifica parco divertimenti"
 
-#: build/trans_presets.java:1701
+#: build/trans_presets.java:1705
 msgid "Artwork"
 msgstr "Opera d'arte"
@@ -17920,5 +18254,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1707
 msgid "Edit Artwork"
 msgstr "Modifica opera d'arte"
@@ -17926,19 +18260,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1712
 msgid "Information Office"
 msgstr "Ufficio informazioni"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1719
 msgid "Map"
 msgstr "Mappa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "topo"
 msgstr ""
@@ -17976,5 +18310,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1720 build/trans_style.java:619
+#: build/trans_presets.java:1724 build/trans_style.java:619
 #: build/trans_style.java:635 build/trans_style.java:651
 #: build/trans_style.java:659
@@ -17982,28 +18316,28 @@
 msgstr "strada"
 
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1722 build/trans_presets.java:1738
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1726 build/trans_presets.java:1742
+#: build/trans_presets.java:1786
 msgid "Closer Description"
 msgstr "Descrizione più specifica"
@@ -18013,5 +18347,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1724 build/trans_presets.java:1747
+#: build/trans_presets.java:1728 build/trans_presets.java:1751
 msgid "Routes shown for:"
 msgstr ""
@@ -18019,6 +18353,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1726 build/trans_presets.java:1749
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1965
 msgid "Cycling"
 msgstr "Ciclismo"
@@ -18026,5 +18360,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1727 build/trans_presets.java:1750
+#: build/trans_presets.java:1731 build/trans_presets.java:1754
 msgid "Mountainbiking"
 msgstr ""
@@ -18032,6 +18366,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1728 build/trans_presets.java:1751
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:1732 build/trans_presets.java:1755
+#: build/trans_presets.java:2019
 msgid "Skiing"
 msgstr "Sci"
@@ -18039,5 +18373,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1729 build/trans_presets.java:1752
+#: build/trans_presets.java:1733 build/trans_presets.java:1756
 msgid "Riding"
 msgstr ""
@@ -18045,46 +18379,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1734 build/trans_presets.java:1757
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1736
 msgid "Information Board"
 msgstr "Tabellone informativo"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "history"
 msgstr "storia"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "nature"
 msgstr "natura"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "wildlife"
 msgstr "fauna"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1744
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1759
 msgid "Information Terminal"
 msgstr ""
@@ -18092,29 +18426,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1760 build/trans_presets.java:1770
+#: build/trans_presets.java:1764 build/trans_presets.java:1774
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1769
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1779
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1780
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1778
+#: build/trans_presets.java:1782
 msgid "Other Information Points"
 msgstr "Altri punti informativi"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1790
 msgid "Edit Shelter"
 msgstr "Modifica pensilina/ricovero"
@@ -18122,25 +18456,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1789 build/trans_presets.java:1795
+#: build/trans_presets.java:1793 build/trans_presets.java:1799
 msgid "Fireplace"
 msgstr "Caminetto"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1791
+#: build/trans_presets.java:1795
 msgid "Picnic Site"
 msgstr "Area picnic"
 
 #. item
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1796
 msgid "Edit Picnic Site"
 msgstr "Modifica area picnic"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1802
 msgid "Historic Places"
 msgstr "Luoghi storici"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1799
+#: build/trans_presets.java:1803
 msgid "Castle"
 msgstr "Castello"
@@ -18149,19 +18483,19 @@
 #. <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:1802
+#: build/trans_presets.java:1806
 msgid "Edit Castle"
 msgstr "Modifica castello"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1810
 msgid "Ruins"
 msgstr "Rovine"
 
 #. item
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1811
 msgid "Edit Ruins"
 msgstr "Modifica rovine"
 
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1816
 msgid "Archaeological Site"
 msgstr "Sito archeologico"
@@ -18170,9 +18504,9 @@
 #. <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:1815
+#: build/trans_presets.java:1819
 msgid "Edit Archaeological Site"
 msgstr "Modifica sito archeologico"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1824
 msgid "Battlefield"
 msgstr "Campo di battaglia"
@@ -18180,5 +18514,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1826
 msgid "Edit Battlefield"
 msgstr "Modifica campo di battaglia"
@@ -18186,15 +18520,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1831
 msgid "Monument"
 msgstr "Monumento"
 
 #. item
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1832
 msgid "Edit Monument"
 msgstr "Modifica monumento"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1836
 msgid "Memorial"
 msgstr "Memoriale"
@@ -18202,45 +18536,57 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1838
 msgid "Edit Memorial"
 msgstr "Modifica memoriale"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1842
 msgid "Wayside Cross"
 msgstr "Crocefisso"
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1843
 msgid "Edit Wayside Cross"
 msgstr "Crocefisso"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1847
 msgid "Wayside Shrine"
 msgstr "Edicola votiva"
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1848
 msgid "Edit Wayside Shrine"
 msgstr "Modifica edicola votiva"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1852
+#, fuzzy
+msgid "Boundary Stone"
+msgstr "Confini"
+
+#. item
+#: build/trans_presets.java:1853
+#, fuzzy
+msgid "Edit Boundary Stone"
+msgstr "Modifica fermata dell'autobus"
+
+#. item "Historic Places/Boundary Stone" text "Name"
+#: build/trans_presets.java:1858
 msgid "Leisure"
 msgstr "Svago"
 
 #. group "Leisure"
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1859
 msgid "Water Park"
 msgstr "Parco acquatico"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1860
 msgid "Edit Water Park"
 msgstr "Modifica parco acquatico"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1864
 msgid "Playground"
 msgstr "Parco giochi"
@@ -18248,31 +18594,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1866
 msgid "Edit Playground"
 msgstr "Modifica parco giochi"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1870
 msgid "Fishing"
 msgstr "Riserva di pesca"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1871
 msgid "Edit Fishing"
 msgstr "Modifica riserva di pesca"
 
 #. item "Leisure/Fishing" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1877 build/trans_presets.java:2669
+msgid "Sports"
+msgstr "Articoli sportivi"
+
+#. group "Sports"
+#: build/trans_presets.java:1878
 msgid "Sport Facilities"
 msgstr "Strutture sportive"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1879
 msgid "Stadium"
 msgstr "Stadio"
 
 #. item
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1880
 msgid "Edit Stadium"
 msgstr "Modifica stadio"
@@ -18286,6 +18636,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1874 build/trans_presets.java:1883
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1902 build/trans_presets.java:1911
 msgid "select sport:"
 msgstr "seleziona uno sport:"
@@ -18677,30 +19027,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884 build/trans_style.java:3892
-#: build/trans_style.java:3900 build/trans_style.java:3908
-#: build/trans_style.java:3916 build/trans_style.java:3924
-#: build/trans_style.java:3932
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_style.java:3572 build/trans_style.java:3580
+#: build/trans_style.java:3588 build/trans_style.java:3596
+#: build/trans_style.java:3604 build/trans_style.java:3612
+#: build/trans_style.java:3620 build/trans_style.java:3628
+#: build/trans_style.java:3636 build/trans_style.java:3644
+#: build/trans_style.java:3652 build/trans_style.java:3660
+#: build/trans_style.java:3668 build/trans_style.java:3676
+#: build/trans_style.java:3684 build/trans_style.java:3692
+#: build/trans_style.java:3700 build/trans_style.java:3708
+#: build/trans_style.java:3716 build/trans_style.java:3724
+#: build/trans_style.java:3732 build/trans_style.java:3740
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3764 build/trans_style.java:3772
+#: build/trans_style.java:3780 build/trans_style.java:3788
+#: build/trans_style.java:3796 build/trans_style.java:3804
+#: build/trans_style.java:3812 build/trans_style.java:3820
+#: build/trans_style.java:3828 build/trans_style.java:3836
+#: build/trans_style.java:3844 build/trans_style.java:3852
+#: build/trans_style.java:3860 build/trans_style.java:3868
+#: build/trans_style.java:3876 build/trans_style.java:3884
+#: build/trans_style.java:3892 build/trans_style.java:3900
+#: build/trans_style.java:3908 build/trans_style.java:3916
+#: build/trans_style.java:3924 build/trans_style.java:3932
+#: build/trans_style.java:3940
 msgid "sport"
 msgstr "sport"
@@ -18710,225 +19060,225 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "multi"
 msgstr "polivalente"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "archery"
 msgstr "tiro con l'arco"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "athletics"
 msgstr "atletica"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "australian_football"
 msgstr "football_australiano"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "basketball"
 msgstr "pallacanestro"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "bowls"
 msgstr "boccie"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "canoe"
 msgstr "canoa"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "climbing"
 msgstr "arrampicata"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket_nets"
 msgstr "reti_cricket"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cycling"
 msgstr "ciclismo"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "dog_racing"
 msgstr "cinodromo"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "equestrian"
 msgstr "sport_equestri"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "football"
 msgstr "football_americano"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "gymnastics"
 msgstr "ginnastica"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "horse_racing"
 msgstr "ippodromo"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "motor"
 msgstr "autodromo"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "racquet"
 msgstr "racchette"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "shooting"
 msgstr "poligono_di_tiro"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skating"
 msgstr "pattinaggio"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skiing"
 msgstr "comprensorio_sciistico"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "soccer"
 msgstr "calcio"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "swimming"
 msgstr "piscina"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "table_tennis"
 msgstr "ping_pong"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1888
 msgid "Sports Centre"
 msgstr "Centro sportivo"
 
 #. item
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1889
 msgid "Edit Sports Centre"
 msgstr "Modifica centro sportivo"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1897
 msgid "Pitch"
 msgstr "Campo sportivo"
 
 #. item
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1898
 msgid "Edit Pitch"
 msgstr "Modifica campo sportivo"
 
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1906
 msgid "Racetrack"
 msgstr "Circuito (pista)"
 
 #. item
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1907
 msgid "Edit Racetrack"
 msgstr "Modifica circuito (pista)"
 
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1915
 msgid "Golf Course"
 msgstr "Campo da golf"
 
 #. item
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1916
 msgid "Edit Golf Course"
 msgstr "Modifica campo da golf"
 
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1921
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1922
 msgid "Edit Miniature Golf"
 msgstr "Modifica minigolf"
 
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1928
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1929
 msgid "Multi"
 msgstr "Struttura polivalente"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1930
 msgid "Edit Multi"
 msgstr "Modifica struttura polivalente"
@@ -18967,183 +19317,183 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "pitch"
 msgstr "campo_sportivo"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "sports_centre"
 msgstr "centro_sportivo"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "stadium"
 msgstr "stadio"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1935
 msgid "10pin"
 msgstr "Bowling"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1936
 msgid "Edit 10pin"
 msgstr "Modifica bowling"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1941
 msgid "Athletics"
 msgstr "Atletica"
 
 #. item
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1942
 msgid "Edit Athletics"
 msgstr "Modifica atletica"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1947
 msgid "Archery"
 msgstr "Tiro con l'arco"
 
 #. item
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1948
 msgid "Edit Archery"
 msgstr "Modifica tiro con l'arco"
 
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1953
 msgid "Climbing"
 msgstr "Arrampicata"
 
 #. item
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:1954
 msgid "Edit Climbing"
 msgstr "Modifica arrampicata"
 
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1959
 msgid "Canoeing"
 msgstr "Canoa"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1960
 msgid "Edit Canoeing"
 msgstr "Modifca canoa"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1966
 msgid "Edit Cycling"
 msgstr "Modifica ciclismo"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1971
 msgid "Dog Racing"
 msgstr "Corse dei cani"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1972
 msgid "Edit Dog Racing"
 msgstr "Modifica corse dei cani"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1977
 msgid "Equestrian"
 msgstr "Equitazione"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1978
 msgid "Edit Equestrian"
 msgstr "Modificare Equitazione"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1983
 msgid "Horse Racing"
 msgstr "Ippodromo"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1984
 msgid "Edit Horse Racing"
 msgstr "Modifica ippodromo"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1989
 msgid "Gymnastics"
 msgstr "Ginnastica"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1990
 msgid "Edit Gymnastics"
 msgstr "Modificare Ginnastica"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1995
 msgid "Motor Sports"
 msgstr "Sport motoristici"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1996
 msgid "Edit Motor Sports"
 msgstr "Modifica Sport Motoristici"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2001
 msgid "Skating"
 msgstr "Pattinaggio"
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2002
 msgid "Edit Skating"
 msgstr "Modificare Pattinaggio"
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2007
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2008
 msgid "Edit Skateboard"
 msgstr "Modificare Skateboard"
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2013
 msgid "Swimming"
 msgstr "Piscina"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2014
 msgid "Edit Swimming"
 msgstr "Modificare Nuoto"
@@ -19151,56 +19501,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2021
 msgid "Edit Skiing"
 msgstr "Modificare Sci"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "Piste type"
 msgstr "Tipo di pista"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "downhill"
 msgstr "Sci alpino"
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "nordic"
 msgstr "Sci nordico"
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "snow_park"
 msgstr "snow_park"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "Difficulty"
 msgstr "Difficoltà"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "novice"
 msgstr "principante"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "easy"
 msgstr "facile"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "intermediate"
 msgstr "intermedio"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "advanced"
 msgstr "avanzato"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "expert"
 msgstr "esperto"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "freeride"
 msgstr "freeride"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2028
 msgid "Shooting"
 msgstr "Poligono di tiro"
@@ -19208,178 +19558,183 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2030
 msgid "Edit Shooting"
 msgstr "Modifica poligono di tiro"
 
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2036
 msgid "Sport (Ball)"
 msgstr "Sport (Pallone)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2037
 msgid "Soccer"
 msgstr "Calcio"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2038
 msgid "Edit Soccer"
 msgstr "Modifica Calcio"
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2043
 msgid "Football"
 msgstr "Football"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2044
 msgid "Edit Football"
 msgstr "Modifica football"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2049
 msgid "Australian Football"
 msgstr "Football australiano"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2050
 msgid "Edit Australian Football"
 msgstr "Modifica football australiano"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2055
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2056
 msgid "Edit Baseball"
 msgstr "Modifica Baseball"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2061
 msgid "Basketball"
 msgstr "Pallacanestro"
 
 #. item
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2062
 msgid "Edit Basketball"
 msgstr "Modifica Pallacanestro"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2067
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2068
 msgid "Edit Golf"
 msgstr "Modifica Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2071
 msgid "golf_course"
 msgstr "campo_da_golf"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2073
 msgid "Boule"
 msgstr "Boule (sport popolare in Francia)"
 
 #. item
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2074
 msgid "Edit Boule"
 msgstr "Modifica boule (sport popolare in Francia)"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2079
 msgid "Bowls"
 msgstr "Bocce"
 
 #. item
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2080
 msgid "Edit Bowls"
 msgstr "Modifica Bocce"
 
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2085
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2086
 msgid "Edit Cricket"
 msgstr "Modifica Cricket"
 
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2091
 msgid "Cricket Nets"
 msgstr "Reti per Cricket"
 
 #. item
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2092
 msgid "Edit Cricket Nets"
 msgstr "Modifica Reti per Cricket"
 
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2097
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2098
 msgid "Edit Croquet"
 msgstr "Modifica croquet"
 
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2103
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2104
 msgid "Edit Hockey"
 msgstr "Modifica Hockey"
 
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2109
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2110
 msgid "Edit Pelota"
 msgstr "Modifica Pelota"
 
-#: build/trans_presets.java:2105
+#: build/trans_presets.java:2115
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2116
 msgid "Edit Racquet"
 msgstr "Modifica racquet"
 
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2121
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2122
 msgid "Edit Rugby"
 msgstr "Modifica Rugby"
 
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2127
 msgid "Table Tennis"
 msgstr "Tennis da tavolo"
 
 #. item
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2128
 msgid "Edit Table Tennis"
 msgstr "Modifica Tenniis da tavolo"
 
-#: build/trans_presets.java:2123
+#: build/trans_presets.java:2133
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2134
 msgid "Edit Tennis"
 msgstr "Modifica Tennis"
 
-#. <separator/>
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2141
+#, fuzzy
+msgid "Man-Made"
+msgstr "Costruzioni umane"
+
+#. group "Man-Made"
+#: build/trans_presets.java:2142
 msgid "Buildings"
 msgstr "Edifici"
 
 #. group "Buildings"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2143
 msgid "Building"
 msgstr "Palazzo"
@@ -19387,5 +19742,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Public Building"
 msgstr "Edificio pubblico"
@@ -19393,10 +19748,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2148
 msgid "Edit Public Building"
 msgstr "Modifica edificio pubblico"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2152
 msgid "Town hall"
 msgstr "Municipio"
@@ -19404,10 +19759,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2154
 msgid "Edit Town hall"
 msgstr "Modifica Municipio"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:2158
 msgid "Embassy"
 msgstr "Ambasciata"
@@ -19415,10 +19770,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Edit Embassy"
 msgstr "Modifica ambasciata"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2164
 msgid "Courthouse"
 msgstr "Tribunale"
@@ -19427,10 +19782,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:2156
+#: build/trans_presets.java:2167
 msgid "Edit Courthouse"
 msgstr "Modifica Palazzio del tribunale"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2171
 msgid "Prison"
 msgstr "Prigione"
@@ -19439,10 +19794,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:2163
+#: build/trans_presets.java:2174
 msgid "Edit Prison"
 msgstr "Modifica Prigione"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2178
 msgid "Police"
 msgstr "Polizia"
@@ -19452,10 +19807,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:2171
+#: build/trans_presets.java:2182
 msgid "Edit Police"
 msgstr "Modifica Polizia"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2186
 msgid "Fire Station"
 msgstr "Vigili del fuoco"
@@ -19464,10 +19819,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:2178
+#: build/trans_presets.java:2189
 msgid "Edit Fire Station"
 msgstr "Modifica vigili del fuoco"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "Post Office"
 msgstr "Ufficio Postale"
@@ -19475,5 +19830,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Edit Post Office"
 msgstr "Modifica Ufficio Postale"
@@ -19481,15 +19836,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2200
 msgid "Kindergarten"
 msgstr "Asilo"
 
 #. item
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Kindergarten"
 msgstr "Modifica Asilo"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2205
 msgid "School"
 msgstr "Scuola"
@@ -19497,10 +19852,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Edit School"
 msgstr "Modifica Scuola"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2211
 msgid "University"
 msgstr "Università"
@@ -19508,10 +19863,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit University"
 msgstr "Modifica Università"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "College"
 msgstr "Scuola superiore"
@@ -19519,5 +19874,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2219
 msgid "Edit College"
 msgstr "Modifica Scuola superiore"
@@ -19525,5 +19880,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2224
 msgid "Cinema"
 msgstr "Cinema"
@@ -19532,10 +19887,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:2216
+#: build/trans_presets.java:2227
 msgid "Edit Cinema"
 msgstr "Modifica Cinema"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2231
 msgid "Library"
 msgstr "Biblioteca"
@@ -19544,9 +19899,9 @@
 #. <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:2223
+#: build/trans_presets.java:2234
 msgid "Edit Library"
 msgstr "Modifica biblioteca"
 
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Arts Centre"
 msgstr "Centro Artistico"
@@ -19554,10 +19909,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Arts Centre"
 msgstr "Modifica centro d'arte"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Theatre"
 msgstr "Teatro"
@@ -19566,10 +19921,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:2237
+#: build/trans_presets.java:2248
 msgid "Edit Theatre"
 msgstr "Modifica Teatro"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2252
 msgid "Place of Worship"
 msgstr "Luogo di culto"
@@ -19579,5 +19934,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:2245
+#: build/trans_presets.java:2256
 msgid "Edit Place of Worship"
 msgstr "Modifica Luogo di culto"
@@ -19586,6 +19941,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "Religion"
 msgstr "Religione"
@@ -19594,66 +19949,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "bahai"
 msgstr "bahaismo"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "buddhist"
 msgstr "Buddista"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "christian"
 msgstr "Cristiana"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "hindu"
 msgstr "induismo"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jain"
 msgstr "giainismo"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jewish"
 msgstr "Ebraica"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "muslim"
 msgstr "Mussulmana"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "spiritualist"
 msgstr "Spiritualista"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "taoist"
 msgstr "taoismo"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "unitarian"
 msgstr "unitariano"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "zoroastrian"
 msgstr "zoroastrismo"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "Denomination"
 msgstr "Denominazione"
@@ -19662,81 +20017,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "anglican"
 msgstr "Anglicana"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "baptist"
 msgstr "Battista"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "catholic"
 msgstr "Cattolica"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "evangelical"
 msgstr "Evangelica"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "jehovahs_witness"
 msgstr "Testimoni di Geova"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "lutheran"
 msgstr "Luterana"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "methodist"
 msgstr "Metodista"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "mormon"
 msgstr "Mormone"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "orthodox"
 msgstr "Ortodossa"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "pentecostal"
 msgstr "Pentecostale"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "presbyterian"
 msgstr "Prebiteriana"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "protestant"
 msgstr "Protestante"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "quaker"
 msgstr "Quacchera"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "shia"
 msgstr "sciismo"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "sunni"
 msgstr "sunnismo"
 
 #. <separator/>
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2264
 msgid "Addresses"
 msgstr "Indirizzi"
@@ -19745,5 +20100,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:2256
+#: build/trans_presets.java:2267
 msgid "Edit Address Information"
 msgstr "Modifica dati indirizzo"
@@ -19751,5 +20106,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2269
 msgid "House number"
 msgstr "Numero civico"
@@ -19757,20 +20112,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "House name"
 msgstr "Nome Casa"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "City name"
 msgstr "Nome città"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2274
 msgid "Post code"
 msgstr "Codice postale"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2275
 msgid "Country code"
 msgstr "Codice nazione"
@@ -19778,5 +20133,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Address Interpolation"
 msgstr "Interpolazione indirizzo"
@@ -19785,5 +20140,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:2270
+#: build/trans_presets.java:2281
 msgid "Edit Address Interpolation"
 msgstr "Modifica interpolazione indirizzo"
@@ -19791,67 +20146,67 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "Numbering scheme"
 msgstr "Schema numerazione"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "odd"
 msgstr "dispari"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "even"
 msgstr "pari"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "alphabetic"
 msgstr "alfabetico"
 
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2286
 msgid "Man Made"
 msgstr "Costruzioni umane"
 
 #. group "Man Made"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Works"
 msgstr "Fabbrica"
 
 #. item
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2288
 msgid "Edit Works"
 msgstr "Modifica fabbrica"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2292
 msgid "Tower"
 msgstr "Torre"
 
 #. item
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2293
 msgid "Edit Tower"
 msgstr "Modifica torre"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Water Tower"
 msgstr "Torre idrica"
 
 #. item
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2298
 msgid "Edit Water Tower"
 msgstr "Modifica torre idrica"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Gasometer"
 msgstr "Gasometro"
 
 #. item
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2303
 msgid "Edit Gasometer"
 msgstr "Modifica gasometro"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Lighthouse"
 msgstr "Faro"
@@ -19859,10 +20214,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2309
 msgid "Edit Lighthouse"
 msgstr "Modifica faro"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Windmill"
 msgstr "Mulino a vento"
@@ -19870,10 +20225,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2315
 msgid "Edit Windmill"
 msgstr "Modifica mulino a vento"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2319
 msgid "Pipeline"
 msgstr "Conduttura"
@@ -19881,10 +20236,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Edit Pipeline"
 msgstr "Modifica conduttura"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2325
 msgid "Wastewater Plant"
 msgstr "Depuratore acqua"
@@ -19894,10 +20249,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:2318
+#: build/trans_presets.java:2329
 msgid "Edit Wastewater Plant"
 msgstr "Modifica depuratore acqua"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2333
 msgid "Crane"
 msgstr "Gru permanente"
@@ -19905,10 +20260,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2335
 msgid "Edit Crane"
 msgstr "Modifica gru permanente"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Beacon"
 msgstr "Torre radio"
@@ -19916,10 +20271,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2341
 msgid "Edit Beacon"
 msgstr "Modifica torre radio"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2345
 msgid "Survey Point"
 msgstr "Punto geodetico o altra stazione fissa"
@@ -19927,10 +20282,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Edit Survey Point"
 msgstr "Modifica punto geodetico o altra stazione fissa"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2351
 msgid "Surveillance"
 msgstr "Telecamera di sorveglianza"
@@ -19938,5 +20293,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2353
 msgid "Edit Surveillance Camera"
 msgstr "Modifica telecamera di sorveglianza"
@@ -19944,5 +20299,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Power Generator"
 msgstr "Centrale elettrica"
@@ -19952,39 +20307,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:2351
+#: build/trans_presets.java:2362
 msgid "Edit Power Generator"
 msgstr "Modifica centrale elettrica"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "wind"
 msgstr "eolica"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "hydro"
 msgstr "idroelettrica"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "fossil"
 msgstr "a combustibile fossile"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "nuclear"
 msgstr "fissione nucleare"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "coal"
 msgstr "carbone"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "photovoltaic"
 msgstr "fotovoltaico"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "gas"
 msgstr "gas"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2367
 msgid "Power Station"
 msgstr "Stazione elettrica"
@@ -19993,10 +20348,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:2359
+#: build/trans_presets.java:2370
 msgid "Edit Power Station"
 msgstr "Modifica stazione elettrica"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2374
 msgid "Power Sub Station"
 msgstr "Sottostazione elettrica"
@@ -20005,5 +20360,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:2366
+#: build/trans_presets.java:2377
 msgid "Edit Power Sub Station"
 msgstr "Modifica sottostazione elettrica"
@@ -20011,10 +20366,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2369 build/trans_presets.java:2385
+#: build/trans_presets.java:2380 build/trans_presets.java:2396
 msgid "Line reference"
 msgstr "Riferimento linea"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2382
 msgid "Power Tower"
 msgstr "Pilone (elettricità)"
@@ -20025,5 +20380,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:2376
+#: build/trans_presets.java:2387
 msgid "Edit Power Tower"
 msgstr "Modifica pilone (elettricità)"
@@ -20031,5 +20386,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2390
 msgid "Power Line"
 msgstr "Linea elettrica"
@@ -20038,40 +20393,40 @@
 #. <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:2382
+#: build/trans_presets.java:2393
 msgid "Edit Power Line"
 msgstr "Modifica linea elettrica"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Voltage"
 msgstr "Tensione"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2398
 msgid "Amount of Wires"
 msgstr "Numero di linee"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Amenities"
 msgstr "Servizi"
 
 #. group "Amenities"
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2402
 msgid "Toilets"
 msgstr "Bagni"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2398 build/trans_presets.java:2514
+#: build/trans_presets.java:2409 build/trans_presets.java:2525
 msgid "Note"
 msgstr "Nota"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2411
 msgid "Post Box"
 msgstr "Cassetta Postale"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2416
 msgid "Telephone"
 msgstr "Telefono"
@@ -20080,5 +20435,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:2408
+#: build/trans_presets.java:2419
 msgid "Edit Telephone"
 msgstr "Modifica Telefono"
@@ -20086,5 +20441,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2411 build/trans_presets.java:2515
+#: build/trans_presets.java:2422 build/trans_presets.java:2526
 msgid "Coins"
 msgstr "Monete"
@@ -20092,5 +20447,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2412 build/trans_presets.java:2516
+#: build/trans_presets.java:2423 build/trans_presets.java:2527
 msgid "Notes"
 msgstr "Note"
@@ -20098,5 +20453,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2413 build/trans_presets.java:2517
+#: build/trans_presets.java:2424 build/trans_presets.java:2528
 msgid "Electronic purses and Charge cards"
 msgstr "Portafogli elettronici e carte di debito"
@@ -20104,5 +20459,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2414 build/trans_presets.java:2518
+#: build/trans_presets.java:2425 build/trans_presets.java:2529
 msgid "Debit cards"
 msgstr "Carte di debito"
@@ -20110,15 +20465,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2415 build/trans_presets.java:2519
+#: build/trans_presets.java:2426 build/trans_presets.java:2530
 msgid "Credit cards"
 msgstr "Carte di credito"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2427
 msgid "Telephone cards"
 msgstr "Carte telefoniche"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2429
 msgid "Recycling"
 msgstr "Riciclaggio"
@@ -20127,5 +20482,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:2421
+#: build/trans_presets.java:2432
 msgid "Edit Recycling station"
 msgstr "Modifica Stazione di riciclaggio"
@@ -20133,35 +20488,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Batteries"
 msgstr "Batterie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2435
 msgid "Cans"
 msgstr "Lattine"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Clothes"
 msgstr "Vestiti"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2437
 msgid "Glass"
 msgstr "Vetro"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2438
 msgid "Paper"
 msgstr "Carta"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2439
 msgid "Scrap Metal"
 msgstr "Rottami metallici"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2441
 msgid "Bench"
 msgstr "Panchina"
@@ -20170,40 +20525,33 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2433
-#, fuzzy
+#: build/trans_presets.java:2444
 msgid "Backrest"
-msgstr "Indietro"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "Material"
-msgstr "Memoriale"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2434
-#, fuzzy
+#: build/trans_presets.java:2445
 msgid "stone"
-msgstr "nessuno"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "plastic"
-msgstr "luogo"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "Colour"
-msgstr "Colore"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "black"
-msgstr "Indietro"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "brown"
-msgstr "giù"
+msgstr ""
 
 #. color historic
@@ -20272,39 +20620,35 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2435 build/trans_style.java:3055
-#: build/trans_style.java:3063 build/trans_style.java:3071
-#: build/trans_style.java:3079 build/trans_style.java:3127
-#: build/trans_style.java:3135 build/trans_style.java:3233
-#: build/trans_style.java:3241
+#: build/trans_presets.java:2446 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3135
+#: build/trans_style.java:3143 build/trans_style.java:3241
+#: build/trans_style.java:3249
 msgid "green"
 msgstr "verde"
 
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "red"
-msgstr "fine"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "blue"
-msgstr "Valore"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "white"
-msgstr "acqua"
-
-#: build/trans_presets.java:2436
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2447
 msgid "Amount of Seats"
-msgstr "Numero di linee"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2449
 msgid "Hunting Stand"
 msgstr "Postazione di caccia"
 
 #. item
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2450
 msgid "Edit Hunting Stand"
 msgstr "Modifica una postazione di caccia"
@@ -20313,30 +20657,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2441 build/trans_presets.java:2902
+#: build/trans_presets.java:2452 build/trans_presets.java:2914
 msgid "Height"
 msgstr "Modifica Albero"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "low"
 msgstr "basso"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "half"
 msgstr "mezzo"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "full"
 msgstr "completo"
 
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2454
 msgid "Hide"
 msgstr "Nascondi"
 
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2455
 msgid "Lock"
 msgstr "Blocco"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Fountain"
 msgstr "Fontana"
@@ -20345,10 +20689,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:2449
+#: build/trans_presets.java:2460
 msgid "Edit Fountain"
 msgstr "Modifica Fontana"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2464
 msgid "Drinking Water"
 msgstr "Acqua potabile"
@@ -20357,10 +20701,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:2456
+#: build/trans_presets.java:2467
 msgid "Edit Drinking Water"
 msgstr "Modifica acqua potabile"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2471
 msgid "Baby Hatch"
 msgstr "Culla per la vita"
@@ -20368,33 +20712,33 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Baby Hatch"
 msgstr "Modifica culla per la vita"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2479
 msgid "Shops"
 msgstr "Negozi"
 
 #. group "Shops"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2480
 msgid "Supermarket"
 msgstr "Supermercato"
 
 #. item
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2481
 msgid "Edit Supermarket"
 msgstr "Modifica Supermercato"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2486
 msgid "Chemist"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2487
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2492
 msgid "Convenience Store"
 msgstr "Minimarket"
@@ -20402,9 +20746,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Edit Convenience Store"
 msgstr "Modifica minimarket"
 
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2499
 msgid "Kiosk"
 msgstr "Chiosco"
@@ -20412,27 +20756,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Kiosk"
 msgstr "Modificia Chiosco"
 
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Book Store"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2507
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2512
 msgid "Travel Agency"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2513
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2518
 msgid "Vending machine"
 msgstr "Distributore automatico"
@@ -20440,5 +20784,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Edit Vending machine"
 msgstr "Modifica Distributore automatico"
@@ -20446,88 +20790,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "Vending products"
 msgstr "Distributore automatico"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_tickets"
 msgstr "Biglietti trasporto pubblico"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_plans"
 msgstr "Orari trasporto pubblico"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "parking_tickets"
 msgstr "Biglietti per il parcheggio"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "food"
 msgstr "Alimenti"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "drinks"
 msgstr "Bevande"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "sweets"
 msgstr "Dolci"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "cigarettes"
 msgstr "Sigarette"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "photos"
 msgstr "fotografie"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "animal_food"
 msgstr "Cibo per animali"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "news_papers"
 msgstr "Giornali"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "toys"
 msgstr "giocattoli"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "stamps"
 msgstr "francobolli"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "SIM-cards"
 msgstr "Schede SIM"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "telephone_vouchers"
 msgstr "buoni_telefonici"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "vouchers"
 msgstr "buoni"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "condoms"
 msgstr "preservativi"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "tampons"
 msgstr "assorbenti"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "excrement_bags"
 msgstr "Sacchetto per escrementi"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Account or loyalty cards"
 msgstr "Conto o carta fedeltà"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Butcher"
 msgstr "Macellaio"
@@ -20535,9 +20879,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2535
 msgid "Edit Butcher"
 msgstr "Modifica Macellaio"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2540
 msgid "Baker"
 msgstr "Panificio"
@@ -20545,9 +20889,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2542
 msgid "Edit Baker"
 msgstr "Modifica Panificio"
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2547
 msgid "Florist"
 msgstr "Fiorista"
@@ -20555,18 +20899,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Florist"
 msgstr "Modifica Fiorista"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2554
 msgid "Organic"
 msgstr "Prodotti biologici"
 
 #. item
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Edit Organic Shop"
 msgstr "Modifica negozio di prodotti biologici"
 
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2560
 msgid "Alcohol"
 msgstr "Alcolici (non in Italia)"
@@ -20574,54 +20918,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2562
 msgid "Edit Alcohol Shop"
 msgstr "Modifica negozio di alcolici (non in Italia)"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2567
 msgid "Beverages"
 msgstr "Bevande"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2568
 msgid "Edit Beverages Shop"
 msgstr "Modifica negozio di bevande"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2573
 msgid "Computer"
 msgstr "Computer"
 
 #. item
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2574
 msgid "Edit Computer Shop"
 msgstr "Modifica negozio di informatica"
 
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Electronics"
 msgstr "Elettronica"
 
 #. item
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2580
 msgid "Edit Electronics Shop"
 msgstr "Modifica Negozio di Elettronica"
 
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2585
 msgid "Hifi"
 msgstr "Hi-Fi"
 
 #. item
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2586
 msgid "Edit Hifi Shop"
 msgstr "Modifica negozio di Hi-Fi"
 
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2591
 msgid "Furniture"
 msgstr "Mobilia"
 
 #. item
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Edit Furniture Shop"
 msgstr "Modifica Negozio di Mobilia"
 
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Garden Centre"
 msgstr "Giardinaggio"
@@ -20629,9 +20973,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2599
 msgid "Edit Garden Centre"
 msgstr "Modifica giardinaggio"
 
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Hardware"
 msgstr "Ferramenta"
@@ -20639,9 +20983,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2606
 msgid "Edit Hardware Store"
 msgstr "Modifica Negozio di Ferramenta"
 
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "Do-it-yourself-store"
 msgstr "Fai-da-te"
@@ -20649,54 +20993,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2613
 msgid "Edit Do-it-yourself-store"
 msgstr "Modifica negozio Fai-da-te"
 
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2618
 msgid "Stationery"
 msgstr "Cartoleria"
 
 #. item
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2619
 msgid "Edit Stationery Shop"
 msgstr "Modifica cartoleria"
 
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Hairdresser"
 msgstr "Parrucchiere/barbiere"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Hairdresser"
 msgstr "Modifica parrucchiere/barbiere"
 
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Shoes"
 msgstr "Calzature"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Shoe Shop"
 msgstr "Modifica Negozio di Scarpe"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2636
 msgid "Toys"
 msgstr "Giocattoli"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit Toy Shop"
 msgstr "Modifica Negozio di Giocattoli"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Video"
 msgstr "Videoteca"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Video Shop"
 msgstr "Modifica videoteca"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "Dry Cleaning"
 msgstr "Lavanderia a secco"
@@ -20704,9 +21048,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2650
 msgid "Edit Dry Cleaning"
 msgstr "Modifica Lavanderia a secco"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "Laundry"
 msgstr "Lavanderia"
@@ -20714,9 +21058,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2657
 msgid "Edit Laundry"
 msgstr "Modifica lavanderia"
 
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2662
 msgid "Outdoor"
 msgstr "Sport all'aperto"
@@ -20724,32 +21068,28 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2664
 msgid "Edit Outdoor Shop"
 msgstr "Modifica sport all'aperto"
 
-#: build/trans_presets.java:2658
-msgid "Sports"
-msgstr "Articoli sportivi"
-
-#. item
-#: build/trans_presets.java:2659
+#. item
+#: build/trans_presets.java:2670
 msgid "Edit Sports Shop"
 msgstr "Modifica articoli sportivi"
 
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Optician"
 msgstr "Ottico"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Optician"
 msgstr "Modifica Ottico"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2683
 msgid "Cash"
 msgstr "Contanti"
 
 #. group "Cash"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2684
 msgid "Bank"
 msgstr "Banca"
@@ -20757,14 +21097,14 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2686
 msgid "Edit Bank"
 msgstr "Modifica banca"
 
-#: build/trans_presets.java:2680 build/trans_presets.java:2689
+#: build/trans_presets.java:2691 build/trans_presets.java:2700
 msgid "Automated Teller Machine"
 msgstr "Bancomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2693
 msgid "Money Exchange"
 msgstr "Cambiavalute"
@@ -20772,5 +21112,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Edit Money Exchange"
 msgstr "Modifica cambiavalute"
@@ -20778,15 +21118,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2691
+#: build/trans_presets.java:2702
 msgid "Edit Automated Teller Machine"
 msgstr "Modifica bancomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2707
 msgid "Health"
 msgstr "Salute"
 
 #. group "Health"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2708
 msgid "Doctors"
 msgstr "Ambulatorio"
@@ -20794,18 +21134,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2710
 msgid "Edit Doctors"
 msgstr "Modifica ambulatorio"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2715
 msgid "Dentist"
 msgstr "Dentista"
 
 #. item
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Edit Dentist"
 msgstr "Modifica dentista"
 
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2721
 msgid "Pharmacy"
 msgstr "Farmacia"
@@ -20813,5 +21153,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Edit Pharmacy"
 msgstr "Modifica Farmacia"
@@ -20819,9 +21159,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Dispensing"
 msgstr "Vendita medicinali con obbligo di prescrizione"
 
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2729
 msgid "Hospital"
 msgstr "Ospedale"
@@ -20829,10 +21169,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Edit Hospital"
 msgstr "Modifica Ospedale"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2735
 msgid "Emergency Access Point"
 msgstr "Colonnina SOS"
@@ -20841,5 +21181,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:2727
+#: build/trans_presets.java:2738
 msgid "Edit Emergency Access Point"
 msgstr "Modifica Colonnina SOS"
@@ -20848,20 +21188,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2741
 msgid "Point Number"
 msgstr "Numero del punto"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2742
 msgid "Point Name"
 msgstr "Nome del punto"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Phone Number"
 msgstr "Numero di telefono"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Usare prefisso internazionale, es. +12-345-67890)"
@@ -20869,5 +21209,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2748
 msgid "Veterinary"
 msgstr "Veterinario"
@@ -20876,55 +21216,60 @@
 #. <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:2740
+#: build/trans_presets.java:2751
 msgid "Edit Veterinary"
 msgstr "Modifica veterinario"
 
+#: build/trans_presets.java:2758
+#, fuzzy
+msgid "Geography"
+msgstr "WGS84 Geografico"
+
 #. group "Places"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2760
 msgid "Continent"
 msgstr "Continente"
 
 #. item
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2761
 msgid "Edit Continent"
 msgstr "Modifica continente"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2766
 msgid "Country"
 msgstr "Stato"
 
 #. item
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2767
 msgid "Edit Country"
 msgstr "Modifica stato"
 
 #. item "Places/Country" text "Name"
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2772
 msgid "State"
 msgstr "Regione"
 
 #. item
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2773
 msgid "Edit State"
 msgstr "Modifica regione"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2778
 msgid "Region"
 msgstr "Provincia"
 
 #. item
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2779
 msgid "Edit Region"
 msgstr "Modifica provincia"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2784
 msgid "County"
 msgstr "Contea (in Italia NON usare)"
 
 #. item
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2785
 msgid "Edit County"
 msgstr "Modifica contea (in Italia NON usare)"
@@ -20932,15 +21277,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2791
 msgid "City"
 msgstr "Città"
 
 #. item
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2792
 msgid "Edit City"
 msgstr "Modifica città"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2797
 msgid "Town"
 msgstr "Paese"
@@ -20948,10 +21293,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2799
 msgid "Edit Town"
 msgstr "Modifica Paese"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2804
 msgid "Suburb"
 msgstr "Sobborgo"
@@ -20959,25 +21304,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2806
 msgid "Edit Suburb"
 msgstr "Modifica Sobborgo"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2811
 msgid "Village"
 msgstr "Frazione"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2812
 msgid "Edit Village"
 msgstr "Modifica Frazione"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2817
 msgid "Hamlet"
 msgstr "Borgo"
 
 #. item
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2818
 msgid "Edit Hamlet"
 msgstr "Modifica Borgo"
@@ -20985,5 +21330,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2824
 msgid "Locality"
 msgstr "Luogo che ha un nome, ma non popolato"
@@ -20991,10 +21336,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2826
 msgid "Edit Locality"
 msgstr "Località"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2831
 msgid "Island"
 msgstr "Isola"
@@ -21002,10 +21347,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2833
 msgid "Edit Island"
 msgstr "Modifica isola"
 
 #. item "Places/Island" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2838
 msgid "Islet"
 msgstr ""
@@ -21013,5 +21358,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2840
 msgid "Edit Islet"
 msgstr ""
@@ -21019,5 +21364,5 @@
 #. item "Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2846
 msgid "Cave Entrance"
 msgstr "Entrata di una grotta/caverna"
@@ -21025,10 +21370,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2848
 msgid "Edit Cave Entrance"
 msgstr "Modifica entrata di una grotta/caverna"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2852
 msgid "Peak"
 msgstr "Picco montuoso"
@@ -21036,10 +21381,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2854
 msgid "Edit Peak"
 msgstr "Modifica picco montuoso"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2859
 msgid "Glacier"
 msgstr "Ghiacciaio"
@@ -21047,10 +21392,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2861
 msgid "Edit Glacier"
 msgstr "Modifica Ghiacciaio"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2854
+#: build/trans_presets.java:2866
 msgid "Volcano"
 msgstr "Vulcano"
@@ -21058,70 +21403,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2868
 msgid "Edit Volcano"
 msgstr "Modifica vulcano"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2874
 msgid "Boundaries"
 msgstr "Confini"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2875
 msgid "National"
 msgstr "Nazionale"
 
 #. item
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2876
 msgid "Edit National Boundary"
 msgstr "Modifica confine nazionale"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2881
 msgid "Administrative"
 msgstr "Amministrativo"
 
 #. item
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2882
 msgid "Edit Administrative Boundary"
 msgstr "Modifica confine amministrativo"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:2887
 msgid "Civil"
 msgstr "Civile"
 
 #. item
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2888
 msgid "Edit Civil Boundary"
 msgstr "Modifica confine civile"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2893
 msgid "Political"
 msgstr "Politico"
 
 #. item
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2894
 msgid "Edit Political Boundary"
 msgstr "Modifica confine politico"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2899
 msgid "National park"
 msgstr "Parco nazionale"
 
 #. item
-#: build/trans_presets.java:2888
+#: build/trans_presets.java:2900
 msgid "Edit National Park Boundary"
 msgstr "Modifica Confine Parco Nazionale"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2906
 msgid "Land use"
 msgstr "Uso del terreno"
 
 #. group "Land use"
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2907
 msgid "Tree"
 msgstr "Albero"
@@ -21130,15 +21475,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:2898
+#: build/trans_presets.java:2910
 msgid "Edit Tree"
 msgstr "Modifica albero singolo"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2915
 msgid "Botanical Name"
 msgstr "Nome Botanico"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2917
 msgid "Wood"
 msgstr "Bosco"
@@ -21147,5 +21492,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:2908
+#: build/trans_presets.java:2920
 msgid "Edit Wood"
 msgstr "Modifica bosco"
@@ -21153,17 +21498,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "coniferous"
 msgstr "Conifere"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "deciduous"
 msgstr "deciduo (caducifoglie)"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "mixed"
 msgstr "Mista"
 
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2925
 msgid "Forest"
 msgstr "Foresta"
@@ -21172,14 +21517,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:2916
+#: build/trans_presets.java:2928
 msgid "Edit Forest Landuse"
 msgstr "Modifica area di foresta"
 
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2934
 msgid "Nature Reserve"
 msgstr "Riserva naturale"
 
 #. item
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2935
 msgid "Edit Nature Reserve"
 msgstr "Modifica riserva naturale"
@@ -21187,25 +21532,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2940
 msgid "Scree"
 msgstr "Ghiaione"
 
 #. item
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2941
 msgid "Edit Scree"
 msgstr "Modifica Ghiaione"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2945
 msgid "Scrub"
 msgstr "Boscaglia"
 
 #. item
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2946
 msgid "Edit Scrub"
 msgstr "Modifica boscaglia"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2950
 msgid "Fell"
 msgstr "Fell"
@@ -21213,10 +21558,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2952
 msgid "Edit Fell"
 msgstr "Modifica Fell"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2956
 msgid "Heath"
 msgstr "Brughiera"
@@ -21224,5 +21569,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2958
 msgid "Edit Heath"
 msgstr "Modifica brughiera"
@@ -21230,5 +21575,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2963
 msgid "Farmyard"
 msgstr "Aia"
@@ -21237,45 +21582,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:2954
+#: build/trans_presets.java:2966
 msgid "Edit Farmyard Landuse"
 msgstr "Modifica aia"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2971
 msgid "Farmland"
 msgstr "Area agricola"
 
 #. item
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2972
 msgid "Edit Farmland Landuse"
 msgstr "Modifica area agricola"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2977
 msgid "Meadow"
 msgstr "Prato"
 
 #. item
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2978
 msgid "Edit Meadow Landuse"
 msgstr "Modifica area a prato"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2983
 msgid "Vineyard"
 msgstr "Vigna"
 
 #. item
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2984
 msgid "Edit Vineyard Landuse"
 msgstr "Modifica area di vigneto"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:2989
 msgid "Allotments"
 msgstr "Area pubblica concessa ai cittadini per la realizzazione di orti"
 
 #. item
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2990
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -21284,25 +21629,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2996
 msgid "Garden"
 msgstr "Giardino"
 
 #. item
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2997
 msgid "Edit Garden"
 msgstr "Modifica giardino"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3001
 msgid "Grass"
 msgstr "Erba"
 
 #. item
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3002
 msgid "Edit Grass Landuse"
 msgstr "Modifica area di prato"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3007
 msgid "Village Green"
 msgstr "Village Green"
@@ -21310,10 +21655,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3009
 msgid "Edit Village Green Landuse"
 msgstr "Modifica Village Green"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3014
 msgid "Common"
 msgstr "Common (UK)"
@@ -21321,20 +21666,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3004
+#: build/trans_presets.java:3016
 msgid "Edit Common"
 msgstr "Modifica una Common (UK)"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3020
 msgid "Park"
 msgstr "Parco"
 
 #. item
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3021
 msgid "Edit Park"
 msgstr "Modifica parco"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3025
 msgid "Recreation Ground"
 msgstr "Area di svago"
@@ -21342,5 +21687,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3027
 msgid "Edit Recreation Ground Landuse"
 msgstr "Modifica area di svago"
@@ -21348,15 +21693,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3033
 msgid "Residential area"
 msgstr "Residential Landuse"
 
 #. item
-#: build/trans_presets.java:3022
+#: build/trans_presets.java:3034
 msgid "Edit Residential Landuse"
 msgstr "Modifica Residential Landuse"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3039
 msgid "Graveyard"
 msgstr "Cimitero"
@@ -21364,9 +21709,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3029
+#: build/trans_presets.java:3041
 msgid "Edit Graveyard"
 msgstr "Modifica Cimitero"
 
-#: build/trans_presets.java:3035
+#: build/trans_presets.java:3047
 msgid "Cemetery"
 msgstr "Cimitero"
@@ -21374,39 +21719,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3049
 msgid "Edit Cemetery Landuse"
 msgstr "Modifica area di cimitero (esteso)"
 
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3056
 msgid "Retail"
 msgstr "Commerciale (negozi)"
 
 #. item
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3057
 msgid "Edit Retail Landuse"
 msgstr "Modifica area commerciale (negozi)"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3062
 msgid "Commercial"
 msgstr "Commerciale (uffici)"
 
 #. item
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3063
 msgid "Edit Commercial Landuse"
 msgstr "Modifica area commerciale (uffici)"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3056
+#: build/trans_presets.java:3068
 msgid "Industrial"
 msgstr "Industriale"
 
 #. item
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3069
 msgid "Edit Industrial Landuse"
 msgstr "Modifica area industriale"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3074
 msgid "Railway land"
 msgstr "Deposito materiale ferroviario"
@@ -21414,15 +21759,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3076
 msgid "Edit Railway Landuse"
 msgstr "Modifica deposito materiale ferroviario"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3081
 msgid "Military"
 msgstr "Militare"
 
 #. item
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3082
 msgid "Edit Military Landuse"
 msgstr "Modifica area militare"
@@ -21430,55 +21775,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3088
 msgid "Construction area"
 msgstr "Area in costruzione"
 
 #. item
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3089
 msgid "Edit Construction Landuse"
 msgstr "Modifica area in costruzione"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3094
 msgid "Brownfield"
 msgstr "Ridestinazione d'uso"
 
 #. item
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3095
 msgid "Edit Brownfield Landuse"
 msgstr "Modifica area di ridestinazione d'uso"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3100
 msgid "Greenfield"
 msgstr "Area agricola destinata alla costruzione"
 
 #. item
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3101
 msgid "Edit Greenfield Landuse"
 msgstr "Modifica area agricola destinata alla costruzione"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3106
 msgid "Landfill"
 msgstr "Discarica"
 
 #. item
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3107
 msgid "Edit Landfill Landuse"
 msgstr "Modifica area di discarica"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3112
 msgid "Quarry"
 msgstr "Cava"
 
 #. item
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3113
 msgid "Edit Quarry Landuse"
 msgstr "Modifica area di cava/miniera"
 
 #. group "Relations"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3122
 msgid "Multipolygon"
 msgstr "Multi-poligono"
@@ -21488,5 +21833,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:3114
+#: build/trans_presets.java:3126
 msgid "Edit Multipolygon"
 msgstr "Modifica un multi-poligono"
@@ -21495,10 +21840,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3132
 msgid "outer segment"
 msgstr "segmento esterno"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3133
 msgid "inner segment"
 msgstr "segmento interno"
@@ -21506,5 +21851,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3136
 msgid "Turn restriction"
 msgstr "Divieto di svolta"
@@ -21513,5 +21858,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3139
 msgid "Edit Turn Restriction"
 msgstr "Modifica un divieto di svolta"
@@ -21519,34 +21864,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "Restriction"
 msgstr "Divieto"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_left_turn"
 msgstr "no svolta a sinistra"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_right_turn"
 msgstr "no svolta a destra"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_straight_on"
 msgstr "non diritto"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_u_turn"
 msgstr "no inversione di marcia"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_right_turn"
 msgstr "solo svolta a destra"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_left_turn"
 msgstr "solo svolta a sinistra"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_straight_on"
 msgstr "solo diritto"
@@ -21555,15 +21900,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3146
 msgid "from way"
 msgstr "dal percorso"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3147
 msgid "via node or way"
 msgstr "attraverso il nodo o percorso"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3148
 msgid "to way"
 msgstr "verso il percorso"
@@ -21571,5 +21916,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3151
 msgid "Route"
 msgstr "Percorso"
@@ -21578,5 +21923,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3154
 msgid "Edit Route"
 msgstr "Modifica un percorso"
@@ -21584,5 +21929,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "Route type"
 msgstr "Tipo di percorso"
@@ -21654,5 +21999,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3144 build/trans_style.java:233
+#: build/trans_presets.java:3156 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -21661,17 +22006,17 @@
 msgstr "bicicletta"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "bus"
 msgstr "autobus"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "road"
 msgstr "strada"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ferry"
 msgstr "traghetto"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ski"
 msgstr "sci"
@@ -21724,5 +22069,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3144 build/trans_style.java:247
+#: build/trans_presets.java:3156 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -21731,13 +22076,13 @@
 msgstr "pedone"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "hiking"
 msgstr "escursionismo"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "detour"
 msgstr "deviazione"
@@ -21751,10 +22096,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3144 build/trans_style.java:1206
+#: build/trans_presets.java:3156 build/trans_style.java:1206
 msgid "subway"
 msgstr "metropolitana"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3159
 msgid "Symbol description"
 msgstr "Descrizione del simbolo"
@@ -21762,31 +22107,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3162
 msgid "Network"
 msgstr "Rete"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "proposed"
 msgstr "proposto"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "alternate"
 msgstr "alternativo"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "temporary"
 msgstr "temporaneo"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "connection"
 msgstr "collegamento"
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "Color (hex)"
 msgstr "Colore (esadecimale)"
@@ -21795,30 +22140,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3168
 msgid "route segment"
 msgstr "segmento di percorso"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3169
 msgid "forward segment"
 msgstr "segmento diretto"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3170
 msgid "backward segment"
 msgstr "segmento opposto"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3171
 msgid "halt point"
 msgstr "punto di fermata"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3172
 msgid "forward halt point"
 msgstr "punto di fermata diretto"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3173
 msgid "backward halt point"
 msgstr "punto di fermata opposto"
@@ -22256,11 +22601,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3375 build/trans_style.java:3376
-#: build/trans_style.java:3946 build/trans_style.java:4254
-#: build/trans_style.java:4263 build/trans_style.java:4272
-#: build/trans_style.java:4281 build/trans_style.java:4290
-#: build/trans_style.java:4299 build/trans_style.java:4308
-#: build/trans_style.java:4309 build/trans_style.java:4318
-#: build/trans_style.java:4327
+#: build/trans_style.java:3383 build/trans_style.java:3384
+#: build/trans_style.java:3954 build/trans_style.java:4262
+#: build/trans_style.java:4271 build/trans_style.java:4280
+#: build/trans_style.java:4289 build/trans_style.java:4298
+#: build/trans_style.java:4307 build/trans_style.java:4316
+#: build/trans_style.java:4317 build/trans_style.java:4326
+#: build/trans_style.java:4335
 msgid "deprecated"
 msgstr "deprecato"
@@ -24284,5 +24629,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3294
+#: build/trans_style.java:3302
 msgid "light_water"
 msgstr "acqua (chiaro)"
@@ -24964,8 +25309,17 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="boundary_stone"/>
+#. <icon annotate="true" src="historic/boundary_stone.png"/>
 #: build/trans_style.java:2990 build/trans_style.java:2998
 #: build/trans_style.java:3006 build/trans_style.java:3014
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
+#: build/trans_style.java:3054
 msgid "historic"
 msgstr "attrazione storica"
@@ -24979,5 +25333,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3095
 msgid "quarry"
 msgstr "cava/miniera"
@@ -24991,5 +25345,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "landfill"
 msgstr "discarica"
@@ -25011,5 +25365,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3103 build/trans_style.java:3111
+#: build/trans_style.java:3111 build/trans_style.java:3119
 msgid "basin"
 msgstr "bacino"
@@ -25023,5 +25377,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3127
 msgid "forest"
 msgstr "foresta"
@@ -25035,5 +25389,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3159
 msgid "farmyard"
 msgstr "aia"
@@ -25056,5 +25410,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3160 build/trans_style.java:3168
+#: build/trans_style.java:3168 build/trans_style.java:3176
 msgid "retail"
 msgstr "area commerciale (negozi)"
@@ -25068,5 +25422,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3176
+#: build/trans_style.java:3184
 msgid "industrial"
 msgstr "industriale"
@@ -25080,5 +25434,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "brownfield"
 msgstr "ridestinazione d'uso"
@@ -25092,5 +25446,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "greenfield"
 msgstr "area agricola destinata alla costruzione"
@@ -25104,5 +25458,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "railland"
 msgstr "area ferroviaria"
@@ -25159,7 +25513,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3217 build/trans_style.java:3252
-#: build/trans_style.java:3260 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3225 build/trans_style.java:3260
+#: build/trans_style.java:3268 build/trans_style.java:3276
+#: build/trans_style.java:3284 build/trans_style.java:3292
 msgid "military"
 msgstr "militare"
@@ -25173,5 +25527,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3225
+#: build/trans_style.java:3233
 msgid "cemetery"
 msgstr "cimitero"
@@ -25184,5 +25538,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3301
+#: build/trans_style.java:3309
 msgid "peak"
 msgstr "picco montuoso"
@@ -25197,5 +25551,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3310
+#: build/trans_style.java:3318
 msgid "glacier"
 msgstr "ghiacciaio"
@@ -25209,5 +25563,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "volcano"
 msgstr "vulcano"
@@ -25262,8 +25616,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3326 build/trans_style.java:3327
-#: build/trans_style.java:3335 build/trans_style.java:3351
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440
+#: build/trans_style.java:3334 build/trans_style.java:3335
+#: build/trans_style.java:3343 build/trans_style.java:3359
+#: build/trans_style.java:3432 build/trans_style.java:3440
+#: build/trans_style.java:3448
 msgid "natural"
 msgstr "elemento naturale"
@@ -25277,5 +25631,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3343
+#: build/trans_style.java:3351
 msgid "scrub"
 msgstr "boscaglia"
@@ -25289,5 +25643,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3359
+#: build/trans_style.java:3367
 msgid "heath"
 msgstr "brughiera"
@@ -25301,5 +25655,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3408
+#: build/trans_style.java:3416
 msgid "mud"
 msgstr "zona fangosa (sabbie mobili)"
@@ -25313,5 +25667,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "beach"
 msgstr "spiaggia"
@@ -25389,8 +25743,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
-#: build/trans_style.java:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496 build/trans_style.java:3504
+#: build/trans_style.java:3512 build/trans_style.java:3520
 msgid "route"
 msgstr "percorso"
@@ -25438,7 +25792,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3522 build/trans_style.java:3530
-#: build/trans_style.java:3538 build/trans_style.java:3546
-#: build/trans_style.java:3554
+#: build/trans_style.java:3530 build/trans_style.java:3538
+#: build/trans_style.java:3546 build/trans_style.java:3554
+#: build/trans_style.java:3562
 msgid "boundary"
 msgstr "confine"
@@ -25588,11 +25942,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090
+#: build/trans_style.java:4002 build/trans_style.java:4010
+#: build/trans_style.java:4018 build/trans_style.java:4026
+#: build/trans_style.java:4034 build/trans_style.java:4042
+#: build/trans_style.java:4050 build/trans_style.java:4058
+#: build/trans_style.java:4066 build/trans_style.java:4074
+#: build/trans_style.java:4082 build/trans_style.java:4090
+#: build/trans_style.java:4098
 msgid "place"
 msgstr "luogo"
@@ -25640,6 +25994,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4207 build/trans_style.java:4214
-#: build/trans_style.java:4221 build/trans_style.java:4228
+#: build/trans_style.java:4215 build/trans_style.java:4222
+#: build/trans_style.java:4229 build/trans_style.java:4236
 msgid "address"
 msgstr "indirizzo"
@@ -25947,12 +26301,181 @@
 msgstr ""
 
-#~ msgid "All the ways were empty"
-#~ msgstr "Tutti i percorsi erano vuoti"
+#~ msgid "Close current changeset"
+#~ msgstr "Chiude il changeset corrente"
+
+#~ msgid "There is currently no changeset open."
+#~ msgstr "Attualmente non ci sono changeset aperti."
+
+#~ msgid "- running version is {0}"
+#~ msgstr "- la versione in esecuzione è {0}"
+
+#~ msgid "Use a new changeset and close it"
+#~ msgstr "Usare un nuovo changset a chiuderlo."
+
+#~ msgid ""
+#~ "Select to upload the data using a new changeset and to leave the "
+#~ "changeset open after the upload"
+#~ msgstr ""
+#~ "Selezionare per caricare i dati usando un nuovo changeset e per chiudere "
+#~ "il changeset dopo il caricamento"
+
+#~ msgid "Data Layer"
+#~ msgstr "Livello dati"
+
+#~ msgid "Email"
+#~ msgstr "Email"
+
+#~ msgid "Move"
+#~ msgstr "Sposta"
+
+#~ msgid "unnamed"
+#~ msgstr "Senza nome"
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr "Nessun documento è aperto per cui non c'è niente da salvare."
+
+#~ msgid "Unknown file extension."
+#~ msgstr "L'estensione del file è sconosciuta."
+
+#~ msgid "Change"
+#~ msgstr "Cambia"
+
+#~ msgid "Resolve {0} conflicts in {1} objects"
+#~ msgstr "Risolvere {0} conflitti in {1} oggetti"
+
+#~ msgid "Rotate"
+#~ msgstr "Ruota"
+
+#~ msgid "different"
+#~ msgstr "diverso"
+
+#~ msgid "true"
+#~ msgstr "vero"
+
+#~ msgid "false"
+#~ msgstr "falso"
+
+#~ msgid "position"
+#~ msgstr "posizione"
+
+#~ msgid "{0} object has conflicts:"
+#~ msgid_plural "{0} objects have conflicts:"
+#~ msgstr[0] "{0} oggetto causa conflitti:"
+#~ msgstr[1] "{0} oggetti causano conflitti:"
+
+#~ msgid "my version:"
+#~ msgstr "versione locale:"
+
+#~ msgid "their version:"
+#~ msgstr "versione remota:"
+
+#~ msgid "resolved version:"
+#~ msgstr "versione risolta:"
+
+#~ msgid "Resolve Conflicts"
+#~ msgstr "Resolvi conflitti"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Fare clic su Ricarica per aggiornare la lista"
+
+#~ msgid "Object"
+#~ msgstr "Oggetto"
+
+#~ msgid "Date"
+#~ msgstr "Data"
+
+#~ msgid ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr ""
+#~ "Riporta lo stato di tutti gli oggetti correntemente selezionati alla "
+#~ "versione selezionata nella lista della cronologia."
+
+#~ msgid "Occupied By"
+#~ msgstr "Occupato da"
+
+#~ msgid "Tags (empty value deletes tag)"
+#~ msgstr "Etichette (un valore vuoto cancella l'etichetta)"
+
+#~ msgid "Add all currently selected objects as members"
+#~ msgstr "Aggiungi tutti gli oggetti selezionati come membri"
+
+#~ msgid "There were conflicts during import."
+#~ msgstr "Si sono verificati dei conflitti durante l'importazione."
+
+#~ msgid "Error parsing server response."
+#~ msgstr "Errore di scansione nella risposta del server."
+
+#~ msgid "Cannot connect to server."
+#~ msgstr "Impossibile connettersi al server."
+
+#~ 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 "Contacting the OSM server..."
+#~ msgstr "Connessione al server OSM..."
+
+#~ msgid "Add either site-josm.xml or Wiki Pages."
+#~ msgstr "Aggiungi sia site-josm.xml che le pagine Wiki."
+
+#~ 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 "Aborting..."
+#~ msgstr "Interruzione in corso"
+
+#~ msgid "Unknown version"
+#~ msgstr "Versione sconosciuta"
+
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "Trovato <nd> elemento in non-percorso."
+
+#~ msgid "<nd> has zero ref"
+#~ msgstr "<nd> ha zero ref"
+
+#~ msgid "Hint: Some changes came from uploading new data to the server."
+#~ msgstr ""
+#~ "Suggerimento: alcuni cambiamenti derivano dal caricamento dei nuovi dati "
+#~ "sul server."
+
+#~ msgid "Could not download plugin: {0} from {1}"
+#~ msgstr "Impossibile scaricare il plugin: {0} da {1}"
+
+#~ msgid "Navigation"
+#~ msgstr "Navigazione"
 
 #~ msgid "Merge nodes with different memberships?"
 #~ msgstr "Unire i nodi con diffenti appartenenze?"
 
-#~ msgid "Merge Anyway"
-#~ msgstr "Incorpora comunque"
+#~ msgid ""
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
+#~ msgstr ""
+#~ "Errore Interno: impossibile controllare le condizioni dei layer. Segnala "
+#~ "questo come bug."
+
+#~ msgid "Delete {1} {0}"
+#~ msgstr "Cancella {1} {0}"
+
+#~ msgid "Revert"
+#~ msgstr "Ripristina"
+
+#~ 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 "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
+#~ msgid "Adjust the position of the WMS layer"
+#~ msgstr "Aggiusta la posizione dl layer WMS"
 
 #~ msgid ""
@@ -25963,175 +26486,6 @@
 #~ "unirli?"
 
-#~ msgid "Unknown version"
-#~ msgstr "Versione sconosciuta"
-
-#~ msgid "Version number missing from OSM data"
-#~ msgstr "I dati OSM sono privi del numero di versione"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "Trovato <nd> elemento in non-percorso."
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> ha zero ref"
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Trovato etichetta <member> su una non relazione."
-
-#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
-#~ msgstr ""
-#~ "\"type\" non previsto sul membro {0} della relazione {1}, ottenuto {2}."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Id del nodo malformato"
-
-#~ msgid "Data Layer"
-#~ msgstr "Livello dati"
-
-#~ msgid "Email"
-#~ msgstr "Email"
-
-#~ msgid "Move"
-#~ msgstr "Sposta"
-
-#~ msgid "unnamed"
-#~ msgstr "Senza nome"
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Nessun documento è aperto per cui non c'è niente da salvare."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "L'estensione del file è sconosciuta."
-
-#~ msgid "Change"
-#~ msgstr "Cambia"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Risolvere {0} conflitti in {1} oggetti"
-
-#~ msgid "Rotate"
-#~ msgstr "Ruota"
-
-#~ msgid "different"
-#~ msgstr "diverso"
-
-#~ msgid "true"
-#~ msgstr "vero"
-
-#~ msgid "false"
-#~ msgstr "falso"
-
-#~ msgid "position"
-#~ msgstr "posizione"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} oggetto causa conflitti:"
-#~ msgstr[1] "{0} oggetti causano conflitti:"
-
-#~ msgid "my version:"
-#~ msgstr "versione locale:"
-
-#~ msgid "their version:"
-#~ msgstr "versione remota:"
-
-#~ msgid "resolved version:"
-#~ msgstr "versione risolta:"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Resolvi conflitti"
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Fare clic su Ricarica per aggiornare la lista"
-
-#~ msgid "Object"
-#~ msgstr "Oggetto"
-
-#~ msgid "Date"
-#~ msgstr "Data"
-
-#~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-#~ msgstr ""
-#~ "Riporta lo stato di tutti gli oggetti correntemente selezionati alla "
-#~ "versione selezionata nella lista della cronologia."
-
-#~ msgid "Occupied By"
-#~ msgstr "Occupato da"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Etichette (un valore vuoto cancella l'etichetta)"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Aggiungi tutti gli oggetti selezionati come membri"
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Si sono verificati dei conflitti durante l'importazione."
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Errore di scansione nella risposta del server."
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Impossibile connettersi al server."
-
-#~ 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 "Contacting the OSM server..."
-#~ msgstr "Connessione al server OSM..."
-
-#~ msgid "Add either site-josm.xml or Wiki Pages."
-#~ msgstr "Aggiungi sia site-josm.xml che le pagine Wiki."
-
-#~ 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 "Aborting..."
-#~ msgstr "Interruzione in corso"
-
-#~ msgid "Commit comment"
-#~ msgstr "Inserisci commento"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr ""
-#~ "Suggerimento: alcuni cambiamenti derivano dal caricamento dei nuovi dati "
-#~ "sul server."
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Impossibile scaricare il plugin: {0} da {1}"
-
-#~ msgid "Navigation"
-#~ msgstr "Navigazione"
-
-#~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
-#~ msgstr ""
-#~ "Errore Interno: impossibile controllare le condizioni dei layer. Segnala "
-#~ "questo come bug."
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Cancella {1} {0}"
-
-#~ msgid "Revert"
-#~ msgstr "Ripristina"
-
-#~ 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 "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "Adjust the position of the WMS layer"
-#~ msgstr "Aggiusta la posizione dl layer WMS"
+#~ msgid "All the ways were empty"
+#~ msgstr "Tutti i percorsi erano vuoti"
 
 #~ msgid "YAHOO (WebKit)"
@@ -26176,7 +26530,4 @@
 #~ "cui si è ottenuto JOSM."
 
-#~ msgid "Add Selected"
-#~ msgstr "Aggiungi la selezione"
-
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "L'estensione richiede l'aggiornamento di JOSM: {0}."
@@ -26226,4 +26577,10 @@
 #~ msgid "Import TCX File..."
 #~ msgstr "Importa file TCX..."
+
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "Trovato etichetta <member> su una non relazione."
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "Id del nodo malformato"
 
 #~ msgid ""
@@ -26380,9 +26737,9 @@
 #~ msgstr[1] "{0} Estensioni aggiornate con successo. Riavviare JOSM."
 
-#~ msgid "Delete Layer"
-#~ msgstr "Elimina livello"
-
 #~ msgid "Delete and Download"
 #~ msgstr "Elimina e Scarica"
+
+#~ msgid "Merge Anyway"
+#~ msgstr "Incorpora comunque"
 
 #~ msgid "Continue anyway"
@@ -26498,4 +26855,7 @@
 #~ "\n"
 #~ "{0}"
+
+#~ msgid "Version number missing from OSM data"
+#~ msgstr "I dati OSM sono privi del numero di versione"
 
 #~ msgid "Error processing changeset upload response"
@@ -26534,4 +26894,8 @@
 #~ msgstr "L''immagine con il percorso {0} non esiste o non è leggibile."
 
+#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
+#~ msgstr ""
+#~ "\"type\" non previsto sul membro {0} della relazione {1}, ottenuto {2}."
+
 #~ msgid "Resolve conflicts in member list of of relation {0}"
 #~ msgstr "Risolvi conflitti nella lista dei membri della relazione {0}"
@@ -26586,7 +26950,4 @@
 #~ msgstr "Primitiva mancante"
 
-#~ msgid "changesets"
-#~ msgstr "gruppi di modifiche"
-
 #~ msgid "Failed to initialize API. Please try again later."
 #~ msgstr "E' fallita l'inizializzazione delle API. Riprovare più tardi."
@@ -26631,5 +26992,2 @@
 #~ msgid "Delete all"
 #~ msgstr "Elimina tutto"
-
-#~ msgid "Set Lambert coordinate"
-#~ msgstr "Imposta le coordinate di Lambert"
Index: applications/editors/josm/i18n/po/ja.po
===================================================================
--- applications/editors/josm/i18n/po/ja.po	(revision 17655)
+++ applications/editors/josm/i18n/po/ja.po	(revision 17697)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-12 18:11+0200\n"
-"PO-Revision-Date: 2009-09-11 15:08+0000\n"
+"POT-Creation-Date: 2009-09-19 13:00+0200\n"
+"PO-Revision-Date: 2009-09-19 04:53+0000\n"
 "Last-Translator: higa4 <higa432@gmail.com>\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-09-12 16:04+0000\n"
+"X-Launchpad-Export-Date: 2009-09-19 10:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -42,10 +42,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:543
 #: ../core/src/org/openstreetmap/josm/Main.java:551
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -70,5 +70,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -86,6 +86,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:358
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
@@ -101,6 +101,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
@@ -124,10 +124,10 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
 msgid "Save and Exit"
 msgstr "保存して終了"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
 msgid "Discard and Exit"
 msgstr "変更を破棄して終了"
@@ -138,4 +138,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
@@ -143,27 +144,28 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:296
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:258
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:613
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
@@ -171,5 +173,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -189,6 +191,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
@@ -205,17 +207,17 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:654
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1528
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -226,6 +228,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
@@ -279,9 +281,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:607
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:609
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -341,5 +343,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
 msgid "Plugins"
@@ -396,5 +398,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "マージ"
@@ -484,5 +486,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -495,4 +497,5 @@
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -528,6 +531,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
@@ -536,6 +539,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:346
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
@@ -647,4 +650,46 @@
 msgstr "ズームの対象になる競合はありません"
 
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#, fuzzy
+msgid "Close open changesets"
+msgstr "開かれている変更セットなし"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#, fuzzy
+msgid "Closes open changesets"
+msgstr "開かれている変更セットなし"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
+#: ../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:114
+#, java-format
+msgid "File: {0}"
+msgstr "ファイル: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
+#, fuzzy
+msgid "There are no open changesets"
+msgstr "開かれている変更セットなし"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
+#, fuzzy
+msgid "No open changesets"
+msgstr "開かれている変更セットなし"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
+#, fuzzy
+msgid "Downloading open changesets ..."
+msgstr "変更した設定を閉じています..."
+
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
@@ -741,10 +786,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:123
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
@@ -787,31 +833,30 @@
 msgstr "直線に沿って、選択したノードを等間隔に配置します。"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
 msgid "Download from OSM..."
 msgstr "OSMからダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
 msgid "Download map data from the OSM server."
 msgstr "地図データをOSMサーバからダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
-#, java-format
-msgid "File: {0}"
-msgstr "ファイル: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
 msgid "Download"
 msgstr "ダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
 msgid "Please select at least one task to download"
 msgstr "ダウンロードするタスクを少なくとも一つ選んでください。"
@@ -832,5 +877,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1527
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307
@@ -850,6 +895,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:376
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1415
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
 msgid "Duplicate"
 msgstr "複製"
@@ -923,10 +968,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
@@ -1012,25 +1058,26 @@
 msgstr "現在のレイヤーを他のレイヤーに結合"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 msgid "Merge Nodes"
 msgstr "ノードの結合"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
 msgid "Merge nodes into the oldest one."
 msgstr "一番古いものにノードをマージします。"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
 msgid "Please select at least two nodes to merge."
 msgstr "結合する少なくとも二つのウエイを選択してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:394
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
@@ -1046,8 +1093,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -1073,6 +1120,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
@@ -1081,10 +1132,10 @@
 msgstr "パラメータ ''{0}'' はヌルでなければなりません"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
 "ノードを結合できません：使用しているウェイを削除しないとけなくなります。"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283
 #, java-format
 msgid "Merge {0} nodes"
@@ -1156,5 +1207,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "New"
 msgstr "新規"
@@ -1431,14 +1482,15 @@
 msgstr "ヘルプ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
 msgid "Status Report"
 msgstr "状況報告"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 msgid "Copy to clipboard and close"
 msgstr "クリップボードにコピーして閉じる"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
@@ -1520,25 +1572,4 @@
 msgstr "ウェイ{0}を{1}こに分割"
 
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24
-msgid "Close current changeset"
-msgstr "現在の変更セットを閉じる"
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-msgid "Close the current changeset ..."
-msgstr "現在の変更セットを閉じる ..."
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41
-msgid "There is currently no changeset open."
-msgstr "現在開かれている変更セットはありません。"
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42
-msgid "No open changeset"
-msgstr "開かれている変更セットなし"
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60
-msgid "Closing changeset"
-msgstr "変更セットを閉じています"
-
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
@@ -1707,41 +1738,41 @@
 msgstr "選択は空です"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "OSMにアップロード"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 msgid "Upload all changes to the OSM server."
 msgstr "OSMサーバにすべての変更をアップロードします。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#, java-format
 msgid ""
 "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
 "resolve them first.</html>"
 msgstr ""
-"<html>レイヤー ''{0}' に未解決の競合があります。<br>最初に競合を解決してくだ"
-"さい。<html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155
+"<html>レイヤー ''{0}'' に未解決の競合があります。<br>これを最初に解決してくだ"
+"さい。</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
 msgid "Nothing to upload. Get some data first."
 msgstr "アップロードするものがありません。最初にデータを取得してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 msgid "No changes to upload."
 msgstr "アップロードする変更はありません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "{0} {1} だけを同期"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
 msgid "Synchronize entire dataset"
 msgstr "データセット全体を同期"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
 #, java-format
 msgid ""
@@ -1763,17 +1794,17 @@
 "リックしてください。<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
 msgid "Conflict detected"
 msgstr "競合が検出されました"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr "予期せぬ値が返って来ました。 {0} を受けとりました。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:267
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
 #, java-format
 msgid ""
@@ -1789,28 +1820,40 @@
 "てください。<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
+msgid ""
+"<html>Uploading <strong>failed</strong> because you've been "
+"using<br>changeset {0} which was already closed at {1}.<br>Please upload "
+"again with a new or an existing open changeset."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+#, fuzzy
+msgid "Changeset closed"
+msgstr "変更セット情報"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr "警告: エラーヘッダ \"{0}\" は期待されたパターン {1} に一致しません"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr "エラー　ヘッダ \"{0}\" は期待パターン \"{1}\" に一致しません"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr "<html>アップロード <strong>失敗</strong>。<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
 msgid "Upload to OSM API failed"
 msgstr "OSM API へのアップロード失敗"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
 msgid "Updating primitive"
 msgstr "プリミティブ更新中"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -2034,14 +2077,14 @@
 msgstr "ウェイのノードを追加して接続"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:930
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:932
 msgid "Create new node."
 msgstr "新規ノードの作成"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
 msgid "Select node under cursor."
 msgstr "カーソルの下のノードを選択"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939
 #, java-format
 msgid "Insert new node into way."
@@ -2049,14 +2092,14 @@
 msgstr[0] "新規ノードを {0}このウエイに追加します。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
 msgid "Start new way from last node."
 msgstr "新規ウエイを最後に操作したノードから開始"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951
 msgid "Continue way from last node."
 msgstr "最後に操作したノードからウエイを継続"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:972
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:974
 msgid "Finish drawing."
 msgstr "描画の完了"
@@ -2179,62 +2222,72 @@
 "移動; 右ドラッグによるズーム"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "検索…"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "オブジェクトを検索する。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
 msgid "Can't search because there is no loaded data."
 msgstr "データがロードされていないので検索できません。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
+#, fuzzy
+msgid "Please enter a filter string."
+msgstr "検索文字列を入力してください"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
 msgid "Please enter a search string."
 msgstr "検索文字列を入力してください"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
 msgid "replace selection"
 msgstr "セレクションを置換"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72
 msgid "add to selection"
 msgstr "セレクションに加える"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73
 msgid "remove from selection"
 msgstr "セレクションの削除"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
+#, fuzzy
+msgid "find in selection"
+msgstr "セレクションに加える"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81
 msgid "case sensitive"
 msgstr "大/小文字を区別する"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82
 msgid "regular expression"
 msgstr "正規表現検索"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
 msgstr ""
 "<b>ベイカー・ストリート</b> - どんなキーや名前の 'ベイカー' と 'ストリート'。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
 msgstr ""
 "<b>\"ベイカー・ストリート\"</b> - どんなキーや名前の 'ベイカー・ストリート'。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
 msgstr "<b>name:Bak</b> - 'Bak' その名前のどこか。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
 msgstr "<b>type=route</b> -  正確に 'route'の値を持つキー 'type'です。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid ""
 "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
@@ -2244,17 +2297,17 @@
 "<b>type=</b>, <b>*=*</b>, <b>*=</b>もできます。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
 msgstr "<b>-name:Bak</b> - その名前の内 'Bak' でない。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - key=任意の値を入力してください."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
 msgid "<u>Special targets:</u>"
 msgstr "<u>特殊なターゲット:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
@@ -2262,92 +2315,109 @@
 "<b>type:</b> - オブジェクトの型 (<b>node</b>, <b>way</b>, <b>relation</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - 該当ユーザに変更された全オブジェクト"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr "<b>id:</b>... - オブジェクトに与えられた ID (0 は新しいオブジェクト)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 msgid "<b>nodes:</b>... - object with given number of nodes"
 msgstr "<b>nodes:</b>... - 指定されたノード番号のオブジェクト"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>変更済み</b> - すべての変更されたオブジェクト"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>選択</b>- すべての選択されたオブジェクト"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>未完了</b> - すべての未完了のオブジェクト"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>タグなし</b> - すべてのタグなしオブジェクト"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr "<b>child <i>式</i></b> - 式にマッチしたオブジェクトの全ての子"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr "<b>parent <i>式</i></b> - 式にマッチしたオブジェクトの全ての親"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "<b>|</b> や <b>OR</b>を、論理和をとるために使う"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr "<b>\"</b> を演算子をくくるために使ってください。（例：キーが：を含む)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "グループの分類のために <b>(</b> と <b>)</b> を使用する。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
+msgid "Filter"
+msgstr "フィルタ"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "検索"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
+msgid "Submit filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "Start Search"
 msgstr "検索開始"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "\"{0}\"にマッチするものが見つからない"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "''{0}''を検索することにより、何も選択肢に加えられませんでした。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "''{0}''を検索することにより、何も選択肢から除かれませんでした。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#, fuzzy, java-format
+msgid "Nothing find in selection by searching for ''{0}''"
+msgstr "''{0}''を検索することにより、何も選択肢に加えられませんでした。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262
 #, java-format
 msgid "Found {0} matches"
 msgstr "{0} の一致が見つかりました"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283
 msgid "RX"
 msgstr "RX"
@@ -2540,5 +2610,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
 msgid "Double conflict"
 msgstr "二重の競合"
@@ -2786,4 +2856,5 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:134
 msgid "Old value"
 msgstr "古い値"
@@ -2907,4 +2978,6 @@
 "default: {0}"
 msgstr ""
+"警告: 設定の初期化に失敗しました。設定ファイルのデフォルト: {0} へのリセット"
+"に失敗"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87
@@ -2963,27 +3036,59 @@
 
 #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
 msgid "E"
 msgstr "東"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:59
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:203
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
 msgid "Changeset {0}"
 msgstr "変更セット {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:323
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
 msgstr "パラメータ {0} > 0 が必須です。 {1} を受け取りました。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:325
-#, fuzzy, java-format
-msgid "paramete''{0}'' must not be null"
-msgstr "パラメータ ''{0}'' はヌルでなければなりません"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331
-#, fuzzy, java-format
-msgid "unsupported value ''{0}'' or parameter ''{1}''"
-msgstr "ウェイ\"{1}\"に有効なロール\"{0}\"がありません。"
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "H"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "Text"
+msgstr "テキスト"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "C"
+msgstr "CS"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "I"
+msgstr "CI"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "M"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#, fuzzy
+msgid "R"
+msgstr "RX"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+msgid "A"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+msgid "D"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+msgid "F"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
@@ -2997,24 +3102,24 @@
 msgstr "Warning: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
+#, java-format
 msgid "expected id >= 0. Got {0}"
-msgstr "予期しないカラムインデックス。 {0} を受け取りました"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:257
+msgstr "ID >= 0 である必要があります。 {0} を受け取りました"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
 msgid "a primitive with id=0 can't be invisible"
 msgstr "id=0 のプリミティブは非表示にできません"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:293
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
+#, java-format
 msgid "id > 0 expected. Got {0}"
-msgstr "id > 0 でなければなりませんが、{0} を受け取りました"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295
-#, fuzzy, java-format
+msgstr "ID > 0 である必要があります。 {0} を受け取りました"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
+#, java-format
 msgid "version > 0 expected. Got {0}"
-msgstr "id > 0 でなければなりませんが、{0} を受け取りました"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26
+msgstr "バージョン > 0 である必要があります。 {0} を受け取りました"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
 msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
@@ -3022,5 +3127,5 @@
 "パラメータ ''{0}'' は正しいタイプ名ではありません、 ''{1}'' を受け取りました"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
 msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
@@ -3041,5 +3146,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
 msgid "can't add node {0} to incomplete way {1}"
-msgstr ""
+msgstr "ノード {0} を不完全なウェイ {1} に追加できません"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154
@@ -3056,4 +3161,5 @@
 msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
 msgstr ""
+"パラメータ {0} は 0..{1} の範囲内である必要があります、 {2} を受け取りました"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:180
@@ -3088,11 +3194,11 @@
 #, java-format
 msgid "parameter {0} not in range 0..{1}, got {2}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:247
+msgstr "パラメータ {0} は 0..{1} の範囲外です、 {2} を受け取りました"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:249
 msgid "Area style way is not closed."
 msgstr "領域を指定するウエイが閉じていません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:478
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:482
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
@@ -3101,118 +3207,118 @@
 #. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
 #. TODO Remove useless nullcheck when RelationMember.member is encalupsed
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:851
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855
 msgid "Empty member in relation."
 msgstr "リレーションに登録すべきものがありません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:853
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "メンバー \"{0}\"を関連から削除"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:864
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "ウエイ\"{0}\"は二つ未満のポイントです。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "More than one \"from\" way found."
 msgstr "二つ以上の\"from\"ウェイがあります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "More than one \"to\" way found."
 msgstr "二つ以上の\"to\"ウェイがあります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "More than one \"via\" found."
 msgstr "経由地が複数有ります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "不明なロール\"{0}\"です。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "{0}のメンバーのタイプが不明"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"from\" way found."
 msgstr "\"from\"ウェイが見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"to\" way found."
 msgstr "\"to\"ウェイが見つかりません"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652
 msgid "No \"via\" node or way found."
 msgstr "経由地かウエイが見つかりません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "\"from\"ウェイは、\"via\"ノードで開始または終了していません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "\"to\"のウエイは\"via\"のノードで始まったり終わったりしません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "\"from\" のウエイは\"via\"のウエイで始まったり終わったりしません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "\"to\"のウエイは\"via\"のウエイで始まったり終わったりしません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "制約条件{0}のスタイルがありません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "ウェイ\"{1}\"に有効なロール\"{0}\"がありません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:885
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "マルチポリゴンにウェイではない\"{0}\"があります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:943
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "マルチポリゴン用の外側のウェイが ''{0}'' にありません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1032
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "ウエイ \"{0}\"と\"{1}\"の交差する点"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1044
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "内部のウェイ ''{0}''が外側にあります。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1097
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "マルチポリゴンと等しい、内側のウェイ ''{0}'' 用のスタイル。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1123
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "外側のウェイ ''{0}''のスタイルが合いません。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1327
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331
 msgid "untagged"
 msgstr "タグ付いていない"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1328
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332
 msgid "text"
 msgstr "テキスト"
@@ -3227,4 +3333,7 @@
 "Keeping my primitive. "
 msgstr ""
+"ID {0} バージョン {1} の自分のプリミティブは表示されますが、低いバージョン "
+"{2} の相手のプリミティブは表示されません。この不整合を解決できません。自分の"
+"プリミティブを残します。 "
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95
@@ -3233,5 +3342,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
@@ -3250,5 +3359,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
@@ -3301,5 +3410,5 @@
 msgstr "ランベルトゾーン（フランス）"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
 msgid "Lambert Zone (Estonia)"
 msgstr "ランベルトゾーン（エストニア）"
@@ -3316,5 +3425,5 @@
 #, java-format
 msgid "UTM Zone {0}"
-msgstr ""
+msgstr "UTM ゾーン {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_Guadeloupe_Fort_Marigot.java:35
@@ -3342,9 +3451,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:38
 msgid "Do not show again"
 msgstr "今後は表示しない"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
 #, java-format
@@ -3352,31 +3461,31 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:91
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:116
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154
 msgid "incomplete"
 msgstr "不完全"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
 msgid "highway"
 msgstr "道路"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
-#: build/trans_presets.java:3144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: build/trans_presets.java:3156
 msgid "railway"
 msgstr "鉄道"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
 msgid "waterway"
 msgstr "水路"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "landuse"
 msgstr "土地利用"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:474
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
@@ -3385,5 +3494,5 @@
 msgstr[0] "{0}ノード"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
 #, java-format
 msgid "{0} member"
@@ -3412,7 +3521,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
-#, fuzzy
 msgid "Bad Request"
-msgstr "ラケットボールの編集"
+msgstr "不正な要求"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144
@@ -3428,10 +3536,5 @@
 msgstr "今日のメッセージはありません"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67
-#, java-format
-msgid "- running version is {0}"
-msgstr "- 起動中のバージョンは {0} です。"
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:95
 msgid "Downloading \"Message of the day\""
 msgstr "\"今日のメッセージ\"をダウンロード"
@@ -3503,10 +3606,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:162
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
 msgid "Username"
 msgstr "ユーザ名"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
 msgid "Password"
 msgstr "パスワード"
@@ -3566,5 +3669,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "/PATH/TO/JOSM/FOLDER/         "
-msgstr ""
+msgstr "/PATH/TO/JOSM/FOLDER/         "
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
@@ -3629,5 +3732,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226
 msgid "Presets"
 msgstr "プリセット"
@@ -3701,38 +3804,49 @@
 msgstr "拡大・縮小"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
 msgid "The geographic longitude at the mouse pointer."
 msgstr "マウスポインターで示される地理経度"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The name of the object at the mouse pointer."
 msgstr "マウスポインターで示されるオブジェクトの名前"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The geographic latitude at the mouse pointer."
 msgstr "マウスポインターで示される地理緯度"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The angle between the previous and the current way segment."
 msgstr "これより前のウェイセグメントとこのウェイセグメントの間の角度。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "描かれている線分の(コンパスの)向き"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The length of the new way segment being drawn."
 msgstr "描きたい新規ウェイセグメントの長さ"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199
+msgid ""
+"Middle click again to cycle through.<br>Hold CTRL to select directly from "
+"this list with the mouse.<hr>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290
 msgid "(no object)"
 msgstr "(オブジェクトなし)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:301
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418
+#, fuzzy
+msgid "User:"
+msgstr "ユーザ"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
 msgid "layer not in list."
 msgstr "レイヤーがリストにありません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:488
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3793,5 +3907,5 @@
 #, java-format
 msgid "role {0} is not participating in compare pair {1}"
-msgstr ""
+msgstr "ロール {0} は比較ペア {1} に参加していません"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:101
@@ -3802,7 +3916,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:224
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Tags"
 msgstr "タグ"
@@ -3817,5 +3931,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
@@ -3901,10 +4015,10 @@
 #, java-format
 msgid "list in role {0} is currently not participating in a compare pair"
-msgstr ""
+msgstr "ロール {0} のリストは現在比較ペアに参加していません"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:764
 #, java-format
 msgid "unexpected value of parameter \"index\". Got {0}"
-msgstr ""
+msgstr "パラメータ \"index\" におかしな値。入力値: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:778
@@ -3941,4 +4055,6 @@
 "decisions are applied."
 msgstr ""
+"結合された要素のリスト。結合の決定が適用された時、相手は自分の要素を置換する"
+"でしょう。"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:275
@@ -4004,4 +4120,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
 msgid "Up"
 msgstr "上"
@@ -4009,7 +4126,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:634
 msgid "Move up the selected elements by one position"
-msgstr ""
+msgstr "同じ位置で選択した要素を上に移動"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Down"
 msgstr "下"
@@ -4017,10 +4135,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:666
 msgid "Move down the selected entries by one position"
-msgstr ""
+msgstr "同じ位置で選択したエントリを下に移動"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
@@ -4136,5 +4254,5 @@
 #, java-format
 msgid "unexpected column index. Got {0}"
-msgstr "予期しないカラムインデックス。 {0} を受け取りました"
+msgstr "おかしなカラムインデックス。入力値: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:421
@@ -4165,4 +4283,6 @@
 "the server.<br><br>Do you want to undelete these nodes too?</html>"
 msgstr ""
+"<html>サーバーから削除されたウェイ{1}に<br>付加された {0} 個のノードがありま"
+"す。<br><br>これらのノードも復活させたいですか?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:477
@@ -4177,8 +4297,10 @@
 "</html>"
 msgstr ""
+"<html>サーバーから削除されたリレーション{1}に<br>参照されていた {0} 個のプリ"
+"ミティブがあります。<br><br>これらも復活させたいですか?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
 msgid "Undelete dependent primitives?"
-msgstr ""
+msgstr "依存するプリミティブの削除を取り消しますか？"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:79
@@ -4337,4 +4459,5 @@
 msgid "merged nodes not frozen yet. Can't build resolution command"
 msgstr ""
+"結合されたノードはまだ固定されていません。解決コマンドをビルドできません"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:37
@@ -4395,5 +4518,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java:100
 msgid "cannot apply undecided tag merge item"
-msgstr ""
+msgstr "未決のタグ結合アイテムを適用できません"
 
 #. should not happen, but just in case
@@ -4415,5 +4538,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:286
 msgid ">"
-msgstr ""
+msgstr ">"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:259
@@ -4441,35 +4564,34 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97
 msgid "Conflicts when combining primitives"
-msgstr ""
+msgstr "プリミティブの連結時に競合"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
-msgstr ""
+msgstr "ウェイの連結時に競合 - 連結されたウェイは''{0}'' です"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110
 #, java-format
 msgid "Conflicts when merging nodes - merged node is ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:236
-#, fuzzy
+msgstr "ノードの結合時に競合 - 結合されたノードは''{0}'' です"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239
 msgid "No conflicts to resolve"
-msgstr "解決が必要な保留中のタグ競合はありません"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:295
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257
+msgstr "解決が必要な競合はありません"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254
 msgid "Cancel conflict resolution"
 msgstr "競合解決をキャンセル"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:310
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269
 msgid "Apply resolved conflicts"
 msgstr "解決済み競合を適用"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Apply"
 msgstr "適用"
@@ -4481,5 +4603,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "all"
 msgstr "全て"
@@ -4506,5 +4628,5 @@
 #, java-format
 msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''"
-msgstr ""
+msgstr "''{0}'' として連結された値は全てキー ''{1}'' に適用されます"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
@@ -4517,4 +4639,6 @@
 msgid "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
 msgstr ""
+"タグのパラメーター ''{0}'' は、厳格に1つのキーであることが期待されています。 "
+"{1} を受けとりました。"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
@@ -4523,7 +4647,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
-msgid "not yet decided"
-msgstr "未決定です"
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:213
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
@@ -4550,7 +4671,7 @@
 msgstr "貼り付けられたタグの競合"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
@@ -4559,7 +4680,7 @@
 msgstr[0] "{0}ウェイ"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:152
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
@@ -4568,64 +4689,59 @@
 msgstr[0] "{0} 関連"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "Paste ..."
 msgstr "貼り付け ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "From ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:372
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+msgstr "元: ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "To ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:428
+msgstr "先: ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
 #, java-format
 msgid "{0} tag"
 msgid_plural "{0} tags"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} タグ"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
 #, java-format
 msgid "pos {0} is out of range. current number of members: {1}"
-msgstr ""
+msgstr "pos {0} は、範囲外です。現在のメンバーの数: {1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
-#, fuzzy
 msgid "Remove this relation member from the relation"
-msgstr "このリレーションから現在選択されたメンバーを削除"
+msgstr "このリレーションメンバーをこのリレーションから除きます。"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-#, fuzzy
 msgid "Replace"
-msgstr "場所"
+msgstr "置換"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
 msgid "Replace the way this member refers to with the combined way"
-msgstr ""
+msgstr "このメンバーが参照しているウェイを統合するウェイと置き換えてください。"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
-#, fuzzy
 msgid "Undecided"
-msgstr "未決"
+msgstr "未確定"
 
 #. --- role editing
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:56
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510
 msgid "Role:"
 msgstr "ロール:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:65
-#, fuzzy
 msgid "Tag modified relations with   "
-msgstr "リレーションからのタグ"
+msgstr "タグは、次のものでリレーションを変更しました:   "
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:68
@@ -4635,25 +4751,22 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70
-#, fuzzy
 msgid "Value:"
-msgstr "値"
+msgstr "値:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86
 msgid "Apply this role to all members"
-msgstr ""
+msgstr "全てのメンバーにこのロールを適用"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33
 msgid "Pos."
-msgstr ""
+msgstr "位置"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51
-#, fuzzy
 msgid "Orig. Way"
-msgstr "一方通行"
+msgstr "元ウェイ"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
-#, fuzzy
 msgid "Decision"
-msgstr "リビジョン"
+msgstr "判断"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -4669,6 +4782,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
@@ -4728,5 +4842,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
 msgid "Close anyway"
-msgstr "とにかく閉じる"
+msgstr "強制的に閉じる"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:194
@@ -4757,169 +4871,13 @@
 msgstr "''{0}'' の競合を解決する"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-msgid "History"
-msgstr "履歴"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-msgid "Display the history of all selected items."
-msgstr "選択したアイテムすべての履歴の表示"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
-#, java-format
-msgid "index out of bounds Got {0}"
-msgstr "範囲外のインデックス。{0} を受け取りました"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr "ノード {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr "ウェイ {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr "リレーション {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
-msgid "History item"
-msgstr "履歴アイテム"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "現在選択しているオブジェクトを再読み込みし、リストを再作成します。"
-
-#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
-msgid "Show"
-msgstr "表示"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
-msgstr "選択されたプリミティブの履歴を表示"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
-msgid "Dialog not created yet. Invoke createInstance() first"
-msgstr ""
-"ダイアログはまだ作成されていません。最初に createInstance() を呼び出してくだ"
-"さい"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
-msgid "Layers"
-msgstr "レイヤー"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-msgid "Open a list of all loaded layers."
-msgstr "全ての読み込んだレイヤのリストを開きます"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:297
-msgid "Delete the selected layer."
-msgstr "選択したレイヤーの削除"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:367
-msgid "Show/Hide"
-msgstr "表示/非表示"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:378
-msgid "Toggle visible state of the selected layer."
-msgstr "選択したレイヤーの表示状態を切り替え"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414
-msgid "Activate"
-msgstr "有効化"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:420
-msgid "Activate the selected layer"
-msgstr "選択されたレイヤーを有効化"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:475
-msgid "Merge this layer into another layer"
-msgstr "このレイヤーを他のレイヤーに結合"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:581
-msgid "Move the selected layer one row up."
-msgstr "選択したレイヤーを一つ上に上げます。"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:600
-msgid "Move the selected layer one row down."
-msgstr "選択したレイヤーを一つ下に移動します。"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
-msgid "Information about layer"
-msgstr "レイヤーについての情報"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
-#, java-format
-msgid "This will change up to {0} object."
-msgid_plural "This will change up to {0} objects."
-msgstr[0] "これは、最大{0}このオブジェクトが変更されます。"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
-msgid "An empty value deletes the key."
-msgstr "空の値でキーを削除。"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
-msgid "<different>"
-msgstr "<差異あり>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
-msgid "Change values?"
-msgstr "値を変更しますか?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
-#, java-format
-msgid "Change properties of up to {0} object"
-msgid_plural "Change properties of up to {0} objects"
-msgstr[0] "{0}このオブジェクトのプロパティーの変更"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
-msgid "Please select a key"
-msgstr "キーを選択してください"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
-msgid "Please select a value"
-msgstr "値を選択してください"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
-msgid "Please select the objects you want to change properties for."
-msgstr "プロパティを変えたいオブジェクトを選択してください。"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
-msgid "Properties/Memberships"
-msgstr "プロパティ/メンバー"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-msgid "Properties for selected objects."
-msgstr "選択されたオブジェクトのプロパティ"
-
-#. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-msgid "Member Of"
-msgstr "メンバー"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
-msgid "Add Properties"
-msgstr "プロパティの追加"
-
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+msgid "Filter objects and hide/disable them."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
@@ -4933,4 +4891,212 @@
 msgstr "追加"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#, fuzzy
+msgid "Add filter."
+msgstr "選択したものを追加"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
+#, fuzzy
+msgid "Edit filter."
+msgstr "桟橋の編集"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#, fuzzy
+msgid "Delete filter."
+msgstr "レイヤー削除"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
+#, fuzzy
+msgid "Move filter up."
+msgstr "上へ移動"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
+#, fuzzy
+msgid "Move filter down."
+msgstr "下へ移動"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128
+msgid "Enable filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
+#, fuzzy
+msgid "Hide elements"
+msgstr "単一の要素"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
+msgid "Apply also for children"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
+msgid "Inverse filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
+#, fuzzy
+msgid "Filter mode"
+msgstr "フィルタ"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
+msgid "History"
+msgstr "履歴"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+msgid "Display the history of all selected items."
+msgstr "選択したアイテムすべての履歴の表示"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr "範囲外のインデックス。{0} を受け取りました"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr "ノード {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr "ウェイ {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr "リレーション {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
+msgid "History item"
+msgstr "履歴アイテム"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
+msgid "Reload all currently selected objects and refresh the list."
+msgstr "現在選択しているオブジェクトを再読み込みし、リストを再作成します。"
+
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
+msgid "Show"
+msgstr "表示"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
+msgid "Display the history of the selected primitive"
+msgstr "選択されたプリミティブの履歴を表示"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84
+msgid "Dialog not created yet. Invoke createInstance() first"
+msgstr ""
+"ダイアログはまだ作成されていません。最初に createInstance() を呼び出してくだ"
+"さい"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
+msgid "Layers"
+msgstr "レイヤー"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+msgid "Open a list of all loaded layers."
+msgstr "全ての読み込んだレイヤのリストを開きます"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294
+msgid "Delete the selected layer."
+msgstr "選択したレイヤーの削除"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364
+msgid "Show/Hide"
+msgstr "表示/非表示"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375
+msgid "Toggle visible state of the selected layer."
+msgstr "選択したレイヤーの表示状態を切り替え"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgid "Activate"
+msgstr "有効化"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417
+msgid "Activate the selected layer"
+msgstr "選択されたレイヤーを有効化"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472
+msgid "Merge this layer into another layer"
+msgstr "このレイヤーを他のレイヤーに結合"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578
+msgid "Move the selected layer one row up."
+msgstr "選択したレイヤーを一つ上に上げます。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597
+msgid "Move the selected layer one row down."
+msgstr "選択したレイヤーを一つ下に移動します。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+msgid "Information about layer"
+msgstr "レイヤーについての情報"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+#, java-format
+msgid "This will change up to {0} object."
+msgid_plural "This will change up to {0} objects."
+msgstr[0] "これは、最大{0}このオブジェクトが変更されます。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+msgid "An empty value deletes the key."
+msgstr "空の値でキーを削除。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+msgid "<different>"
+msgstr "<差異あり>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+msgid "Change values?"
+msgstr "値を変更しますか?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#, java-format
+msgid "Change properties of up to {0} object"
+msgid_plural "Change properties of up to {0} objects"
+msgstr[0] "{0}このオブジェクトのプロパティーの変更"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+msgid "Please select a key"
+msgstr "キーを選択してください"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+msgid "Please select a value"
+msgstr "値を選択してください"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
+msgid "Please select the objects you want to change properties for."
+msgstr "プロパティを変えたいオブジェクトを選択してください。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
+msgid "Properties/Memberships"
+msgstr "プロパティ/メンバー"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+msgid "Properties for selected objects."
+msgstr "選択されたオブジェクトのプロパティ"
+
+#. setting up the membership table
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+msgid "Member Of"
+msgstr "メンバー"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
+msgid "Add Properties"
+msgstr "プロパティの追加"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574
 msgid "Add a new key/value pair to all objects"
@@ -4972,10 +5138,9 @@
 
 #. item "Land use/Quarry" text "Name"
-#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
-#: build/trans_presets.java:3109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168
+#: build/trans_presets.java:3121
 msgid "Relations"
 msgstr "リレーション"
@@ -4985,23 +5150,23 @@
 msgstr "全てのリレーションのリストを開く"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166
 #, java-format
 msgid "Relations: {0}"
 msgstr "リレーション: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276
 msgid "Open an editor for the selected relation"
 msgstr "選択したリレーションの編集画面を開く"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
 msgid "Delete the selected relation"
 msgstr "選択したリレーションを削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349
 msgid "Create a new relation"
 msgstr "新規リレーション作成"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:373
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1412
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "このリレーションのコピーを作成し、他のエディタウィンドウで開く"
@@ -5034,5 +5199,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5044,9 +5209,9 @@
 msgstr "選択: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441
 msgid "Undock the panel"
 msgstr "パネルの取り外し"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5055,5 +5220,5 @@
 "ます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:457
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "クリックすることでパネルの内容を最小化/最大化"
@@ -5092,4 +5257,5 @@
 "Warning: only launching info browsers for the first {0} of {1} selected users"
 msgstr ""
+"警告: 選択されたユーザ {1} のうち、最初の {0} だけに情報ブラウザを起動します"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208
@@ -5115,7 +5281,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
 msgid "Edit the relation the currently selected relation member refers to"
-msgstr ""
+msgstr "現在選択中のリレーションメンバーが参照しているリレーションを編集"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:221
@@ -5137,5 +5303,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1502
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1370
 msgid "Download relation members"
 msgstr "リレーションメンバーをダウンロード"
@@ -5166,5 +5332,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -5172,18 +5338,18 @@
 msgstr "警告: タククがキャンセルされたために例外を無視します。例外: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
 msgid "Tags and Members"
 msgstr "タグとメンバ－"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:167
 msgid "Parent Relations"
 msgstr "親リレーション"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
 msgid "Child Relations"
 msgstr "子リレーション"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5191,15 +5357,18 @@
 "<br>How do you want to proceed with circular dependencies?</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+"<html>このリレーションの少なくともひとつメンバーは、<br>自身のリレーションを"
+"参照しています。<br>これは循環参照を引き起こすため、推奨されません。<br>循環"
+"参照をどうしますか？</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
 msgid "Remove them, clean up relation"
 msgstr "削除し、リレーションをクリーンナップ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
 msgid "Ignore them, leave relation as is"
 msgstr "無視し、リレーションはそのまま"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613
 #, java-format
 msgid ""
@@ -5212,9 +5381,9 @@
 "か？</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
 msgid "Multiple members referring to same primitive"
 msgstr "複数のメンバーが同じプリミティブを参照しています"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid ""
@@ -5226,5 +5395,5 @@
 "起こすので薦められません。<br>リレーション ''{0}'' をスキップします。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
@@ -5232,5 +5401,5 @@
 "現在のデータセット内で選択された全プリミティブを最初のメンバーの前に追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
@@ -5238,5 +5407,5 @@
 "現在のデータセット内で選択された全プリミティブを最後のメンバーの後に追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5246,5 +5415,5 @@
 "に追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5254,20 +5423,20 @@
 "に追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
 msgid "Remove all members referring to one of the selected primitives"
 msgstr "選択されたプリミティブのひとつを参照している全てのメンバーを削除"
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
 msgid "Relation Editor: Remove Selected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918
+msgstr "リレーションエディタ: 削除が選択されました"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr "現在の選択の中でプリミティブを参照しているリレーションメンバーを選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849
 #, java-format
 msgid ""
@@ -5277,57 +5446,57 @@
 "現在の選択の中で {0} プリミティブを参照しているリレーションメンバーを選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873
 msgid "Select primitives for selected relation members"
 msgstr "選択されたリレーションメンバーのプリミティブを選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:961
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
 msgid "Sort the relation members"
 msgstr "リレーションメンバーをソート"
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897
 msgid "Relation Editor: Sort"
 msgstr "リレーションエディタ: ソート"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909
 msgid "Move the currently selected members up"
 msgstr "現在選択したメンバーを一つ上に移動します"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:979
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:912
 msgid "Relation Editor: Move Up"
 msgstr "リレーションエディタ: 上へ移動"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928
 msgid "Move the currently selected members down"
 msgstr "選択したメンバーを一つ下に移動します"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:998
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:931
 msgid "Relation Editor: Move Down"
 msgstr "リレーションエディタ: 下へ移動"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947
 msgid "Remove the currently selected members from this relation"
 msgstr "このリレーションから現在選択されたメンバーを削除"
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
 msgid "Relation Editor: Remove"
 msgstr "リレーションエディタ: 削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
 msgid "Delete the currently edited relation"
 msgstr "現在編集されたリレーションを削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Yes, create a conflict and close"
 msgstr "はい、競合を作成して閉じる"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050
 msgid "No, continue editing"
 msgstr "いいえ、編集を続ける"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5338,9 +5507,9 @@
 "集を続けることはできません<br><br>競合を作成してエディタを閉じますか？</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1058
 msgid "Conflict in data"
 msgstr "データ中に競合"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
 #, java-format
 msgid ""
@@ -5351,56 +5520,41 @@
 "最初にこの競合を解決してからやり直してください。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090
 msgid "Apply the current updates"
 msgstr "現在の更新を適用"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123
 msgid "Apply the updates and close the dialog"
 msgstr "更新を適用してダイアログを閉じる"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Cancel the updates and close the dialog"
 msgstr "更新をキャンセルしてダイアログを閉じる"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 msgid "Add an empty tag"
 msgstr "空のタグを追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
-msgid "Delete the currently selected tags"
-msgstr "現在選択されているタグを削除"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "この関連の全ての未完成のウェイとノードをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 msgid "Download Members"
 msgstr "メンバーのダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Relation Editor: Download Members"
 msgstr "リレーションエディタ: メンバーをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1208
 msgid "Sets a role for the selected members"
 msgstr "選択されたメンバーにロールをセット"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1211
 msgid "Apply Role"
 msgstr "ロールを適用"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1356
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 #, java-format
 msgid ""
@@ -5412,13 +5566,13 @@
 "ルを削除することになります。<br>新しいロールを本当に適用しますか？</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228
 msgid "Yes, apply it"
 msgstr "はい、適用します"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1229
 msgid "No, don't apply"
 msgstr "いいえ、適用しません"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1367
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
 msgid "Confirm empty role"
 msgstr "空のロールを確認"
@@ -5426,10 +5580,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
 msgid "Zoom to"
-msgstr ""
+msgstr "ズームする:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:223
 msgid "Zoom to primitive the first selected member refers to"
-msgstr ""
+msgstr "最初に選択されたメンバーが参照しているプリミティブにズーム"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:214
@@ -5454,7 +5608,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
-#, fuzzy, java-format
+#, java-format
 msgid "child.getId() >0 expected. Got {1}"
-msgstr "子id > 0 でなければなりません。{1} を受け取りました"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
@@ -5505,37 +5659,37 @@
 msgstr "ブックマーク"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:82
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
 msgid "Please enter the desired coordinates first."
 msgstr "最初に目的の座標を入力してください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
 msgid "Please enter a name for the location."
 msgstr "場所の名称を入力してください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:107
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
 msgid "Select a bookmark first."
 msgstr "最初にブックマークを選択してください、"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
 msgid "min lat"
 msgstr "最小緯度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
 msgid "min lon"
 msgstr "最小経度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid "max lat"
 msgstr "最大緯度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
 msgid "max lon"
 msgstr "最大経度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5545,26 +5699,26 @@
 "ることができます。）"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
 msgid "Bounding Box"
 msgstr "境界囲み"
 
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
 msgid "Data Sources and Types"
 msgstr "データソースと型"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
 msgid "Download as new layer"
 msgstr "新しいレイヤーとしてダウンロードする"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
 msgid "Download Area"
 msgstr "エリアをダウンロードする"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
 msgid "Download area too large; will probably be rejected by server"
 msgstr "ダウンロードするエリアが広すぎます; サーバから拒否されるでしょう"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
 msgid "Download area ok, size probably acceptable to server"
 msgstr "ダウンロード領域はOKです。指定のサイズはサーバに受け入れられるでしょう"
@@ -5589,7 +5743,7 @@
 msgstr "検索する地名を入れてください："
 
-#. <separator/>
+#. group "Geography"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2759
 msgid "Places"
 msgstr "地名"
@@ -5636,21 +5790,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "type"
 msgstr "タイプ"
@@ -5667,5 +5821,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-#, fuzzy
 msgid ""
 "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
@@ -5674,6 +5827,6 @@
 msgstr ""
 "<b>ズーム:</b> マウスホイール、ダブルクリックまたは Ctrl + Up/Down <b>マップ"
-"移動:</b> 右クリックしたままマウスを動かすか、カーソルキーを使用。 <b>選択:</"
-"b> クリック"
+"を移動:</b> 右クリックしたままマウスを移動またはカーソルキーを使用。<b>選択:"
+"</b> 左クリックしたままフレームをドロー。"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
@@ -6135,4 +6288,6 @@
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
 #. <key key="historic" value="wayside_shrine" />
+#. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
+#. <key key="historic" value="boundary_stone" />
 #. item "Leisure/Water Park" label "Edit Water Park"
 #. <key key="leisure" value="water_park" />
@@ -6504,153 +6659,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/trans_presets.java:66 build/trans_presets.java:102
-#: build/trans_presets.java:142 build/trans_presets.java:179
-#: build/trans_presets.java:199 build/trans_presets.java:217
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:272 build/trans_presets.java:305
-#: build/trans_presets.java:351 build/trans_presets.java:371
-#: build/trans_presets.java:386 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:463 build/trans_presets.java:482
-#: build/trans_presets.java:502 build/trans_presets.java:522
-#: build/trans_presets.java:543 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627 build/trans_presets.java:658
-#: build/trans_presets.java:679 build/trans_presets.java:692
-#: build/trans_presets.java:705 build/trans_presets.java:718
-#: build/trans_presets.java:731 build/trans_presets.java:744
-#: build/trans_presets.java:755 build/trans_presets.java:764
-#: build/trans_presets.java:811 build/trans_presets.java:832
-#: build/trans_presets.java:841 build/trans_presets.java:901
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1067 build/trans_presets.java:1075
-#: build/trans_presets.java:1085 build/trans_presets.java:1093
-#: build/trans_presets.java:1098 build/trans_presets.java:1105
-#: build/trans_presets.java:1112 build/trans_presets.java:1117
-#: build/trans_presets.java:1125 build/trans_presets.java:1134
-#: build/trans_presets.java:1140 build/trans_presets.java:1146
-#: build/trans_presets.java:1151 build/trans_presets.java:1157
-#: build/trans_presets.java:1163 build/trans_presets.java:1172
-#: build/trans_presets.java:1181 build/trans_presets.java:1188
-#: build/trans_presets.java:1196 build/trans_presets.java:1209
-#: build/trans_presets.java:1215 build/trans_presets.java:1224
-#: build/trans_presets.java:1230 build/trans_presets.java:1236
-#: build/trans_presets.java:1244 build/trans_presets.java:1299
-#: build/trans_presets.java:1346 build/trans_presets.java:1352
-#: build/trans_presets.java:1358 build/trans_presets.java:1364
-#: build/trans_presets.java:1370 build/trans_presets.java:1381
-#: build/trans_presets.java:1390 build/trans_presets.java:1405
-#: build/trans_presets.java:1412 build/trans_presets.java:1418
-#: build/trans_presets.java:1426 build/trans_presets.java:1433
-#: build/trans_presets.java:1442 build/trans_presets.java:1450
-#: build/trans_presets.java:1457 build/trans_presets.java:1468
-#: build/trans_presets.java:1478 build/trans_presets.java:1488
-#: build/trans_presets.java:1508 build/trans_presets.java:1520
-#: build/trans_presets.java:1531 build/trans_presets.java:1548
-#: build/trans_presets.java:1555 build/trans_presets.java:1570
-#: build/trans_presets.java:1577 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1594
-#: build/trans_presets.java:1599 build/trans_presets.java:1605
-#: build/trans_presets.java:1611 build/trans_presets.java:1619
-#: build/trans_presets.java:1627 build/trans_presets.java:1635
-#: build/trans_presets.java:1642 build/trans_presets.java:1648
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1670 build/trans_presets.java:1677
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1712 build/trans_presets.java:1719
-#: build/trans_presets.java:1736 build/trans_presets.java:1744
-#: build/trans_presets.java:1759 build/trans_presets.java:1769
-#: build/trans_presets.java:1781 build/trans_presets.java:1788
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:1809 build/trans_presets.java:1817
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1841
-#: build/trans_presets.java:1846 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1864
-#: build/trans_presets.java:1872 build/trans_presets.java:1881
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1908 build/trans_presets.java:1914
-#: build/trans_presets.java:1922 build/trans_presets.java:1928
-#: build/trans_presets.java:1934 build/trans_presets.java:1940
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2013
-#: build/trans_presets.java:2022 build/trans_presets.java:2030
-#: build/trans_presets.java:2036 build/trans_presets.java:2042
-#: build/trans_presets.java:2048 build/trans_presets.java:2054
-#: build/trans_presets.java:2060 build/trans_presets.java:2066
-#: build/trans_presets.java:2072 build/trans_presets.java:2078
-#: build/trans_presets.java:2084 build/trans_presets.java:2090
-#: build/trans_presets.java:2096 build/trans_presets.java:2102
-#: build/trans_presets.java:2108 build/trans_presets.java:2114
-#: build/trans_presets.java:2120 build/trans_presets.java:2126
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2158
-#: build/trans_presets.java:2165 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2186
-#: build/trans_presets.java:2192 build/trans_presets.java:2198
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2218 build/trans_presets.java:2225
-#: build/trans_presets.java:2232 build/trans_presets.java:2239
-#: build/trans_presets.java:2247 build/trans_presets.java:2279
-#: build/trans_presets.java:2284 build/trans_presets.java:2289
-#: build/trans_presets.java:2294 build/trans_presets.java:2300
-#: build/trans_presets.java:2306 build/trans_presets.java:2312
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2354
-#: build/trans_presets.java:2451 build/trans_presets.java:2458
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2485 build/trans_presets.java:2492
-#: build/trans_presets.java:2498 build/trans_presets.java:2504
-#: build/trans_presets.java:2526 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2553 build/trans_presets.java:2559
-#: build/trans_presets.java:2565 build/trans_presets.java:2571
-#: build/trans_presets.java:2577 build/trans_presets.java:2583
-#: build/trans_presets.java:2590 build/trans_presets.java:2597
-#: build/trans_presets.java:2604 build/trans_presets.java:2610
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2661
-#: build/trans_presets.java:2667 build/trans_presets.java:2677
-#: build/trans_presets.java:2686 build/trans_presets.java:2701
-#: build/trans_presets.java:2707 build/trans_presets.java:2715
-#: build/trans_presets.java:2722 build/trans_presets.java:2742
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2783
-#: build/trans_presets.java:2790 build/trans_presets.java:2797
-#: build/trans_presets.java:2803 build/trans_presets.java:2809
-#: build/trans_presets.java:2817 build/trans_presets.java:2824
-#: build/trans_presets.java:2831 build/trans_presets.java:2838
-#: build/trans_presets.java:2844 build/trans_presets.java:2851
-#: build/trans_presets.java:2858 build/trans_presets.java:2867
-#: build/trans_presets.java:2873 build/trans_presets.java:2879
-#: build/trans_presets.java:2885 build/trans_presets.java:2891
-#: build/trans_presets.java:2900 build/trans_presets.java:2910
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2948
-#: build/trans_presets.java:2957 build/trans_presets.java:2963
-#: build/trans_presets.java:2969 build/trans_presets.java:2975
-#: build/trans_presets.java:2981 build/trans_presets.java:2987
-#: build/trans_presets.java:2993 build/trans_presets.java:3000
-#: build/trans_presets.java:3006 build/trans_presets.java:3011
-#: build/trans_presets.java:3018 build/trans_presets.java:3025
-#: build/trans_presets.java:3031 build/trans_presets.java:3040
-#: build/trans_presets.java:3048 build/trans_presets.java:3054
-#: build/trans_presets.java:3060 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3080
-#: build/trans_presets.java:3086 build/trans_presets.java:3092
-#: build/trans_presets.java:3098 build/trans_presets.java:3104
-#: build/trans_presets.java:3117 build/trans_presets.java:3131
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:67 build/trans_presets.java:103
+#: build/trans_presets.java:143 build/trans_presets.java:180
+#: build/trans_presets.java:200 build/trans_presets.java:218
+#: build/trans_presets.java:235 build/trans_presets.java:253
+#: build/trans_presets.java:273 build/trans_presets.java:306
+#: build/trans_presets.java:352 build/trans_presets.java:372
+#: build/trans_presets.java:387 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:503 build/trans_presets.java:523
+#: build/trans_presets.java:544 build/trans_presets.java:565
+#: build/trans_presets.java:586 build/trans_presets.java:607
+#: build/trans_presets.java:628 build/trans_presets.java:659
+#: build/trans_presets.java:680 build/trans_presets.java:693
+#: build/trans_presets.java:706 build/trans_presets.java:719
+#: build/trans_presets.java:732 build/trans_presets.java:745
+#: build/trans_presets.java:756 build/trans_presets.java:765
+#: build/trans_presets.java:812 build/trans_presets.java:833
+#: build/trans_presets.java:842 build/trans_presets.java:902
+#: build/trans_presets.java:1053 build/trans_presets.java:1061
+#: build/trans_presets.java:1069 build/trans_presets.java:1077
+#: build/trans_presets.java:1087 build/trans_presets.java:1095
+#: build/trans_presets.java:1100 build/trans_presets.java:1107
+#: build/trans_presets.java:1114 build/trans_presets.java:1119
+#: build/trans_presets.java:1127 build/trans_presets.java:1136
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1153 build/trans_presets.java:1159
+#: build/trans_presets.java:1165 build/trans_presets.java:1174
+#: build/trans_presets.java:1183 build/trans_presets.java:1190
+#: build/trans_presets.java:1198 build/trans_presets.java:1211
+#: build/trans_presets.java:1217 build/trans_presets.java:1226
+#: build/trans_presets.java:1232 build/trans_presets.java:1238
+#: build/trans_presets.java:1246 build/trans_presets.java:1302
+#: build/trans_presets.java:1349 build/trans_presets.java:1355
+#: build/trans_presets.java:1361 build/trans_presets.java:1367
+#: build/trans_presets.java:1373 build/trans_presets.java:1384
+#: build/trans_presets.java:1393 build/trans_presets.java:1408
+#: build/trans_presets.java:1415 build/trans_presets.java:1421
+#: build/trans_presets.java:1429 build/trans_presets.java:1436
+#: build/trans_presets.java:1445 build/trans_presets.java:1453
+#: build/trans_presets.java:1460 build/trans_presets.java:1471
+#: build/trans_presets.java:1481 build/trans_presets.java:1491
+#: build/trans_presets.java:1511 build/trans_presets.java:1523
+#: build/trans_presets.java:1534 build/trans_presets.java:1551
+#: build/trans_presets.java:1558 build/trans_presets.java:1574
+#: build/trans_presets.java:1581 build/trans_presets.java:1586
+#: build/trans_presets.java:1592 build/trans_presets.java:1598
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1646 build/trans_presets.java:1652
+#: build/trans_presets.java:1659 build/trans_presets.java:1666
+#: build/trans_presets.java:1674 build/trans_presets.java:1681
+#: build/trans_presets.java:1689 build/trans_presets.java:1696
+#: build/trans_presets.java:1702 build/trans_presets.java:1709
+#: build/trans_presets.java:1716 build/trans_presets.java:1723
+#: build/trans_presets.java:1740 build/trans_presets.java:1748
+#: build/trans_presets.java:1763 build/trans_presets.java:1773
+#: build/trans_presets.java:1785 build/trans_presets.java:1792
+#: build/trans_presets.java:1798 build/trans_presets.java:1808
+#: build/trans_presets.java:1813 build/trans_presets.java:1821
+#: build/trans_presets.java:1828 build/trans_presets.java:1834
+#: build/trans_presets.java:1840 build/trans_presets.java:1845
+#: build/trans_presets.java:1850 build/trans_presets.java:1855
+#: build/trans_presets.java:1862 build/trans_presets.java:1868
+#: build/trans_presets.java:1873 build/trans_presets.java:1882
+#: build/trans_presets.java:1891 build/trans_presets.java:1900
+#: build/trans_presets.java:1909 build/trans_presets.java:1918
+#: build/trans_presets.java:1924 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 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:2023 build/trans_presets.java:2032
+#: build/trans_presets.java:2040 build/trans_presets.java:2046
+#: build/trans_presets.java:2052 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 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:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2150
+#: build/trans_presets.java:2156 build/trans_presets.java:2162
+#: build/trans_presets.java:2169 build/trans_presets.java:2176
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2197 build/trans_presets.java:2203
+#: build/trans_presets.java:2209 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2229
+#: build/trans_presets.java:2236 build/trans_presets.java:2243
+#: build/trans_presets.java:2250 build/trans_presets.java:2258
+#: build/trans_presets.java:2290 build/trans_presets.java:2295
+#: build/trans_presets.java:2300 build/trans_presets.java:2305
+#: build/trans_presets.java:2311 build/trans_presets.java:2317
+#: build/trans_presets.java:2323 build/trans_presets.java:2331
+#: build/trans_presets.java:2337 build/trans_presets.java:2343
+#: build/trans_presets.java:2349 build/trans_presets.java:2355
+#: build/trans_presets.java:2365 build/trans_presets.java:2462
+#: build/trans_presets.java:2469 build/trans_presets.java:2483
+#: build/trans_presets.java:2489 build/trans_presets.java:2496
+#: build/trans_presets.java:2503 build/trans_presets.java:2509
+#: build/trans_presets.java:2515 build/trans_presets.java:2537
+#: build/trans_presets.java:2544 build/trans_presets.java:2551
+#: build/trans_presets.java:2557 build/trans_presets.java:2564
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2594 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2615
+#: build/trans_presets.java:2621 build/trans_presets.java:2627
+#: build/trans_presets.java:2633 build/trans_presets.java:2639
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2672 build/trans_presets.java:2678
+#: build/trans_presets.java:2688 build/trans_presets.java:2697
+#: build/trans_presets.java:2712 build/trans_presets.java:2718
+#: build/trans_presets.java:2726 build/trans_presets.java:2733
+#: build/trans_presets.java:2753 build/trans_presets.java:2764
+#: build/trans_presets.java:2770 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2788
+#: build/trans_presets.java:2795 build/trans_presets.java:2802
+#: build/trans_presets.java:2809 build/trans_presets.java:2815
+#: build/trans_presets.java:2821 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2912
+#: build/trans_presets.java:2922 build/trans_presets.java:2931
+#: build/trans_presets.java:2937 build/trans_presets.java:2943
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 build/trans_presets.java:2981
+#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:2999 build/trans_presets.java:3005
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3023 build/trans_presets.java:3030
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3066 build/trans_presets.java:3072
+#: build/trans_presets.java:3079 build/trans_presets.java:3085
+#: build/trans_presets.java:3092 build/trans_presets.java:3098
+#: build/trans_presets.java:3104 build/trans_presets.java:3110
+#: build/trans_presets.java:3116 build/trans_presets.java:3129
+#: build/trans_presets.java:3143 build/trans_presets.java:3157
 msgid "Name"
 msgstr "名前"
@@ -6679,9 +6835,63 @@
 #, java-format
 msgid "Version {0} created on {1} by {2}"
-msgstr ""
+msgstr "バージョン {0} 作成日: {1} 作成者: {2}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20
 msgid "Version"
 msgstr "バージョン"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
+#, fuzzy
+msgid "Changeset id:"
+msgstr "変更セット情報"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
+#, fuzzy
+msgid "Created at:"
+msgstr "エリアの作成"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
+#, fuzzy
+msgid "Changeset comment:"
+msgstr "変更セット情報"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
+msgid "No open changeset"
+msgstr "開かれている変更セットなし"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48
+#, fuzzy
+msgid "<html>Please select the changesets you want to close</html>"
+msgstr "適用したいプロパティの変更を選択してください。"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
+#, fuzzy
+msgid "Open changesets"
+msgstr "開かれている変更セットなし"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101
+#, fuzzy
+msgid "Close changesets"
+msgstr "変更セットを閉じています"
+
+#. putValue(SMALL_ICON, ImageProvider.get("cancel"));
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
+#, fuzzy
+msgid "Close the selected open changesets"
+msgstr "現在の変更セットを閉じる ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126
+#, fuzzy
+msgid "Cancel closeing of changesets"
+msgstr "変更セットを閉じています"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37
+msgid "Closing changeset"
+msgstr "変更セットを閉じています"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77
+#, fuzzy, java-format
+msgid "Closing changeset {0}"
+msgstr "変更セット {0} を閉じています..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
@@ -6710,12 +6920,12 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50
-#, java-format
-msgid "Layer ''{0}'' has no modifications to be uploaded"
+#, fuzzy, java-format
+msgid "Layer ''{0}'' has no modifications to be uploaded."
 msgstr "レイヤー ''{0}'' にはアップロードする修正はありません"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:61
-#, java-format
-msgid ""
-"Layer ''{0}'' has modifications which should be saved to its assoicated file "
+#, fuzzy, java-format
+msgid ""
+"Layer ''{0}'' has modifications which should be saved to its associated file "
 "''{1}''."
 msgstr ""
@@ -6724,6 +6934,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63
-#, java-format
-msgid "Layer ''{0}'' has no modifications to be saved"
+#, fuzzy, java-format
+msgid "Layer ''{0}'' has no modifications to be saved."
 msgstr "レイヤー ''{0}'' には保存する修正はありません"
 
@@ -6758,17 +6968,17 @@
 msgstr "レイヤーを ''{0}'' に保存中..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113
 msgid "Unsaved changes - Save/Upload before exiting?"
 msgstr "未保存の変更 - 終了前に保存/アップロード？"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr "未保存の変更 - 削除前に保存/アップロード？"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139
 msgid "Uploading and saving modified layers ..."
 msgstr "修正されたレイヤーをアップロード、保存中 ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194
 #, java-format
 msgid ""
@@ -6782,10 +6992,9 @@
 "てください。<br>競合のあるレイヤー:</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205
 msgid "Unsaved data and conflicts"
-msgstr "競合を解決"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
+msgstr "保存されていないデータと競合"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212
 #, java-format
 msgid ""
@@ -6801,9 +7010,9 @@
 "ヤー:</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223
 msgid "Unsaved data and missing associated file"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
+msgstr "保存されていないデータと不明な関連ファイル"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230
 #, java-format
 msgid ""
@@ -6820,50 +7029,52 @@
 "い。<br>書き込み不可のファイルのあるレイヤー:</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243
 msgid "Unsaved data non-writable files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
 msgid "Close this dialog and resume editing in JOSM"
 msgstr "ダイアログを閉じてJOSMでの編集に戻る"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr "保存せずにJOSM を終了"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322
 msgid "Discard and Delete"
 msgstr "破棄して削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr "保存せずにレイヤーを削除。未保存の変更は失われます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr "保存せずにJOSM を終了。未保存の変更はアップロード、保存されます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354
 msgid "Save and Delete"
 msgstr "保存と削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
 msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
 msgstr "削除前に保存/アップロード。未保存の変更は失われます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402
 #, java-format
 msgid "Preparing layer ''{0}'' for upload ..."
 msgstr "レイヤー ''{0}'' のアップロード準備中 ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
 "cancelled or has been failed.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492
+"<html>修正されたひとつのレイヤーのアップロード、保存操作は<br>キャンセルされ"
+"たか失敗しました。</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491
 msgid "Incomplete upload and/or save"
-msgstr ""
+msgstr "アップロード、保存未完了"
 
 #. item "Streets/Motorway" text "Name"
@@ -6901,21 +7112,21 @@
 #. item "Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:200
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:278
-#: build/trans_presets.java:311 build/trans_presets.java:357
-#: build/trans_presets.java:372 build/trans_presets.java:387
-#: build/trans_presets.java:409 build/trans_presets.java:429
-#: build/trans_presets.java:450 build/trans_presets.java:470
-#: build/trans_presets.java:489 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:549
-#: build/trans_presets.java:570 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:633
-#: build/trans_presets.java:664 build/trans_presets.java:1060
-#: build/trans_presets.java:1068 build/trans_presets.java:1076
-#: build/trans_presets.java:1086 build/trans_presets.java:1305
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:242
+#: build/trans_presets.java:260 build/trans_presets.java:279
+#: build/trans_presets.java:312 build/trans_presets.java:358
+#: build/trans_presets.java:373 build/trans_presets.java:388
+#: build/trans_presets.java:410 build/trans_presets.java:430
+#: build/trans_presets.java:451 build/trans_presets.java:471
+#: build/trans_presets.java:490 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:665 build/trans_presets.java:1062
+#: build/trans_presets.java:1070 build/trans_presets.java:1078
+#: build/trans_presets.java:1088 build/trans_presets.java:1308
 msgid "Layer"
 msgstr "レイヤー"
@@ -6934,73 +7145,32 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:200
 msgid "Upload"
 msgstr "アップロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-msgid "Use a new changeset and close it"
-msgstr "新しい変更セットを使用して閉じる"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
-msgid ""
-"Select to upload the data using a new changeset and to close the changeset "
-"after the upload"
-msgstr ""
-"選択の上、新しい変更セットを使用してデータをアップロードし、アップロード後に"
-"変更セットを閉じる"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
-msgid "Use a new changeset and leave it open"
-msgstr "新しい変更セットを使用して開いたままにする"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
-msgid ""
-"Select to upload the data using a new changeset and to leave the changeset "
-"open after the upload"
-msgstr ""
-"選択の上、新しい変更セットを使用してデータをアップロードし、アップロード後に"
-"変更セットを閉じる"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
-msgid "Upload to a new or to an existing changeset?"
-msgstr "新規または既存の変更セットにアップロードしますか？"
-
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
-msgid "upload all changes in one request"
-msgstr "一度のリクエストで全ての変更をアップロードしました。"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
-msgid ""
-"Enable to upload all changes in one request, disable to use one request per "
-"changed primitive"
-msgstr ""
-"一度のリクエストで全ての変更をアップロードするには有効にする。変更したプリミ"
-"ティブごとにリクエストするには、無効にする。"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "アップロードする変更の概略コメントを入力してください。"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:216
 msgid "Settings"
 msgstr "設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908
 msgid "Tags of new changeset"
 msgstr "新しい変更セットのタグ"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:221
 msgid "Objects to add:"
 msgstr "追加するオブジェクト:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:227
 msgid "Objects to modify:"
 msgstr "修正するオブジェクト:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:233
 msgid "Objects to delete:"
 msgstr "削除するオブジェクト:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
 #, java-format
 msgid "{0} object to add:"
@@ -7008,5 +7178,5 @@
 msgstr[0] "{0} 個のオブジェクトを加えてください:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:277
 #, java-format
 msgid "{0} object to modifiy:"
@@ -7014,5 +7184,5 @@
 msgstr[0] "{0}個のオブジェクトを変更:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:286
 #, java-format
 msgid "{0} object to delete:"
@@ -7020,59 +7190,95 @@
 msgstr[0] "{0} 個のオブジェクトを削除:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422
-#, java-format
-msgid "Use the existing changeset {0} and close it after upload"
-msgstr "既存の変更セット {0} を使用しアップロード後に閉じる"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:423
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to close the changeset "
-"after this upload"
-msgstr ""
-"選択の上、既存の変更セット {0} にアップロードし、アップロード後に変更セットを"
-"閉じる"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426
-#, java-format
-msgid "Use the existing changeset {0} and leave it open"
-msgstr "既存の変更セット {0} を使用し開いたままにしておく"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:427
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to leave the changeset "
-"open for further uploads"
-msgstr ""
-"選択の上、既存の変更セット {0} へアップロードし、さらにアップロードするために"
-"変更セットを開いておく"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:470
+msgid "Upload Changes"
+msgstr "変更のアップロード"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472
+msgid "Upload the changed primitives"
+msgstr "変更されたプリミティブをアップロード"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
+msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+msgstr "このアップロード変更セットにコメントを入力してください（3文字以上）"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:479
+msgid "Illegal upload comment"
+msgstr "不正なアップロードコメント"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
+msgid "Cancel the upload and resume editing"
+msgstr "アップロードをキャンセルして編集に戻る"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606
+#, fuzzy
+msgid "Upload all changes in one request"
+msgstr "一度のリクエストで全ての変更をアップロードしました。"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607
+msgid ""
+"Enable to upload all changes in one request, disable to use one request per "
+"changed primitive"
+msgstr ""
+"一度のリクエストで全ての変更をアップロードするには有効にする。変更したプリミ"
+"ティブごとにリクエストするには、無効にする。"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:617
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "アップロードする変更の概略コメントを入力してください。"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672
+#, fuzzy
+msgid "Open a new changeset"
+msgstr "新しい変更セットのタグ"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
+#, fuzzy
+msgid "Open a new changeset and use it in the next upload"
+msgstr "新しい変更セットを使用して開いたままにする"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
+#, fuzzy
+msgid "Use an open changeset"
+msgstr "開かれている変更セットなし"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
+#, fuzzy
+msgid "Upload data to an already opened changeset"
+msgstr "新規または既存の変更セットにアップロードしますか？"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
+#, fuzzy
+msgid "Close changeset after upload"
+msgstr "アップロードする変更はありません。"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
+#, fuzzy
+msgid "Select to close the changeset after the next upload"
+msgstr ""
+"選択の上、新しい変更セットを使用してデータをアップロードし、アップロード後に"
+"変更セットを閉じる"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922
 #, java-format
 msgid "Tags of changeset {0}"
 msgstr "変更セット {0} のタグ"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584
-msgid "Upload Changes"
-msgstr "変更のアップロード"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
 #, fuzzy
-msgid "Upload the changed primitives"
-msgstr "この変更をアップロードしますか?"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592
+msgid "Load the list of your open changesets from the server"
+msgstr "履歴をサーバからリロード"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
 #, fuzzy
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "場所の名称を入力してください。"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:593
-msgid "Illegal upload comment"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
-#, fuzzy
-msgid "Cancel the upload and resume editing"
-msgstr "更新をキャンセルしてダイアログを閉じる"
+msgid "Close the currently selected open changeset"
+msgstr "現在選択されているタグを削除"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
+#, fuzzy, java-format
+msgid "changeset id > 0 expected. Got {1}"
+msgstr "ID > 0 である必要があります。 {0} を受け取りました"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63
@@ -7149,5 +7355,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
@@ -7185,5 +7391,5 @@
 msgstr "入力した時刻は、解釈できません"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
@@ -7191,30 +7397,30 @@
 msgstr "GPSポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
 msgid "Customize line drawing"
 msgstr "線描画のカスタマイズ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
 msgid "Use global settings."
 msgstr "全体設定を使用"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Draw lines between points for this layer."
 msgstr "このレイヤーの点の間に線を引く。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Do not draw lines between points for this layer."
 msgstr "このレイヤーの点の間に線を引かない。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 msgid "Select line drawing options"
 msgstr "線描画オプションの選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7222,5 +7428,5 @@
 msgstr "配色のカスタマイズ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7229,5 +7435,5 @@
 msgstr "既定"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7236,37 +7442,74 @@
 msgstr "色選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
 msgid "Markers From Named Points"
 msgstr "名前のついた地点からのマーカー"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "{0} からの名前付きトラックポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
 msgid "Import Audio"
 msgstr "音声のインポート"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
 msgid "Wave Audio files (*.wav)"
 msgstr "WAV音声ファイル(*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "{0} からの音声マーカー"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
 msgid "Import images"
 msgstr "イメージのインポート"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#, java-format
+msgid "Name: {0}"
+msgstr "名前: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#, java-format
+msgid "Description: {0}"
+msgstr "記述: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#, fuzzy, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
 msgstr[0] "{0} トラック "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
+#: build/trans_presets.java:3160
+msgid "Description"
+msgstr "説明"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#, fuzzy
+msgid "Timespan"
+msgstr "Timespan: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#, fuzzy
+msgid "Length"
+msgstr "長さ: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
+msgid "URL"
+msgstr "URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+msgid "Length: "
+msgstr "長さ: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
 #, java-format
 msgid "{0} route, "
@@ -7274,5 +7517,5 @@
 msgstr[0] "{0}ルート, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 #, java-format
 msgid "{0} waypoint"
@@ -7280,29 +7523,10 @@
 msgstr[0] "{0} ウェイポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
-#, java-format
-msgid "Name: {0}"
-msgstr "名前: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
-#, java-format
-msgid "Description: {0}"
-msgstr "記述: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
-msgid "Timespan: "
-msgstr "Timespan: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
-msgid "Length: "
-msgstr "長さ: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "データレイヤーへ変換"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7313,10 +7537,10 @@
 "てください："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -7327,29 +7551,29 @@
 msgstr "{0}からのコンバート"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
 msgid "Download from OSM along this track"
 msgstr "このトラックに沿ってOSMからダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
 msgid "Download everything within:"
 msgstr "次の範囲内の全てをダウンロード:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
 #, java-format
 msgid "{0} meters"
 msgstr "{0} メータ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 msgid "Maximum area per request:"
 msgstr "リクエストあたりの最大面積："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} 平方キロメートル"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
 #, java-format
 msgid ""
@@ -7360,13 +7584,13 @@
 "すか？</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
 msgid "Download data"
 msgstr "データのダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
 msgid "No GPX track available in layer to associate audio with."
 msgstr "音声に関連づいたGPXトラックがこのレイヤーにありません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7376,5 +7600,5 @@
 "に変更又は移動されました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7427,31 +7651,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
-#, fuzzy
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
 "<br>If you want to upload traces, look here:</html>"
 msgstr ""
-"<html>マップデータとして加工されていないGPSデータをアップロードすることは、有"
-"害だと考えられています。<br>もしトレースをアップロードしたいならば、ここを見"
-"てください："
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "track"
 msgid_plural "tracks"
@@ -7581,4 +7801,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
@@ -7817,13 +8038,18 @@
 msgstr "大きなGPS点を表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+msgid "Draw a circle form HDOP value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "速度（赤＝遅い、緑＝速い）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "位置精度低下率(赤=高い、緑=低い, 可能な場合）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "単色（namedレイヤーからカスタマイズ可能）"
@@ -7831,6 +8057,6 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1374
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:1377
 msgid "Car"
 msgstr "自動車"
@@ -7851,14 +8077,14 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:324 build/trans_presets.java:650
-#: build/trans_presets.java:857 build/trans_presets.java:876
-#: build/trans_presets.java:890 build/trans_presets.java:912
-#: build/trans_presets.java:949 build/trans_presets.java:962
-#: build/trans_presets.java:974 build/trans_presets.java:986
-#: build/trans_presets.java:998 build/trans_presets.java:1010
-#: build/trans_presets.java:1020 build/trans_presets.java:1029
-#: build/trans_presets.java:1038 build/trans_presets.java:1437
-#: build/trans_presets.java:1510
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:325 build/trans_presets.java:651
+#: build/trans_presets.java:858 build/trans_presets.java:877
+#: build/trans_presets.java:891 build/trans_presets.java:913
+#: build/trans_presets.java:950 build/trans_presets.java:963
+#: build/trans_presets.java:975 build/trans_presets.java:987
+#: build/trans_presets.java:999 build/trans_presets.java:1011
+#: build/trans_presets.java:1021 build/trans_presets.java:1030
+#: build/trans_presets.java:1039 build/trans_presets.java:1440
+#: build/trans_presets.java:1513
 msgid "Bicycle"
 msgstr "自転車"
@@ -7891,62 +8117,62 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:325 build/trans_presets.java:649
-#: build/trans_presets.java:856 build/trans_presets.java:875
-#: build/trans_presets.java:889 build/trans_presets.java:911
-#: build/trans_presets.java:948 build/trans_presets.java:961
-#: build/trans_presets.java:973 build/trans_presets.java:985
-#: build/trans_presets.java:997 build/trans_presets.java:1009
-#: build/trans_presets.java:1019 build/trans_presets.java:1028
-#: build/trans_presets.java:1037
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:326 build/trans_presets.java:650
+#: build/trans_presets.java:857 build/trans_presets.java:876
+#: build/trans_presets.java:890 build/trans_presets.java:912
+#: build/trans_presets.java:949 build/trans_presets.java:962
+#: build/trans_presets.java:974 build/trans_presets.java:986
+#: build/trans_presets.java:998 build/trans_presets.java:1010
+#: build/trans_presets.java:1020 build/trans_presets.java:1029
+#: build/trans_presets.java:1038
 msgid "Foot"
 msgstr "徒歩"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "進行方向を矢印表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "高速表示（若干汚い）"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "必要なときだけ方向ヒントを表示(例：一方通行の時）"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Only on the head of a way."
 msgstr "ウェイの開始のみ"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "セグメントの順序番号を描画"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "ダウンロードデータの境界を描画"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "選択モードで仮想ノードを描画"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "不活性のレイヤーを他色で描画"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "地図画像をスムース処理（アンチアライアス）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:82
 msgid "Draw lines between raw GPS points"
 msgstr "GPS生データのポイント間にラインを引いて下さい"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -7954,34 +8180,34 @@
 msgstr "ローカルファイルに線を描くの最大長(m)。'-1'にすると全てに線を描く。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
 msgid "Maximum length for local files (meters)"
 msgstr "ローカルファイルに対する最大長 (メートル)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
 msgstr "線を描く最大長(m)。'-1'にすると全ての線を描く。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length (meters)"
 msgstr "最大長（ｍ）"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "インポートしたデータが線の情報を有していないときに、強制的に線を引く。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:129
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "GPSの点をつないで、方向の矢印付きの線を引く。"
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:135
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr "数式演算ではなく、テーブル検索によって矢印の方向を決めて描画する。"
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:141
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -7989,13 +8215,13 @@
 msgstr "少なくともこの距離を超える移動がなかった場合には、矢印を描画しない。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:144
 msgid "Minimum distance (pixels)"
 msgstr "最小距離（ピクセル）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Draw larger dots for the GPS points."
 msgstr "GPSポイントに大きなドットを表示する"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -8005,9 +8231,9 @@
 "可能です。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Colors points and track segments by velocity."
 msgstr "速度により点とトラックセグメントの色を決める。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -8017,46 +8243,46 @@
 "う。使用しているGPS機器がこの情報を記録している必要があります。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "平均速度の違いによって、配色の仕方を調整するようにする。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid "Track and Point Coloring"
 msgstr "トラックと点の配色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202
 msgid "GPS Points"
 msgstr "GPSポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "Draw direction hints for way segments."
 msgstr "ウェイのセグメントに方向のヒントを描く。"
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:237
 msgid "Draw the order numbers of all segments within their way."
 msgstr "ウェイ内の全セグメントで順序番号を表示する。"
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "見た目をスムースにするため、マップ表示にアンチエイリアス処理をかける。"
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "サーバから読み出したデータの境界を描く。"
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "ウェイの変更が容易になるように、選択モードで仮想ノードを描く。"
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257
 msgid "Draw the inactive data layers in a different color."
 msgstr "異なった色で、不活性になっているデータレイヤーを描く。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "OSM Data"
 msgstr "OSMデータ"
@@ -8130,51 +8356,52 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:67
 msgid "Map Paint Styles"
-msgstr ""
+msgstr "地図塗りつぶしスタイル"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:62
 msgid "Used style"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+msgstr "使用スタイル"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Configure available plugins."
 msgstr "利用可能なプラグインを設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50
+#. buttons at the bottom
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
 msgid "Download List"
 msgstr "リストをダウンロードする"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:100
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 msgid "Update"
 msgstr "アップデート"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Configure Sites..."
 msgstr "サイトの設定..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:125
 msgid "Add JOSM Plugin description URL."
 msgstr "JOSM プラグイン情報のURLの追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:126
 msgid "Enter URL"
 msgstr "URL入力"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:162
 msgid "Please select an entry."
 msgstr "エントリーを選択してください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:147
 msgid "Edit JOSM Plugin description URL."
 msgstr "JOSM プラグイン情報のURLを編集"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:148
 msgid "JOSM Plugin description URL"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:141
+msgstr "JOSMプラグイン説明URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:175
 msgid "Configure Plugin Sites"
 msgstr "プラグインサイトを設定"
@@ -8285,5 +8512,5 @@
 #, java-format
 msgid "Short Description: {0}"
-msgstr ""
+msgstr "簡単な説明: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:61
@@ -8326,5 +8553,5 @@
 #, java-format
 msgid "The XML source (URL or filename) for {0} definition files."
-msgstr ""
+msgstr "{0} 定義ファイル用XML ソース(URL またはファイル名)。"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:274
@@ -8510,6 +8737,6 @@
 msgstr "<multiple>"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:369
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341
 #, java-format
 msgid "Remove old keys from up to {0} object"
@@ -8517,9 +8744,9 @@
 msgstr[0] "{0} オブジェクトまで古いキーを削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135
 msgid "Add a new tag"
 msgstr "新しいタグを追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160
 msgid "Delete the selection in the tag table"
 msgstr "タグテーブルの選択を削除"
@@ -8554,7 +8781,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:68
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:75
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -8597,4 +8824,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24
+#, fuzzy, java-format
+msgid "Preset group ''{0}'' of group ''{1}''"
+msgstr "グループ \"{1}\"のプリセット\"{0}\"を使います"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
 #, java-format
 msgid "Preset group ''{0}''"
@@ -8615,4 +8847,11 @@
 msgstr "{1}にポイント{0}をダウンロード中..."
 
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, fuzzy, java-format
+msgid "parameter ''{0}'' > 0 expected. Got {1}"
+msgstr ""
+"パラメータ ''{0}'' > 0 である必要がありますが、 ''{1}'' を受け取りました"
+
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8721,5 +8960,5 @@
 msgstr "ファイル \"{0}\" の解析に失敗"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "パースエラー：GPXファイルのドキュメント構造が不適切です"
@@ -8764,5 +9003,5 @@
 #, java-format
 msgid "Server replied with response code 404 for id {0}. Skipping."
-msgstr ""
+msgstr "ID {0} に対してサーバが404コードを返しました。スキップします。"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:403
@@ -8786,4 +9025,6 @@
 "for each primitive"
 msgstr ""
+"サーバがレスポンスコード404を返しました、各プリミティブの個別リクエストで最試"
+"行中"
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21
@@ -8843,90 +9084,93 @@
 msgstr "プロトコルバージョン {1}を使った確立された{0}で通信する。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
-msgstr "予期しない形式のID がサーバから返されました。 ''{0}'' を受け取りました"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261
+msgstr "おかしな形式のID がサーバから返されました。入力値: ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
 "unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
 msgstr ""
-"変更されたプリミティブ ''{0}'' の新しいバージョンに予期しない形式、 ''{1}'' "
-"を受け取りました"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290
+"変更されたプリミティブ ''{0}'' の新しいバージョンにおかしな形式。入力値: "
+"''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315
 msgid "Creating changeset..."
 msgstr "変更セットを作成しています..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
 #, java-format
 msgid "Successfully opened changeset {0}"
 msgstr "変更セット {0} を開きました"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#, fuzzy, java-format
+msgid "id of changeset > 0 required. Got {0}"
+msgstr "ID パラメータ ''{0}'' > 0 必須です。 {1} を受け取りました"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
 msgstr "変更セットを更新中..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
-#, java-format
-msgid "Changeset {0} is unchanged. Skipping update."
-msgstr "変更セット {0} は変更されていません。更新をスキップします。"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
 #, java-format
 msgid "Updating changeset {0}..."
 msgstr "変更セット {0} を更新中..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
-msgid ""
-"Failed to update changeset. Either there is no current changeset or the id "
-"of the current changeset is 0"
-msgstr ""
-"変更セットの更新に失敗しました。現在の変更セットが無いか、または現在の変更"
-"セットのIDが 0 です。"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
 msgid "Closing changeset..."
 msgstr "変更した設定を閉じています..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
-#, java-format
-msgid "Closing changeset {0}..."
-msgstr "変更セット {0} を閉じています..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
-#, java-format
-msgid "Leaving changeset {0} open..."
-msgstr "変更セット {0} を開いたままにします.."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
 msgid "No changeset present for diff upload"
 msgstr "diffアップロードのための変更セットを用意できませんでした。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414
 msgid "Preparing..."
 msgstr "準備中..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419
 msgid "Uploading..."
 msgstr "アップロード中..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438
 msgid "Waiting 10 seconds ... "
 msgstr "10秒待機中 ... "
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
+msgstr "{2} 秒で {1} 分の {0} 回の再試行を開始 ..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449
 msgid "OK - trying again."
 msgstr "OK - やり直しています。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:485
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517
 #, java-format
 msgid "Starting retry {0} of {1}."
+msgstr "{1} 分の {0} 回の再試行を開始。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
+msgid "current changeset is null. Can't upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
+#, java-format
+msgid "id of current changeset > required. Current id is {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, fuzzy, java-format
+msgid "Changeset id > 0 expected. Got {0}"
+msgstr "ID > 0 である必要があります。 {0} を受け取りました"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
+#, java-format
+msgid "Open changeset expected. Got closed changeset with id {0}"
 msgstr ""
 
@@ -8945,5 +9189,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:17
 msgid "OSM Server Files bzip2 compressed"
-msgstr ""
+msgstr "OSMサーバファイルはbzip2 圧縮されました"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:26
@@ -8952,50 +9196,110 @@
 msgstr "不正なbz2 ファイル。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
+#, fuzzy, java-format
+msgid "missing mandatory attribute ''{0}''"
+msgstr "必要な属性 ''{0}'' がありません"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:128
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:134
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
+#, fuzzy, java-format
+msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgstr "属性 ''{0}'' に不正な長い値。入力値: ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
+#, fuzzy, java-format
+msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgstr "属性 ''{0}'' に不正な長い値。入力値: ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
+#, fuzzy, java-format
+msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgstr "属性 ''{0}'' に不正な長い値。入力値: ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#, java-format
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
+msgstr "XML 要素 {1} に必要な属性 ''{0}'' がありません"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''"
+msgstr "必要な属性 ''{0}'' がありません"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#, java-format
+msgid "Unsupported version: {0}"
+msgstr "サポートされないバージョン: {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:176
+#, fuzzy, java-format
+msgid "Undefined element ''{0}'' found in input stream. Aborting."
+msgstr ""
+"警告: 未定義の要素 ''{0}'' が入力ストリームに見つかりました。スキップします。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#, java-format
+msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgstr "属性 ''uid'' に不正な値。入力値: ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
+#, fuzzy
+msgid "Parsing list of changesets..."
+msgstr "変更した設定を閉じています..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
 msgid "Incorrect password or username."
 msgstr "正しくないパスワードかユーザ名です。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:168
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Warning: The password is transferred unencrypted."
 msgstr "警告:パスワードは暗号化されずに送信されます。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Save user and password (unencrypted)"
 msgstr "ユーザーとパスワードを保存します(暗号化されません)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
 msgid "Enter Password"
 msgstr "パスワードを入力して下さい"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 msgid "Login"
 msgstr "ログイン"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:242
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
 msgid "The base URL for the OSM server (REST API)"
 msgstr "OSMサーバのベースURL（REST API)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
 msgid "Login name (e-mail) to the OSM account."
 msgstr "OSM アカウントへのログイン名(e-mail)。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr "OSMのログインパスワード。空白にすればパスワードを格納しません。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
 msgid "Base Server URL"
 msgstr "サーバのベースURL"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
 msgid "OSM username (e-mail)"
 msgstr "OSM ユーザ名 (e-mail)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
 msgid "OSM password"
 msgstr "OSMパスワード"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -9007,5 +9311,5 @@
 "使用しないでください。</b></html>"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:51
+#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #, java-format
 msgid "(at line {0}, column {1})"
@@ -9044,5 +9348,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:16
 msgid "OSM Server Files gzip compressed"
-msgstr ""
+msgstr "OSMサーバファイルがgzip 圧縮されました"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:68
@@ -9098,20 +9402,5 @@
 msgstr "パース中にエラーが発生しています"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124
-#, fuzzy, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr "必須の属性 ''{0}'' がありません"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
-#, fuzzy, java-format
-msgid "Missing mandatory attribute ''{0}''"
-msgstr "必須の属性 ''{0}'' がありません"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
-#, fuzzy, java-format
-msgid "Unsupported version: {0}"
-msgstr "不明なバージョン: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:155
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -9120,76 +9409,66 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
 msgid "found XML element <nd> element not as direct child of element <way>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
-msgstr "必須の属性 ''{0}'' がありません"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
 msgstr ""
-"リレーション {0} のメンバーの属性 \"ref\" に不正な値、 ''{1}'' を受け取りまし"
-"た"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
 msgid "Found XML element <member> not as direct child of element <relation>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}"
-msgstr "リレーション {0}のメンバーに属性\"ref\"がかけています。"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217
-#, fuzzy, java-format
+msgstr "リレーション {0} のメンバーに属性 ''ref'' がありません"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
-msgstr ""
-"リレーション {0} のメンバーの属性 \"ref\" に不正な値、 ''{1}'' を受け取りまし"
-"た"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
-#, fuzzy, java-format
+msgstr "リレーション {0} のメンバーの属性 ''ref'' に不正な値。入力値: {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}"
-msgstr "リレーション {1} のメンバー {0} に属性 \"type\" がありません"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
-#, fuzzy, java-format
+msgstr "リレーション {1} のメンバー {0} に属性 ''type'' がありません"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#, java-format
 msgid ""
 "Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}."
 msgstr ""
-"リレーション {0} のメンバーの属性 \"ref\" に不正な値、 ''{1}'' を受け取りまし"
-"た"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
+"リレーション {1} のメンバー {0} の属性 ''type'' に不正な値。入力値: {2}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
 msgid "Incomplete <member> specification with ref=0"
 msgstr "ref=0の不完全な<member>指定です。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
-#, java-format
-msgid "Warning: Undefined element ''{0}'' found in input stream. Skipping."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
 #, fuzzy, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
-msgstr "int 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+msgid "Undefined element ''{0}'' found in input stream. Skipping."
+msgstr ""
+"警告: 未定義の要素 ''{0}'' が入力ストリームに見つかりました。スキップします。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
 msgid "Illegal object with id=0"
 msgstr "id=0の禁じられたオブジェクトです"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#, java-format
 msgid ""
 "Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
-msgstr ""
-"ID {0} のOSM プリミティブの属性 \"version\"に不正な値 、 {1} を受け取りました"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:303
+msgstr "ID {0} のOSM プリミティブの ''version'' 属性に不正な値。入力値: {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
 #, java-format
 msgid ""
@@ -9198,5 +9477,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
 #, java-format
 msgid ""
@@ -9205,5 +9484,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
@@ -9213,25 +9492,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:316
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#, java-format
 msgid "Unknown or unsupported API version. Got {0}"
-msgstr "不明なバージョン: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
-#, fuzzy, java-format
+msgstr "不明なまたはサポートされない APIバージョン。入力値: {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#, java-format
 msgid "Missing attribute ''version'' on OSM primitive with id {0}"
-msgstr "id {0} のOSM プリミティブに属性 \"version\" がありません"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
-#, fuzzy, java-format
+msgstr "ID {0} のOSM プリミティブ「の属性 ''version'' がありません"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#, java-format
 msgid "Missing required attribute ''{0}''."
-msgstr "必要な属性\"{0}\"がありません"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#, fuzzy, java-format
+msgstr "必要な属性 ''{0}'' がありません。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
-msgstr "int 型の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
+msgstr "属性 ''{0}'' に不正な長い値。入力値: ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
 #, java-format
 msgid ""
@@ -9239,5 +9518,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
 #, java-format
 msgid ""
@@ -9246,30 +9525,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
+#, java-format
 msgid ""
 "Unknown relation member type ''{0}'' in relation with external id ''{1}''"
-msgstr "不明なリレーションメンバーのタイプ {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
-#, fuzzy, java-format
+msgstr ""
+"外部ID ''{1}'' のリレーションに不明なリレーションメンバータイプ ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#, java-format
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
 "id ''{1}''"
-msgstr "id ''{0}'' のプリミティブと id ''{1}'' のプリミティブを比較できません"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+msgstr ""
+"外部ID ''{0}'' のリレーションが外部ID ''{1}'' の存在しないプリミティブを参照"
+"しています"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
 msgid "Prepare OSM data..."
 msgstr "OSMデータを準備します…"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 msgid "Parsing OSM data..."
-msgstr "OSM 履歴データ解析中 ..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487
-#, fuzzy
+msgstr "OSMデータ解析中..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
 msgid "Preparing data set..."
-msgstr "データを準備中..."
+msgstr "データセット準備中..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
@@ -9291,4 +9571,24 @@
 msgstr "参照リレーションをダウンロード中"
 
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51
+#, fuzzy
+msgid "Reading changesets..."
+msgstr "変更セットを作成しています..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
+#, fuzzy
+msgid "Downloading changesets ..."
+msgstr "変更した設定を閉じています..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85
+#, fuzzy, java-format
+msgid "Reading changeset {0} ..."
+msgstr "変更セット {0} を開いたままにします.."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91
+#, fuzzy, java-format
+msgid "Downloading changeset {0} ..."
+msgstr "変更セット {0} を閉じています..."
+
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
@@ -9304,43 +9604,66 @@
 msgstr "サーバに接続中..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
 msgid "Failed to open connection to API {0}"
 msgstr "API {0} への接続に失敗しました"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
+msgid "Error: failed to add authentication credentials to the connection."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
 msgstr "osmサーバに接続できません。インターネット接続 をチェックしてください。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+msgid "XML tag <user> is missing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
+#, fuzzy, java-format
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgstr "XML 要素 {1} に必要な属性 ''{0}'' がありません"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
+#, fuzzy, java-format
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgstr "属性 ''{0}'' に不正な長い値。入力値: ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
 msgid "Starting to upload with one request per primitive ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
+msgstr "プリミティブ単位にひとつのリクエストでアップロードを開始 ..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
 msgid "Starting to upload in one request ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:171
-#, fuzzy
+msgstr "ひとつのリクエストでアップロード開始..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135
 msgid "Uploading data ..."
-msgstr "アップロード中..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:178
+msgstr "データアップロード中 ..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
 msgid ""
 "WARNING: no API version defined for data to upload. Falling back to version "
@@ -9348,5 +9671,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147
 #, java-format
 msgid ""
@@ -9356,10 +9679,10 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
 msgid "Update Plugins"
 msgstr "プラグインのアップデート"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 msgid "Download Plugins"
 msgstr "ダウンロードプラグイン"
@@ -9523,5 +9846,5 @@
 msgstr "もっと詳細"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -9529,18 +9852,18 @@
 msgstr[0] "{0} このサイトからプラグイン情報をダウンロードしました。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
 msgid "No plugin information found."
 msgstr "プラグイン情報が見つかりません。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr "{0} という名前のプラグインは利用できません。更新はスキップされました。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:93
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
 msgid "All installed plugins are up to date."
 msgstr "インストールされた全てのプラグインは最新です。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
 #, java-format
 msgid ""
@@ -9553,9 +9876,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
 msgid "Download missing plugins"
 msgstr "不足するプラグインをダウンロードします。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
 #, java-format
 msgid ""
@@ -9570,43 +9893,43 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
 msgid "unknown"
 msgstr "不明な"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Version {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 msgid "Plugin bundled with JOSM"
 msgstr "JOSMに付属のプラグイン"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:357
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -9744,5 +10067,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:165
-#, fuzzy
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -9750,6 +10072,4 @@
 "community."
 msgstr ""
-"bbox の最大は 0.25です。要求された範囲は大きすぎます。より小さい範囲を要求す"
-"るか、planet.osm を使用して下さい。"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:168
@@ -9955,10 +10275,4 @@
 msgstr "(その意味は？)"
 
-#. item "Relations/Route" text "Symbol description"
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3148
-msgid "Description"
-msgstr "説明"
-
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
 msgid "Please enter Description about your trace."
@@ -10348,4 +10662,6 @@
 "adjust the sliders to manually match the photos."
 msgstr ""
+"GPX トラックと写真の照合中にエラーが発生。スライダーを調整して写真と手動で照"
+"合できます。"
 
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:871
@@ -10383,4 +10699,6 @@
 "(No = new cache)"
 msgstr ""
+"位置 \"{0}\" がキャッシュに見つかりました。\n"
+"最初にキャッシュをロードしますか？"
 
 #. this below is a temporary workaround to fix the "always on top" issue
@@ -10709,4 +11027,6 @@
 "or just retry "
 msgstr ""
+"完全にキャンセルしますか\n"
+"それとも単にやり直しますか "
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:249
@@ -10727,6 +11047,7 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
-msgid "Set "
-msgstr ""
+#, fuzzy, java-format
+msgid "Set {0} Lambert coordinates"
+msgstr "相手の座標を残す"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -11351,6 +11672,6 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 #: build/trans_style.java:990 build/trans_style.java:1007
-#: build/trans_style.java:1023 build/trans_style.java:3392
-#: build/trans_style.java:3400
+#: build/trans_style.java:1023 build/trans_style.java:3400
+#: build/trans_style.java:3408
 msgid "water"
 msgstr "水域(湖沼)"
@@ -11639,4 +11960,55 @@
 msgstr "測定"
 
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Michigan Left"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Adds no left turn for sets of 4 or 5 ways."
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45
+#, fuzzy
+msgid "Please select 4 or 5 ways to assign no left turns."
+msgstr "少なくとも４ノードからなる閉じたウェイを、一つ以上選択してください。"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61
+#, fuzzy, java-format
+msgid "{0} extrem nodes."
+msgstr "{0}ノード"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69
+#, fuzzy, java-format
+msgid "Via node {0}, {1}"
+msgstr "ノード {0} を変更"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75
+#, fuzzy, java-format
+msgid "{0} via nodes."
+msgstr "{0}ノード"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78
+msgid "Unable to find via nodes. Please check your selection"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98
+#, fuzzy, java-format
+msgid "MIddle way: {0}"
+msgstr "ウェイ {0} を追加"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121
+msgid "Create Michigan left turn restriction"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129
+#, fuzzy, java-format
+msgid "Processing {0}"
+msgstr "バージョン{0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142
+#, fuzzy, java-format
+msgid "Relation: from {0} to {1} via {2}"
+msgstr "バージョン {0} 作成日: {1} 作成者: {2}"
+
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
 msgid "OpenLayers"
@@ -11793,7 +12165,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
-#, fuzzy
 msgid "create new objects"
-msgstr "新規ノードの作成"
+msgstr "新しいオブジェクトを作成"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
@@ -11858,9 +12229,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
-#, fuzzy
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
-"APIを通じて、リモートコントロールプラグインによって、データをロードするよう要"
-"求されました。"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
@@ -12122,5 +12490,5 @@
 msgstr "タグ編集ダイアログの開始"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:158
 msgid "JOSM Tag Editor Plugin"
 msgstr "JOSM タグ編集プラグイン"
@@ -12130,5 +12498,5 @@
 msgstr "強調"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:370
 #, java-format
 msgid "Updating properties of up to {0} object"
@@ -12136,20 +12504,4 @@
 msgstr[0] "{0} オブジェクトまでのプロパティを更新しています"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44
-msgid "INFO: entering compatibilty mode for JOSM with Main.ds"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47
-msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49
-msgid ""
-"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-"found."
-msgstr ""
-"JOSM の予期しないバージョン。Main.ds も Main.getCurrentDataSet() も見つかりま"
-"せん。"
-
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
 msgid "Group"
@@ -12159,9 +12511,4 @@
 msgid "Item"
 msgstr "アイテム"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-msgid "Filter"
-msgstr "フィルタ"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63
@@ -12174,5 +12521,5 @@
 #, java-format
 msgid "unexpected column number {0}"
-msgstr "予期しないカラム番号 {0}"
+msgstr "おかしなカラム番号 {0}"
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:80
@@ -12247,5 +12594,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2272
 msgid "Street name"
 msgstr "ストリートの名前"
@@ -12370,5 +12717,5 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:461
 msgid "Removed Element from Relations"
-msgstr ""
+msgstr "リレーションから要素を削除"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:570
@@ -12408,8 +12755,4 @@
 msgstr "ズーム（メートル単位）"
 
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
-msgid "URL"
-msgstr "URL"
-
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
 msgid "Jump there"
@@ -12446,6 +12789,5 @@
 msgid_plural ""
 "The selection contains {0} ways. Are you sure you want to simplify them all?"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "選択には {0} ウェイが含まれます。本当に簡略化しますか？"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:91
@@ -12607,7 +12949,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:460
-#, fuzzy
 msgid "Fixing errors ..."
-msgstr "10秒待機中 ... "
+msgstr "エラー修正中 ..."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:484
@@ -12617,7 +12958,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501
-#, fuzzy
 msgid "Updating map ..."
-msgstr "変更セットを更新中..."
+msgstr "地図を更新中 ..."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69
@@ -12682,5 +13022,5 @@
 "This test checks that there are no ways with same tags and same node "
 "coordinates."
-msgstr ""
+msgstr "このテストは同じタグで同じノード座標が無いことをチェックしています。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141
@@ -12757,5 +13097,5 @@
 msgid ""
 "This test checks for ways that contain some of their nodes more than once."
-msgstr ""
+msgstr "このテストはノードのいくつかを一回以上含むウェイをチェックしています。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:36
@@ -12919,5 +13259,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:728
 msgid "Check if map painting found data errors."
-msgstr ""
+msgstr "地図塗りつぶしでデータエラーがあるかどうかチェック"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:735
@@ -12973,5 +13313,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:32
 msgid "This tests if ways which should be circular are closed."
-msgstr ""
+msgstr "これは循環しているべきウェイが閉じられているかチェックします。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:76
@@ -13105,7 +13445,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
-#: build/trans_style.java:4179
+#: build/trans_style.java:4159 build/trans_style.java:4166
+#: build/trans_style.java:4173 build/trans_style.java:4180
+#: build/trans_style.java:4187
 msgid "building"
 msgstr "ビル"
@@ -13119,5 +13459,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4186
+#: build/trans_style.java:4194
 msgid "area"
 msgstr "領域"
@@ -13134,4 +13474,6 @@
 msgid "This test checks if a way has an endpoint very near to another way."
 msgstr ""
+"このテストはウェイが別のウェイのすぐ近くにエンドポイントを持っているかチェッ"
+"クしています。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:83
@@ -13159,4 +13501,5 @@
 msgid "This test checks for untagged nodes that are not part of any way."
 msgstr ""
+"このテストはどのウェイにも属さないタグ無しのノードをチェックしています。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:58
@@ -13167,4 +13510,5 @@
 msgid "This test checks for untagged, empty and one node ways."
 msgstr ""
+"このテストはタグ無し、空、そして単一ノードのウェイをチェックしています。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:90
@@ -13220,5 +13564,5 @@
 msgid ""
 "Display a map that was previously scanned and uploaded to walking-papers.org"
-msgstr ""
+msgstr "以前スキャンしてwalking-papers.org にアップロードされた地図を表示"
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29
@@ -13244,10 +13588,10 @@
 msgstr "ウェイ終端の開始ノードを選択"
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:148
 msgid "Reached the end of the line"
 msgstr "ラインの終端に到達"
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:155
 msgid "Reached a junction"
 msgstr "ジャンクションに到達"
@@ -13540,7 +13884,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
-#, fuzzy
 msgid "Overlap tiles"
-msgstr "重なった領域"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
@@ -13549,7 +13892,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
-#, fuzzy
 msgid "% of north:"
-msgstr "北"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -13660,4 +14002,6 @@
 "very fast."
 msgstr ""
+"ユーザにタイムスタンプの匿名化と広大なGPX トラックの部分的な高速削除を許可す"
+"る。"
 
 #. Plugin globalsat
@@ -13693,5 +14037,5 @@
 msgid ""
 "Support live GPS input (moving dot) through a connection to gpsd server."
-msgstr ""
+msgstr "gpsd サーバを通してライブ GPS 入力(移動する点)をサポート。"
 
 #. Plugin measurement
@@ -13705,6 +14049,11 @@
 "追加します。"
 
+#. Plugin michigan_left
+#: build/trans_plugins.java:35
+msgid "Adds no left turn for sets of 4 or 5 ways"
+msgstr ""
+
 #. Plugin nearclick
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid ""
 "Simulates a click when you do a small and short drag. This is usefull for "
@@ -13714,10 +14063,10 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid "Displays an OpenLayers background image"
 msgstr "OpenLayers の背景画面を表示"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
@@ -13726,5 +14075,5 @@
 
 #. Plugin openvisible
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13732,5 +14081,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13740,22 +14089,24 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
 "align it with the map."
 msgstr ""
+"このプラグインではエディタの背景として任意の画像を表示し、地図と並べることが"
+"できます。"
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Let other applications send commands to JOSM."
 msgstr "他のアプリーケーションにJOSM へのコマンドを送信させる"
 
 #. Plugin routes
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13764,10 +14115,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Provides routing capabilities."
 msgstr "ルーティング能力の提供"
 
 #. Plugin slippymap
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13776,15 +14127,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "現在のGPSポジションで、マーカー/ノードの追加を許可"
 
 #. Plugin tageditor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "表形式でタグ編集のダイアログ・ボックスを提供"
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -13794,10 +14145,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Make terraced houses out of single blocks."
 msgstr "一つのブロックからテラスハウスを作成する"
 
 #. Plugin usertools
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -13806,5 +14157,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -13813,12 +14164,14 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
 "for the common ones. Spellcheck integrated for tag names."
 msgstr ""
+"OSM データ妥当性検証。データ中の問題をチェックし、一般的な解決法を提供しま"
+"す。タグ名用にスペルチェック機能が統合されています。"
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -13827,10 +14180,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -13886,4 +14239,10 @@
 #. <annotations>
 #: build/trans_presets.java:57
+#, fuzzy
+msgid "Highways"
+msgstr "道路"
+
+#. group "Highways"
+#: build/trans_presets.java:58
 msgid "Streets"
 msgstr "ストリート"
@@ -13894,5 +14253,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:58 build/trans_surveyor.java:72
+#: build/trans_presets.java:59 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "高速道路・有料道路"
@@ -13901,5 +14260,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:61
+#: build/trans_presets.java:62
 msgid "Edit Motorway"
 msgstr "高速道路の編集"
@@ -13926,8 +14285,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:120 build/trans_presets.java:140
-#: build/trans_presets.java:177 build/trans_presets.java:197
-#: build/trans_presets.java:1557 build/trans_presets.java:3146
+#: build/trans_presets.java:65 build/trans_presets.java:101
+#: build/trans_presets.java:121 build/trans_presets.java:141
+#: build/trans_presets.java:178 build/trans_presets.java:198
+#: build/trans_presets.java:1560 build/trans_presets.java:3158
 msgid "Reference"
 msgstr "道路番号"
@@ -13941,8 +14300,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:358
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:359
 msgid "Lanes"
 msgstr "車線数"
@@ -13959,15 +14318,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:224 build/trans_presets.java:280
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:373 build/trans_presets.java:388
-#: build/trans_presets.java:412 build/trans_presets.java:431
-#: build/trans_presets.java:452 build/trans_presets.java:472
-#: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1307
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:225 build/trans_presets.java:281
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:374 build/trans_presets.java:389
+#: build/trans_presets.java:413 build/trans_presets.java:432
+#: build/trans_presets.java:453 build/trans_presets.java:473
+#: build/trans_presets.java:511 build/trans_presets.java:667
+#: build/trans_presets.java:1310
 msgid "Max. speed (km/h)"
 msgstr "最高速度（km/h）"
@@ -14004,16 +14363,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:293 build/trans_presets.java:306
-#: build/trans_presets.java:320 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:464
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:659 build/trans_presets.java:1300
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:294 build/trans_presets.java:307
+#: build/trans_presets.java:321 build/trans_presets.java:353
+#: build/trans_presets.java:405 build/trans_presets.java:425
+#: build/trans_presets.java:445 build/trans_presets.java:465
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:660 build/trans_presets.java:1303
 msgid "Oneway"
 msgstr "一方通行"
@@ -14055,19 +14414,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:353
-#: build/trans_presets.java:362 build/trans_presets.java:405
-#: build/trans_presets.java:425 build/trans_presets.java:445
-#: build/trans_presets.java:465 build/trans_presets.java:485
-#: build/trans_presets.java:504 build/trans_presets.java:523
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:586 build/trans_presets.java:607
-#: build/trans_presets.java:628 build/trans_presets.java:660
-#: build/trans_presets.java:1301 build/trans_surveyor.java:12
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:354
+#: build/trans_presets.java:363 build/trans_presets.java:406
+#: build/trans_presets.java:426 build/trans_presets.java:446
+#: build/trans_presets.java:466 build/trans_presets.java:486
+#: build/trans_presets.java:505 build/trans_presets.java:524
+#: build/trans_presets.java:545 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629 build/trans_presets.java:661
+#: build/trans_presets.java:1304 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "橋"
@@ -14103,19 +14462,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:354
-#: build/trans_presets.java:378 build/trans_presets.java:406
-#: build/trans_presets.java:426 build/trans_presets.java:446
-#: build/trans_presets.java:466 build/trans_presets.java:486
-#: build/trans_presets.java:505 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629 build/trans_presets.java:661
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:355
+#: build/trans_presets.java:379 build/trans_presets.java:407
+#: build/trans_presets.java:427 build/trans_presets.java:447
+#: build/trans_presets.java:467 build/trans_presets.java:487
+#: build/trans_presets.java:506 build/trans_presets.java:525
+#: build/trans_presets.java:546 build/trans_presets.java:567
+#: build/trans_presets.java:588 build/trans_presets.java:609
+#: build/trans_presets.java:630 build/trans_presets.java:662
+#: build/trans_presets.java:1305
 msgid "Tunnel"
 msgstr "トンネル"
@@ -14149,18 +14508,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:73 build/trans_presets.java:90
-#: build/trans_presets.java:110 build/trans_presets.java:129
-#: build/trans_presets.java:150 build/trans_presets.java:166
-#: build/trans_presets.java:186 build/trans_presets.java:205
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:355
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:467
-#: build/trans_presets.java:487 build/trans_presets.java:506
-#: build/trans_presets.java:525 build/trans_presets.java:546
-#: build/trans_presets.java:567 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:630
-#: build/trans_presets.java:662 build/trans_presets.java:1303
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:356
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:468
+#: build/trans_presets.java:488 build/trans_presets.java:507
+#: build/trans_presets.java:526 build/trans_presets.java:547
+#: build/trans_presets.java:568 build/trans_presets.java:589
+#: build/trans_presets.java:610 build/trans_presets.java:631
+#: build/trans_presets.java:663 build/trans_presets.java:1306
 msgid "Cutting"
 msgstr "切り通し"
@@ -14194,18 +14553,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:74 build/trans_presets.java:91
-#: build/trans_presets.java:111 build/trans_presets.java:130
-#: build/trans_presets.java:151 build/trans_presets.java:167
-#: build/trans_presets.java:187 build/trans_presets.java:206
-#: build/trans_presets.java:222 build/trans_presets.java:240
-#: build/trans_presets.java:258 build/trans_presets.java:277
-#: build/trans_presets.java:310 build/trans_presets.java:356
-#: build/trans_presets.java:408 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:468
-#: build/trans_presets.java:488 build/trans_presets.java:507
-#: build/trans_presets.java:526 build/trans_presets.java:547
-#: build/trans_presets.java:568 build/trans_presets.java:589
-#: build/trans_presets.java:610 build/trans_presets.java:631
-#: build/trans_presets.java:663 build/trans_presets.java:1304
+#: build/trans_presets.java:75 build/trans_presets.java:92
+#: build/trans_presets.java:112 build/trans_presets.java:131
+#: build/trans_presets.java:152 build/trans_presets.java:168
+#: build/trans_presets.java:188 build/trans_presets.java:207
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:357
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:469
+#: build/trans_presets.java:489 build/trans_presets.java:508
+#: build/trans_presets.java:527 build/trans_presets.java:548
+#: build/trans_presets.java:569 build/trans_presets.java:590
+#: build/trans_presets.java:611 build/trans_presets.java:632
+#: build/trans_presets.java:664 build/trans_presets.java:1307
 msgid "Embankment"
 msgstr "土手"
@@ -14213,5 +14572,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Motorway Link"
 msgstr "高速道路の連絡路"
@@ -14220,5 +14579,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:80
+#: build/trans_presets.java:81
 msgid "Edit Motorway Link"
 msgstr "高速道路の連絡路の編集"
@@ -14226,5 +14585,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:94
+#: build/trans_presets.java:95
 msgid "Trunk"
 msgstr "国道"
@@ -14233,5 +14592,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:97
+#: build/trans_presets.java:98
 msgid "Edit Trunk"
 msgstr "国道の編集"
@@ -14241,6 +14600,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
 msgid "Motorroad"
 msgstr ""
@@ -14248,5 +14607,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:114
+#: build/trans_presets.java:115
 msgid "Trunk Link"
 msgstr "国道の連絡路"
@@ -14255,5 +14614,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:117
+#: build/trans_presets.java:118
 msgid "Edit Trunk Link"
 msgstr "国道の連絡路の編集"
@@ -14266,5 +14625,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:134 build/trans_surveyor.java:76
+#: build/trans_presets.java:135 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "都道府県道"
@@ -14273,5 +14632,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:137
+#: build/trans_presets.java:138
 msgid "Edit Primary Road"
 msgstr "都道府県道を編集"
@@ -14279,10 +14638,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:154
+#: build/trans_presets.java:155
 msgid "Primary Link"
 msgstr "都道府県道の連絡路"
 
 #. item
-#: build/trans_presets.java:155
+#: build/trans_presets.java:156
 msgid "Edit Primary Link"
 msgstr "都道府県道の連絡路の編集"
@@ -14294,5 +14653,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:170 build/trans_surveyor.java:80
+#: build/trans_presets.java:171 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "主要道路"
@@ -14302,5 +14661,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:174
+#: build/trans_presets.java:175
 msgid "Edit Secondary Road"
 msgstr "主要道路の編集"
@@ -14308,5 +14667,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:190
+#: build/trans_presets.java:191
 msgid "Tertiary"
 msgstr "主要道路(Tertiary)"
@@ -14316,5 +14675,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:194
+#: build/trans_presets.java:195
 msgid "Edit Tertiary Road"
 msgstr "主要道路(Tertiary)の編集"
@@ -14326,5 +14685,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:209 build/trans_surveyor.java:84
+#: build/trans_presets.java:210 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "１車線道"
@@ -14334,5 +14693,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:213
+#: build/trans_presets.java:214
 msgid "Edit Unclassified Road"
 msgstr "分類なし道路の編集"
@@ -14359,19 +14718,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:225 build/trans_presets.java:243
-#: build/trans_presets.java:261 build/trans_presets.java:281
-#: build/trans_presets.java:314 build/trans_presets.java:359
-#: build/trans_presets.java:375 build/trans_presets.java:389
-#: build/trans_presets.java:413 build/trans_presets.java:432
-#: build/trans_presets.java:453 build/trans_presets.java:473
-#: build/trans_presets.java:491 build/trans_presets.java:511
-#: build/trans_presets.java:532 build/trans_presets.java:553
-#: build/trans_presets.java:574 build/trans_presets.java:595
-#: build/trans_presets.java:616 build/trans_presets.java:637
-#: build/trans_presets.java:667 build/trans_presets.java:680
-#: build/trans_presets.java:693 build/trans_presets.java:706
-#: build/trans_presets.java:719 build/trans_presets.java:732
-#: build/trans_presets.java:745 build/trans_presets.java:1308
-#: build/trans_presets.java:1498 build/trans_presets.java:1540
+#: build/trans_presets.java:226 build/trans_presets.java:244
+#: build/trans_presets.java:262 build/trans_presets.java:282
+#: build/trans_presets.java:315 build/trans_presets.java:360
+#: build/trans_presets.java:376 build/trans_presets.java:390
+#: build/trans_presets.java:414 build/trans_presets.java:433
+#: build/trans_presets.java:454 build/trans_presets.java:474
+#: build/trans_presets.java:492 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:554
+#: build/trans_presets.java:575 build/trans_presets.java:596
+#: build/trans_presets.java:617 build/trans_presets.java:638
+#: build/trans_presets.java:668 build/trans_presets.java:681
+#: build/trans_presets.java:694 build/trans_presets.java:707
+#: build/trans_presets.java:720 build/trans_presets.java:733
+#: build/trans_presets.java:746 build/trans_presets.java:1311
+#: build/trans_presets.java:1501 build/trans_presets.java:1543
 msgid "Width (meters)"
 msgstr "幅(m)"
@@ -14383,5 +14742,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:228 build/trans_surveyor.java:88
+#: build/trans_presets.java:229 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "敷地内道路"
@@ -14390,5 +14749,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:231
+#: build/trans_presets.java:232
 msgid "Edit Residential Street"
 msgstr "敷地内道路の編集"
@@ -14413,14 +14772,14 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:611
-#: build/trans_presets.java:632 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "Surface"
 msgstr "表面"
@@ -14441,53 +14800,53 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paved"
 msgstr "舗装"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "unpaved"
 msgstr "未舗装"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
 msgid "metal"
 msgstr ""
@@ -14501,22 +14860,22 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
-#: build/trans_style.java:3367
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
+#: build/trans_style.java:3375
 msgid "wood"
 msgstr "森"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paving_stones"
 msgstr ""
@@ -14524,77 +14883,77 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "cobblestone"
 msgstr "敷石"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "gravel"
 msgstr "砂利道"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "grass"
 msgstr "草地"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "sand"
 msgstr "砂地"
@@ -14602,13 +14961,13 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "ground"
 msgstr "地表"
@@ -14616,5 +14975,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:246
+#: build/trans_presets.java:247
 msgid "Living Street"
 msgstr "私道"
@@ -14623,5 +14982,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:249
+#: build/trans_presets.java:250
 msgid "Edit Living Street"
 msgstr "私道の編集"
@@ -14629,5 +14988,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:264
+#: build/trans_presets.java:265
 msgid "Service"
 msgstr "サービス"
@@ -14636,5 +14995,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:267
+#: build/trans_presets.java:268
 msgid "Edit Serviceway"
 msgstr "サービス道路の編集"
@@ -14644,18 +15003,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "Serviceway type"
 msgstr "サービス路のタイプ"
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "alley"
 msgstr "裏通り・路地"
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "driveway"
 msgstr "私道"
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "parking_aisle"
 msgstr "駐車場の通路"
@@ -14663,5 +15022,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:284
+#: build/trans_presets.java:285
 msgid "Parking Aisle"
 msgstr "駐車場の通路"
@@ -14671,5 +15030,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:288
+#: build/trans_presets.java:289
 msgid "Edit Parking Aisle"
 msgstr "駐車場の通路の編集"
@@ -14677,5 +15036,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:298
+#: build/trans_presets.java:299
 msgid "Road (Unknown Type)"
 msgstr "道路（種別不明)"
@@ -14684,5 +15043,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Edit Road of unknown type"
 msgstr "種別不明道路の編集"
@@ -14691,20 +15050,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:318
+#: build/trans_presets.java:319
 msgid "Road Restrictions"
 msgstr "通行制限"
 
 #. item
-#: build/trans_presets.java:319
+#: build/trans_presets.java:320
 msgid "Edit Road Restrictions"
 msgstr "通行制限の編集"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:321
+#: build/trans_presets.java:322
 msgid "Toll"
 msgstr "料金"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:322
+#: build/trans_presets.java:323
 msgid "No exit (cul-de-sac)"
 msgstr "行き止まり(cul-de-sac)"
@@ -14717,8 +15076,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:323 build/trans_presets.java:529
-#: build/trans_presets.java:550 build/trans_presets.java:571
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:634
+#: build/trans_presets.java:324 build/trans_presets.java:530
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:593 build/trans_presets.java:614
+#: build/trans_presets.java:635
 msgid "Access"
 msgstr "アクセス"
@@ -14772,29 +15131,29 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1397
-#: build/trans_presets.java:1398 build/trans_presets.java:1399
-#: build/trans_presets.java:1763 build/trans_presets.java:1773
-#: build/trans_presets.java:2397 build/trans_presets.java:2433
-#: build/trans_presets.java:2442 build/trans_presets.java:2443
-#: build/trans_presets.java:2444 build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:1396
+#: build/trans_presets.java:1397 build/trans_presets.java:1400
+#: build/trans_presets.java:1401 build/trans_presets.java:1402
+#: build/trans_presets.java:1767 build/trans_presets.java:1777
+#: build/trans_presets.java:2408 build/trans_presets.java:2444
+#: build/trans_presets.java:2453 build/trans_presets.java:2454
+#: build/trans_presets.java:2455 build/trans_presets.java:2725
 msgid "yes"
 msgstr "はい"
@@ -14807,40 +15166,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:212
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:212
 msgid "private"
 msgstr "私道"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655
 msgid "designated"
 msgstr "指定済み"
@@ -14853,19 +15212,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:219
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:219
 msgid "destination"
 msgstr "行き先"
@@ -14888,71 +15247,71 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:205
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:205
 msgid "permissive"
 msgstr "関係車両のみ可"
 
-#: build/trans_presets.java:323 build/trans_presets.java:327
-#: build/trans_presets.java:330 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636
+#: build/trans_presets.java:324 build/trans_presets.java:328
+#: build/trans_presets.java:331 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637
 msgid "agricultural"
 msgstr "農業の"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
-#: build/trans_presets.java:2433 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1396 build/trans_presets.java:1397
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
+#: build/trans_presets.java:2444 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
+#: build/trans_presets.java:2725
 msgid "no"
 msgstr "いいえ"
 
-#: build/trans_presets.java:326
+#: build/trans_presets.java:327
 msgid "Goods"
 msgstr "貨物トラック"
 
-#: build/trans_presets.java:327
+#: build/trans_presets.java:328
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "大型車"
@@ -14967,10 +15326,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:328 build/trans_presets.java:651
-#: build/trans_presets.java:858 build/trans_presets.java:891
-#: build/trans_presets.java:913 build/trans_presets.java:950
-#: build/trans_presets.java:963 build/trans_presets.java:975
-#: build/trans_presets.java:987 build/trans_presets.java:999
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:329 build/trans_presets.java:652
+#: build/trans_presets.java:859 build/trans_presets.java:892
+#: build/trans_presets.java:914 build/trans_presets.java:951
+#: build/trans_presets.java:964 build/trans_presets.java:976
+#: build/trans_presets.java:988 build/trans_presets.java:1000
+#: build/trans_presets.java:1040
 msgid "Horse"
 msgstr "馬"
@@ -14986,13 +15345,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:329 build/trans_presets.java:530
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:635 build/trans_presets.java:859
-#: build/trans_presets.java:877 build/trans_presets.java:892
-#: build/trans_presets.java:914 build/trans_presets.java:951
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:330 build/trans_presets.java:531
+#: build/trans_presets.java:552 build/trans_presets.java:573
+#: build/trans_presets.java:594 build/trans_presets.java:615
+#: build/trans_presets.java:636 build/trans_presets.java:860
+#: build/trans_presets.java:878 build/trans_presets.java:893
+#: build/trans_presets.java:915 build/trans_presets.java:952
+#: build/trans_presets.java:965 build/trans_presets.java:977
+#: build/trans_presets.java:989 build/trans_presets.java:1001
+#: build/trans_presets.java:1041
 msgid "Motorcycle"
 msgstr "自動二輪"
@@ -15007,30 +15366,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:330 build/trans_presets.java:531
-#: build/trans_presets.java:552 build/trans_presets.java:573
-#: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:636 build/trans_presets.java:654
-#: build/trans_presets.java:878 build/trans_presets.java:893
-#: build/trans_presets.java:915 build/trans_presets.java:952
-#: build/trans_presets.java:965 build/trans_presets.java:977
-#: build/trans_presets.java:989 build/trans_presets.java:1001
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:331 build/trans_presets.java:532
+#: build/trans_presets.java:553 build/trans_presets.java:574
+#: build/trans_presets.java:595 build/trans_presets.java:616
+#: build/trans_presets.java:637 build/trans_presets.java:655
+#: build/trans_presets.java:879 build/trans_presets.java:894
+#: build/trans_presets.java:916 build/trans_presets.java:953
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1042
 msgid "Motorcar"
 msgstr "自動車"
 
-#: build/trans_presets.java:331
+#: build/trans_presets.java:332
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
-#: build/trans_presets.java:332
+#: build/trans_presets.java:333
 msgid "Motorboat"
 msgstr "モーターボート"
 
-#: build/trans_presets.java:333
+#: build/trans_presets.java:334
 msgid "Boat"
 msgstr "ボート"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:336
 msgid "Min. speed (km/h)"
 msgstr "最小速度（km/h)"
@@ -15038,25 +15397,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:336 build/trans_presets.java:374
+#: build/trans_presets.java:337 build/trans_presets.java:375
 msgid "Max. weight (tonnes)"
 msgstr "最大重量（トン）"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:337
+#: build/trans_presets.java:338
 msgid "Max. Height (meters)"
 msgstr "最大高（ｍ）"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Max. Width (meters)"
 msgstr "最大幅（ｍ）"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:339
+#: build/trans_presets.java:340
 msgid "Max. Length (meters)"
 msgstr "最大長（ｍ）"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:341
+#: build/trans_presets.java:342
 msgid "Roundabout"
 msgstr "ロータリー交差点"
@@ -15067,5 +15426,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:346
+#: build/trans_presets.java:347
 msgid "Edit Junction"
 msgstr "ジャンクションの編集"
@@ -15087,9 +15446,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:349 build/trans_presets.java:648
-#: build/trans_presets.java:788 build/trans_presets.java:1135
-#: build/trans_presets.java:1392 build/trans_presets.java:2353
-#: build/trans_presets.java:2901 build/trans_presets.java:2911
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:350 build/trans_presets.java:649
+#: build/trans_presets.java:789 build/trans_presets.java:1137
+#: build/trans_presets.java:1395 build/trans_presets.java:2364
+#: build/trans_presets.java:2913 build/trans_presets.java:2923
+#: build/trans_presets.java:2932
 msgid "Type"
 msgstr "タイプ"
@@ -15109,10 +15468,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:547
+#: build/trans_presets.java:350 build/trans_style.java:547
 #: build/trans_style.java:555
 msgid "motorway"
 msgstr "高速道路"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "motorway_link"
 msgstr "高速道路のランプ"
@@ -15134,10 +15493,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:563
+#: build/trans_presets.java:350 build/trans_style.java:563
 #: build/trans_style.java:571
 msgid "trunk"
 msgstr "国道"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "trunk_link"
 msgstr "国道の連絡路"
@@ -15159,10 +15518,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:579
+#: build/trans_presets.java:350 build/trans_style.java:579
 #: build/trans_style.java:587
 msgid "primary"
 msgstr "都道府県道"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "primary_link"
 msgstr "都道府県道の連絡路"
@@ -15184,5 +15543,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:595
+#: build/trans_presets.java:350 build/trans_style.java:595
 #: build/trans_style.java:603
 msgid "secondary"
@@ -15197,9 +15556,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:349 build/trans_style.java:611
+#: build/trans_presets.java:350 build/trans_style.java:611
 msgid "tertiary"
 msgstr "敷地内道路"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "unclassified"
 msgstr "１車線道"
@@ -15213,9 +15572,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:349 build/trans_style.java:3143
+#: build/trans_presets.java:350 build/trans_style.java:3151
 msgid "residential"
 msgstr "敷地内道路"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "living_street"
 msgstr "私道"
@@ -15245,10 +15604,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:349 build/trans_style.java:667
-#: build/trans_style.java:4244
+#: build/trans_presets.java:350 build/trans_style.java:667
+#: build/trans_style.java:4252
 msgid "service"
 msgstr "サービス"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "bus_guideway"
 msgstr "バスレーン"
@@ -15278,6 +15637,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:349 build/trans_style.java:877
-#: build/trans_style.java:3208 build/trans_style.java:3209
+#: build/trans_presets.java:350 build/trans_style.java:877
+#: build/trans_style.java:3216 build/trans_style.java:3217
 msgid "construction"
 msgstr "工事中"
@@ -15288,10 +15647,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Edit Bridge"
 msgstr "橋の編集"
 
 #. item
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "Edit Tunnel"
 msgstr "トンネルの編集"
@@ -15299,19 +15658,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:393
+#: build/trans_presets.java:394
 msgid "Ways"
 msgstr "ウエイ"
 
 #. group "Ways"
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Construction"
 msgstr "工事中"
 
 #. item
-#: build/trans_presets.java:395
+#: build/trans_presets.java:396
 msgid "Edit Highway Under Construction"
 msgstr "工事中道路の編集"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "Junction"
 msgstr "ジャンクション"
@@ -15327,5 +15686,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:411 build/trans_style.java:895
+#: build/trans_presets.java:412 build/trans_style.java:895
 msgid "roundabout"
 msgstr "ロータリー交差点"
@@ -15334,5 +15693,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:417
+#: build/trans_presets.java:418
 msgid "Bridleway"
 msgstr "馬道"
@@ -15340,5 +15699,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:419
+#: build/trans_presets.java:420
 msgid "Edit Bridleway"
 msgstr "馬道の編集"
@@ -15346,5 +15705,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:435
+#: build/trans_presets.java:436
 msgid "Cycleway"
 msgstr "自転車道"
@@ -15354,10 +15713,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:439
+#: build/trans_presets.java:440
 msgid "Edit Cycleway"
 msgstr "自転車道の編集"
 
 #. item "Ways/Cycleway" check "Embankment"
-#: build/trans_presets.java:449
+#: build/trans_presets.java:450
 msgid "Pedestrians"
 msgstr ""
@@ -15365,5 +15724,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Footway"
 msgstr "歩道"
@@ -15372,10 +15731,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Footway"
 msgstr "歩道の編集"
 
 #. item "Ways/Footway" check "Embankment"
-#: build/trans_presets.java:469
+#: build/trans_presets.java:470
 msgid "Bikes"
 msgstr ""
@@ -15383,5 +15742,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:476
+#: build/trans_presets.java:477
 msgid "Pedestrian"
 msgstr "ペデストリアン・歩行者用市街道路"
@@ -15390,5 +15749,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Edit Pedestrian Street"
 msgstr "ペデストリアンデッキ、歩行者専用道路の編集"
@@ -15396,5 +15755,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:494
+#: build/trans_presets.java:495
 msgid "Steps"
 msgstr "階段"
@@ -15404,5 +15763,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:498
+#: build/trans_presets.java:499
 msgid "Edit Flight of Steps"
 msgstr ""
@@ -15411,5 +15770,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:515
+#: build/trans_presets.java:516
 msgid "Track"
 msgstr "トラック"
@@ -15418,5 +15777,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:518
+#: build/trans_presets.java:519
 msgid "Edit Track"
 msgstr "トラックの編集"
@@ -15424,5 +15783,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:535
+#: build/trans_presets.java:536
 msgid "Track Grade 1"
 msgstr "トラック グレード 1"
@@ -15431,5 +15790,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:538
+#: build/trans_presets.java:539
 msgid "Edit Track of grade 1"
 msgstr "トラック グレード 1　の編集"
@@ -15437,5 +15796,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:556
+#: build/trans_presets.java:557
 msgid "Track Grade 2"
 msgstr "トラック グレード 2"
@@ -15444,5 +15803,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:559
+#: build/trans_presets.java:560
 msgid "Edit Track of grade 2"
 msgstr "トラック グレード 2の編集"
@@ -15450,5 +15809,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:577
+#: build/trans_presets.java:578
 msgid "Track Grade 3"
 msgstr "トラック グレード 3"
@@ -15457,5 +15816,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:580
+#: build/trans_presets.java:581
 msgid "Edit Track of grade 3"
 msgstr "トラック グレード 3　の編集"
@@ -15463,5 +15822,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:598
+#: build/trans_presets.java:599
 msgid "Track Grade 4"
 msgstr "トラック グレード 4"
@@ -15470,5 +15829,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:601
+#: build/trans_presets.java:602
 msgid "Edit Track of grade 4"
 msgstr "トラック グレード 4　の編集"
@@ -15476,5 +15835,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:619
+#: build/trans_presets.java:620
 msgid "Track Grade 5"
 msgstr "トラック グレード 5"
@@ -15483,5 +15842,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:622
+#: build/trans_presets.java:623
 msgid "Edit Track of grade 5"
 msgstr "トラック グレード 5 の編集"
@@ -15490,5 +15849,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:641
+#: build/trans_presets.java:642
 msgid "Path"
 msgstr "小道"
@@ -15497,13 +15856,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:644
+#: build/trans_presets.java:645
 msgid "Edit Path"
 msgstr "小道の編集"
 
-#: build/trans_presets.java:652
+#: build/trans_presets.java:653
 msgid "Ski"
 msgstr "スキー"
 
-#: build/trans_presets.java:653
+#: build/trans_presets.java:654
 msgid "Snowmobile"
 msgstr "スノーモービル"
@@ -15513,6 +15872,6 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:670 build/trans_presets.java:1725
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:671 build/trans_presets.java:1729
+#: build/trans_presets.java:1752
 msgid "Hiking"
 msgstr "ハイキング"
@@ -15522,5 +15881,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:674
+#: build/trans_presets.java:675
 msgid "Edit Hiking"
 msgstr "ハイキングの編集"
@@ -15528,5 +15887,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:683
+#: build/trans_presets.java:684
 msgid "Mountain Hiking"
 msgstr "山岳ハイキング"
@@ -15536,5 +15895,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:687
+#: build/trans_presets.java:688
 msgid "Edit Mountain Hiking"
 msgstr "山岳ハイキングの編集"
@@ -15542,5 +15901,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:696
+#: build/trans_presets.java:697
 msgid "Demanding Mountain Hiking"
 msgstr "厳しい山岳ハイキング"
@@ -15550,5 +15909,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:700
+#: build/trans_presets.java:701
 msgid "Edit Demanding Mountain Hiking"
 msgstr "厳しい山岳ハイキングの編集"
@@ -15556,5 +15915,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:709
+#: build/trans_presets.java:710
 msgid "Alpine Hiking"
 msgstr "高山ハイキング"
@@ -15564,5 +15923,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:713
+#: build/trans_presets.java:714
 msgid "Edit Alpine Hiking"
 msgstr "高山ハイキングの編集"
@@ -15570,5 +15929,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:723
 msgid "Demanding Alpine Hiking"
 msgstr "厳しい高山ハイキング"
@@ -15578,5 +15937,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:726
+#: build/trans_presets.java:727
 msgid "Edit Demanding Alpine Hiking"
 msgstr "厳しい高山ハイキングの編集"
@@ -15584,5 +15943,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:735
+#: build/trans_presets.java:736
 msgid "Difficult Alpine Hiking"
 msgstr "困難な高山ハイキング"
@@ -15592,5 +15951,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:739
+#: build/trans_presets.java:740
 msgid "Edit Difficult Alpine Hiking"
 msgstr "困難な高山ハイキングの編集"
@@ -15598,10 +15957,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:749
+#: build/trans_presets.java:750
 msgid "Waypoints"
 msgstr "ウェイポイント"
 
 #. group "Waypoints"
-#: build/trans_presets.java:750
+#: build/trans_presets.java:751
 msgid "Motorway Junction"
 msgstr "高速道路のジャンクション"
@@ -15609,15 +15968,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:752
+#: build/trans_presets.java:753
 msgid "Edit Motorway Junction"
 msgstr "高速道路ジャンクションの編集"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:757
 msgid "Number"
 msgstr "数"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:759
 msgid "Services"
 msgstr "サービス"
@@ -15625,5 +15984,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:761
 msgid "Edit Service Station"
 msgstr "サービスステーションの編集"
@@ -15661,15 +16020,15 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:765 build/trans_presets.java:902
-#: build/trans_presets.java:1382 build/trans_presets.java:1406
-#: build/trans_presets.java:1413 build/trans_presets.java:1419
-#: build/trans_presets.java:1427 build/trans_presets.java:1434
-#: build/trans_presets.java:1761 build/trans_presets.java:1771
-#: build/trans_presets.java:2361 build/trans_presets.java:2368
-#: build/trans_presets.java:2384 build/trans_presets.java:2395
-#: build/trans_presets.java:2403 build/trans_presets.java:2410
-#: build/trans_presets.java:2464 build/trans_presets.java:2512
-#: build/trans_presets.java:2678 build/trans_presets.java:2693
-#: build/trans_presets.java:2732 build/trans_presets.java:3151
+#: build/trans_presets.java:766 build/trans_presets.java:903
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
+#: build/trans_presets.java:1416 build/trans_presets.java:1422
+#: build/trans_presets.java:1430 build/trans_presets.java:1437
+#: build/trans_presets.java:1765 build/trans_presets.java:1775
+#: build/trans_presets.java:2372 build/trans_presets.java:2379
+#: build/trans_presets.java:2395 build/trans_presets.java:2406
+#: build/trans_presets.java:2414 build/trans_presets.java:2421
+#: build/trans_presets.java:2475 build/trans_presets.java:2523
+#: build/trans_presets.java:2689 build/trans_presets.java:2704
+#: build/trans_presets.java:2743 build/trans_presets.java:3163
 msgid "Operator"
 msgstr "操作員"
@@ -15678,5 +16037,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:769
+#: build/trans_presets.java:770
 msgid "Traffic Signal"
 msgstr "信号機"
@@ -15686,5 +16045,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:774
 msgid "Pedestrian crossing type"
 msgstr "横断歩道タイプ"
@@ -15693,27 +16052,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "uncontrolled"
 msgstr "マークだけ"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "traffic_signals"
 msgstr "信号機"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "island"
 msgstr "途中に島あり"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "unmarked"
 msgstr "マークなし"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:774 build/trans_presets.java:790
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:775 build/trans_presets.java:791
+#: build/trans_presets.java:1334
 msgid "Cross on horseback"
 msgstr "馬用横断道"
@@ -15721,6 +16080,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:775 build/trans_presets.java:789
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:776 build/trans_presets.java:790
+#: build/trans_presets.java:1335
 msgid "Cross by bicycle"
 msgstr "自転車用横断歩道"
@@ -15729,11 +16088,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:776 build/trans_presets.java:791
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:1336
 msgid "Crossing attendant"
 msgstr "踏切係員"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:778
 msgid "Crossing type name (UK)"
 msgstr "踏切タイプ名(UK)"
@@ -15741,30 +16100,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "zebra"
 msgstr "横断歩道"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pelican"
 msgstr "ペリカン柄横断歩道（ＵＫ）"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "toucan"
 msgstr "Toucan柄横断歩道（ＵＫ）"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "puffin"
 msgstr "ツノメドリ"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pegasus"
 msgstr "ペガサス柄横断歩道（ＵＫ）"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "tiger"
 msgstr "虎縞柄横断歩道（ＵＫ）"
 
 #. </optional>
-#: build/trans_presets.java:780
+#: build/trans_presets.java:781
 msgid "Stop"
 msgstr "停止"
@@ -15772,5 +16131,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:783
+#: build/trans_presets.java:784
 msgid "Pedestrian Crossing"
 msgstr "横断歩道"
@@ -15779,14 +16138,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:786
+#: build/trans_presets.java:787
 msgid "Edit Crossing"
 msgstr "踏切の編集"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:793
 msgid "Type name (UK)"
 msgstr "タイプ名(UK)"
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:795
 msgid "Mini-roundabout"
 msgstr "小さなラウンドアバウト"
@@ -15797,14 +16156,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "Direction"
 msgstr "方向"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "clockwise"
 msgstr "時計回り"
 
-#: build/trans_presets.java:801
+#: build/trans_presets.java:802
 msgid "Turning Circle"
 msgstr "転回場"
@@ -15814,20 +16173,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:806
+#: build/trans_presets.java:807
 msgid "City Limit"
 msgstr "市境界標識"
 
 #. item
-#: build/trans_presets.java:807
+#: build/trans_presets.java:808
 msgid "Edit City Limit Sign"
 msgstr "市境界標識の編集"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:812
+#: build/trans_presets.java:813
 msgid "Second Name"
 msgstr "二つ目の名前"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:814
+#: build/trans_presets.java:815
 msgid "Speed Camera"
 msgstr "スピードカメラ（オービス）"
@@ -15835,5 +16194,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:817
+#: build/trans_presets.java:818
 msgid "Emergency Phone"
 msgstr "緊急電話"
@@ -15841,5 +16200,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:820
+#: build/trans_presets.java:821
 msgid "Incline"
 msgstr "坂"
@@ -15847,5 +16206,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:823
+#: build/trans_presets.java:824
 msgid "Incline Steep"
 msgstr "急な坂"
@@ -15854,10 +16213,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:827
+#: build/trans_presets.java:828
 msgid "Ford"
 msgstr "浅瀬（洗い越し）"
 
 #. item
-#: build/trans_presets.java:828
+#: build/trans_presets.java:829
 msgid "Edit Ford"
 msgstr "浅瀬（歩いて渡る）"
@@ -15865,5 +16224,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:835
+#: build/trans_presets.java:836
 msgid "Mountain Pass"
 msgstr "峠道"
@@ -15871,5 +16230,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:837
+#: build/trans_presets.java:838
 msgid "Edit Mountain Pass"
 msgstr "峠道の編集"
@@ -15881,7 +16240,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:842 build/trans_presets.java:1600
-#: build/trans_presets.java:1745 build/trans_presets.java:2845
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:843 build/trans_presets.java:1604
+#: build/trans_presets.java:1749 build/trans_presets.java:2857
+#: build/trans_presets.java:2864 build/trans_presets.java:2871
 msgid "Elevation"
 msgstr "高度"
@@ -15889,5 +16248,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:846
+#: build/trans_presets.java:847
 msgid "Barriers"
 msgstr "ゲート等"
@@ -15895,5 +16254,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:849
+#: build/trans_presets.java:850
 msgid "Bollard"
 msgstr "車止め杭"
@@ -15901,5 +16260,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:852
 msgid "Edit Bollard"
 msgstr "bollardの編集"
@@ -15944,16 +16303,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:854 build/trans_presets.java:873
-#: build/trans_presets.java:887 build/trans_presets.java:909
-#: build/trans_presets.java:946 build/trans_presets.java:959
-#: build/trans_presets.java:971 build/trans_presets.java:983
-#: build/trans_presets.java:995 build/trans_presets.java:1007
-#: build/trans_presets.java:1017 build/trans_presets.java:1026
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:855 build/trans_presets.java:874
+#: build/trans_presets.java:888 build/trans_presets.java:910
+#: build/trans_presets.java:947 build/trans_presets.java:960
+#: build/trans_presets.java:972 build/trans_presets.java:984
+#: build/trans_presets.java:996 build/trans_presets.java:1008
+#: build/trans_presets.java:1018 build/trans_presets.java:1027
+#: build/trans_presets.java:1036
 msgid "Allowed traffic:"
 msgstr "許可された通行："
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:861
+#: build/trans_presets.java:862
 msgid "Cycle Barrier"
 msgstr "自転車止め"
@@ -15962,5 +16321,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:865
+#: build/trans_presets.java:866
 msgid "Block"
 msgstr "ブロック"
@@ -15969,5 +16328,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:868
+#: build/trans_presets.java:869
 msgid "Cattle Grid"
 msgstr "Cattle Grid(家畜用格子柵)"
@@ -15975,5 +16334,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:870
+#: build/trans_presets.java:871
 msgid "Edit Cattle Grid"
 msgstr "Cattle Gridの編集"
@@ -15981,5 +16340,5 @@
 # http://en.wikipedia.org/wiki/Bus_trap
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:880
+#: build/trans_presets.java:881
 msgid "Bus Trap"
 msgstr "バスだけが通行可能になる落とし穴"
@@ -15987,15 +16346,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:883
+#: build/trans_presets.java:884
 msgid "Spikes"
 msgstr "車止めのとげ"
 
 #. item
-#: build/trans_presets.java:884
+#: build/trans_presets.java:885
 msgid "Edit Spikes"
 msgstr "車止めのとげの編集"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:896
 msgid "Toll Booth"
 msgstr "料金所"
@@ -16003,5 +16362,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:897
+#: build/trans_presets.java:898
 msgid "Edit Toll Booth"
 msgstr "料金所の編集"
@@ -16009,10 +16368,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:905
+#: build/trans_presets.java:906
 msgid "Border Control"
 msgstr "国境検査所"
 
 #. item
-#: build/trans_presets.java:906
+#: build/trans_presets.java:907
 msgid "Edit Border Control"
 msgstr "国境検査所の編集"
@@ -16022,5 +16381,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:920
+#: build/trans_presets.java:921
 msgid "Hedge"
 msgstr "生け垣"
@@ -16029,5 +16388,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:925
 msgid "Fence"
 msgstr "フェンス"
@@ -16036,5 +16395,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:929
 msgid "Wall"
 msgstr "壁"
@@ -16042,5 +16401,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:931
+#: build/trans_presets.java:932
 msgid "City Wall"
 msgstr "城壁"
@@ -16049,5 +16408,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:935
+#: build/trans_presets.java:936
 msgid "Retaining Wall"
 msgstr "擁壁"
@@ -16059,15 +16418,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:942
+#: build/trans_presets.java:943
 msgid "Entrance"
 msgstr "入口"
 
 #. item
-#: build/trans_presets.java:943
+#: build/trans_presets.java:944
 msgid "Edit Entrance"
 msgstr "入り口の編集"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:954
+#: build/trans_presets.java:955
 msgid "Gate"
 msgstr "ゲート"
@@ -16075,50 +16434,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:956
+#: build/trans_presets.java:957
 msgid "Edit Gate"
 msgstr "ゲートの編集"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:967
+#: build/trans_presets.java:968
 msgid "Lift Gate"
 msgstr "引き上げゲート"
 
 #. item
-#: build/trans_presets.java:968
+#: build/trans_presets.java:969
 msgid "Edit Lift Gate"
 msgstr "引き上げゲートの編集"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:979
+#: build/trans_presets.java:980
 msgid "Hampshire Gate"
 msgstr "Hampshire Gate"
 
 #. item
-#: build/trans_presets.java:980
+#: build/trans_presets.java:981
 msgid "Edit Hampshire Gate"
 msgstr "Hampshire Gateの編集"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:991
+#: build/trans_presets.java:992
 msgid "Bump Gate"
 msgstr "竹のゲート"
 
 #. item
-#: build/trans_presets.java:992
+#: build/trans_presets.java:993
 msgid "Edit Bump Gate"
 msgstr "竹のゲートの編集"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:1003
+#: build/trans_presets.java:1004
 msgid "Kissing Gate"
 msgstr "幅の狭いゲート"
 
 #. item
-#: build/trans_presets.java:1004
+#: build/trans_presets.java:1005
 msgid "Edit Kissing Gate"
 msgstr "幅の狭いゲートの編集"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1013
 msgid "Stile"
 msgstr "踏み越し段"
@@ -16126,25 +16485,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1014
+#: build/trans_presets.java:1015
 msgid "Edit Stile"
 msgstr "Stileの編集"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1023
 msgid "Turnstile"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1024
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1032
 msgid "Sally Port"
 msgstr "城の出撃路"
 
 #. item
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1033
 msgid "Edit Sally Port"
 msgstr "城の出撃路の編集"
@@ -16152,13 +16511,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #.
-#. <separator/>
+#. group "Water"
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1046 build/trans_presets.java:1089
+#: build/trans_presets.java:1047 build/trans_presets.java:1048
+#: build/trans_presets.java:1091
 msgid "Water"
 msgstr "水域(湖沼)"
 
 #. group "Water"
-#: build/trans_presets.java:1047
+#: build/trans_presets.java:1049
 msgid "Spring"
 msgstr "泉"
@@ -16166,5 +16526,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1049
+#: build/trans_presets.java:1051
 msgid "Edit Spring"
 msgstr "泉の編集"
@@ -16172,5 +16532,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1056
 msgid "Drain"
 msgstr "側溝"
@@ -16178,10 +16538,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1058
 msgid "Edit Drain"
 msgstr "川(drain)の編集"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1064
 msgid "Stream"
 msgstr "小川"
@@ -16189,10 +16549,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1066
 msgid "Edit Stream"
 msgstr "小川の編集"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1072
 msgid "Canal"
 msgstr "運河"
@@ -16200,10 +16560,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1074
 msgid "Edit Canal"
 msgstr "運河の編集"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1080
 msgid "River"
 msgstr "川"
@@ -16213,5 +16573,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1084
 msgid "Edit River"
 msgstr "河川の編集"
@@ -16219,15 +16579,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1093
 msgid "Edit Water"
 msgstr "水域の編集"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1097
 msgid "Land"
 msgstr "陸"
 
 #. item
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1098
 msgid "Edit Land"
 msgstr "陸の編集"
@@ -16235,5 +16595,5 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1103
 msgid "Basin"
 msgstr "水たまり、窪地"
@@ -16241,10 +16601,10 @@
 # 水たまりになるような土地
 #. item
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1104
 msgid "Edit Basin Landuse"
 msgstr "窪地、水盤場の盆地"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1109
 msgid "Reservoir"
 msgstr "ため池"
@@ -16252,15 +16612,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1109
+#: build/trans_presets.java:1111
 msgid "Edit Reservoir Landuse"
 msgstr "ため池の編集"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1116
 msgid "Covered Reservoir"
 msgstr "蓋付きため池"
 
 #. item
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1117
 msgid "Edit Covered Reservoir"
 msgstr "蓋のされたため池の編集"
@@ -16268,5 +16628,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1120
+#: build/trans_presets.java:1122
 msgid "Riverbank"
 msgstr "川岸"
@@ -16275,10 +16635,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1125
 msgid "Edit Riverbank"
 msgstr "川岸の編集"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1127
+#: build/trans_presets.java:1129
 msgid "Wetland"
 msgstr "湿地帯"
@@ -16289,14 +16649,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1134
 msgid "Edit Wetland"
 msgstr "湿地帯の編集"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "swamp"
 msgstr "沼地"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "bog"
 msgstr "湿地"
@@ -16310,35 +16670,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1135 build/trans_style.java:3384
+#: build/trans_presets.java:1137 build/trans_style.java:3392
 msgid "marsh"
 msgstr "沼地、湿地"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "reedbed"
 msgstr "葦原"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "saltmarsh"
 msgstr "塩湖"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "tidalflat"
 msgstr "干潟"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "mangrove"
 msgstr "マングローブ"
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1139
 msgid "Mud"
 msgstr "泥地"
 
 #. item
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1140
 msgid "Edit Mud"
 msgstr "泥地の編集"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1144
 msgid "Beach"
 msgstr "砂浜"
@@ -16346,20 +16706,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1144
+#: build/trans_presets.java:1146
 msgid "Edit Beach"
 msgstr "砂浜の編集"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1150
 msgid "Bay"
 msgstr "湾"
 
 #. item
-#: build/trans_presets.java:1149
+#: build/trans_presets.java:1151
 msgid "Edit Bay"
 msgstr "湾の編集"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1155
 msgid "Cliff"
 msgstr "崖"
@@ -16367,10 +16727,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1157
 msgid "Edit Cliff"
 msgstr "崖の編集"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1159
+#: build/trans_presets.java:1161
 msgid "Coastline"
 msgstr "海岸線"
@@ -16378,5 +16738,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1163
 msgid "Edit Coastline"
 msgstr "海岸線の編集"
@@ -16384,5 +16744,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1168
 msgid "Ferry Route"
 msgstr "フェリー航路"
@@ -16390,5 +16750,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1170
 msgid "Edit Ferry"
 msgstr "フェリー航路の編集"
@@ -16397,5 +16757,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1176
+#: build/trans_presets.java:1178
 msgid "Boatyard"
 msgstr "ボートヤード(陸上の船置き場)"
@@ -16403,10 +16763,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:1180
 msgid "Edit Boatyard"
 msgstr "ボートヤードの編集"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1185
 msgid "Dock"
 msgstr "ドック"
@@ -16414,5 +16774,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1187
 msgid "Edit Dock"
 msgstr "ドックの編集"
@@ -16420,5 +16780,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1193
 msgid "Dam"
 msgstr "ダム"
@@ -16426,15 +16786,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1195
 msgid "Edit Dam"
 msgstr "ダムの編集"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1199
+#: build/trans_presets.java:1201
 msgid "Waterway Point"
 msgstr "水路ポイント"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1202
 msgid "Lock Gate"
 msgstr "ロックゲート"
@@ -16443,5 +16803,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1206
 msgid "Weir"
 msgstr "堰"
@@ -16449,20 +16809,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1208
 msgid "Edit Weir"
 msgstr "ダムの編集"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1213
 msgid "Waterfall"
 msgstr "滝"
 
 #. item
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1214
 msgid "Edit Waterfall"
 msgstr "滝の編集"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1219
 msgid "Turning Point"
 msgstr "転回地点"
@@ -16471,15 +16831,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1221
+#: build/trans_presets.java:1223
 msgid "Marina"
 msgstr "マリーナ"
 
 #. item
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1224
 msgid "Edit Marina"
 msgstr "マリーナの編集"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1228
 msgid "Pier"
 msgstr "桟橋"
@@ -16487,10 +16847,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1230
 msgid "Edit Pier"
 msgstr "桟橋の編集"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1234
 msgid "Ferry Terminal"
 msgstr "フェリーターミナル"
@@ -16498,10 +16858,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1236
 msgid "Edit Ferry Terminal"
 msgstr "フェリーターミナルの編集"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1240
 msgid "Slipway"
 msgstr "スリップウェイ(進水所)"
@@ -16511,16 +16871,21 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1244
 msgid "Edit Slipway"
 msgstr "スリップウェイの編集"
 
 #. item "Waterway Point/Slipway" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1250
+#, fuzzy
+msgid "Transport"
+msgstr "公共交通機関"
+
+#. group "Transport"
+#: build/trans_presets.java:1251
 msgid "Railway"
 msgstr "鉄道"
 
 #. group "Railway"
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1252
 msgid "Rail"
 msgstr "線路"
@@ -16528,5 +16893,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:1254
 msgid "Edit Rail"
 msgstr "線路の編集"
@@ -16556,8 +16921,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "Optional Types"
 msgstr "追加のタイプ"
@@ -16571,35 +16936,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "yard"
 msgstr "中庭"
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "siding"
 msgstr "待避線"
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "spur"
 msgstr "分岐線"
 
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1259
 msgid "Narrow Gauge Rail"
 msgstr "トロッコ線路（狭軌）"
 
 #. item
-#: build/trans_presets.java:1257
+#: build/trans_presets.java:1260
 msgid "Edit Narrow Gauge Rail"
 msgstr "トロッコ線路（狭軌）の編集"
 
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1265
 msgid "Monorail"
 msgstr "モノレール"
@@ -16607,45 +16972,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1267
 msgid "Edit Monorail"
 msgstr "モノレールの編集"
 
-#: build/trans_presets.java:1269
+#: build/trans_presets.java:1272
 msgid "Preserved"
 msgstr "保存鉄道"
 
 #. item
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1273
 msgid "Edit Preserved Railway"
 msgstr "保存鉄道の編集"
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1278
 msgid "Light Rail"
 msgstr "路面電車（ライトレール）"
 
 #. item
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1279
 msgid "Edit Light Rail"
 msgstr "路面電車（ライトレール）の編集"
 
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1284
 msgid "Subway"
 msgstr "地下鉄"
 
 #. item
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1285
 msgid "Edit Subway"
 msgstr "地下鉄の編集"
 
-#: build/trans_presets.java:1287
+#: build/trans_presets.java:1290
 msgid "Tram"
 msgstr "路面電車（トラム）"
 
 #. item
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1291
 msgid "Edit Tram"
 msgstr "路面電車（トラム）の編集"
 
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1296
 msgid "Bus Guideway"
 msgstr "バスレーン"
@@ -16653,5 +17018,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1295
+#: build/trans_presets.java:1298
 msgid "Edit Bus Guideway"
 msgstr "バス車線の編集"
@@ -16660,14 +17025,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1315
 msgid "Disused Rail"
 msgstr "使われていない線路"
 
 #. item
-#: build/trans_presets.java:1313
+#: build/trans_presets.java:1316
 msgid "Edit Disused Railway"
 msgstr "使われていない線路の編集"
 
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1321
 msgid "Abandoned Rail"
 msgstr "廃棄された線路"
@@ -16676,5 +17041,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1325
 msgid "Level Crossing"
 msgstr "踏切"
@@ -16683,5 +17048,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1329
 msgid "Crossing"
 msgstr "踏切（遮断機なし）"
@@ -16691,5 +17056,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1333
 msgid "Crossing type"
 msgstr "踏切のタイプ"
@@ -16697,5 +17062,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1339
 msgid "Turntable"
 msgstr "転車台（ターンテーブル）"
@@ -16704,10 +17069,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1344
 msgid "Aerialway"
 msgstr "リフト"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1345
 msgid "Chair Lift"
 msgstr "いすリフト"
@@ -16715,10 +17080,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1347
 msgid "Edit Chair Lift"
 msgstr "いすリフトの編集"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1351
 msgid "Drag Lift"
 msgstr "Tバーリフト"
@@ -16726,10 +17091,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1353
 msgid "Edit Drag Lift"
 msgstr "Tバーリフト"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1357
 msgid "Cable Car"
 msgstr "ケーブルカー"
@@ -16737,10 +17102,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1359
 msgid "Edit Cable Car"
 msgstr "ケーブルカーの編集"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1360
+#: build/trans_presets.java:1363
 msgid "Gondola"
 msgstr ""
@@ -16748,5 +17113,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1365
 msgid "Edit Gondola"
 msgstr ""
@@ -16754,5 +17119,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1366 build/trans_presets.java:1461
+#: build/trans_presets.java:1369 build/trans_presets.java:1464
 msgid "Station"
 msgstr "駅"
@@ -16763,10 +17128,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1368 build/trans_presets.java:1464
+#: build/trans_presets.java:1371 build/trans_presets.java:1467
 msgid "Edit Station"
 msgstr "駅の編集"
 
 #. group "Car"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1378
 msgid "Fuel"
 msgstr "ガソリンスタンド"
@@ -16776,5 +17141,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1382
 msgid "Edit Fuel"
 msgstr "ガソリンスタンドの編集"
@@ -16832,32 +17197,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1671 build/trans_presets.java:1678
-#: build/trans_presets.java:1686 build/trans_presets.java:1699
-#: build/trans_presets.java:1713 build/trans_presets.java:1810
-#: build/trans_presets.java:1818 build/trans_presets.java:1909
-#: build/trans_presets.java:1915 build/trans_presets.java:2226
-#: build/trans_presets.java:2250 build/trans_presets.java:2465
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1703
+#: build/trans_presets.java:1717 build/trans_presets.java:1814
+#: build/trans_presets.java:1822 build/trans_presets.java:1919
+#: build/trans_presets.java:1925 build/trans_presets.java:2237
+#: build/trans_presets.java:2261 build/trans_presets.java:2476
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Opening Hours"
 msgstr "営業時間"
@@ -16916,91 +17281,91 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -17015,5 +17380,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1385 build/trans_presets.java:1438
+#: build/trans_presets.java:1388 build/trans_presets.java:1441
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -17023,5 +17388,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1391
 msgid "Edit Parking"
 msgstr "駐車場の編集"
@@ -17032,24 +17397,24 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1391 build/trans_presets.java:1762
-#: build/trans_presets.java:1772 build/trans_presets.java:2396
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:1394 build/trans_presets.java:1766
+#: build/trans_presets.java:1776 build/trans_presets.java:2407
+#: build/trans_presets.java:2524
 msgid "Reference number"
 msgstr "参照番号"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "multi-storey"
 msgstr "多階の建物"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "surface"
 msgstr "表面"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "underground"
 msgstr "地下"
 
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1396
 msgid "Park and Ride"
 msgstr ""
@@ -17058,38 +17423,38 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1394 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
+#: build/trans_presets.java:1397 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
 msgid "Fee"
 msgstr "料金"
 
 #. <space />
-#: build/trans_presets.java:1396
+#: build/trans_presets.java:1399
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1400
 msgid "Spaces for Disabled"
 msgstr "障がい者用スペース"
 
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1401
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1402
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1403
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1405
 msgid "Wash"
 msgstr "洗車場"
 
 #. item
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1406
 msgid "Edit Car Wash"
 msgstr "洗車場の編集"
@@ -17097,5 +17462,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1408 build/trans_presets.java:1452
+#: build/trans_presets.java:1411 build/trans_presets.java:1455
 msgid "Shop"
 msgstr "自動車パーツショップ"
@@ -17103,15 +17468,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1413
 msgid "Edit Car Shop"
 msgstr "自動車パーツショップの編集"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1418
 msgid "Repair"
 msgstr "自動車修理"
 
 #. item
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1419
 msgid "Edit Car Repair"
 msgstr "自動車修理工場の編集"
@@ -17119,5 +17484,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1421 build/trans_presets.java:1445
+#: build/trans_presets.java:1424 build/trans_presets.java:1448
 msgid "Rental"
 msgstr "レンタル"
@@ -17126,10 +17491,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1427
 msgid "Edit Car Rental"
 msgstr "レンタカーの編集"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1432
 msgid "Sharing"
 msgstr "自家用車共有"
@@ -17137,5 +17502,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1434
 msgid "Edit Car Sharing"
 msgstr "カーシェアリング"
@@ -17143,10 +17508,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Parking"
 msgstr "駐輪場の編集"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1446
 msgid "Capacity"
 msgstr "収容台数"
@@ -17155,5 +17520,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1448
+#: build/trans_presets.java:1451
 msgid "Edit Bicycle Rental"
 msgstr "自転車レンタルの編集"
@@ -17162,15 +17527,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1458
 msgid "Edit Bicycle Shop"
 msgstr "自転車ショップの編集"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1463
 msgid "Public Transport"
 msgstr "公共交通機関"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:1472
 msgid "UIC-Reference"
 msgstr "UIC-Reference"
@@ -17178,5 +17543,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1475
 msgid "Railway Halt"
 msgstr "停車場"
@@ -17184,5 +17549,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1477
 msgid "Edit Halt"
 msgstr "停止線の編集"
@@ -17190,5 +17555,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1484
 msgid "Tram Stop"
 msgstr "トラム停車場"
@@ -17197,5 +17562,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1484
+#: build/trans_presets.java:1487
 msgid "Edit Tram Stop"
 msgstr "トラム停車場の編集"
@@ -17203,5 +17568,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1494
 msgid "Railway Platform"
 msgstr "鉄道のプラットホーム"
@@ -17210,5 +17575,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1497
 msgid "Edit Railway Platform"
 msgstr "鉄道のプラットホームの編集"
@@ -17220,5 +17585,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1497 build/trans_presets.java:1539
+#: build/trans_presets.java:1500 build/trans_presets.java:1542
 msgid "Reference (track number)"
 msgstr "リファレンス (ホームの番号)"
@@ -17226,10 +17591,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1499 build/trans_presets.java:1541
+#: build/trans_presets.java:1502 build/trans_presets.java:1544
 msgid "Area"
 msgstr "エリア"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1504
 msgid "Subway Entrance"
 msgstr "地下鉄の入口"
@@ -17238,10 +17603,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1507
 msgid "Edit Subway Entrance"
 msgstr "地下鉄入口の編集"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1512
 msgid "Wheelchair"
 msgstr "車いす"
@@ -17250,5 +17615,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1517
 msgid "Bus Station"
 msgstr "バスターミナル"
@@ -17257,5 +17622,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1520
 msgid "Edit Bus Station"
 msgstr "バスターミナルの編集"
@@ -17263,5 +17628,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1526
 msgid "Bus Stop"
 msgstr "バス停"
@@ -17271,5 +17636,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1530
 msgid "Edit Bus Stop"
 msgstr "バス停の編集"
@@ -17278,6 +17643,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1532 build/trans_presets.java:1785
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:1535 build/trans_presets.java:1789
+#: build/trans_presets.java:2453
 msgid "Shelter"
 msgstr "避難所"
@@ -17285,10 +17650,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1538
 msgid "Bus Platform"
 msgstr "バス乗り場"
 
 #. item
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1539
 msgid "Edit Bus Platform"
 msgstr "バス乗り場の編集"
@@ -17296,5 +17661,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1547
 msgid "Taxi"
 msgstr "タクシー"
@@ -17302,5 +17667,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1549
 msgid "Edit Taxi station"
 msgstr "タクシー乗り場の編集"
@@ -17308,5 +17673,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1554
 msgid "Airport"
 msgstr "空港"
@@ -17314,15 +17679,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1556
 msgid "Edit Airport"
 msgstr "空港の編集"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1561
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1559
+#: build/trans_presets.java:1562
 msgid "ICAO"
 msgstr "ICAO"
@@ -17330,6 +17695,11 @@
 #. item "Public Transport/Airport" text "ICAO"
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1567
+#, fuzzy
+msgid "Travel"
+msgstr "砂利道"
+
+#. group "Travel"
+#: build/trans_presets.java:1568
 msgid "Accomodation"
 msgstr "宿泊施設"
@@ -17341,5 +17711,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1565 build/trans_surveyor.java:43
+#: build/trans_presets.java:1569 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "ホテル"
@@ -17348,15 +17718,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:1568
+#: build/trans_presets.java:1572
 msgid "Edit Hotel"
 msgstr "ホテルの編集"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1575
 msgid "Stars"
 msgstr "星の数"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1577
 msgid "Motel"
 msgstr "モーテル"
@@ -17364,20 +17734,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1579
 msgid "Edit Motel"
 msgstr "モーテルの編集"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1583
 msgid "Guest House"
 msgstr "ゲストハウス"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1584
 msgid "Edit Guest House"
 msgstr "ゲストハウスの編集"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1588
 msgid "Chalet"
 msgstr "シャレー風の別荘、シャレー"
@@ -17385,10 +17755,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1590
 msgid "Edit Chalet"
 msgstr "シャレー風の別荘の編集"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1594
 msgid "Hostel"
 msgstr "ホステル"
@@ -17396,30 +17766,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1592
+#: build/trans_presets.java:1596
 msgid "Edit Hostel"
 msgstr "ホステルの編集"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1600
 msgid "Alpine Hut"
 msgstr "山小屋"
 
 #. item
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1601
 msgid "Edit Alpine Hut"
 msgstr "山小屋の編集"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1606
 msgid "Caravan Site"
 msgstr "ハウストレーラー用駐車場"
 
 #. item
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1607
 msgid "Edit Caravan Site"
 msgstr "ハウストレーラー用駐車場の編集"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1611
 msgid "Camping Site"
 msgstr "キャンプ場"
@@ -17427,10 +17797,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1613
 msgid "Edit Camping Site"
 msgstr "キャンプ場の編集"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1618
 msgid "Food+Drinks"
 msgstr "飲食店"
@@ -17441,5 +17811,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1615 build/trans_surveyor.java:47
+#: build/trans_presets.java:1619 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "レストラン"
@@ -17447,5 +17817,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1621
 msgid "Edit Restaurant"
 msgstr "レストランの編集"
@@ -17453,5 +17823,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "Cuisine"
 msgstr "料理の種類"
@@ -17459,61 +17829,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "italian"
 msgstr "イタリアン"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "chinese"
 msgstr "中国料理"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "pizza"
 msgstr "ピザ"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "burger"
 msgstr "バーガー"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "greek"
 msgstr "ギリシャ料理"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "german"
 msgstr "ドイツ料理"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "indian"
 msgstr "インド料理"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "regional"
 msgstr "郷土料理"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "kebab"
 msgstr "カバブ"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "turkish"
 msgstr "トルコ料理"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "asian"
 msgstr "アジア各国料理"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "thai"
 msgstr "タイ料理"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "mexican"
 msgstr "メキシコ料理"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "japanese"
 msgstr "日本食"
 
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1627
 msgid "Fast Food"
 msgstr "ファーストフード"
@@ -17521,9 +17891,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1629
 msgid "Edit Fast Food Restaurant"
 msgstr "ファーストフード店の編集"
 
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1635
 msgid "Cafe"
 msgstr "カフェ"
@@ -17531,9 +17901,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1633
+#: build/trans_presets.java:1637
 msgid "Edit Cafe"
 msgstr "カフェの編集"
 
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1642
 msgid "Pub"
 msgstr "パブ、居酒屋"
@@ -17541,18 +17911,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1644
 msgid "Edit Pub"
 msgstr "パブの編集"
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1649
 msgid "Biergarten"
 msgstr "ビアガーデン"
 
 #. item
-#: build/trans_presets.java:1646
+#: build/trans_presets.java:1650
 msgid "Edit Biergarten"
 msgstr "ビアガーデンの編集"
 
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1655
 msgid "Bar"
 msgstr "バー"
@@ -17560,9 +17930,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1657
 msgid "Edit Bar"
 msgstr "バーの編集"
 
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1662
 msgid "Nightclub"
 msgstr "ナイトクラブ"
@@ -17570,24 +17940,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1664
 msgid "Edit Nightclub"
 msgstr "ナイトクラブの編集"
 
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1670
 msgid "Tourism"
 msgstr "旅行"
 
 #. group "Tourism"
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1671
 msgid "Attraction"
 msgstr "アトラクション"
 
 #. item
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1672
 msgid "Edit Attraction"
 msgstr "アトラクションの編集"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1677
 msgid "Museum"
 msgstr "博物館"
@@ -17595,9 +17965,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1679
 msgid "Edit Museum"
 msgstr "博物館の編集"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1684
 msgid "Zoo"
 msgstr "動物園"
@@ -17606,9 +17976,9 @@
 #. <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:1683
+#: build/trans_presets.java:1687
 msgid "Edit Zoo"
 msgstr "動物園の編集"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1692
 msgid "Viewpoint"
 msgstr "観覧台"
@@ -17616,24 +17986,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1694
 msgid "Edit Viewpoint"
 msgstr "View pointの編集"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1697
 msgid "Look-Out Tower"
 msgstr "Look-Out Tower"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1699
 msgid "Theme Park"
 msgstr "テーマパーク"
 
 #. item
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1700
 msgid "Edit Theme Park"
 msgstr "テーマパークの編集"
 
-#: build/trans_presets.java:1701
+#: build/trans_presets.java:1705
 msgid "Artwork"
 msgstr "美術館"
@@ -17641,5 +18011,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1707
 msgid "Edit Artwork"
 msgstr "美術館の編集"
@@ -17647,19 +18017,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1712
 msgid "Information Office"
 msgstr "案内所"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1719
 msgid "Map"
 msgstr "マップ"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "Detail Grade"
-msgstr ""
+msgstr "詳細なグレード"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "topo"
 msgstr ""
@@ -17697,5 +18067,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1720 build/trans_style.java:619
+#: build/trans_presets.java:1724 build/trans_style.java:619
 #: build/trans_style.java:635 build/trans_style.java:651
 #: build/trans_style.java:659
@@ -17703,28 +18073,28 @@
 msgstr "ストリート"
 
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "scheme"
-msgstr ""
-
-#: build/trans_presets.java:1721
+msgstr "スキーム"
+
+#: build/trans_presets.java:1725
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "site"
-msgstr ""
-
-#: build/trans_presets.java:1721
+msgstr "サイト"
+
+#: build/trans_presets.java:1725
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1722 build/trans_presets.java:1738
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1726 build/trans_presets.java:1742
+#: build/trans_presets.java:1786
 msgid "Closer Description"
 msgstr ""
@@ -17734,5 +18104,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1724 build/trans_presets.java:1747
+#: build/trans_presets.java:1728 build/trans_presets.java:1751
 msgid "Routes shown for:"
 msgstr ""
@@ -17740,6 +18110,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1726 build/trans_presets.java:1749
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1965
 msgid "Cycling"
 msgstr "サイクリング"
@@ -17747,12 +18117,12 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1727 build/trans_presets.java:1750
+#: build/trans_presets.java:1731 build/trans_presets.java:1754
 msgid "Mountainbiking"
-msgstr ""
+msgstr "マウンテンバイク"
 
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1728 build/trans_presets.java:1751
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:1732 build/trans_presets.java:1755
+#: build/trans_presets.java:2019
 msgid "Skiing"
 msgstr "スキー"
@@ -17760,5 +18130,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1729 build/trans_presets.java:1752
+#: build/trans_presets.java:1733 build/trans_presets.java:1756
 msgid "Riding"
 msgstr ""
@@ -17766,76 +18136,76 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1734 build/trans_presets.java:1757
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1736
 msgid "Information Board"
 msgstr "情報板"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "Board Content"
-msgstr ""
+msgstr "掲示板の内容"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "notice"
 msgstr "通知"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "history"
 msgstr "履歴"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "nature"
 msgstr "自然"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "wildlife"
 msgstr "野生生物"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1744
 msgid "Guidepost"
-msgstr ""
+msgstr "道しるべ"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1759
 msgid "Information Terminal"
-msgstr ""
+msgstr "情報端末"
 
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1760 build/trans_presets.java:1770
+#: build/trans_presets.java:1764 build/trans_presets.java:1774
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1769
 msgid "Audioguide"
 msgstr "音声ガイド"
 
 #. <space />
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1779
 msgid "Audioguide via mobile phone?"
 msgstr "携帯電話経由の音声ガイド？"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1780
 msgid "Phone number"
 msgstr "電話番号"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1778
+#: build/trans_presets.java:1782
 msgid "Other Information Points"
 msgstr "その他の情報ポイント"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1790
 msgid "Edit Shelter"
 msgstr "シェルターの編集"
@@ -17843,25 +18213,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1789 build/trans_presets.java:1795
+#: build/trans_presets.java:1793 build/trans_presets.java:1799
 msgid "Fireplace"
 msgstr "野外炉"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1791
+#: build/trans_presets.java:1795
 msgid "Picnic Site"
 msgstr "ピクニック場(野外調理場)"
 
 #. item
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1796
 msgid "Edit Picnic Site"
 msgstr "ピクニック場の編集"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1802
 msgid "Historic Places"
 msgstr "史跡"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1799
+#: build/trans_presets.java:1803
 msgid "Castle"
 msgstr "城"
@@ -17870,19 +18240,19 @@
 #. <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:1802
+#: build/trans_presets.java:1806
 msgid "Edit Castle"
 msgstr "城の編集"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1810
 msgid "Ruins"
 msgstr "遺跡"
 
 #. item
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1811
 msgid "Edit Ruins"
 msgstr "遺跡(ruins)の編集"
 
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1816
 msgid "Archaeological Site"
 msgstr "遺跡（群）"
@@ -17891,9 +18261,9 @@
 #. <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:1815
+#: build/trans_presets.java:1819
 msgid "Edit Archaeological Site"
 msgstr "遺跡（群）の編集"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1824
 msgid "Battlefield"
 msgstr "戦場"
@@ -17901,5 +18271,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1826
 msgid "Edit Battlefield"
 msgstr "戦場の編集"
@@ -17907,15 +18277,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1831
 msgid "Monument"
 msgstr "記念塔(モニュメント)"
 
 #. item
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1832
 msgid "Edit Monument"
 msgstr "モニュメントの編集"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1836
 msgid "Memorial"
 msgstr "記念碑(戦争記念などの)"
@@ -17923,45 +18293,57 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1838
 msgid "Edit Memorial"
 msgstr "記念碑の編集"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1842
 msgid "Wayside Cross"
 msgstr "道路際の十字架"
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1843
 msgid "Edit Wayside Cross"
 msgstr "道路際の十字架の編集"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1847
 msgid "Wayside Shrine"
 msgstr "道祖神"
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1848
 msgid "Edit Wayside Shrine"
 msgstr "道祖神の編集"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1852
+#, fuzzy
+msgid "Boundary Stone"
+msgstr "境界線"
+
+#. item
+#: build/trans_presets.java:1853
+#, fuzzy
+msgid "Edit Boundary Stone"
+msgstr "本屋を編集"
+
+#. item "Historic Places/Boundary Stone" text "Name"
+#: build/trans_presets.java:1858
 msgid "Leisure"
 msgstr "レジャー"
 
 #. group "Leisure"
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1859
 msgid "Water Park"
 msgstr "遊泳用プール"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1860
 msgid "Edit Water Park"
 msgstr "遊泳用プールの編集"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1864
 msgid "Playground"
 msgstr "遊び場"
@@ -17969,31 +18351,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1866
 msgid "Edit Playground"
 msgstr "運動公園の編集"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1870
 msgid "Fishing"
 msgstr "つり"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1871
 msgid "Edit Fishing"
 msgstr "つりの編集"
 
 #. item "Leisure/Fishing" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1877 build/trans_presets.java:2669
+msgid "Sports"
+msgstr "スポーツ"
+
+#. group "Sports"
+#: build/trans_presets.java:1878
 msgid "Sport Facilities"
 msgstr "スポーツ施設"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1879
 msgid "Stadium"
 msgstr "スタジアム"
 
 #. item
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1880
 msgid "Edit Stadium"
 msgstr "スタジアムの編集"
@@ -18007,6 +18393,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1874 build/trans_presets.java:1883
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1902 build/trans_presets.java:1911
 msgid "select sport:"
 msgstr "スポーツ選択："
@@ -18398,30 +18784,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884 build/trans_style.java:3892
-#: build/trans_style.java:3900 build/trans_style.java:3908
-#: build/trans_style.java:3916 build/trans_style.java:3924
-#: build/trans_style.java:3932
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_style.java:3572 build/trans_style.java:3580
+#: build/trans_style.java:3588 build/trans_style.java:3596
+#: build/trans_style.java:3604 build/trans_style.java:3612
+#: build/trans_style.java:3620 build/trans_style.java:3628
+#: build/trans_style.java:3636 build/trans_style.java:3644
+#: build/trans_style.java:3652 build/trans_style.java:3660
+#: build/trans_style.java:3668 build/trans_style.java:3676
+#: build/trans_style.java:3684 build/trans_style.java:3692
+#: build/trans_style.java:3700 build/trans_style.java:3708
+#: build/trans_style.java:3716 build/trans_style.java:3724
+#: build/trans_style.java:3732 build/trans_style.java:3740
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3764 build/trans_style.java:3772
+#: build/trans_style.java:3780 build/trans_style.java:3788
+#: build/trans_style.java:3796 build/trans_style.java:3804
+#: build/trans_style.java:3812 build/trans_style.java:3820
+#: build/trans_style.java:3828 build/trans_style.java:3836
+#: build/trans_style.java:3844 build/trans_style.java:3852
+#: build/trans_style.java:3860 build/trans_style.java:3868
+#: build/trans_style.java:3876 build/trans_style.java:3884
+#: build/trans_style.java:3892 build/trans_style.java:3900
+#: build/trans_style.java:3908 build/trans_style.java:3916
+#: build/trans_style.java:3924 build/trans_style.java:3932
+#: build/trans_style.java:3940
 msgid "sport"
 msgstr "スポーツ"
@@ -18431,225 +18817,225 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "multi"
 msgstr "多目的"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "archery"
 msgstr "アーチェリー"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "athletics"
 msgstr "アスレチック"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "australian_football"
 msgstr "オーストラリアフットボール"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "baseball"
 msgstr "野球"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "basketball"
 msgstr "バスケットボール"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "boules"
 msgstr "ペタンク"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "bowls"
 msgstr "ボーリング"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "canoe"
 msgstr "カヌー"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "climbing"
 msgstr "登山"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket"
 msgstr "クリケット"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket_nets"
 msgstr "クリケットネット"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "croquet"
 msgstr "クローク"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cycling"
 msgstr "サイクリング"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "dog_racing"
 msgstr "ドッグレース"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "equestrian"
 msgstr "乗馬"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "football"
 msgstr "フットボール"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "golf"
 msgstr "ゴルフ"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "gymnastics"
 msgstr "体操"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "hockey"
 msgstr "ホッケー"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "horse_racing"
 msgstr "競馬"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "motor"
 msgstr "モータースポーツ"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "pelota"
 msgstr "ペロタ"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "racquet"
 msgstr "ラケットボール"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "rugby"
 msgstr "ラグビー"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "shooting"
 msgstr "射撃"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skateboard"
 msgstr "スケートボード"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skating"
 msgstr "スケート"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skiing"
 msgstr "スキー"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "soccer"
 msgstr "サッカー"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "swimming"
 msgstr "水泳"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "table_tennis"
 msgstr "卓球"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "tennis"
 msgstr "テニス"
 
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1888
 msgid "Sports Centre"
 msgstr "スポーツセンター"
 
 #. item
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1889
 msgid "Edit Sports Centre"
 msgstr "スポーツセンターの編集"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1897
 msgid "Pitch"
 msgstr "運動場"
 
 #. item
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1898
 msgid "Edit Pitch"
 msgstr "運動場の編集"
 
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1906
 msgid "Racetrack"
 msgstr "競技トラック"
 
 #. item
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1907
 msgid "Edit Racetrack"
 msgstr "競技場のトラックの編集"
 
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1915
 msgid "Golf Course"
 msgstr "ゴルフコース"
 
 #. item
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1916
 msgid "Edit Golf Course"
 msgstr "ゴルフコースの編集"
 
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1921
 msgid "Miniature Golf"
 msgstr "ミニチュアゴルフ"
 
 #. item
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1922
 msgid "Edit Miniature Golf"
 msgstr "ミニチュアゴルフの編集"
 
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1928
 msgid "Sport"
 msgstr "スポーツ"
 
 #. group "Sport"
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1929
 msgid "Multi"
 msgstr "多目的"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1930
 msgid "Edit Multi"
 msgstr "Multiの編集"
@@ -18688,183 +19074,183 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "pitch"
 msgstr "運動場"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "sports_centre"
 msgstr "スポーツセンター"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "stadium"
 msgstr "スタジアム"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1935
 msgid "10pin"
 msgstr "テンピンズ"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1936
 msgid "Edit 10pin"
 msgstr "テンピンズの編集"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1941
 msgid "Athletics"
 msgstr "アスレチック"
 
 #. item
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1942
 msgid "Edit Athletics"
 msgstr "アスレチック場の編集"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1947
 msgid "Archery"
 msgstr "アーチェリー"
 
 #. item
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1948
 msgid "Edit Archery"
 msgstr "アーチェリーの編集"
 
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1953
 msgid "Climbing"
 msgstr "登山"
 
 #. item
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:1954
 msgid "Edit Climbing"
 msgstr "登山の編集"
 
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1959
 msgid "Canoeing"
 msgstr "カヌー・競艇"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1960
 msgid "Edit Canoeing"
 msgstr "競艇場の編集"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1966
 msgid "Edit Cycling"
 msgstr "サイクリングの編集"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1971
 msgid "Dog Racing"
 msgstr "ドッグレース"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1972
 msgid "Edit Dog Racing"
 msgstr "ドックレースの編集"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1977
 msgid "Equestrian"
 msgstr "乗馬"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1978
 msgid "Edit Equestrian"
 msgstr "乗馬の編集"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1983
 msgid "Horse Racing"
 msgstr "競馬"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1984
 msgid "Edit Horse Racing"
 msgstr "競馬場の編集"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1989
 msgid "Gymnastics"
 msgstr "体操"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1990
 msgid "Edit Gymnastics"
 msgstr "体操競技の編集"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1995
 msgid "Motor Sports"
 msgstr "モータースポーツ"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1996
 msgid "Edit Motor Sports"
 msgstr "モータースポーツの編集"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2001
 msgid "Skating"
 msgstr "スケート"
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2002
 msgid "Edit Skating"
 msgstr "スケート場の編集"
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2007
 msgid "Skateboard"
 msgstr "スケートボード"
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2008
 msgid "Edit Skateboard"
 msgstr "スケートボードの編集"
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2013
 msgid "Swimming"
 msgstr "水泳"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2014
 msgid "Edit Swimming"
 msgstr "水泳の編集"
@@ -18872,56 +19258,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2021
 msgid "Edit Skiing"
 msgstr "スキーの編集"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "Piste type"
 msgstr "ゲレンデのタイプ"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "downhill"
 msgstr "ダウンヒル"
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "nordic"
 msgstr "ノルディックスキー"
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "snow_park"
 msgstr "スノーパーク"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "Difficulty"
 msgstr "難易度"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "novice"
 msgstr "初心者"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "easy"
 msgstr "初球"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "intermediate"
-msgstr ""
-
-#: build/trans_presets.java:2015
+msgstr "中間"
+
+#: build/trans_presets.java:2025
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "expert"
 msgstr "エキスパート"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "freeride"
 msgstr "ただ乗り"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2028
 msgid "Shooting"
 msgstr "射撃"
@@ -18929,127 +19315,127 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2030
 msgid "Edit Shooting"
 msgstr "射撃の編集"
 
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2036
 msgid "Sport (Ball)"
 msgstr "球技"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2037
 msgid "Soccer"
 msgstr "サッカー"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2038
 msgid "Edit Soccer"
 msgstr "サッカー場の編集"
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2043
 msgid "Football"
 msgstr "フットボール"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2044
 msgid "Edit Football"
 msgstr "フットボール場の編集"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2049
 msgid "Australian Football"
 msgstr "オーストラリアフットボール"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2050
 msgid "Edit Australian Football"
 msgstr "オーストラリアフットボールの編集"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2055
 msgid "Baseball"
 msgstr "野球"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2056
 msgid "Edit Baseball"
 msgstr "野球場の編集"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2061
 msgid "Basketball"
 msgstr "バスケットボール"
 
 #. item
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2062
 msgid "Edit Basketball"
 msgstr "バスケットボール場の編集"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2067
 msgid "Golf"
 msgstr "ゴルフ"
 
 #. item
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2068
 msgid "Edit Golf"
 msgstr "ゴルフの編集"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2071
 msgid "golf_course"
 msgstr "ゴルフコース"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2073
 msgid "Boule"
 msgstr "ペタンク"
 
 #. item
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2074
 msgid "Edit Boule"
 msgstr "（ペタンクの）ブールの編集"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2079
 msgid "Bowls"
 msgstr "ボーリング"
 
 #. item
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2080
 msgid "Edit Bowls"
 msgstr "ボーリング場の編集"
 
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2085
 msgid "Cricket"
 msgstr "クリケット"
 
 #. item
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2086
 msgid "Edit Cricket"
 msgstr "クリケットの編集"
 
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2091
 msgid "Cricket Nets"
 msgstr "クリケットネット"
 
 #. item
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2092
 msgid "Edit Cricket Nets"
 msgstr "クリケットネットの編集"
 
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2097
 msgid "Croquet"
 msgstr "クロッケー"
 
 #. item
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2098
 msgid "Edit Croquet"
 msgstr "クロッケーの編集"
 
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2103
 msgid "Hockey"
 msgstr "ホッケー"
 
 #. item
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2104
 msgid "Edit Hockey"
 msgstr "ホッケーの編集"
 
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2109
 msgid "Pelota"
 msgstr "ペロタ"
@@ -19057,51 +19443,56 @@
 #  ペロタ 《スペイン・南米・フィリピンなどで行なわれる球技; ハイアライ (jai alai) に発展》.
 #. item
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2110
 msgid "Edit Pelota"
 msgstr "ペロタの編集"
 
-#: build/trans_presets.java:2105
+#: build/trans_presets.java:2115
 msgid "Racquet"
 msgstr "ラケットボール"
 
 #. item
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2116
 msgid "Edit Racquet"
 msgstr "ラケットボールの編集"
 
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2121
 msgid "Rugby"
 msgstr "ラグビー"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2122
 msgid "Edit Rugby"
 msgstr "ラグビー場の編集"
 
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2127
 msgid "Table Tennis"
 msgstr "卓球"
 
 #. item
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2128
 msgid "Edit Table Tennis"
 msgstr "卓球の編集"
 
-#: build/trans_presets.java:2123
+#: build/trans_presets.java:2133
 msgid "Tennis"
 msgstr "テニス"
 
 #. item
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2134
 msgid "Edit Tennis"
 msgstr "テニスの編集"
 
-#. <separator/>
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2141
+#, fuzzy
+msgid "Man-Made"
+msgstr "人工物"
+
+#. group "Man-Made"
+#: build/trans_presets.java:2142
 msgid "Buildings"
 msgstr "ビル"
 
 #. group "Buildings"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2143
 msgid "Building"
 msgstr "ビル"
@@ -19109,5 +19500,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Public Building"
 msgstr "公共のビル"
@@ -19115,10 +19506,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2148
 msgid "Edit Public Building"
 msgstr "公共のビルの編集"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2152
 msgid "Town hall"
 msgstr "役場"
@@ -19126,10 +19517,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2154
 msgid "Edit Town hall"
 msgstr "役場の編集"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:2158
 msgid "Embassy"
 msgstr "大使館"
@@ -19137,10 +19528,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Edit Embassy"
 msgstr "大使館の編集"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2164
 msgid "Courthouse"
 msgstr "裁判所"
@@ -19149,10 +19540,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:2156
+#: build/trans_presets.java:2167
 msgid "Edit Courthouse"
 msgstr "裁判所の編集"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2171
 msgid "Prison"
 msgstr "刑務所"
@@ -19161,10 +19552,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:2163
+#: build/trans_presets.java:2174
 msgid "Edit Prison"
 msgstr "刑務所の編集"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2178
 msgid "Police"
 msgstr "警察"
@@ -19174,10 +19565,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:2171
+#: build/trans_presets.java:2182
 msgid "Edit Police"
 msgstr "警察署・交番の編集"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2186
 msgid "Fire Station"
 msgstr "消防署"
@@ -19186,10 +19577,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:2178
+#: build/trans_presets.java:2189
 msgid "Edit Fire Station"
 msgstr "消防署の編集"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "Post Office"
 msgstr "郵便局"
@@ -19197,5 +19588,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Edit Post Office"
 msgstr "郵便局の編集"
@@ -19203,15 +19594,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2200
 msgid "Kindergarten"
 msgstr "幼稚園"
 
 #. item
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Kindergarten"
 msgstr "幼稚園の編集"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2205
 msgid "School"
 msgstr "学校"
@@ -19219,10 +19610,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Edit School"
 msgstr "学校の編集"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2211
 msgid "University"
 msgstr "大学"
@@ -19230,10 +19621,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit University"
 msgstr "大学の編集"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "College"
 msgstr "短大"
@@ -19241,5 +19632,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2219
 msgid "Edit College"
 msgstr "短大の編集"
@@ -19247,5 +19638,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2224
 msgid "Cinema"
 msgstr "映画館"
@@ -19254,10 +19645,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:2216
+#: build/trans_presets.java:2227
 msgid "Edit Cinema"
 msgstr "映画館の編集"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2231
 msgid "Library"
 msgstr "図書館"
@@ -19266,9 +19657,9 @@
 #. <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:2223
+#: build/trans_presets.java:2234
 msgid "Edit Library"
 msgstr "図書館の編集"
 
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Arts Centre"
 msgstr "美術館"
@@ -19276,10 +19667,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Arts Centre"
 msgstr "美術館の編集"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Theatre"
 msgstr "劇場"
@@ -19288,10 +19679,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:2237
+#: build/trans_presets.java:2248
 msgid "Edit Theatre"
 msgstr "劇場の編集"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2252
 msgid "Place of Worship"
 msgstr "礼拝所"
@@ -19301,5 +19692,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:2245
+#: build/trans_presets.java:2256
 msgid "Edit Place of Worship"
 msgstr "礼拝所の編集"
@@ -19308,6 +19699,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "Religion"
 msgstr "宗教"
@@ -19316,66 +19707,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "bahai"
 msgstr "バハーイ教"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "buddhist"
 msgstr "仏教"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "christian"
 msgstr "キリスト教"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "hindu"
 msgstr "ヒンズー教"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jain"
 msgstr "ジャイナ教"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jewish"
 msgstr "ユダヤ教"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "muslim"
 msgstr "ムスリム"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "sikh"
 msgstr "シーク教"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "spiritualist"
 msgstr "降霊術士、イタコ"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "taoist"
 msgstr "道教"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "zoroastrian"
 msgstr "ゾロアスター教"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "Denomination"
 msgstr "宗派"
@@ -19384,81 +19775,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "anglican"
 msgstr "英国教会系"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "baptist"
 msgstr "バプチスト"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "catholic"
 msgstr "カトリック"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "evangelical"
 msgstr "福音派"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "jehovahs_witness"
 msgstr "ものみの塔、エホバの証人"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "lutheran"
 msgstr "ルター派"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "methodist"
 msgstr "メソジスト派"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "mormon"
 msgstr "モルモン"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "orthodox"
 msgstr "ギリシャ正教系"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "pentecostal"
 msgstr "ペンテコステ派"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "presbyterian"
 msgstr "長老派"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "protestant"
 msgstr "プロテスタント"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "quaker"
 msgstr "クエーカー教徒"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "shia"
 msgstr "シーア派"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "sunni"
 msgstr "スンニ派"
 
 #. <separator/>
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2264
 msgid "Addresses"
 msgstr "住所"
@@ -19467,5 +19858,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:2256
+#: build/trans_presets.java:2267
 msgid "Edit Address Information"
 msgstr "住所情報の編集"
@@ -19473,5 +19864,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2269
 msgid "House number"
 msgstr "いえ番号"
@@ -19479,20 +19870,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "House name"
 msgstr "家の名前"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "City name"
 msgstr "都市名"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2274
 msgid "Post code"
 msgstr "郵便番号"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2275
 msgid "Country code"
 msgstr "国コード"
@@ -19500,5 +19891,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Address Interpolation"
 msgstr "住所の補間"
@@ -19507,5 +19898,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:2270
+#: build/trans_presets.java:2281
 msgid "Edit Address Interpolation"
 msgstr "住所の補間を編集"
@@ -19513,67 +19904,67 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "Numbering scheme"
 msgstr "番地付けルール"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "odd"
 msgstr "奇数"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "even"
 msgstr "偶数"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "alphabetic"
-msgstr ""
-
-#: build/trans_presets.java:2275
+msgstr "アルファベット順"
+
+#: build/trans_presets.java:2286
 msgid "Man Made"
 msgstr "人工物"
 
 #. group "Man Made"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Works"
 msgstr "工場"
 
 #. item
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2288
 msgid "Edit Works"
 msgstr "工場の編集"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2292
 msgid "Tower"
 msgstr "タワー"
 
 #. item
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2293
 msgid "Edit Tower"
 msgstr "タワーの編集"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Water Tower"
 msgstr "水道塔"
 
 #. item
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2298
 msgid "Edit Water Tower"
 msgstr "水道塔の編集"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Gasometer"
 msgstr "ガスタンク"
 
 #. item
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2303
 msgid "Edit Gasometer"
 msgstr "ガスタンクの編集"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Lighthouse"
 msgstr "灯台"
@@ -19581,10 +19972,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2309
 msgid "Edit Lighthouse"
 msgstr "灯台の編集"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Windmill"
 msgstr "風車"
@@ -19592,10 +19983,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2315
 msgid "Edit Windmill"
 msgstr "風車の編集"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2319
 msgid "Pipeline"
 msgstr "パイプライン"
@@ -19603,10 +19994,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Edit Pipeline"
 msgstr "パイプラインの編集"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2325
 msgid "Wastewater Plant"
 msgstr "下水処理場"
@@ -19616,10 +20007,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:2318
+#: build/trans_presets.java:2329
 msgid "Edit Wastewater Plant"
 msgstr "下水処理場の編集"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2333
 msgid "Crane"
 msgstr "クレーン"
@@ -19627,10 +20018,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2335
 msgid "Edit Crane"
 msgstr "クレーンの編集"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Beacon"
 msgstr "ビーコン"
@@ -19638,10 +20029,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2341
 msgid "Edit Beacon"
 msgstr "誘導灯の編集"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2345
 msgid "Survey Point"
 msgstr "調査ポイント"
@@ -19649,10 +20040,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Edit Survey Point"
 msgstr "測点の編集"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2351
 msgid "Surveillance"
 msgstr "監視カメラ"
@@ -19660,5 +20051,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2353
 msgid "Edit Surveillance Camera"
 msgstr "監視カメラの編集"
@@ -19666,5 +20057,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Power Generator"
 msgstr "発電機"
@@ -19674,39 +20065,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:2351
+#: build/trans_presets.java:2362
 msgid "Edit Power Generator"
 msgstr "発電機の編集"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "wind"
 msgstr "風"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "hydro"
 msgstr "水力発電"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "fossil"
 msgstr "火力発電"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "nuclear"
 msgstr "原子力"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "coal"
 msgstr "石炭"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "photovoltaic"
 msgstr "太陽光発電"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "gas"
 msgstr "ガス"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2367
 msgid "Power Station"
 msgstr "変電所"
@@ -19715,10 +20106,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:2359
+#: build/trans_presets.java:2370
 msgid "Edit Power Station"
 msgstr "変電所の編集"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2374
 msgid "Power Sub Station"
 msgstr "発電サブステーション"
@@ -19727,5 +20118,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:2366
+#: build/trans_presets.java:2377
 msgid "Edit Power Sub Station"
 msgstr "配電所の編集"
@@ -19733,10 +20124,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2369 build/trans_presets.java:2385
+#: build/trans_presets.java:2380 build/trans_presets.java:2396
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2382
 msgid "Power Tower"
 msgstr "送電塔"
@@ -19747,5 +20138,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:2376
+#: build/trans_presets.java:2387
 msgid "Edit Power Tower"
 msgstr "送電塔の編集"
@@ -19753,5 +20144,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2390
 msgid "Power Line"
 msgstr "送電線"
@@ -19760,40 +20151,40 @@
 #. <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:2382
+#: build/trans_presets.java:2393
 msgid "Edit Power Line"
 msgstr "送電線の編集"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Voltage"
 msgstr "電圧"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2398
 msgid "Amount of Wires"
 msgstr "ワイヤー量"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Amenities"
 msgstr "各種設備"
 
 #. group "Amenities"
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2402
 msgid "Toilets"
 msgstr "トイレ"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2398 build/trans_presets.java:2514
+#: build/trans_presets.java:2409 build/trans_presets.java:2525
 msgid "Note"
 msgstr "備考"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2411
 msgid "Post Box"
 msgstr "郵便ポスト"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2416
 msgid "Telephone"
 msgstr "電話"
@@ -19802,5 +20193,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:2408
+#: build/trans_presets.java:2419
 msgid "Edit Telephone"
 msgstr "電話を編集"
@@ -19808,5 +20199,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2411 build/trans_presets.java:2515
+#: build/trans_presets.java:2422 build/trans_presets.java:2526
 msgid "Coins"
 msgstr "コイン"
@@ -19814,5 +20205,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2412 build/trans_presets.java:2516
+#: build/trans_presets.java:2423 build/trans_presets.java:2527
 msgid "Notes"
 msgstr "備考"
@@ -19820,5 +20211,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2413 build/trans_presets.java:2517
+#: build/trans_presets.java:2424 build/trans_presets.java:2528
 msgid "Electronic purses and Charge cards"
 msgstr "電子マネー"
@@ -19826,5 +20217,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2414 build/trans_presets.java:2518
+#: build/trans_presets.java:2425 build/trans_presets.java:2529
 msgid "Debit cards"
 msgstr "デビットカード"
@@ -19832,15 +20223,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2415 build/trans_presets.java:2519
+#: build/trans_presets.java:2426 build/trans_presets.java:2530
 msgid "Credit cards"
 msgstr "クレジットカード"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2427
 msgid "Telephone cards"
 msgstr "テレフォンカード"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2429
 msgid "Recycling"
 msgstr "リサイクル"
@@ -19849,5 +20240,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:2421
+#: build/trans_presets.java:2432
 msgid "Edit Recycling station"
 msgstr "リサイクルステーションの編集"
@@ -19855,35 +20246,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Batteries"
 msgstr "バッテリー"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2435
 msgid "Cans"
 msgstr "カン"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Clothes"
 msgstr "被服"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2437
 msgid "Glass"
 msgstr "ガラス"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2438
 msgid "Paper"
 msgstr "紙"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2439
 msgid "Scrap Metal"
 msgstr "スクラップ金属"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2441
 msgid "Bench"
 msgstr "ベンチ"
@@ -19892,40 +20283,33 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2433
-#, fuzzy
+#: build/trans_presets.java:2444
 msgid "Backrest"
-msgstr "戻る"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "Material"
-msgstr "記念碑(戦争記念などの)"
+msgstr "素材"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2434
-#, fuzzy
+#: build/trans_presets.java:2445
 msgid "stone"
-msgstr "なし"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr "石"
+
+#: build/trans_presets.java:2445
 msgid "plastic"
-msgstr "場所"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr "プラスチック"
+
+#: build/trans_presets.java:2446
 msgid "Colour"
 msgstr "色"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "black"
-msgstr "戻る"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr "黒"
+
+#: build/trans_presets.java:2446
 msgid "brown"
-msgstr "下"
+msgstr "茶"
 
 #. color historic
@@ -19994,39 +20378,35 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2435 build/trans_style.java:3055
-#: build/trans_style.java:3063 build/trans_style.java:3071
-#: build/trans_style.java:3079 build/trans_style.java:3127
-#: build/trans_style.java:3135 build/trans_style.java:3233
-#: build/trans_style.java:3241
+#: build/trans_presets.java:2446 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3135
+#: build/trans_style.java:3143 build/trans_style.java:3241
+#: build/trans_style.java:3249
 msgid "green"
 msgstr "緑"
 
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "red"
-msgstr "終了"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr "赤"
+
+#: build/trans_presets.java:2446
 msgid "blue"
-msgstr "値"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr "青"
+
+#: build/trans_presets.java:2446
 msgid "white"
-msgstr "水域(湖沼)"
-
-#: build/trans_presets.java:2436
-#, fuzzy
+msgstr "白"
+
+#: build/trans_presets.java:2447
 msgid "Amount of Seats"
-msgstr "ワイヤー量"
+msgstr "席の数"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2449
 msgid "Hunting Stand"
 msgstr "Hunting Stand"
 
 #. item
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2450
 msgid "Edit Hunting Stand"
 msgstr "Hunting Standの編集"
@@ -20035,30 +20415,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2441 build/trans_presets.java:2902
+#: build/trans_presets.java:2452 build/trans_presets.java:2914
 msgid "Height"
 msgstr "高さ"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "low"
 msgstr "低い"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "half"
 msgstr "半分"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "full"
 msgstr "完全"
 
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2454
 msgid "Hide"
 msgstr "隠す"
 
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2455
 msgid "Lock"
 msgstr "ロック"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Fountain"
 msgstr "噴水"
@@ -20067,10 +20447,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:2449
+#: build/trans_presets.java:2460
 msgid "Edit Fountain"
 msgstr "噴水の編集"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2464
 msgid "Drinking Water"
 msgstr "飲料水"
@@ -20079,10 +20459,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:2456
+#: build/trans_presets.java:2467
 msgid "Edit Drinking Water"
 msgstr "飲料水の編集"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2471
 msgid "Baby Hatch"
 msgstr "赤ちゃんポスト"
@@ -20090,33 +20470,33 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Baby Hatch"
 msgstr "赤ちゃんポストの編集"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2479
 msgid "Shops"
 msgstr "店舗"
 
 #. group "Shops"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2480
 msgid "Supermarket"
 msgstr "スーパーマーケット"
 
 #. item
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2481
 msgid "Edit Supermarket"
 msgstr "スーパーマーケットの編集"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2486
 msgid "Chemist"
 msgstr "薬品屋"
 
 #. item
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2487
 msgid "Edit Chemist"
 msgstr "薬品屋の編集"
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2492
 msgid "Convenience Store"
 msgstr "コンビニエンスストア"
@@ -20124,9 +20504,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Edit Convenience Store"
 msgstr "コンビニの編集"
 
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2499
 msgid "Kiosk"
 msgstr "キオスク"
@@ -20134,27 +20514,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Kiosk"
 msgstr "キオスクの編集"
 
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Book Store"
 msgstr "本屋"
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2507
 msgid "Edit Book Store"
 msgstr "本屋を編集"
 
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2512
 msgid "Travel Agency"
 msgstr "旅行代理店"
 
 #. item
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2513
 msgid "Edit Travel Agency"
 msgstr "旅行代理店の編集"
 
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2518
 msgid "Vending machine"
 msgstr "自動販売機"
@@ -20162,5 +20542,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Edit Vending machine"
 msgstr "自動販売機の編集"
@@ -20168,88 +20548,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "Vending products"
 msgstr "自動販売機"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_tickets"
 msgstr "公共_交通_チケット"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "parking_tickets"
 msgstr "パーキングチケット"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "food"
 msgstr "食料"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "drinks"
 msgstr "飲料"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "sweets"
 msgstr "甘味"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "cigarettes"
 msgstr "たばこ"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "photos"
 msgstr "写真"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "animal_food"
 msgstr "ペットフード"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "news_papers"
 msgstr "新聞"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "toys"
 msgstr "おもちゃ"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "stamps"
 msgstr "切手"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "SIM-cards"
 msgstr "携帯の契約"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "telephone_vouchers"
 msgstr "プリペイド携帯のチャージ"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "vouchers"
 msgstr "車"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "condoms"
 msgstr "コンドーム"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "tampons"
 msgstr "タンポン"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Butcher"
 msgstr "精肉店"
@@ -20257,9 +20637,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2535
 msgid "Edit Butcher"
 msgstr "精肉店の編集"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2540
 msgid "Baker"
 msgstr "パン屋"
@@ -20267,9 +20647,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2542
 msgid "Edit Baker"
 msgstr "パン屋の編集"
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2547
 msgid "Florist"
 msgstr "生花店"
@@ -20277,18 +20657,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Florist"
 msgstr "生花店の編集"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2554
 msgid "Organic"
 msgstr "オーガニック"
 
 #. item
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Edit Organic Shop"
 msgstr "オーガニック（有機）ショップの編集"
 
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2560
 msgid "Alcohol"
 msgstr "酒屋"
@@ -20296,54 +20676,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2562
 msgid "Edit Alcohol Shop"
 msgstr "酒屋の編集"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2567
 msgid "Beverages"
 msgstr "飲料店"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2568
 msgid "Edit Beverages Shop"
 msgstr "酒屋(飲み物屋)の編集"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2573
 msgid "Computer"
 msgstr "コンピュータ店"
 
 #. item
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2574
 msgid "Edit Computer Shop"
 msgstr "コンピュータ店の編集"
 
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Electronics"
 msgstr "家電店"
 
 #. item
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2580
 msgid "Edit Electronics Shop"
 msgstr "家電店の編集"
 
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2585
 msgid "Hifi"
 msgstr "オーディオショップ"
 
 #. item
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2586
 msgid "Edit Hifi Shop"
 msgstr "オーディオショップの編集"
 
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2591
 msgid "Furniture"
 msgstr "家具店"
 
 #. item
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Edit Furniture Shop"
 msgstr "家具店の編集"
 
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Garden Centre"
 msgstr "園芸用品店"
@@ -20351,9 +20731,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2599
 msgid "Edit Garden Centre"
 msgstr "園芸用品店の編集"
 
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Hardware"
 msgstr "金物屋"
@@ -20361,9 +20741,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2606
 msgid "Edit Hardware Store"
 msgstr "金物屋の編集"
 
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "Do-it-yourself-store"
 msgstr "DIYショップ"
@@ -20371,54 +20751,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2613
 msgid "Edit Do-it-yourself-store"
 msgstr "DIYショップの編集"
 
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2618
 msgid "Stationery"
 msgstr "文具店"
 
 #. item
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2619
 msgid "Edit Stationery Shop"
 msgstr "文具店の編集"
 
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Hairdresser"
 msgstr "美容院"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Hairdresser"
 msgstr "美容院の編集"
 
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Shoes"
 msgstr "靴店"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Shoe Shop"
 msgstr "靴店の編集"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2636
 msgid "Toys"
 msgstr "おもちゃ屋"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit Toy Shop"
 msgstr "おもちゃ屋の編集"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Video"
 msgstr "ビデオ"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Video Shop"
 msgstr "ビデオショップの編集"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "Dry Cleaning"
 msgstr "クリーニング店"
@@ -20426,9 +20806,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2650
 msgid "Edit Dry Cleaning"
 msgstr "クリーニング店の編集"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "Laundry"
 msgstr "ランドリー"
@@ -20436,9 +20816,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2657
 msgid "Edit Laundry"
 msgstr "ランドリーの編集"
 
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2662
 msgid "Outdoor"
 msgstr "アウトドア店"
@@ -20446,32 +20826,28 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2664
 msgid "Edit Outdoor Shop"
 msgstr "アウトドア店の編集"
 
-#: build/trans_presets.java:2658
-msgid "Sports"
-msgstr "スポーツ"
-
-#. item
-#: build/trans_presets.java:2659
+#. item
+#: build/trans_presets.java:2670
 msgid "Edit Sports Shop"
 msgstr "スポーツ店"
 
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Optician"
 msgstr "メガネ屋"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Optician"
 msgstr "眼鏡屋の編集"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2683
 msgid "Cash"
 msgstr "お金"
 
 #. group "Cash"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2684
 msgid "Bank"
 msgstr "銀行"
@@ -20479,14 +20855,14 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2686
 msgid "Edit Bank"
 msgstr "銀行の編集"
 
-#: build/trans_presets.java:2680 build/trans_presets.java:2689
+#: build/trans_presets.java:2691 build/trans_presets.java:2700
 msgid "Automated Teller Machine"
 msgstr "ATM"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2693
 msgid "Money Exchange"
 msgstr "両替"
@@ -20494,5 +20870,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Edit Money Exchange"
 msgstr "両替の編集"
@@ -20500,15 +20876,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2691
+#: build/trans_presets.java:2702
 msgid "Edit Automated Teller Machine"
 msgstr "ATMの編集"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2707
 msgid "Health"
 msgstr "健康"
 
 #. group "Health"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2708
 msgid "Doctors"
 msgstr "医院"
@@ -20516,18 +20892,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2710
 msgid "Edit Doctors"
 msgstr "医院の編集"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2715
 msgid "Dentist"
 msgstr "歯科医院"
 
 #. item
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Edit Dentist"
 msgstr "歯科医院の編集"
 
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2721
 msgid "Pharmacy"
 msgstr "薬局"
@@ -20535,5 +20911,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Edit Pharmacy"
 msgstr "薬局の編集"
@@ -20541,9 +20917,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Dispensing"
 msgstr "調剤薬局"
 
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2729
 msgid "Hospital"
 msgstr "病院"
@@ -20551,10 +20927,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Edit Hospital"
 msgstr "病院の編集"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2735
 msgid "Emergency Access Point"
 msgstr "夜間急病センター"
@@ -20563,5 +20939,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:2727
+#: build/trans_presets.java:2738
 msgid "Edit Emergency Access Point"
 msgstr "夜間急病センターの編集"
@@ -20570,20 +20946,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2741
 msgid "Point Number"
 msgstr "ポイント数"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2742
 msgid "Point Name"
 msgstr "ポイント名"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Phone Number"
 msgstr "電話番号"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(+81-3-3345-6789のような国際で通用する電話番号を使ってください)"
@@ -20591,5 +20967,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2748
 msgid "Veterinary"
 msgstr "動物病院"
@@ -20598,55 +20974,59 @@
 #. <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:2740
+#: build/trans_presets.java:2751
 msgid "Edit Veterinary"
 msgstr "動物病院の編集"
 
+#: build/trans_presets.java:2758
+msgid "Geography"
+msgstr ""
+
 #. group "Places"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2760
 msgid "Continent"
 msgstr "大陸"
 
 #. item
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2761
 msgid "Edit Continent"
 msgstr "大陸の編集"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2766
 msgid "Country"
 msgstr "国(country)"
 
 #. item
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2767
 msgid "Edit Country"
 msgstr "国(country)の編集"
 
 #. item "Places/Country" text "Name"
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2772
 msgid "State"
 msgstr "州(state)"
 
 #. item
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2773
 msgid "Edit State"
 msgstr "州(state)の編集"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2778
 msgid "Region"
 msgstr "地方"
 
 #. item
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2779
 msgid "Edit Region"
 msgstr "地方の編集"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2784
 msgid "County"
 msgstr "郡"
 
 #. item
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2785
 msgid "Edit County"
 msgstr "郡の編集"
@@ -20654,15 +21034,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2791
 msgid "City"
 msgstr "市区"
 
 #. item
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2792
 msgid "Edit City"
 msgstr "市区の編集"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2797
 msgid "Town"
 msgstr "町"
@@ -20670,10 +21050,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2799
 msgid "Edit Town"
 msgstr "町の編集"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2804
 msgid "Suburb"
 msgstr "近郊住宅地"
@@ -20681,25 +21061,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2806
 msgid "Edit Suburb"
 msgstr "近郊住宅地の編集"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2811
 msgid "Village"
 msgstr "村"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2812
 msgid "Edit Village"
 msgstr "村の編集"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2817
 msgid "Hamlet"
 msgstr "小村落"
 
 #. item
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2818
 msgid "Edit Hamlet"
 msgstr "小村落の編集"
@@ -20707,5 +21087,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2824
 msgid "Locality"
 msgstr "地域"
@@ -20713,10 +21093,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2826
 msgid "Edit Locality"
 msgstr "地域の編集"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2831
 msgid "Island"
 msgstr "島"
@@ -20724,10 +21104,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2833
 msgid "Edit Island"
 msgstr "島の編集"
 
 #. item "Places/Island" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2838
 msgid "Islet"
 msgstr ""
@@ -20735,5 +21115,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2840
 msgid "Edit Islet"
 msgstr ""
@@ -20741,5 +21121,5 @@
 #. item "Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2846
 msgid "Cave Entrance"
 msgstr "洞窟の入口"
@@ -20747,10 +21127,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2848
 msgid "Edit Cave Entrance"
 msgstr "洞窟の入口の編集"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2852
 msgid "Peak"
 msgstr "山頂"
@@ -20758,10 +21138,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2854
 msgid "Edit Peak"
 msgstr "山頂の編集"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2859
 msgid "Glacier"
 msgstr "氷河"
@@ -20769,10 +21149,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2861
 msgid "Edit Glacier"
 msgstr "氷河の編集"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2854
+#: build/trans_presets.java:2866
 msgid "Volcano"
 msgstr "火山"
@@ -20780,70 +21160,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2868
 msgid "Edit Volcano"
 msgstr "火山の編集"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2874
 msgid "Boundaries"
 msgstr "境界線"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2875
 msgid "National"
 msgstr "国境"
 
 #. item
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2876
 msgid "Edit National Boundary"
 msgstr "国境の編集"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2881
 msgid "Administrative"
 msgstr "行政区画"
 
 #. item
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2882
 msgid "Edit Administrative Boundary"
 msgstr "行政区画の編集"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:2887
 msgid "Civil"
 msgstr "Civil境界"
 
 #. item
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2888
 msgid "Edit Civil Boundary"
 msgstr "Civil境界の編集"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2893
 msgid "Political"
 msgstr "地点名"
 
 #. item
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2894
 msgid "Edit Political Boundary"
 msgstr "Political境界の編集"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2899
 msgid "National park"
 msgstr "国立公園"
 
 #. item
-#: build/trans_presets.java:2888
+#: build/trans_presets.java:2900
 msgid "Edit National Park Boundary"
 msgstr "国立公園の境界編集"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2906
 msgid "Land use"
 msgstr "土地利用"
 
 #. group "Land use"
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2907
 msgid "Tree"
 msgstr "樹木・林"
@@ -20852,15 +21232,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:2898
+#: build/trans_presets.java:2910
 msgid "Edit Tree"
 msgstr "樹木・林の編集"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2915
 msgid "Botanical Name"
 msgstr "植物の名前"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2917
 msgid "Wood"
 msgstr "森"
@@ -20869,5 +21249,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:2908
+#: build/trans_presets.java:2920
 msgid "Edit Wood"
 msgstr "森の編集"
@@ -20875,17 +21255,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "coniferous"
 msgstr "針葉樹"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "deciduous"
 msgstr "広葉樹"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "mixed"
 msgstr "混合林"
 
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2925
 msgid "Forest"
 msgstr "森"
@@ -20894,14 +21274,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:2916
+#: build/trans_presets.java:2928
 msgid "Edit Forest Landuse"
 msgstr "森の編集"
 
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2934
 msgid "Nature Reserve"
 msgstr "自然保護区"
 
 #. item
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2935
 msgid "Edit Nature Reserve"
 msgstr "自然保護区の編集"
@@ -20909,25 +21289,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2940
 msgid "Scree"
 msgstr "ガレ場"
 
 #. item
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2941
 msgid "Edit Scree"
 msgstr "ガレ場の編集"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2945
 msgid "Scrub"
 msgstr "低木林"
 
 #. item
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2946
 msgid "Edit Scrub"
 msgstr "低木林の編集"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2950
 msgid "Fell"
 msgstr "山(Fell)"
@@ -20935,10 +21315,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2952
 msgid "Edit Fell"
 msgstr "山(Fell)の編集"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2956
 msgid "Heath"
 msgstr "荒れ地"
@@ -20946,5 +21326,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2958
 msgid "Edit Heath"
 msgstr "荒れ地の編集"
@@ -20952,5 +21332,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2963
 msgid "Farmyard"
 msgstr "農家の庭"
@@ -20959,45 +21339,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:2954
+#: build/trans_presets.java:2966
 msgid "Edit Farmyard Landuse"
 msgstr "農家の庭の編集"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2971
 msgid "Farmland"
 msgstr "農地"
 
 #. item
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2972
 msgid "Edit Farmland Landuse"
 msgstr "農地の編集"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2977
 msgid "Meadow"
 msgstr "牧草地"
 
 #. item
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2978
 msgid "Edit Meadow Landuse"
 msgstr "牧草地の編集"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2983
 msgid "Vineyard"
 msgstr "ぶどう園"
 
 #. item
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2984
 msgid "Edit Vineyard Landuse"
 msgstr "ぶどう園の土地利用の編集"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:2989
 msgid "Allotments"
 msgstr "貸し農園"
 
 #. item
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2990
 msgid "Edit Allotments Landuse"
 msgstr "家庭菜園用地の編集"
@@ -21005,25 +21385,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2996
 msgid "Garden"
 msgstr "庭園"
 
 #. item
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2997
 msgid "Edit Garden"
 msgstr "庭園の編集"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3001
 msgid "Grass"
 msgstr "草地"
 
 #. item
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3002
 msgid "Edit Grass Landuse"
 msgstr "草地の編集"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3007
 msgid "Village Green"
 msgstr "里山"
@@ -21031,10 +21411,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3009
 msgid "Edit Village Green Landuse"
 msgstr "里山利用区画の編集"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3014
 msgid "Common"
 msgstr "共有地"
@@ -21042,20 +21422,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3004
+#: build/trans_presets.java:3016
 msgid "Edit Common"
 msgstr "共有地の名前"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3020
 msgid "Park"
 msgstr "公園"
 
 #. item
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3021
 msgid "Edit Park"
 msgstr "公園の編集"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3025
 msgid "Recreation Ground"
 msgstr "レクレーション広場"
@@ -21063,5 +21443,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3027
 msgid "Edit Recreation Ground Landuse"
 msgstr "レクレーション広場利用区画の編集"
@@ -21069,15 +21449,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3033
 msgid "Residential area"
 msgstr "住宅エリア"
 
 #. item
-#: build/trans_presets.java:3022
+#: build/trans_presets.java:3034
 msgid "Edit Residential Landuse"
 msgstr "住宅用地の編集"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3039
 msgid "Graveyard"
 msgstr "墓所"
@@ -21085,9 +21465,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3029
+#: build/trans_presets.java:3041
 msgid "Edit Graveyard"
 msgstr "（教会・寺院にある）墓所の編集"
 
-#: build/trans_presets.java:3035
+#: build/trans_presets.java:3047
 msgid "Cemetery"
 msgstr "共同墓地"
@@ -21095,39 +21475,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3049
 msgid "Edit Cemetery Landuse"
 msgstr "共同墓地の編集"
 
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3056
 msgid "Retail"
 msgstr "小売り商業"
 
 #. item
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3057
 msgid "Edit Retail Landuse"
 msgstr "小売商用地の編集"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3062
 msgid "Commercial"
 msgstr "商用"
 
 #. item
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3063
 msgid "Edit Commercial Landuse"
 msgstr "商用地の編集"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3056
+#: build/trans_presets.java:3068
 msgid "Industrial"
 msgstr "工業"
 
 #. item
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3069
 msgid "Edit Industrial Landuse"
 msgstr "工業地の編集"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3074
 msgid "Railway land"
 msgstr "鉄道用地"
@@ -21135,15 +21515,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3076
 msgid "Edit Railway Landuse"
 msgstr "鉄道用地の編集"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3081
 msgid "Military"
 msgstr "軍用"
 
 #. item
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3082
 msgid "Edit Military Landuse"
 msgstr "軍用地の編集"
@@ -21151,55 +21531,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3088
 msgid "Construction area"
 msgstr "工事中エリア"
 
 #. item
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3089
 msgid "Edit Construction Landuse"
 msgstr "工事中用地の編集"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3094
 msgid "Brownfield"
 msgstr "利用されなくなった商業設備"
 
 #. item
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3095
 msgid "Edit Brownfield Landuse"
 msgstr "利用されなくなった工業地の編集"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3100
 msgid "Greenfield"
 msgstr "未開発工業地"
 
 #. item
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3101
 msgid "Edit Greenfield Landuse"
 msgstr "緑地の編集"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3106
 msgid "Landfill"
 msgstr "埋め立てゴミ処理地"
 
 #. item
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3107
 msgid "Edit Landfill Landuse"
 msgstr "埋め立てゴミ処理地の編集"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3112
 msgid "Quarry"
 msgstr "採石場"
 
 #. item
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3113
 msgid "Edit Quarry Landuse"
 msgstr "採石場の編集"
 
 #. group "Relations"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3122
 msgid "Multipolygon"
 msgstr "マルチポリゴン"
@@ -21209,5 +21589,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:3114
+#: build/trans_presets.java:3126
 msgid "Edit Multipolygon"
 msgstr "マルチポリゴンを編集"
@@ -21216,10 +21596,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3132
 msgid "outer segment"
 msgstr "外側のセグメント"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3133
 msgid "inner segment"
 msgstr "内側のセグメント"
@@ -21227,5 +21607,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3136
 msgid "Turn restriction"
 msgstr "右左折制限"
@@ -21234,5 +21614,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3139
 msgid "Edit Turn Restriction"
 msgstr "右左折制限の編集"
@@ -21240,34 +21620,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "Restriction"
 msgstr "通行制限"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_left_turn"
 msgstr "左折禁止"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_right_turn"
 msgstr "右折禁止"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_straight_on"
 msgstr "直進禁止"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_u_turn"
 msgstr "Uターン禁止"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_right_turn"
 msgstr "右折のみ"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_left_turn"
 msgstr "左折のみ"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_straight_on"
 msgstr "直進のみ"
@@ -21276,15 +21656,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3146
 msgid "from way"
 msgstr "ウエイから"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3147
 msgid "via node or way"
 msgstr "ノードかウェイを経由して"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3148
 msgid "to way"
 msgstr "ウエイへ"
@@ -21292,5 +21672,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3151
 msgid "Route"
 msgstr "ルート"
@@ -21299,5 +21679,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3154
 msgid "Edit Route"
 msgstr "ルート編集"
@@ -21305,5 +21685,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "Route type"
 msgstr "ルート種類"
@@ -21375,5 +21755,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3144 build/trans_style.java:233
+#: build/trans_presets.java:3156 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -21382,17 +21762,17 @@
 msgstr "自転車"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "bus"
 msgstr "バス"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "road"
 msgstr "道"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ferry"
 msgstr "フェリー"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ski"
 msgstr "スキー"
@@ -21445,5 +21825,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3144 build/trans_style.java:247
+#: build/trans_presets.java:3156 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -21452,13 +21832,13 @@
 msgstr "徒歩"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "hiking"
 msgstr "ハイキング"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "tram"
 msgstr "トラム"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "detour"
 msgstr "迂回路"
@@ -21472,10 +21852,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3144 build/trans_style.java:1206
+#: build/trans_presets.java:3156 build/trans_style.java:1206
 msgid "subway"
 msgstr "地下鉄"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3159
 msgid "Symbol description"
 msgstr "シンボルの説明"
@@ -21483,31 +21863,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3162
 msgid "Network"
 msgstr "ネットワーク"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "proposed"
 msgstr "案"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "alternate"
 msgstr "代替路"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "temporary"
 msgstr "一時的"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "connection"
 msgstr "接続"
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "Color (hex)"
 msgstr "色 (16進法)"
@@ -21516,30 +21896,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3168
 msgid "route segment"
 msgstr "ルートセグメント"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3169
 msgid "forward segment"
 msgstr "前のセグメント"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3170
 msgid "backward segment"
 msgstr "後方セグメント"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3171
 msgid "halt point"
 msgstr "停止点"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3172
 msgid "forward halt point"
 msgstr "前方の停止点"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3173
 msgid "backward halt point"
 msgstr "後方の停止点"
@@ -21977,11 +22357,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3375 build/trans_style.java:3376
-#: build/trans_style.java:3946 build/trans_style.java:4254
-#: build/trans_style.java:4263 build/trans_style.java:4272
-#: build/trans_style.java:4281 build/trans_style.java:4290
-#: build/trans_style.java:4299 build/trans_style.java:4308
-#: build/trans_style.java:4309 build/trans_style.java:4318
-#: build/trans_style.java:4327
+#: build/trans_style.java:3383 build/trans_style.java:3384
+#: build/trans_style.java:3954 build/trans_style.java:4262
+#: build/trans_style.java:4271 build/trans_style.java:4280
+#: build/trans_style.java:4289 build/trans_style.java:4298
+#: build/trans_style.java:4307 build/trans_style.java:4316
+#: build/trans_style.java:4317 build/trans_style.java:4326
+#: build/trans_style.java:4335
 msgid "deprecated"
 msgstr "破棄された"
@@ -24005,5 +24385,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3294
+#: build/trans_style.java:3302
 msgid "light_water"
 msgstr "信号_水域"
@@ -24685,8 +25065,17 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="boundary_stone"/>
+#. <icon annotate="true" src="historic/boundary_stone.png"/>
 #: build/trans_style.java:2990 build/trans_style.java:2998
 #: build/trans_style.java:3006 build/trans_style.java:3014
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
+#: build/trans_style.java:3054
 msgid "historic"
 msgstr "史跡"
@@ -24700,5 +25089,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3095
 msgid "quarry"
 msgstr "石切り場"
@@ -24712,5 +25101,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "landfill"
 msgstr "埋め立て地"
@@ -24732,5 +25121,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3103 build/trans_style.java:3111
+#: build/trans_style.java:3111 build/trans_style.java:3119
 msgid "basin"
 msgstr "水たまり、窪地"
@@ -24744,5 +25133,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3127
 msgid "forest"
 msgstr "森"
@@ -24756,5 +25145,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3159
 msgid "farmyard"
 msgstr "農地"
@@ -24777,5 +25166,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3160 build/trans_style.java:3168
+#: build/trans_style.java:3168 build/trans_style.java:3176
 msgid "retail"
 msgstr "小売りの商用地"
@@ -24789,5 +25178,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3176
+#: build/trans_style.java:3184
 msgid "industrial"
 msgstr "工業地"
@@ -24801,5 +25190,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "brownfield"
 msgstr "使用していない工業地"
@@ -24813,5 +25202,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "greenfield"
 msgstr "緑地"
@@ -24825,5 +25214,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "railland"
 msgstr "鉄道公園"
@@ -24880,7 +25269,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3217 build/trans_style.java:3252
-#: build/trans_style.java:3260 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3225 build/trans_style.java:3260
+#: build/trans_style.java:3268 build/trans_style.java:3276
+#: build/trans_style.java:3284 build/trans_style.java:3292
 msgid "military"
 msgstr "軍用地"
@@ -24894,5 +25283,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3225
+#: build/trans_style.java:3233
 msgid "cemetery"
 msgstr "墓地"
@@ -24905,5 +25294,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3301
+#: build/trans_style.java:3309
 msgid "peak"
 msgstr "山頂"
@@ -24918,5 +25307,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3310
+#: build/trans_style.java:3318
 msgid "glacier"
 msgstr "氷河"
@@ -24930,5 +25319,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "volcano"
 msgstr "火山"
@@ -24983,8 +25372,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3326 build/trans_style.java:3327
-#: build/trans_style.java:3335 build/trans_style.java:3351
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440
+#: build/trans_style.java:3334 build/trans_style.java:3335
+#: build/trans_style.java:3343 build/trans_style.java:3359
+#: build/trans_style.java:3432 build/trans_style.java:3440
+#: build/trans_style.java:3448
 msgid "natural"
 msgstr "自然"
@@ -24998,5 +25387,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3343
+#: build/trans_style.java:3351
 msgid "scrub"
 msgstr "低木"
@@ -25010,5 +25399,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3359
+#: build/trans_style.java:3367
 msgid "heath"
 msgstr "荒地"
@@ -25022,5 +25411,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3408
+#: build/trans_style.java:3416
 msgid "mud"
 msgstr "泥"
@@ -25034,5 +25423,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "beach"
 msgstr "砂浜"
@@ -25110,8 +25499,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
-#: build/trans_style.java:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496 build/trans_style.java:3504
+#: build/trans_style.java:3512 build/trans_style.java:3520
 msgid "route"
 msgstr "ルート"
@@ -25159,7 +25548,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3522 build/trans_style.java:3530
-#: build/trans_style.java:3538 build/trans_style.java:3546
-#: build/trans_style.java:3554
+#: build/trans_style.java:3530 build/trans_style.java:3538
+#: build/trans_style.java:3546 build/trans_style.java:3554
+#: build/trans_style.java:3562
 msgid "boundary"
 msgstr "行政区境"
@@ -25309,11 +25698,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090
+#: build/trans_style.java:4002 build/trans_style.java:4010
+#: build/trans_style.java:4018 build/trans_style.java:4026
+#: build/trans_style.java:4034 build/trans_style.java:4042
+#: build/trans_style.java:4050 build/trans_style.java:4058
+#: build/trans_style.java:4066 build/trans_style.java:4074
+#: build/trans_style.java:4082 build/trans_style.java:4090
+#: build/trans_style.java:4098
 msgid "place"
 msgstr "場所"
@@ -25361,6 +25750,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4207 build/trans_style.java:4214
-#: build/trans_style.java:4221 build/trans_style.java:4228
+#: build/trans_style.java:4215 build/trans_style.java:4222
+#: build/trans_style.java:4229 build/trans_style.java:4236
 msgid "address"
 msgstr "住所"
@@ -25621,20 +26010,20 @@
 #: build/trans_wms.java:13
 msgid "Yahoo Sat"
-msgstr ""
+msgstr "Yahoo 衛星"
 
 #. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
 #: build/trans_wms.java:14
 msgid "OpenStreetMap"
-msgstr ""
+msgstr "OpenStreetMap"
 
 #. html:http://josm.openstreetmap.de/wmsplugin/OpenStreetMap.html?
 #: build/trans_wms.java:15
 msgid "OpenCycleMap"
-msgstr ""
+msgstr "OpenCycleMap"
 
 #. html:http://josm.openstreetmap.de/wmsplugin/OpenCycleMap.html?
 #: build/trans_wms.java:16
 msgid "TilesAtHome"
-msgstr ""
+msgstr "TilesAtHome"
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
@@ -25650,10 +26039,10 @@
 #: build/trans_wms.java:22
 msgid "Terraserver Topo"
-msgstr ""
+msgstr "Terraserver Topo"
 
 #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=drg&styles=&format=image/jpeg&
 #: build/trans_wms.java:23
 msgid "Terraserver Urban"
-msgstr ""
+msgstr "Terraserver Urban"
 
 #. http://terraservice.net/ogcmap.ashx?version=1.1.1&request=GetMap&Layers=urbanarea&styles=&format=image/jpeg&
@@ -25661,60 +26050,75 @@
 #: build/trans_wms.java:25
 msgid "Czech CUZK:KM"
-msgstr ""
+msgstr "チェコ CUZK:KM"
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE&
 #: build/trans_wms.java:26
 msgid "Czech UHUL:ORTOFOTO"
-msgstr ""
-
-#~ msgid "All the ways were empty"
-#~ msgstr "ウェイが全て空です。"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "異なったメンバーになっているノードを結合しますか？"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "強制的に結合"
+msgstr "チェコ UHUL:ORTOFOTO"
+
+#~ msgid "Close current changeset"
+#~ msgstr "現在の変更セットを閉じる"
+
+#~ msgid "There is currently no changeset open."
+#~ msgstr "現在開かれている変更セットはありません。"
+
+#~ msgid "paramete''{0}'' must not be null"
+#~ msgstr "パラメータ''{0}'' はヌルでなければなりません"
+
+#~ msgid "unsupported value ''{0}'' or parameter ''{1}''"
+#~ msgstr "サポートされていない値 ''{0}''またはパラメータ ''{1}''"
+
+#~ msgid "- running version is {0}"
+#~ msgstr "- 起動中のバージョンは {0} です。"
+
+#~ msgid "not yet decided"
+#~ msgstr "未決定です"
+
+#~ msgid "Use a new changeset and close it"
+#~ msgstr "新しい変更セットを使用して閉じる"
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
+#~ "Select to upload the data using a new changeset and to leave the "
+#~ "changeset open after the upload"
 #~ msgstr ""
-#~ "選択したノードは、異なった関連に属しています。それでも、結合しますか？"
-
-#~ msgid "No currently open changeset. Opening a new changeset..."
-#~ msgstr "現在変更セットは開かれていません。新しい変更セットを開いています..."
+#~ "選択の上、新しい変更セットを使用してデータをアップロードし、アップロード後"
+#~ "に変更セットを閉じる"
+
+#~ msgid "Use the existing changeset {0} and close it after upload"
+#~ msgstr "既存の変更セット {0} を使用しアップロード後に閉じる"
 
 #~ msgid ""
-#~ "Warning: could not reuse an existing changeset as requested. Opening a "
-#~ "new one."
+#~ "Select to upload to the existing changeset {0} and to close the changeset "
+#~ "after this upload"
 #~ msgstr ""
-#~ "警告: 要求された既存の変更セットを再利用できません。新しく開いています。"
-
-#~ msgid "Reusing existing changeset {0}"
-#~ msgstr "既存の変更セット {0} を再利用しています"
-
-#~ msgid "Unknown version"
-#~ msgstr "バージョン番号は不明です"
-
-#~ msgid "Version number missing from OSM data"
-#~ msgstr "OSMデータにバージョン番号が欠けています。"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "ウエイ以外で<nd>要素が見つかりました"
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> はゼロ参照です。"
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "<member>要素がリレーション以外に見つかりました"
-
-#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
+#~ "選択の上、既存の変更セット {0} にアップロードし、アップロード後に変更セッ"
+#~ "トを閉じる"
+
+#~ msgid "Use the existing changeset {0} and leave it open"
+#~ msgstr "既存の変更セット {0} を使用し開いたままにしておく"
+
+#~ msgid ""
+#~ "Select to upload to the existing changeset {0} and to leave the changeset "
+#~ "open for further uploads"
 #~ msgstr ""
-#~ "リレーション {1} のメンバー {0} に予期しない \"type\"、 {2} を受け取りまし"
-#~ "た。"
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "III-形式のノードID"
+#~ "選択の上、既存の変更セット {0} へアップロードし、さらにアップロードするた"
+#~ "めに変更セットを開いておく"
+
+#~ msgid "Changeset {0} is unchanged. Skipping update."
+#~ msgstr "変更セット {0} は変更されていません。更新をスキップします。"
+
+#~ msgid ""
+#~ "Failed to update changeset. Either there is no current changeset or the "
+#~ "id of the current changeset is 0"
+#~ msgstr ""
+#~ "変更セットの更新に失敗しました。現在の変更セットが無いか、または現在の変更"
+#~ "セットのIDが 0 です。"
+
+#~ msgid ""
+#~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
+#~ "found."
+#~ msgstr ""
+#~ "JOSM が想定外のバージョンです。Main.ds および Main.getCurrentDataSet() が"
+#~ "見つかりません。"
 
 #~ msgid "Move"
@@ -25761,4 +26165,10 @@
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "プラグインはJPSMのアップデートを要求しています: {0}"
+
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "ウエイ以外で<nd>要素が見つかりました"
+
+#~ msgid "Unknown version"
+#~ msgstr "バージョン番号は不明です"
 
 #~ msgid ""
@@ -25769,6 +26179,12 @@
 #~ "て試してください。"
 
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "<member>要素がリレーション以外に見つかりました"
+
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr "存在しないノードを含むため、ウエイ {0} をスキップします\n"
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "III-形式のノードID"
 
 #~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
@@ -25785,4 +26201,7 @@
 #~ msgid "Layers: {0}"
 #~ msgstr "レイヤー：{0}"
+
+#~ msgid "<nd> has zero ref"
+#~ msgstr "<nd> はゼロ参照です。"
 
 #~ msgid "Contacting the OSM server..."
@@ -25946,7 +26365,4 @@
 #~ msgstr "board"
 
-#~ msgid "Add Selected"
-#~ msgstr "選択したものを追加"
-
 #~ msgid "Remove Selected"
 #~ msgstr "選択の削除"
@@ -25957,4 +26373,7 @@
 #~ msgid "rectifier id={0}"
 #~ msgstr "修正子 ID={0}"
+
+#~ msgid "All the ways were empty"
+#~ msgstr "ウェイが全て空です。"
 
 #~ msgid "viaduct"
@@ -26009,7 +26428,4 @@
 #~ "した状態で移動させる。選択：クリック。"
 
-#~ msgid "Delete Layer"
-#~ msgstr "レイヤー削除"
-
 #~ msgid "Occupied By"
 #~ msgstr "次によって占められる;"
@@ -26056,4 +26472,16 @@
 #~ msgid "Edit Drawbridge"
 #~ msgstr "跳ね橋の編集"
+
+#~ msgid "Merge Anyway"
+#~ msgstr "強制的に結合"
+
+#~ msgid ""
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
+#~ msgstr ""
+#~ "選択したノードは、異なった関連に属しています。それでも、結合しますか？"
+
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "異なったメンバーになっているノードを結合しますか？"
 
 #~ msgid ""
@@ -26163,4 +26591,7 @@
 #~ "このメッセージ以降のデータはアップロードしないでください。"
 
+#~ msgid "Version number missing from OSM data"
+#~ msgstr "OSMデータにバージョン番号が欠けています。"
+
 #~ msgid "Data upload failed for unknown reason"
 #~ msgstr "不明な理由でデータのアップロードに失敗しました。"
@@ -26171,2 +26602,19 @@
 #~ msgid "Selected makes your trace public in openstreetmap.org"
 #~ msgstr "選択したあなたのトレースは、openstreetmap.orgに公開されます。"
+
+#~ msgid "No currently open changeset. Opening a new changeset..."
+#~ msgstr "現在変更セットは開かれていません。新しい変更セットを開いています..."
+
+#~ msgid "Reusing existing changeset {0}"
+#~ msgstr "既存の変更セット {0} を再利用しています"
+
+#~ msgid ""
+#~ "Warning: could not reuse an existing changeset as requested. Opening a "
+#~ "new one."
+#~ msgstr ""
+#~ "警告: 要求された既存の変更セットを再利用できません。新しく開いています。"
+
+#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
+#~ msgstr ""
+#~ "リレーション {1} のメンバー {0} に予期しない \"type\"、 {2} を受け取りまし"
+#~ "た。"
Index: applications/editors/josm/i18n/po/nb.po
===================================================================
--- applications/editors/josm/i18n/po/nb.po	(revision 17655)
+++ applications/editors/josm/i18n/po/nb.po	(revision 17697)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-12 18:11+0200\n"
+"POT-Creation-Date: 2009-09-19 13:00+0200\n"
 "PO-Revision-Date: 2009-08-15 13:39+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-09-12 16:04+0000\n"
+"X-Launchpad-Export-Date: 2009-09-19 10:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -42,10 +42,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:543
 #: ../core/src/org/openstreetmap/josm/Main.java:551
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -70,5 +70,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -86,6 +86,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:358
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
@@ -101,6 +101,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
@@ -124,10 +124,10 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
 msgid "Save and Exit"
 msgstr "Lagre og avslutt"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
 msgid "Discard and Exit"
 msgstr "Forkast og avslutt"
@@ -138,4 +138,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
@@ -143,27 +144,28 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:296
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:258
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:613
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
@@ -171,5 +173,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -189,6 +191,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
@@ -205,17 +207,17 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:654
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1528
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -226,6 +228,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
@@ -278,9 +280,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:607
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:609
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -340,5 +342,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
 msgid "Plugins"
@@ -389,5 +391,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Flett"
@@ -475,5 +477,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -486,4 +488,5 @@
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -519,6 +522,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
@@ -527,6 +530,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:346
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
@@ -639,4 +642,45 @@
 msgstr "Ingen konflikter å vise."
 
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#, fuzzy
+msgid "Close open changesets"
+msgstr "Lukker endringssett …"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#, fuzzy
+msgid "Closes open changesets"
+msgstr "Lukker endringssett …"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
+#: ../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:114
+#, java-format
+msgid "File: {0}"
+msgstr "Fil: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
+msgid "There are no open changesets"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
+#, fuzzy
+msgid "No open changesets"
+msgstr "endringssett"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
+#, fuzzy
+msgid "Downloading open changesets ..."
+msgstr "Lukker endringssett …"
+
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
@@ -732,10 +776,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:123
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
@@ -778,31 +823,30 @@
 msgstr "Fordel valgte noder med lik avstand etter en linje."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
 msgid "Download from OSM..."
 msgstr "Last ned fra OSM …"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
 msgid "Download map data from the OSM server."
 msgstr "Last ned kartdata fra OSM-tjeneren."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
-#, java-format
-msgid "File: {0}"
-msgstr "Fil: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
 msgid "Download"
 msgstr "Last ned"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
 msgid "Please select at least one task to download"
 msgstr "Velg minst én oppgave å laste ned"
@@ -823,5 +867,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1527
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307
@@ -841,6 +885,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:376
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1415
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
 msgid "Duplicate"
 msgstr "Fordoble"
@@ -912,10 +956,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
@@ -1001,25 +1046,26 @@
 msgstr "Flett det gjeldende laget inn i et annet lag"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 msgid "Merge Nodes"
 msgstr "Samle noder"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
 msgid "Merge nodes into the oldest one."
 msgstr "Samle noder i den eldste"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
 msgid "Please select at least two nodes to merge."
 msgstr "Velg minst to noder til å samle"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:394
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
@@ -1035,8 +1081,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -1062,6 +1108,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
@@ -1070,9 +1120,9 @@
 msgstr "parameter «{0}» må ha en verdi"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr "Kan ikke samle noder. Ville ha måttet slette en linje som er i bruk."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283
 #, java-format
 msgid "Merge {0} nodes"
@@ -1144,5 +1194,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "New"
 msgstr "Ny"
@@ -1415,14 +1465,15 @@
 msgstr "Hjelp: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
 msgid "Status Report"
 msgstr "Statusrapport"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 msgid "Copy to clipboard and close"
 msgstr "Kopier til utklippstavlen og lukk"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
@@ -1499,25 +1550,4 @@
 msgstr "Splitt linje {0} i {1} deler"
 
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24
-msgid "Close current changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-msgid "Close the current changeset ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41
-msgid "There is currently no changeset open."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42
-msgid "No open changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60
-msgid "Closing changeset"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
@@ -1681,14 +1711,14 @@
 msgstr "Utvalget er tomt"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Last opp til OSM …"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 msgid "Upload all changes to the OSM server."
 msgstr "Last opp alle endringer til OSM-tjeneren."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
 #, java-format
 msgid ""
@@ -1697,23 +1727,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
 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:166
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 msgid "No changes to upload."
 msgstr "Ingen endringer å laste opp."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Synkroniser kun {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
 msgid "Synchronize entire dataset"
 msgstr "Synkroniser hele datasettet"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
 #, java-format
 msgid ""
@@ -1734,17 +1764,17 @@
 "strong> for å gå tilbake og fortsette å redigere.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
 msgid "Conflict detected"
 msgstr "Konflikt oppdaget"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr "Uventet returverdi. Mottok {0}."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:267
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
 #, java-format
 msgid ""
@@ -1759,28 +1789,40 @@
 "strong> for å avbryte operasjonen og fortsette å redigere.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
+msgid ""
+"<html>Uploading <strong>failed</strong> because you've been "
+"using<br>changeset {0} which was already closed at {1}.<br>Please upload "
+"again with a new or an existing open changeset."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+#, fuzzy
+msgid "Changeset closed"
+msgstr "endringssett"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr "Advarsel: Feillinje «{0}» samsvarer ikke med forventet mønster «{1}»"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr "Feillinje «{0}» samsvarer ikke med forventet mønster «{1}»"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr "<html>Opplasting <strong>feilet</strong>.<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
 msgid "Upload to OSM API failed"
 msgstr "Klarte ikke laste opp til OSM-API"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
 msgid "Updating primitive"
 msgstr "Oppdaterer objekt"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -2004,14 +2046,14 @@
 msgstr "Legg til node i linje og lag tilknytning"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:930
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:932
 msgid "Create new node."
 msgstr "Lag ny node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
 msgid "Select node under cursor."
 msgstr "Veg node under pekeren."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939
 #, java-format
 msgid "Insert new node into way."
@@ -2020,14 +2062,14 @@
 msgstr[1] "Sett inn ny node i {0} linjer."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
 msgid "Start new way from last node."
 msgstr "Start ny linje fra siste node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951
 msgid "Continue way from last node."
 msgstr "Fortsett samme linje fra siste node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:972
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:974
 msgid "Finish drawing."
 msgstr "Avslutt tegning."
@@ -2149,60 +2191,70 @@
 "piltaster; flytt utsnitt med høyre museknapp"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Søk …"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Søk etter objekt."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
 msgid "Can't search because there is no loaded data."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
+#, fuzzy
+msgid "Please enter a filter string."
+msgstr "Skriv inn søketekst."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
 msgid "Please enter a search string."
 msgstr "Skriv inn søketekst."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
 msgid "replace selection"
 msgstr "erstatt utvalg"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72
 msgid "add to selection"
 msgstr "legg til i utvalg"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73
 msgid "remove from selection"
 msgstr "fjern fra utvalg"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
+#, fuzzy
+msgid "find in selection"
+msgstr "legg til i utvalg"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81
 msgid "case sensitive"
 msgstr "skill mellom store/små bokstaver"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82
 msgid "regular expression"
 msgstr "regulært uttrykk"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
 msgstr "<b>Nansens gate</b> – «Nansens» og «gate» i nøkkel eller navn."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
 msgstr "<b>\"Nansens gate\"</b> – «Nansens gate» i nøkkel eller navn."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
 msgstr "<b>name:Nan</b> – «Nan» finnes innen navnet."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
 msgstr "<b>type=route</b> – nøkkel «type» med eksakt verdi «route»."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid ""
 "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
@@ -2212,50 +2264,50 @@
 "<b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
 msgstr "<b>-name:Nan</b> – «Nan» finnes ikke innen navnet."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> – nøkkel «foot» med hvilken som helst verdi."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
 msgid "<u>Special targets:</u>"
 msgstr "<u>Spesialsøk:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr "<b>type:</b> – type objekt (<b>node</b>, <b>way</b>, <b>relation</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>… – alle objekter redigert av angitt bruker"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 msgid "<b>nodes:</b>... - object with given number of nodes"
 msgstr "<b>nodes:</b>… – objekt med angitt antall noder"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> – alle endrede objekter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> – alle objekter i utvalg"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> – alle uferdige objekter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> – alle objekter uten egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2263,5 +2315,5 @@
 "<b>child <i>uttrykk</i></b> – alle underobjekter av objektene i uttrykket"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2269,9 +2321,9 @@
 "<b>parent <i>uttrykk</i></b> – alle overobjekter av objektene i uttrykket"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Bruk <b>|</b> eller <b>OR</b> for søk med logisk <i>eller</i>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
@@ -2279,46 +2331,63 @@
 "«:»)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Bruk <b>(</b> og <b>)</b> for å gruppere uttrykk"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
+msgid "Filter"
+msgstr "Filter"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Søk"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
+msgid "Submit filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "Start Search"
 msgstr "Start søk"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Fant ingen treff for «{0}»"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Ingenting lagt til utvalg ved søk etter «{0}»"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Ingenting fjernet fra utvalg ved søk etter «{0}»"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#, fuzzy, java-format
+msgid "Nothing find in selection by searching for ''{0}''"
+msgstr "Ingenting lagt til utvalg ved søk etter «{0}»"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262
 #, java-format
 msgid "Found {0} matches"
 msgstr "Fant {0} treff"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283
 msgid "RX"
 msgstr "RX"
@@ -2506,5 +2575,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
 msgid "Double conflict"
 msgstr ""
@@ -2753,4 +2822,5 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:134
 msgid "Old value"
 msgstr "Tidligere verdi"
@@ -2914,27 +2984,59 @@
 
 #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
 msgid "E"
 msgstr "Ø"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:59
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:203
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
 msgid "Changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:323
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
 msgstr "parameter {0} > 0 nødvendig. Leste {1}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:325
-#, fuzzy, java-format
-msgid "paramete''{0}'' must not be null"
-msgstr "parameter «{0}» må ha en verdi"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331
-#, fuzzy, java-format
-msgid "unsupported value ''{0}'' or parameter ''{1}''"
-msgstr "Ingen fornuftig rolle «{0}» for linje «{1}»."
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "H"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "Text"
+msgstr "tekst"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "C"
+msgstr "CS"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "I"
+msgstr "CI"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "M"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#, fuzzy
+msgid "R"
+msgstr "RX"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+msgid "A"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+msgid "D"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+msgid "F"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
@@ -2948,29 +3050,29 @@
 msgstr "Advarsel: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
+#, java-format
 msgid "expected id >= 0. Got {0}"
-msgstr "Uventet kolonneindeks: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:257
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
 msgid "a primitive with id=0 can't be invisible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:293
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
+#, java-format
 msgid "id > 0 expected. Got {0}"
-msgstr "Uventet symbol: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
+#, java-format
 msgid "version > 0 expected. Got {0}"
-msgstr "Uventet symbol: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
 msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
 msgstr "parameter «{0}» er ikke et gyldig typenavn – leste «{1}»"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
 msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
@@ -3037,9 +3139,9 @@
 msgstr "parameter {0} er ikke i intervall 0–{1} – leste {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:247
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:249
 msgid "Area style way is not closed."
 msgstr "Linje for areal er ikke lukket."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:478
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:482
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
@@ -3048,118 +3150,118 @@
 #. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
 #. TODO Remove useless nullcheck when RelationMember.member is encalupsed
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:851
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855
 msgid "Empty member in relation."
 msgstr "Tomt medlem i relasjon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:853
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Slettet medlem «{0}» i relasjon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:864
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Linje «{0}» med færre enn to punkter."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "More than one \"from\" way found."
 msgstr "Fant mer enn én linje med «from»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "More than one \"to\" way found."
 msgstr "Fant mer enn én linje med «to»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "More than one \"via\" found."
 msgstr "Fant mer enn én \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Ukjent rolle «{0}»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Ukjent medlemstype for «{0}»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"from\" way found."
 msgstr "Fant ingen linje med «from»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"to\" way found."
 msgstr "Fant ingen linje med «to»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652
 msgid "No \"via\" node or way found."
 msgstr "Fant ingen node eller linje med «via»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "Linje med «from» har ikke start eller slutt i en «via»-node."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "Linje med \"to\" har ikke start eller slutt i \"via\"-node."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "Linje med «from» har ikke start eller slutt i en «via»-linje."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "linje med «to» har ikke start eller slutt i en «via»-linje."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Fant ikke stil for restriksjon {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Ingen fornuftig rolle «{0}» for linje «{1}»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:885
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Multipolygon-medlem «{0}» er ikke en linje."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:943
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Ingen ytre linje for multipolygon «{0}»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1032
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Skjæring mellom linjene «{0}» og «{1}»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1044
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Indre linje «{0}» er utenfor."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1097
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Stil for indre linje «{0}» er samme som multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1123
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Stil for ytre linje «{0}» passer ikke."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1327
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331
 msgid "untagged"
 msgstr "Uten egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1328
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332
 msgid "text"
 msgstr "tekst"
@@ -3183,5 +3285,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
@@ -3202,5 +3304,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
@@ -3254,5 +3356,5 @@
 msgstr "Lambert-sone (Frankrike)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambert-sone (Estland)"
@@ -3294,9 +3396,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:38
 msgid "Do not show again"
 msgstr "Ikke vis igjen"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
 #, java-format
@@ -3304,31 +3406,31 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:91
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:116
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154
 msgid "incomplete"
 msgstr "uferdig"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
 msgid "highway"
 msgstr "ferdselsvei"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
-#: build/trans_presets.java:3144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: build/trans_presets.java:3156
 msgid "railway"
 msgstr "jernbane"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
 msgid "waterway"
 msgstr "vannvei"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "landuse"
 msgstr "bruk av grunn"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:474
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
@@ -3338,5 +3440,5 @@
 msgstr[1] "{0} noder"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
 #, java-format
 msgid "{0} member"
@@ -3366,7 +3468,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
-#, fuzzy
 msgid "Bad Request"
-msgstr "Rediger racquet"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144
@@ -3382,10 +3483,5 @@
 msgstr "Dagens melding er ikke tilgjengelig"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67
-#, java-format
-msgid "- running version is {0}"
-msgstr "- aktive versjon er {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:95
 msgid "Downloading \"Message of the day\""
 msgstr "Laster ned \"Dagens melding\""
@@ -3457,10 +3553,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:162
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
 msgid "Username"
 msgstr "Brukernavn"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
 msgid "Password"
 msgstr "Passord"
@@ -3583,5 +3679,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226
 msgid "Presets"
 msgstr "Objektmaler"
@@ -3655,38 +3751,49 @@
 msgstr "målestokk"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Lengdegrad ved musepekeren."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The name of the object at the mouse pointer."
 msgstr "Navn på objekt ved musepeker"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Breddegrad ved musepekeren."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The angle between the previous and the current way segment."
 msgstr "Vinkel mellom forrige og nåværende linjesegment."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "Kompassretning på segmentet som tegnes."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The length of the new way segment being drawn."
 msgstr "Lengden på segmentet som tegnes."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199
+msgid ""
+"Middle click again to cycle through.<br>Hold CTRL to select directly from "
+"this list with the mouse.<hr>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290
 msgid "(no object)"
 msgstr "(intet objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:301
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418
+#, fuzzy
+msgid "User:"
+msgstr "Bruker"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
 msgid "layer not in list."
 msgstr "Laget er ikke i lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:488
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3757,7 +3864,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:224
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Tags"
 msgstr "Egenskaper"
@@ -3772,5 +3879,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
@@ -3973,4 +4080,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
 msgid "Up"
 msgstr "Opp"
@@ -3981,4 +4089,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Down"
 msgstr "Ned"
@@ -3991,5 +4100,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
@@ -4428,23 +4537,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:236
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239
 msgid "No conflicts to resolve"
-msgstr "Ingen gjenværende egenskapskonflikter å løse"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:295
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254
 msgid "Cancel conflict resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:310
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269
 msgid "Apply resolved conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Apply"
 msgstr ""
@@ -4456,5 +4564,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "all"
 msgstr "alle"
@@ -4498,7 +4606,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
-msgid "not yet decided"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:213
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
@@ -4525,7 +4630,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
@@ -4535,7 +4640,7 @@
 msgstr[1] "{0} linjer"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:152
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
@@ -4545,20 +4650,20 @@
 msgstr[1] "{0} relasjoner"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "Paste ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "From ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:372
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "To ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:428
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
 #, java-format
 msgid "{0} tag"
@@ -4574,13 +4679,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
-#, fuzzy
 msgid "Remove this relation member from the relation"
-msgstr "Fjern medlemmet i aktiv tabelrekke fra denne relasjonen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-#, fuzzy
 msgid "Replace"
-msgstr "sted"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
@@ -4591,11 +4694,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
-#, fuzzy
 msgid "Undecided"
-msgstr "Fjern avgjørelse"
+msgstr ""
 
 #. --- role editing
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:56
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510
 msgid "Role:"
 msgstr ""
@@ -4611,7 +4713,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70
-#, fuzzy
 msgid "Value:"
-msgstr "Verdi"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86
@@ -4624,12 +4725,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51
-#, fuzzy
 msgid "Orig. Way"
-msgstr "Enveiskjøring"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
-#, fuzzy
 msgid "Decision"
-msgstr "Revisjon"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -4645,6 +4744,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
@@ -4733,169 +4833,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-msgid "History"
-msgstr "Historikk"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-msgid "Display the history of all selected items."
-msgstr "Vis historikk på alle valgte objekt."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
-#, java-format
-msgid "index out of bounds Got {0}"
-msgstr "Indeks er utenfor rekkevidde: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr "Node {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
-msgid "History item"
-msgstr "Historikkobjekt"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Les inn og oppfrisk liste over alle valgte objekt."
-
-#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
-msgid "Show"
-msgstr "Vis"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
-msgstr "Vis historikken for det valgte objektet"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
-msgid "Dialog not created yet. Invoke createInstance() first"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
-msgid "Layers"
-msgstr "Lag"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-msgid "Open a list of all loaded layers."
-msgstr "Liste over alle innleste lag"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:297
-msgid "Delete the selected layer."
-msgstr "Slett valgt Lag."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:367
-msgid "Show/Hide"
-msgstr "Vis/Skjul"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:378
-msgid "Toggle visible state of the selected layer."
-msgstr "Slå av/på visning av Lag"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:420
-msgid "Activate the selected layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:475
-msgid "Merge this layer into another layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:581
-msgid "Move the selected layer one row up."
-msgstr "Flytt laget en rad opp."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:600
-msgid "Move the selected layer one row down."
-msgstr "Flytt laget en rad ned."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
-msgid "Information about layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
-#, java-format
-msgid "This will change up to {0} object."
-msgid_plural "This will change up to {0} objects."
-msgstr[0] "Dette vil endre opptil {0} objekt."
-msgstr[1] "Dette vil endre opptil {0} objekt."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
-msgid "An empty value deletes the key."
-msgstr "Nøkkelen blir ikke lagret når den er tom."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
-msgid "<different>"
-msgstr "<different>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
-msgid "Change values?"
-msgstr "Endre verdier?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
-#, java-format
-msgid "Change properties of up to {0} object"
-msgid_plural "Change properties of up to {0} objects"
-msgstr[0] "Endre egenskap på inntil {0} objekt"
-msgstr[1] "Endre egenskap på inntil {0} objekt"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
-msgid "Please select a key"
-msgstr "Velg en nøkkel"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
-msgid "Please select a value"
-msgstr "Velg en verdi"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
-msgid "Please select the objects you want to change properties for."
-msgstr "Velg de objekter, du vil rette egenskaper for."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
-msgid "Properties/Memberships"
-msgstr "Egenskaper/medlemsskaper"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-msgid "Properties for selected objects."
-msgstr "Egenskaper for valgte objekt."
-
-#. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-msgid "Member Of"
-msgstr "Medlem av"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
-msgid "Add Properties"
-msgstr "Tilføy egenskaper"
-
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+msgid "Filter objects and hide/disable them."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
@@ -4909,4 +4853,212 @@
 msgstr "Legg til"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#, fuzzy
+msgid "Add filter."
+msgstr "Legg til utvalgte"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
+#, fuzzy
+msgid "Edit filter."
+msgstr "Rediger brygge"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#, fuzzy
+msgid "Delete filter."
+msgstr "Slett Lag"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
+#, fuzzy
+msgid "Move filter up."
+msgstr "Flytt opp"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
+#, fuzzy
+msgid "Move filter down."
+msgstr "Flytt ned"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128
+msgid "Enable filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
+#, fuzzy
+msgid "Hide elements"
+msgstr "Enkelte element"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
+msgid "Apply also for children"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
+msgid "Inverse filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
+#, fuzzy
+msgid "Filter mode"
+msgstr "Filter"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
+msgid "History"
+msgstr "Historikk"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+msgid "Display the history of all selected items."
+msgstr "Vis historikk på alle valgte objekt."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr "Indeks er utenfor rekkevidde: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr "Node {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
+msgid "History item"
+msgstr "Historikkobjekt"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
+msgid "Reload all currently selected objects and refresh the list."
+msgstr "Les inn og oppfrisk liste over alle valgte objekt."
+
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
+msgid "Show"
+msgstr "Vis"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
+msgid "Display the history of the selected primitive"
+msgstr "Vis historikken for det valgte objektet"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84
+msgid "Dialog not created yet. Invoke createInstance() first"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
+msgid "Layers"
+msgstr "Lag"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+msgid "Open a list of all loaded layers."
+msgstr "Liste over alle innleste lag"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294
+msgid "Delete the selected layer."
+msgstr "Slett valgt Lag."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364
+msgid "Show/Hide"
+msgstr "Vis/Skjul"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375
+msgid "Toggle visible state of the selected layer."
+msgstr "Slå av/på visning av Lag"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgid "Activate"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417
+msgid "Activate the selected layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472
+msgid "Merge this layer into another layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578
+msgid "Move the selected layer one row up."
+msgstr "Flytt laget en rad opp."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597
+msgid "Move the selected layer one row down."
+msgstr "Flytt laget en rad ned."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+msgid "Information about layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+#, java-format
+msgid "This will change up to {0} object."
+msgid_plural "This will change up to {0} objects."
+msgstr[0] "Dette vil endre opptil {0} objekt."
+msgstr[1] "Dette vil endre opptil {0} objekt."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+msgid "An empty value deletes the key."
+msgstr "Nøkkelen blir ikke lagret når den er tom."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+msgid "<different>"
+msgstr "<different>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+msgid "Change values?"
+msgstr "Endre verdier?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#, java-format
+msgid "Change properties of up to {0} object"
+msgid_plural "Change properties of up to {0} objects"
+msgstr[0] "Endre egenskap på inntil {0} objekt"
+msgstr[1] "Endre egenskap på inntil {0} objekt"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+msgid "Please select a key"
+msgstr "Velg en nøkkel"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+msgid "Please select a value"
+msgstr "Velg en verdi"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
+msgid "Please select the objects you want to change properties for."
+msgstr "Velg de objekter, du vil rette egenskaper for."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
+msgid "Properties/Memberships"
+msgstr "Egenskaper/medlemsskaper"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+msgid "Properties for selected objects."
+msgstr "Egenskaper for valgte objekt."
+
+#. setting up the membership table
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+msgid "Member Of"
+msgstr "Medlem av"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
+msgid "Add Properties"
+msgstr "Tilføy egenskaper"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574
 msgid "Add a new key/value pair to all objects"
@@ -4948,10 +5100,9 @@
 
 #. item "Land use/Quarry" text "Name"
-#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
-#: build/trans_presets.java:3109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168
+#: build/trans_presets.java:3121
 msgid "Relations"
 msgstr "Relasjoner"
@@ -4961,23 +5112,23 @@
 msgstr "Åpne en liste over alle relasjoner"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relasjoner: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276
 msgid "Open an editor for the selected relation"
 msgstr "Åpne en editor for den valgte relasjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
 msgid "Delete the selected relation"
 msgstr "Slet valgt relasjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349
 msgid "Create a new relation"
 msgstr "Oprett ny relasjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:373
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1412
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
@@ -5010,5 +5161,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5020,14 +5171,14 @@
 msgstr "Utvalg: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441
 msgid "Undock the panel"
 msgstr "Frigjør panelet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr "Lukk panelet. Du kan åpne det med knappene i venstre verktøygruppe."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:457
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Klikk for at minimere/maksimere panelet"
@@ -5088,5 +5239,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5110,5 +5261,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1502
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1370
 msgid "Download relation members"
 msgstr "Last ned medlemer av relasjon"
@@ -5138,5 +5289,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -5144,18 +5295,18 @@
 msgstr "Advarsel: ignorerer unntak siden handling ble avbrutt. Unntak: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
 msgid "Tags and Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:167
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5164,14 +5315,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613
 #, java-format
 msgid ""
@@ -5181,9 +5332,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid ""
@@ -5193,15 +5344,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5209,5 +5360,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5215,20 +5366,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849
 #, java-format
 msgid ""
@@ -5237,57 +5388,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:961
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909
 msgid "Move the currently selected members up"
 msgstr "Flytt valgte medlem opp"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:979
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:912
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928
 msgid "Move the currently selected members down"
 msgstr "Flytt valgt medlem ned"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:998
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:931
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5296,9 +5447,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1058
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
 #, java-format
 msgid ""
@@ -5307,56 +5458,41 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090
+msgid "Apply the current updates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123
+msgid "Apply the updates and close the dialog"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
-msgid "Apply the current updates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
-msgid "Apply the updates and close the dialog"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
-msgid "Delete the currently selected tags"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Last ned alle ufullstendige linjer og noder i relasjonen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 msgid "Download Members"
 msgstr "Last ned medlemmer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1208
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1211
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1356
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 #, java-format
 msgid ""
@@ -5366,13 +5502,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1229
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1367
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
 msgid "Confirm empty role"
 msgstr ""
@@ -5459,37 +5595,37 @@
 msgstr "Bokmerker"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:82
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
 msgid "Please enter the desired coordinates first."
 msgstr "Tast inn først de ønskede koordinater."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
 msgid "Please enter a name for the location."
 msgstr "Tast inn et navn for stedet."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:107
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
 msgid "Select a bookmark first."
 msgstr "Velg først et bokmerke"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
 msgid "min lat"
 msgstr "min. breddegrad"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
 msgid "min lon"
 msgstr "min. lengdegrad"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid "max lat"
 msgstr "maks. breddegrad"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
 msgid "max lon"
 msgstr "maks. lengdegrad"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5499,26 +5635,26 @@
 "området)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
 msgid "Bounding Box"
 msgstr "Yttergrense for arbeidsområde"
 
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
 msgid "Data Sources and Types"
 msgstr "Datakilder og typer"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
 msgid "Download as new layer"
 msgstr "Last ned som nytt lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
 msgid "Download Area"
 msgstr "Last ned område"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
 msgid "Download area too large; will probably be rejected by server"
 msgstr "Området er for stort; vil sandsynligvis bli avvist av tjener"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
 msgid "Download area ok, size probably acceptable to server"
 msgstr ""
@@ -5544,7 +5680,7 @@
 msgstr "Gi et stednavn å søke etter:"
 
-#. <separator/>
+#. group "Geography"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2759
 msgid "Places"
 msgstr "Steder"
@@ -5591,21 +5727,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "type"
 msgstr "type"
@@ -5622,5 +5758,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-#, fuzzy
 msgid ""
 "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
@@ -5628,6 +5763,4 @@
 "Hold left mousebutton and draw a frame."
 msgstr ""
-"Zoom: Musehjul eller dobbeltklik. Flyt kart: Hold høyre museknapp nede og "
-"flytt musa. Velg: Klik"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
@@ -6092,4 +6225,6 @@
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
 #. <key key="historic" value="wayside_shrine" />
+#. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
+#. <key key="historic" value="boundary_stone" />
 #. item "Leisure/Water Park" label "Edit Water Park"
 #. <key key="leisure" value="water_park" />
@@ -6461,153 +6596,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/trans_presets.java:66 build/trans_presets.java:102
-#: build/trans_presets.java:142 build/trans_presets.java:179
-#: build/trans_presets.java:199 build/trans_presets.java:217
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:272 build/trans_presets.java:305
-#: build/trans_presets.java:351 build/trans_presets.java:371
-#: build/trans_presets.java:386 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:463 build/trans_presets.java:482
-#: build/trans_presets.java:502 build/trans_presets.java:522
-#: build/trans_presets.java:543 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627 build/trans_presets.java:658
-#: build/trans_presets.java:679 build/trans_presets.java:692
-#: build/trans_presets.java:705 build/trans_presets.java:718
-#: build/trans_presets.java:731 build/trans_presets.java:744
-#: build/trans_presets.java:755 build/trans_presets.java:764
-#: build/trans_presets.java:811 build/trans_presets.java:832
-#: build/trans_presets.java:841 build/trans_presets.java:901
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1067 build/trans_presets.java:1075
-#: build/trans_presets.java:1085 build/trans_presets.java:1093
-#: build/trans_presets.java:1098 build/trans_presets.java:1105
-#: build/trans_presets.java:1112 build/trans_presets.java:1117
-#: build/trans_presets.java:1125 build/trans_presets.java:1134
-#: build/trans_presets.java:1140 build/trans_presets.java:1146
-#: build/trans_presets.java:1151 build/trans_presets.java:1157
-#: build/trans_presets.java:1163 build/trans_presets.java:1172
-#: build/trans_presets.java:1181 build/trans_presets.java:1188
-#: build/trans_presets.java:1196 build/trans_presets.java:1209
-#: build/trans_presets.java:1215 build/trans_presets.java:1224
-#: build/trans_presets.java:1230 build/trans_presets.java:1236
-#: build/trans_presets.java:1244 build/trans_presets.java:1299
-#: build/trans_presets.java:1346 build/trans_presets.java:1352
-#: build/trans_presets.java:1358 build/trans_presets.java:1364
-#: build/trans_presets.java:1370 build/trans_presets.java:1381
-#: build/trans_presets.java:1390 build/trans_presets.java:1405
-#: build/trans_presets.java:1412 build/trans_presets.java:1418
-#: build/trans_presets.java:1426 build/trans_presets.java:1433
-#: build/trans_presets.java:1442 build/trans_presets.java:1450
-#: build/trans_presets.java:1457 build/trans_presets.java:1468
-#: build/trans_presets.java:1478 build/trans_presets.java:1488
-#: build/trans_presets.java:1508 build/trans_presets.java:1520
-#: build/trans_presets.java:1531 build/trans_presets.java:1548
-#: build/trans_presets.java:1555 build/trans_presets.java:1570
-#: build/trans_presets.java:1577 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1594
-#: build/trans_presets.java:1599 build/trans_presets.java:1605
-#: build/trans_presets.java:1611 build/trans_presets.java:1619
-#: build/trans_presets.java:1627 build/trans_presets.java:1635
-#: build/trans_presets.java:1642 build/trans_presets.java:1648
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1670 build/trans_presets.java:1677
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1712 build/trans_presets.java:1719
-#: build/trans_presets.java:1736 build/trans_presets.java:1744
-#: build/trans_presets.java:1759 build/trans_presets.java:1769
-#: build/trans_presets.java:1781 build/trans_presets.java:1788
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:1809 build/trans_presets.java:1817
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1841
-#: build/trans_presets.java:1846 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1864
-#: build/trans_presets.java:1872 build/trans_presets.java:1881
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1908 build/trans_presets.java:1914
-#: build/trans_presets.java:1922 build/trans_presets.java:1928
-#: build/trans_presets.java:1934 build/trans_presets.java:1940
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2013
-#: build/trans_presets.java:2022 build/trans_presets.java:2030
-#: build/trans_presets.java:2036 build/trans_presets.java:2042
-#: build/trans_presets.java:2048 build/trans_presets.java:2054
-#: build/trans_presets.java:2060 build/trans_presets.java:2066
-#: build/trans_presets.java:2072 build/trans_presets.java:2078
-#: build/trans_presets.java:2084 build/trans_presets.java:2090
-#: build/trans_presets.java:2096 build/trans_presets.java:2102
-#: build/trans_presets.java:2108 build/trans_presets.java:2114
-#: build/trans_presets.java:2120 build/trans_presets.java:2126
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2158
-#: build/trans_presets.java:2165 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2186
-#: build/trans_presets.java:2192 build/trans_presets.java:2198
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2218 build/trans_presets.java:2225
-#: build/trans_presets.java:2232 build/trans_presets.java:2239
-#: build/trans_presets.java:2247 build/trans_presets.java:2279
-#: build/trans_presets.java:2284 build/trans_presets.java:2289
-#: build/trans_presets.java:2294 build/trans_presets.java:2300
-#: build/trans_presets.java:2306 build/trans_presets.java:2312
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2354
-#: build/trans_presets.java:2451 build/trans_presets.java:2458
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2485 build/trans_presets.java:2492
-#: build/trans_presets.java:2498 build/trans_presets.java:2504
-#: build/trans_presets.java:2526 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2553 build/trans_presets.java:2559
-#: build/trans_presets.java:2565 build/trans_presets.java:2571
-#: build/trans_presets.java:2577 build/trans_presets.java:2583
-#: build/trans_presets.java:2590 build/trans_presets.java:2597
-#: build/trans_presets.java:2604 build/trans_presets.java:2610
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2661
-#: build/trans_presets.java:2667 build/trans_presets.java:2677
-#: build/trans_presets.java:2686 build/trans_presets.java:2701
-#: build/trans_presets.java:2707 build/trans_presets.java:2715
-#: build/trans_presets.java:2722 build/trans_presets.java:2742
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2783
-#: build/trans_presets.java:2790 build/trans_presets.java:2797
-#: build/trans_presets.java:2803 build/trans_presets.java:2809
-#: build/trans_presets.java:2817 build/trans_presets.java:2824
-#: build/trans_presets.java:2831 build/trans_presets.java:2838
-#: build/trans_presets.java:2844 build/trans_presets.java:2851
-#: build/trans_presets.java:2858 build/trans_presets.java:2867
-#: build/trans_presets.java:2873 build/trans_presets.java:2879
-#: build/trans_presets.java:2885 build/trans_presets.java:2891
-#: build/trans_presets.java:2900 build/trans_presets.java:2910
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2948
-#: build/trans_presets.java:2957 build/trans_presets.java:2963
-#: build/trans_presets.java:2969 build/trans_presets.java:2975
-#: build/trans_presets.java:2981 build/trans_presets.java:2987
-#: build/trans_presets.java:2993 build/trans_presets.java:3000
-#: build/trans_presets.java:3006 build/trans_presets.java:3011
-#: build/trans_presets.java:3018 build/trans_presets.java:3025
-#: build/trans_presets.java:3031 build/trans_presets.java:3040
-#: build/trans_presets.java:3048 build/trans_presets.java:3054
-#: build/trans_presets.java:3060 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3080
-#: build/trans_presets.java:3086 build/trans_presets.java:3092
-#: build/trans_presets.java:3098 build/trans_presets.java:3104
-#: build/trans_presets.java:3117 build/trans_presets.java:3131
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:67 build/trans_presets.java:103
+#: build/trans_presets.java:143 build/trans_presets.java:180
+#: build/trans_presets.java:200 build/trans_presets.java:218
+#: build/trans_presets.java:235 build/trans_presets.java:253
+#: build/trans_presets.java:273 build/trans_presets.java:306
+#: build/trans_presets.java:352 build/trans_presets.java:372
+#: build/trans_presets.java:387 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:503 build/trans_presets.java:523
+#: build/trans_presets.java:544 build/trans_presets.java:565
+#: build/trans_presets.java:586 build/trans_presets.java:607
+#: build/trans_presets.java:628 build/trans_presets.java:659
+#: build/trans_presets.java:680 build/trans_presets.java:693
+#: build/trans_presets.java:706 build/trans_presets.java:719
+#: build/trans_presets.java:732 build/trans_presets.java:745
+#: build/trans_presets.java:756 build/trans_presets.java:765
+#: build/trans_presets.java:812 build/trans_presets.java:833
+#: build/trans_presets.java:842 build/trans_presets.java:902
+#: build/trans_presets.java:1053 build/trans_presets.java:1061
+#: build/trans_presets.java:1069 build/trans_presets.java:1077
+#: build/trans_presets.java:1087 build/trans_presets.java:1095
+#: build/trans_presets.java:1100 build/trans_presets.java:1107
+#: build/trans_presets.java:1114 build/trans_presets.java:1119
+#: build/trans_presets.java:1127 build/trans_presets.java:1136
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1153 build/trans_presets.java:1159
+#: build/trans_presets.java:1165 build/trans_presets.java:1174
+#: build/trans_presets.java:1183 build/trans_presets.java:1190
+#: build/trans_presets.java:1198 build/trans_presets.java:1211
+#: build/trans_presets.java:1217 build/trans_presets.java:1226
+#: build/trans_presets.java:1232 build/trans_presets.java:1238
+#: build/trans_presets.java:1246 build/trans_presets.java:1302
+#: build/trans_presets.java:1349 build/trans_presets.java:1355
+#: build/trans_presets.java:1361 build/trans_presets.java:1367
+#: build/trans_presets.java:1373 build/trans_presets.java:1384
+#: build/trans_presets.java:1393 build/trans_presets.java:1408
+#: build/trans_presets.java:1415 build/trans_presets.java:1421
+#: build/trans_presets.java:1429 build/trans_presets.java:1436
+#: build/trans_presets.java:1445 build/trans_presets.java:1453
+#: build/trans_presets.java:1460 build/trans_presets.java:1471
+#: build/trans_presets.java:1481 build/trans_presets.java:1491
+#: build/trans_presets.java:1511 build/trans_presets.java:1523
+#: build/trans_presets.java:1534 build/trans_presets.java:1551
+#: build/trans_presets.java:1558 build/trans_presets.java:1574
+#: build/trans_presets.java:1581 build/trans_presets.java:1586
+#: build/trans_presets.java:1592 build/trans_presets.java:1598
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1646 build/trans_presets.java:1652
+#: build/trans_presets.java:1659 build/trans_presets.java:1666
+#: build/trans_presets.java:1674 build/trans_presets.java:1681
+#: build/trans_presets.java:1689 build/trans_presets.java:1696
+#: build/trans_presets.java:1702 build/trans_presets.java:1709
+#: build/trans_presets.java:1716 build/trans_presets.java:1723
+#: build/trans_presets.java:1740 build/trans_presets.java:1748
+#: build/trans_presets.java:1763 build/trans_presets.java:1773
+#: build/trans_presets.java:1785 build/trans_presets.java:1792
+#: build/trans_presets.java:1798 build/trans_presets.java:1808
+#: build/trans_presets.java:1813 build/trans_presets.java:1821
+#: build/trans_presets.java:1828 build/trans_presets.java:1834
+#: build/trans_presets.java:1840 build/trans_presets.java:1845
+#: build/trans_presets.java:1850 build/trans_presets.java:1855
+#: build/trans_presets.java:1862 build/trans_presets.java:1868
+#: build/trans_presets.java:1873 build/trans_presets.java:1882
+#: build/trans_presets.java:1891 build/trans_presets.java:1900
+#: build/trans_presets.java:1909 build/trans_presets.java:1918
+#: build/trans_presets.java:1924 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 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:2023 build/trans_presets.java:2032
+#: build/trans_presets.java:2040 build/trans_presets.java:2046
+#: build/trans_presets.java:2052 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 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:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2150
+#: build/trans_presets.java:2156 build/trans_presets.java:2162
+#: build/trans_presets.java:2169 build/trans_presets.java:2176
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2197 build/trans_presets.java:2203
+#: build/trans_presets.java:2209 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2229
+#: build/trans_presets.java:2236 build/trans_presets.java:2243
+#: build/trans_presets.java:2250 build/trans_presets.java:2258
+#: build/trans_presets.java:2290 build/trans_presets.java:2295
+#: build/trans_presets.java:2300 build/trans_presets.java:2305
+#: build/trans_presets.java:2311 build/trans_presets.java:2317
+#: build/trans_presets.java:2323 build/trans_presets.java:2331
+#: build/trans_presets.java:2337 build/trans_presets.java:2343
+#: build/trans_presets.java:2349 build/trans_presets.java:2355
+#: build/trans_presets.java:2365 build/trans_presets.java:2462
+#: build/trans_presets.java:2469 build/trans_presets.java:2483
+#: build/trans_presets.java:2489 build/trans_presets.java:2496
+#: build/trans_presets.java:2503 build/trans_presets.java:2509
+#: build/trans_presets.java:2515 build/trans_presets.java:2537
+#: build/trans_presets.java:2544 build/trans_presets.java:2551
+#: build/trans_presets.java:2557 build/trans_presets.java:2564
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2594 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2615
+#: build/trans_presets.java:2621 build/trans_presets.java:2627
+#: build/trans_presets.java:2633 build/trans_presets.java:2639
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2672 build/trans_presets.java:2678
+#: build/trans_presets.java:2688 build/trans_presets.java:2697
+#: build/trans_presets.java:2712 build/trans_presets.java:2718
+#: build/trans_presets.java:2726 build/trans_presets.java:2733
+#: build/trans_presets.java:2753 build/trans_presets.java:2764
+#: build/trans_presets.java:2770 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2788
+#: build/trans_presets.java:2795 build/trans_presets.java:2802
+#: build/trans_presets.java:2809 build/trans_presets.java:2815
+#: build/trans_presets.java:2821 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2912
+#: build/trans_presets.java:2922 build/trans_presets.java:2931
+#: build/trans_presets.java:2937 build/trans_presets.java:2943
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 build/trans_presets.java:2981
+#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:2999 build/trans_presets.java:3005
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3023 build/trans_presets.java:3030
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3066 build/trans_presets.java:3072
+#: build/trans_presets.java:3079 build/trans_presets.java:3085
+#: build/trans_presets.java:3092 build/trans_presets.java:3098
+#: build/trans_presets.java:3104 build/trans_presets.java:3110
+#: build/trans_presets.java:3116 build/trans_presets.java:3129
+#: build/trans_presets.java:3143 build/trans_presets.java:3157
 msgid "Name"
 msgstr "Navn"
@@ -6642,4 +6778,58 @@
 msgstr "Versjon"
 
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
+#, fuzzy
+msgid "Changeset id:"
+msgstr "endringssett"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
+#, fuzzy
+msgid "Created at:"
+msgstr "Tegn områder"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
+#, fuzzy
+msgid "Changeset comment:"
+msgstr "Skift relasjon"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
+msgid "No open changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48
+#, fuzzy
+msgid "<html>Please select the changesets you want to close</html>"
+msgstr "Velg hvilke endringer som skal brukes."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
+#, fuzzy
+msgid "Open changesets"
+msgstr "endringssett"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101
+#, fuzzy
+msgid "Close changesets"
+msgstr "Lukker endringssett …"
+
+#. putValue(SMALL_ICON, ImageProvider.get("cancel"));
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
+#, fuzzy
+msgid "Close the selected open changesets"
+msgstr "Slett valgte objekter."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126
+#, fuzzy
+msgid "Cancel closeing of changesets"
+msgstr "Lukker endringssett …"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37
+msgid "Closing changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77
+#, fuzzy, java-format
+msgid "Closing changeset {0}"
+msgstr "Lukker endringssett …"
+
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
 msgid "Launch a file chooser to select a file"
@@ -6667,5 +6857,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be uploaded"
+msgid "Layer ''{0}'' has no modifications to be uploaded."
 msgstr ""
 
@@ -6673,5 +6863,5 @@
 #, java-format
 msgid ""
-"Layer ''{0}'' has modifications which should be saved to its assoicated file "
+"Layer ''{0}'' has modifications which should be saved to its associated file "
 "''{1}''."
 msgstr ""
@@ -6679,5 +6869,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be saved"
+msgid "Layer ''{0}'' has no modifications to be saved."
 msgstr ""
 
@@ -6711,17 +6901,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113
 msgid "Unsaved changes - Save/Upload before exiting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194
 #, java-format
 msgid ""
@@ -6734,10 +6924,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205
 msgid "Unsaved data and conflicts"
-msgstr "Løs konflikter"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212
 #, java-format
 msgid ""
@@ -6751,9 +6940,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223
 msgid "Unsaved data and missing associated file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230
 #, java-format
 msgid ""
@@ -6768,42 +6957,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243
 msgid "Unsaved data non-writable files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
 msgid "Close this dialog and resume editing in JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322
+msgid "Discard and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
-msgid "Discard and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354
+msgid "Save and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
-msgid "Save and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
 msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402
 #, java-format
 msgid "Preparing layer ''{0}'' for upload ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
@@ -6811,5 +7000,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491
 msgid "Incomplete upload and/or save"
 msgstr ""
@@ -6849,21 +7038,21 @@
 #. item "Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:200
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:278
-#: build/trans_presets.java:311 build/trans_presets.java:357
-#: build/trans_presets.java:372 build/trans_presets.java:387
-#: build/trans_presets.java:409 build/trans_presets.java:429
-#: build/trans_presets.java:450 build/trans_presets.java:470
-#: build/trans_presets.java:489 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:549
-#: build/trans_presets.java:570 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:633
-#: build/trans_presets.java:664 build/trans_presets.java:1060
-#: build/trans_presets.java:1068 build/trans_presets.java:1076
-#: build/trans_presets.java:1086 build/trans_presets.java:1305
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:242
+#: build/trans_presets.java:260 build/trans_presets.java:279
+#: build/trans_presets.java:312 build/trans_presets.java:358
+#: build/trans_presets.java:373 build/trans_presets.java:388
+#: build/trans_presets.java:410 build/trans_presets.java:430
+#: build/trans_presets.java:451 build/trans_presets.java:471
+#: build/trans_presets.java:490 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:665 build/trans_presets.java:1062
+#: build/trans_presets.java:1070 build/trans_presets.java:1078
+#: build/trans_presets.java:1088 build/trans_presets.java:1308
 msgid "Layer"
 msgstr "Lag"
@@ -6882,67 +7071,32 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:200
 msgid "Upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-msgid "Use a new changeset and close it"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
-msgid ""
-"Select to upload the data using a new changeset and to close the changeset "
-"after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
-msgid "Use a new changeset and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
-msgid ""
-"Select to upload the data using a new changeset and to leave the changeset "
-"open after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
-msgid "Upload to a new or to an existing changeset?"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
-msgid "upload all changes in one request"
+msgid "Settings"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
-msgid ""
-"Enable to upload all changes in one request, disable to use one request per "
-"changed primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171
-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/gui/io/UploadDialog.java:216
-msgid "Settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908
 msgid "Tags of new changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:221
 msgid "Objects to add:"
 msgstr "Objekter som legges til:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:227
 msgid "Objects to modify:"
 msgstr "Objekter som endres:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:233
 msgid "Objects to delete:"
 msgstr "Objekter som slettes:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
 #, java-format
 msgid "{0} object to add:"
@@ -6951,5 +7105,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:277
 #, java-format
 msgid "{0} object to modifiy:"
@@ -6958,5 +7112,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:286
 #, java-format
 msgid "{0} object to delete:"
@@ -6965,54 +7119,88 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422
-#, java-format
-msgid "Use the existing changeset {0} and close it after upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:423
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to close the changeset "
-"after this upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426
-#, java-format
-msgid "Use the existing changeset {0} and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:427
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to leave the changeset "
-"open for further uploads"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
-#, java-format
-msgid "Tags of changeset {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:470
 msgid "Upload Changes"
 msgstr "Last opp endringer"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472
+msgid "Upload the changed primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
+msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:479
+msgid "Illegal upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
+msgid "Cancel the upload and resume editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606
 #, fuzzy
-msgid "Upload the changed primitives"
-msgstr "Laste opp disse endringene?"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592
+msgid "Upload all changes in one request"
+msgstr "Last opp alle endringer til OSM-tjeneren."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607
+msgid ""
+"Enable to upload all changes in one request, disable to use one request per "
+"changed primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:617
+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/gui/io/UploadDialog.java:672
 #, fuzzy
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "Tast inn et navn for stedet."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:593
-msgid "Illegal upload comment"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
-msgid "Cancel the upload and resume editing"
-msgstr ""
+msgid "Open a new changeset"
+msgstr "endringssett"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
+msgid "Open a new changeset and use it in the next upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
+#, fuzzy
+msgid "Use an open changeset"
+msgstr "Ulagrede endringer"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
+msgid "Upload data to an already opened changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
+#, fuzzy
+msgid "Close changeset after upload"
+msgstr "Ingen endringer å laste opp."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
+msgid "Select to close the changeset after the next upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922
+#, java-format
+msgid "Tags of changeset {0}"
+msgstr ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
+#, fuzzy
+msgid "Load the list of your open changesets from the server"
+msgstr "Last opp aktive innstillinger til tjener"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
+#, fuzzy
+msgid "Close the currently selected open changeset"
+msgstr "Flytt valgte medlem opp"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
+#, fuzzy, java-format
+msgid "changeset id > 0 expected. Got {1}"
+msgstr "parameter «{0}» > 0 forventet – leste «{1}»"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63
@@ -7090,5 +7278,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
@@ -7126,5 +7314,5 @@
 msgstr "Den indtastede tid kunne ikke tolkes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
@@ -7132,30 +7320,30 @@
 msgstr "gps-punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
 msgid "Customize line drawing"
 msgstr "Tilpass linjetegning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
 msgid "Use global settings."
 msgstr "Bruk globale indstillinger."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Draw lines between points for this layer."
 msgstr "Tegn linjer mellem punkter i dette laget."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Do not draw lines between points for this layer."
 msgstr "Tegn ikke linjer mellem punkt i dette laget."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 msgid "Select line drawing options"
 msgstr "Velg linjetegnings-innstillinger"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7163,5 +7351,5 @@
 msgstr "Tilpass farge"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7170,5 +7358,5 @@
 msgstr "Standard"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7177,38 +7365,75 @@
 msgstr "Velg en farge"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
 msgid "Markers From Named Points"
 msgstr "Markører fra navngitte punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Navngivne sporpunkt fra {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
 msgid "Import Audio"
 msgstr "Importer lyd"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave-lydfiler (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Lyd-markører fra {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
 msgid "Import images"
 msgstr "Importer bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#, java-format
+msgid "Name: {0}"
+msgstr "Navn: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#, java-format
+msgid "Description: {0}"
+msgstr "Beskrivelse: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#, fuzzy, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
 msgstr[0] "{0} spor, "
 msgstr[1] "{0} spor, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
+#: build/trans_presets.java:3160
+msgid "Description"
+msgstr "Beskrivelse"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#, fuzzy
+msgid "Timespan"
+msgstr "Tidshorisont: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#, fuzzy
+msgid "Length"
+msgstr "Lengde: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
+msgid "URL"
+msgstr "URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+msgid "Length: "
+msgstr "Lengde: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
 #, java-format
 msgid "{0} route, "
@@ -7217,5 +7442,5 @@
 msgstr[1] "{0} ruter, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 #, java-format
 msgid "{0} waypoint"
@@ -7224,29 +7449,10 @@
 msgstr[1] "{0} waypoints"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
-#, java-format
-msgid "Name: {0}"
-msgstr "Navn: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
-#, java-format
-msgid "Description: {0}"
-msgstr "Beskrivelse: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
-msgid "Timespan: "
-msgstr "Tidshorisont: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
-msgid "Length: "
-msgstr "Lengde: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Konverter til datalag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7256,10 +7462,10 @@
 "skadeligt <br>Se her for å laste inn GPS spor:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -7270,29 +7476,29 @@
 msgstr "Konvertert fra: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
 msgid "Download from OSM along this track"
 msgstr "Last ned fra OSM langs dette spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
 msgid "Download everything within:"
 msgstr "Last ned alt innenfor:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
 #, java-format
 msgid "{0} meters"
 msgstr "{0} meter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 msgid "Maximum area per request:"
 msgstr "Max areal per forespørsel:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
 #, java-format
 msgid ""
@@ -7303,13 +7509,13 @@
 "Ønsker du<br>å fortsette?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
 msgid "Download data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
 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:1143
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7319,5 +7525,5 @@
 "ble utelatt eller flyttet til start."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7370,30 +7576,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
-#, fuzzy
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
 "<br>If you want to upload traces, look here:</html>"
 msgstr ""
-"<html>Opplasting av ubehandlede GPS-data som kortdata betraktes som "
-"skadeligt <br>Se her for å laste inn GPS spor:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "track"
 msgid_plural "tracks"
@@ -7528,4 +7731,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
@@ -7766,13 +7970,18 @@
 msgstr "Tegn store GPS-punkt."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+msgid "Draw a circle form HDOP value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Hastighet  (rød = langsom, grøn = hurtig)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Dilution of Position (rød = bra, green = dårlig (hvis noen)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "En farge (kan tilpasses navngitte lag)"
@@ -7780,6 +7989,6 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1374
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:1377
 msgid "Car"
 msgstr "Bil"
@@ -7800,14 +8009,14 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:324 build/trans_presets.java:650
-#: build/trans_presets.java:857 build/trans_presets.java:876
-#: build/trans_presets.java:890 build/trans_presets.java:912
-#: build/trans_presets.java:949 build/trans_presets.java:962
-#: build/trans_presets.java:974 build/trans_presets.java:986
-#: build/trans_presets.java:998 build/trans_presets.java:1010
-#: build/trans_presets.java:1020 build/trans_presets.java:1029
-#: build/trans_presets.java:1038 build/trans_presets.java:1437
-#: build/trans_presets.java:1510
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:325 build/trans_presets.java:651
+#: build/trans_presets.java:858 build/trans_presets.java:877
+#: build/trans_presets.java:891 build/trans_presets.java:913
+#: build/trans_presets.java:950 build/trans_presets.java:963
+#: build/trans_presets.java:975 build/trans_presets.java:987
+#: build/trans_presets.java:999 build/trans_presets.java:1011
+#: build/trans_presets.java:1021 build/trans_presets.java:1030
+#: build/trans_presets.java:1039 build/trans_presets.java:1440
+#: build/trans_presets.java:1513
 msgid "Bicycle"
 msgstr "Sykkel"
@@ -7840,62 +8049,62 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:325 build/trans_presets.java:649
-#: build/trans_presets.java:856 build/trans_presets.java:875
-#: build/trans_presets.java:889 build/trans_presets.java:911
-#: build/trans_presets.java:948 build/trans_presets.java:961
-#: build/trans_presets.java:973 build/trans_presets.java:985
-#: build/trans_presets.java:997 build/trans_presets.java:1009
-#: build/trans_presets.java:1019 build/trans_presets.java:1028
-#: build/trans_presets.java:1037
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:326 build/trans_presets.java:650
+#: build/trans_presets.java:857 build/trans_presets.java:876
+#: build/trans_presets.java:890 build/trans_presets.java:912
+#: build/trans_presets.java:949 build/trans_presets.java:962
+#: build/trans_presets.java:974 build/trans_presets.java:986
+#: build/trans_presets.java:998 build/trans_presets.java:1010
+#: build/trans_presets.java:1020 build/trans_presets.java:1029
+#: build/trans_presets.java:1038
 msgid "Foot"
 msgstr "Til fots"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Tegn retningspiler."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Hurtig opptegning (ser uryddig ut)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Bare relevante retningsvisere (f.eks. ved enveiskjøring)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Only on the head of a way."
 msgstr "Bare ved enden af linjen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Tegn segment-nummer"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Tegn omfang af nedlastede data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Tegn virtuelle noder i utvalg-tilstand"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Tegn inaktive lag i annen farge"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Glatting på kartgrafikk (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:82
 msgid "Draw lines between raw GPS points"
 msgstr "Tegn linjer mellom GPS-punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -7904,9 +8113,9 @@
 "Max lengde (i meter) for å tegne linjer i lokal fil. '-1' tegner alle linjer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
 msgid "Maximum length for local files (meters)"
 msgstr "Max lengde for lokale filer (meter)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
@@ -7915,10 +8124,10 @@
 "linjer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length (meters)"
 msgstr "Maksimal lengde (meter)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -7926,10 +8135,10 @@
 "Tvunget tegning av linjer dersom importerte data er uten linje informasjon."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:129
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Tegn retningspiler på linjer mellom GPS-punkt."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:135
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -7937,5 +8146,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:141
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -7943,13 +8152,13 @@
 msgstr "Tegn ikke piler uten at det er minst denne avstand fra forrige punkt."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:144
 msgid "Minimum distance (pixels)"
 msgstr "Minste avstand (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Draw larger dots for the GPS points."
 msgstr "Tegn større prikker for GPS-punkter."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -7959,9 +8168,9 @@
 "for Lag."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Colors points and track segments by velocity."
 msgstr "Punkt og track linjer får farge etter hastighet."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -7971,46 +8180,46 @@
 "GPS kan logge dette."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Tillater å justere fargen etter forskjellig gjennomsnitt hastighet."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid "Track and Point Coloring"
 msgstr "Farge på punkt og track linjer"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202
 msgid "GPS Points"
 msgstr "GPS-punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "Draw direction hints for way segments."
 msgstr "Tegn retningspiler på linjestykker."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:237
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Tegn nummer for linjesegmenter i hver linje."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Bruk udjevning på kartvisningen for et mere glatt utseende."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Tegn omrisset av data hentet fra tjeneren."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Tegn virtuelle noder i utvalget for lettere å endre linjer."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257
 msgid "Draw the inactive data layers in a different color."
 msgstr "Tegn inaktive datalag i en annen farge."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "OSM Data"
 msgstr "OSM-data"
@@ -8089,45 +8298,46 @@
 msgstr "Brukt stil"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Configure available plugins."
 msgstr "Indstil tilgængelige programtillegg"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50
+#. buttons at the bottom
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
 msgid "Download List"
 msgstr "Last ned liste"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:100
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 msgid "Update"
 msgstr "Oppdater"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Configure Sites..."
 msgstr "Sett opp nettsteder …"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:125
 msgid "Add JOSM Plugin description URL."
 msgstr "Legg til URL for liste over programtillegg."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:126
 msgid "Enter URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:162
 msgid "Please select an entry."
 msgstr "Velg en verdi."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:147
 msgid "Edit JOSM Plugin description URL."
 msgstr "Rediger URL for liste over programtillegg."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:148
 msgid "JOSM Plugin description URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:175
 msgid "Configure Plugin Sites"
 msgstr "Indstilling på programtillegg sider"
@@ -8477,6 +8687,6 @@
 msgstr "<multiple>"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:369
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341
 #, java-format
 msgid "Remove old keys from up to {0} object"
@@ -8485,9 +8695,9 @@
 msgstr[1] "Fjern gamle egenskapsnøkler fra  {0} objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135
 msgid "Add a new tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160
 msgid "Delete the selection in the tag table"
 msgstr ""
@@ -8522,7 +8732,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:68
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:75
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -8566,4 +8776,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24
+#, fuzzy, java-format
+msgid "Preset group ''{0}'' of group ''{1}''"
+msgstr "Bruk objektmal «{0}» i gruppe «{1}»"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
 #, java-format
 msgid "Preset group ''{0}''"
@@ -8584,4 +8799,10 @@
 msgstr "Laster ned punkt {0} til {1}..."
 
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, fuzzy, java-format
+msgid "parameter ''{0}'' > 0 expected. Got {1}"
+msgstr "parameter «{0}» > 0 forventet – leste «{1}»"
+
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8690,5 +8911,5 @@
 msgstr "Klarte ikke lese fil «{0}»"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "Lesefeil: Strukturen i GPX fila er ukjent"
@@ -8812,10 +9033,11 @@
 msgstr "Kommunikasjon er opprettet med {0} med protocol versjon {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
 msgstr "Uventet ID-format i svar fra tjener – leste «{0}»"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -8823,75 +9045,79 @@
 msgstr "Uventet format for ny versjon av endret element «{0}»: «{1}»"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315
 msgid "Creating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
 #, java-format
 msgid "Successfully opened changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#, fuzzy, java-format
+msgid "id of changeset > 0 required. Got {0}"
+msgstr "parameter {0} > 0 nødvendig. Leste {1}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
-#, java-format
-msgid "Changeset {0} is unchanged. Skipping update."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
 #, java-format
 msgid "Updating changeset {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
-msgid ""
-"Failed to update changeset. Either there is no current changeset or the id "
-"of the current changeset is 0"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
 msgid "Closing changeset..."
 msgstr "Lukker endringssett …"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
-#, java-format
-msgid "Closing changeset {0}..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
-#, java-format
-msgid "Leaving changeset {0} open..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
 msgid "No changeset present for diff upload"
 msgstr "Ingen base med rettinger tilstede for opplasting"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414
 msgid "Preparing..."
 msgstr "Forbereder …"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419
 msgid "Uploading..."
 msgstr "Laster opp …"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438
 msgid "Waiting 10 seconds ... "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449
 msgid "OK - trying again."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:485
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517
 #, java-format
 msgid "Starting retry {0} of {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
+msgid "current changeset is null. Can't upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
+#, java-format
+msgid "id of current changeset > required. Current id is {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
+#, java-format
+msgid "Open changeset expected. Got closed changeset with id {0}"
 msgstr ""
 
@@ -8917,33 +9143,95 @@
 msgstr "Ugyldig bzip2-fil"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
+#, fuzzy, java-format
+msgid "missing mandatory attribute ''{0}''"
+msgstr "obligatorisk attributt «{0}» mangler"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:128
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:134
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
+#, fuzzy, java-format
+msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+"ugyldig verdi for obligatorisk attributt «{0}» av type «int» – leste «{1}»"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
+#, fuzzy, java-format
+msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+"ugyldig verdi for obligatorisk attributt «{0}» av type «int» – leste «{1}»"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
+#, fuzzy, java-format
+msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+"ugyldig verdi for obligatorisk attributt «{0}» av type «int» – leste «{1}»"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#, java-format
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#, java-format
+msgid "Unsupported version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:176
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Aborting."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#, java-format
+msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
+#, fuzzy
+msgid "Parsing list of changesets..."
+msgstr "Lukker endringssett …"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
 msgid "Incorrect password or username."
 msgstr "Feil passord eller brukernavn."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:168
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Advarsel: Passordet overføres ukryptert."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Save user and password (unencrypted)"
 msgstr "Lagre bruker og passord (ukryptert)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
 msgid "Enter Password"
 msgstr "Skriv inn passord"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 msgid "Login"
 msgstr "Logg inn"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:242
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
 msgid "The base URL for the OSM server (REST API)"
 msgstr "URL-adressen for OSM-tjeneren (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
 msgid "Login name (e-mail) to the OSM account."
 msgstr "E-postadresse for OSM-kontoen"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -8952,17 +9240,17 @@
 "noen passord."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
 msgid "Base Server URL"
 msgstr "URL-adresse til tjener"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
 msgid "OSM username (e-mail)"
 msgstr "OSM-brukernavn (e-post)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
 msgid "OSM password"
 msgstr "OSM passord"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -8974,5 +9262,5 @@
 "<br><b>Ikke bruk et verdifullt passord.</b></html>"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:51
+#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #, java-format
 msgid "(at line {0}, column {1})"
@@ -9071,20 +9359,5 @@
 msgstr "Feil ved innlesing."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124
-#, fuzzy, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr "obligatorisk attributt «{0}» mangler"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
-#, fuzzy, java-format
-msgid "Missing mandatory attribute ''{0}''"
-msgstr "obligatorisk attributt «{0}» mangler"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
-#, fuzzy, java-format
-msgid "Unsupported version: {0}"
-msgstr "Ukjent versjon: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:155
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -9093,74 +9366,64 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
 msgid "found XML element <nd> element not as direct child of element <way>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
-msgstr "obligatorisk attributt «{0}» mangler"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
 msgstr ""
-"Ugyldig verdi for attributt «ref» for medlem av relasjon {0} – leste {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
 msgid "Found XML element <member> not as direct child of element <relation>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}"
-msgstr "Mangler attributt «ref» for medlem av relasjon {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
-"Ugyldig verdi for attributt «ref» for medlem av relasjon {0} – leste {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
-#, fuzzy, java-format
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}"
-msgstr "Mangler attributt «type» for medlem {0} i relasjon {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#, java-format
 msgid ""
 "Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}."
 msgstr ""
-"Ugyldig verdi for attributt «ref» for medlem av relasjon {0} – leste {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Ufullstendig <member>-spesifikasjon med ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
-#, java-format
-msgid "Warning: Undefined element ''{0}'' found in input stream. Skipping."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
-#, fuzzy, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
-msgstr ""
-"ugyldig verdi for obligatorisk attributt «{0}» av type «int» – leste «{1}»"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Skipping."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
 msgid "Illegal object with id=0"
 msgstr "Ulovlig objekt med id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#, java-format
 msgid ""
 "Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
 msgstr ""
-"Ugyldig verdi for attributt «version» for OSM-element med ID {0} – leste {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:303
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
 #, java-format
 msgid ""
@@ -9169,5 +9432,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
 #, java-format
 msgid ""
@@ -9176,5 +9439,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
@@ -9184,26 +9447,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:316
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#, java-format
 msgid "Unknown or unsupported API version. Got {0}"
-msgstr "Ukjent versjon: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#, java-format
 msgid "Missing attribute ''version'' on OSM primitive with id {0}"
-msgstr "Mangler attributt «version» for OSM-element med ID {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#, java-format
 msgid "Missing required attribute ''{0}''."
-msgstr "Mangler obligatorisk attributt «{0}»."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
 msgstr ""
-"ugyldig verdi for obligatorisk attributt «{0}» av type «int» – leste «{1}»"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
 #, java-format
 msgid ""
@@ -9211,5 +9473,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
 #, java-format
 msgid ""
@@ -9218,5 +9480,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
 #, java-format
 msgid ""
@@ -9224,24 +9486,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#, java-format
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
 "id ''{1}''"
-msgstr "klarte ikke sammenlikne element med ID «{0}» og element med ID «{1}»"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
 msgid "Prepare OSM data..."
 msgstr "Klargjør OSM-data …"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 msgid "Parsing OSM data..."
-msgstr "Klargjør OSM-data …"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
 msgid "Preparing data set..."
-msgstr "Klargjør data …"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
@@ -9262,4 +9522,24 @@
 msgid "Downloading referring relations ..."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51
+#, fuzzy
+msgid "Reading changesets..."
+msgstr "Lukker endringssett …"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
+#, fuzzy
+msgid "Downloading changesets ..."
+msgstr "Lukker endringssett …"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85
+#, fuzzy, java-format
+msgid "Reading changeset {0} ..."
+msgstr "Leser {0} …"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91
+#, fuzzy, java-format
+msgid "Downloading changeset {0} ..."
+msgstr "Laster ned programtillegg {0} …"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
@@ -9276,10 +9556,14 @@
 msgstr "Kobler til tjener …"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
 msgid "Failed to open connection to API {0}"
 msgstr "Klarte ikke åpne tilkobling til API {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
+msgid "Error: failed to add authentication credentials to the connection."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -9287,33 +9571,53 @@
 "Kunne ikke koble til OSM-tjeneren. Kontroller internett-tilkoblingen din."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+msgid "XML tag <user> is missing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
+#, fuzzy, java-format
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgstr "Bruk objektmal «{0}» i gruppe «{1}»"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
+#, fuzzy, java-format
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgstr ""
+"ugyldig verdi for obligatorisk attributt «{0}» av type «int» – leste «{1}»"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
 msgid "Starting to upload with one request per primitive ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
 msgid "Starting to upload in one request ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:171
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135
 msgid "Uploading data ..."
-msgstr "Laster opp …"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:178
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
 msgid ""
 "WARNING: no API version defined for data to upload. Falling back to version "
@@ -9321,5 +9625,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147
 #, java-format
 msgid ""
@@ -9329,10 +9633,10 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
 msgid "Update Plugins"
 msgstr "Opdater programtillegg"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 msgid "Download Plugins"
 msgstr "Last ned Programtillegg"
@@ -9491,5 +9795,5 @@
 msgstr "Flere detaljer"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -9498,18 +9802,18 @@
 msgstr[1] "Lastet ned informasjon om programtillegg fra {0} tjenere"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
 msgid "No plugin information found."
 msgstr "Fant ikke info om programtillegg."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:93
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
 msgid "All installed plugins are up to date."
 msgstr "Alle installerte programtillegg er siste versjon."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
 #, java-format
 msgid ""
@@ -9522,9 +9826,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
 msgid "Download missing plugins"
 msgstr "Last ned programtillegg som mangler"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
 #, java-format
 msgid ""
@@ -9539,43 +9843,43 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
 msgid "unknown"
 msgstr "ukjent"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Versjon {1} {2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 msgid "Plugin bundled with JOSM"
 msgstr "Programtillegg inkludert i JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:357
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -9701,5 +10005,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:165
-#, fuzzy
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -9707,6 +10010,4 @@
 "community."
 msgstr ""
-"Maksimal områdeavgrensing er 0.25, og din bestilling er for stor. Bestill "
-"mindre område eller bruk planet.osm"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:168
@@ -9903,10 +10204,4 @@
 msgid "(What does that mean?)"
 msgstr ""
-
-#. item "Relations/Route" text "Symbol description"
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3148
-msgid "Description"
-msgstr "Beskrivelse"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
@@ -10688,6 +10983,7 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
-msgid "Set "
-msgstr ""
+#, fuzzy, java-format
+msgid "Set {0} Lambert coordinates"
+msgstr "Behold tjenerens koordinater"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -11315,6 +11611,6 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 #: build/trans_style.java:990 build/trans_style.java:1007
-#: build/trans_style.java:1023 build/trans_style.java:3392
-#: build/trans_style.java:3400
+#: build/trans_style.java:1023 build/trans_style.java:3400
+#: build/trans_style.java:3408
 msgid "water"
 msgstr "vann"
@@ -11609,4 +11905,55 @@
 msgstr "Mål"
 
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Michigan Left"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Adds no left turn for sets of 4 or 5 ways."
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45
+#, fuzzy
+msgid "Please select 4 or 5 ways to assign no left turns."
+msgstr "Velg en eller flere lukkede linjer med minst fire noder."
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61
+#, fuzzy, java-format
+msgid "{0} extrem nodes."
+msgstr "{0} node"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69
+#, java-format
+msgid "Via node {0}, {1}"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75
+#, fuzzy, java-format
+msgid "{0} via nodes."
+msgstr "{0} node"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78
+msgid "Unable to find via nodes. Please check your selection"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98
+#, fuzzy, java-format
+msgid "MIddle way: {0}"
+msgstr "Modus: {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121
+msgid "Create Michigan left turn restriction"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129
+#, fuzzy, java-format
+msgid "Processing {0}"
+msgstr "Versjon {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142
+#, fuzzy, java-format
+msgid "Relation: from {0} to {1} via {2}"
+msgstr "Versjon {0} lagt til {1} av {2}"
+
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
 msgid "OpenLayers"
@@ -11762,7 +12109,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
-#, fuzzy
 msgid "create new objects"
-msgstr "Lag ny node."
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
@@ -11826,7 +12172,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
-#, fuzzy
 msgid "Remote Control has been asked to create a new node."
-msgstr "Remote Control er bedt om å laste data fra API."
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
@@ -12088,5 +12433,5 @@
 msgstr "Start dialog for egenskaper"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:158
 msgid "JOSM Tag Editor Plugin"
 msgstr "JOSM tilleggsprogram for Egenskaper"
@@ -12096,5 +12441,5 @@
 msgstr "Fremhev"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:370
 #, java-format
 msgid "Updating properties of up to {0} object"
@@ -12103,18 +12448,4 @@
 msgstr[1] "Oppdaterer egenskaper på inntil {0} objekt"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44
-msgid "INFO: entering compatibilty mode for JOSM with Main.ds"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47
-msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49
-msgid ""
-"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-"found."
-msgstr ""
-
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
 msgid "Group"
@@ -12124,9 +12455,4 @@
 msgid "Item"
 msgstr "Objekt"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-msgid "Filter"
-msgstr "Filter"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63
@@ -12214,5 +12540,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2272
 msgid "Street name"
 msgstr "Gatenavn"
@@ -12379,8 +12705,4 @@
 msgid "Zoom (in metres)"
 msgstr "Zoom (i meter)"
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
-msgid "URL"
-msgstr "URL"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -12587,7 +12909,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501
-#, fuzzy
 msgid "Updating map ..."
-msgstr "Laster opp …"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69
@@ -13077,7 +13398,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
-#: build/trans_style.java:4179
+#: build/trans_style.java:4159 build/trans_style.java:4166
+#: build/trans_style.java:4173 build/trans_style.java:4180
+#: build/trans_style.java:4187
 msgid "building"
 msgstr "bygning"
@@ -13091,5 +13412,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4186
+#: build/trans_style.java:4194
 msgid "area"
 msgstr "område"
@@ -13216,10 +13537,10 @@
 msgstr "Velg en startnode i enden av en linje"
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:148
 msgid "Reached the end of the line"
 msgstr "Nådde slutten av linja"
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:155
 msgid "Reached a junction"
 msgstr "Nådde et kryss"
@@ -13536,12 +13857,10 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
-#, fuzzy
 msgid "% of east:"
-msgstr "% av bredden:"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
-#, fuzzy
 msgid "% of north:"
-msgstr "% av bredden:"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -13707,6 +14026,11 @@
 "importeres fra GPX-lag)."
 
+#. Plugin michigan_left
+#: build/trans_plugins.java:35
+msgid "Adds no left turn for sets of 4 or 5 ways"
+msgstr ""
+
 #. Plugin nearclick
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid ""
 "Simulates a click when you do a small and short drag. This is usefull for "
@@ -13719,15 +14043,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid "Displays an OpenLayers background image"
 msgstr "Viser bakgrunnsbildet i et åpent lag"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importerer tema fra OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13735,5 +14059,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13741,5 +14065,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13750,15 +14074,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "JGoodies Plastic Look and Feel."
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Let other applications send commands to JOSM."
 msgstr "La andre program sende kommandoer til JOSM."
 
 #. Plugin routes
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13769,10 +14093,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Provides routing capabilities."
 msgstr "Gir deg Ruteplanlegger på OSM data."
 
 #. Plugin slippymap
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13783,15 +14107,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Legger inn markører eller Noder på gps posisjon."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Dialog for å redigere egenskaper i en tabell."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -13804,10 +14128,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Make terraced houses out of single blocks."
 msgstr "Lager rekkehus / terassehus fra en enkel husblokk."
 
 #. Plugin usertools
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -13818,5 +14142,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -13827,5 +14151,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -13836,5 +14160,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -13843,10 +14167,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Last enkelt ned data langs strekninger av sammenknyttede veier."
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -13902,4 +14226,10 @@
 #. <annotations>
 #: build/trans_presets.java:57
+#, fuzzy
+msgid "Highways"
+msgstr "ferdselsvei"
+
+#. group "Highways"
+#: build/trans_presets.java:58
 msgid "Streets"
 msgstr "Veier"
@@ -13910,5 +14240,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:58 build/trans_surveyor.java:72
+#: build/trans_presets.java:59 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Motorvei"
@@ -13917,5 +14247,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:61
+#: build/trans_presets.java:62
 msgid "Edit Motorway"
 msgstr "Rediger motorvei"
@@ -13942,8 +14272,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:120 build/trans_presets.java:140
-#: build/trans_presets.java:177 build/trans_presets.java:197
-#: build/trans_presets.java:1557 build/trans_presets.java:3146
+#: build/trans_presets.java:65 build/trans_presets.java:101
+#: build/trans_presets.java:121 build/trans_presets.java:141
+#: build/trans_presets.java:178 build/trans_presets.java:198
+#: build/trans_presets.java:1560 build/trans_presets.java:3158
 msgid "Reference"
 msgstr "Veinummer"
@@ -13957,8 +14287,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:358
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:359
 msgid "Lanes"
 msgstr "Kjørebaner"
@@ -13975,15 +14305,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:224 build/trans_presets.java:280
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:373 build/trans_presets.java:388
-#: build/trans_presets.java:412 build/trans_presets.java:431
-#: build/trans_presets.java:452 build/trans_presets.java:472
-#: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1307
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:225 build/trans_presets.java:281
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:374 build/trans_presets.java:389
+#: build/trans_presets.java:413 build/trans_presets.java:432
+#: build/trans_presets.java:453 build/trans_presets.java:473
+#: build/trans_presets.java:511 build/trans_presets.java:667
+#: build/trans_presets.java:1310
 msgid "Max. speed (km/h)"
 msgstr "Hastighetsbegrensning (km/t)"
@@ -14020,16 +14350,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:293 build/trans_presets.java:306
-#: build/trans_presets.java:320 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:464
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:659 build/trans_presets.java:1300
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:294 build/trans_presets.java:307
+#: build/trans_presets.java:321 build/trans_presets.java:353
+#: build/trans_presets.java:405 build/trans_presets.java:425
+#: build/trans_presets.java:445 build/trans_presets.java:465
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:660 build/trans_presets.java:1303
 msgid "Oneway"
 msgstr "Enveiskjøring"
@@ -14071,19 +14401,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:353
-#: build/trans_presets.java:362 build/trans_presets.java:405
-#: build/trans_presets.java:425 build/trans_presets.java:445
-#: build/trans_presets.java:465 build/trans_presets.java:485
-#: build/trans_presets.java:504 build/trans_presets.java:523
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:586 build/trans_presets.java:607
-#: build/trans_presets.java:628 build/trans_presets.java:660
-#: build/trans_presets.java:1301 build/trans_surveyor.java:12
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:354
+#: build/trans_presets.java:363 build/trans_presets.java:406
+#: build/trans_presets.java:426 build/trans_presets.java:446
+#: build/trans_presets.java:466 build/trans_presets.java:486
+#: build/trans_presets.java:505 build/trans_presets.java:524
+#: build/trans_presets.java:545 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629 build/trans_presets.java:661
+#: build/trans_presets.java:1304 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Bro"
@@ -14119,19 +14449,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:354
-#: build/trans_presets.java:378 build/trans_presets.java:406
-#: build/trans_presets.java:426 build/trans_presets.java:446
-#: build/trans_presets.java:466 build/trans_presets.java:486
-#: build/trans_presets.java:505 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629 build/trans_presets.java:661
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:355
+#: build/trans_presets.java:379 build/trans_presets.java:407
+#: build/trans_presets.java:427 build/trans_presets.java:447
+#: build/trans_presets.java:467 build/trans_presets.java:487
+#: build/trans_presets.java:506 build/trans_presets.java:525
+#: build/trans_presets.java:546 build/trans_presets.java:567
+#: build/trans_presets.java:588 build/trans_presets.java:609
+#: build/trans_presets.java:630 build/trans_presets.java:662
+#: build/trans_presets.java:1305
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -14165,18 +14495,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:73 build/trans_presets.java:90
-#: build/trans_presets.java:110 build/trans_presets.java:129
-#: build/trans_presets.java:150 build/trans_presets.java:166
-#: build/trans_presets.java:186 build/trans_presets.java:205
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:355
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:467
-#: build/trans_presets.java:487 build/trans_presets.java:506
-#: build/trans_presets.java:525 build/trans_presets.java:546
-#: build/trans_presets.java:567 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:630
-#: build/trans_presets.java:662 build/trans_presets.java:1303
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:356
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:468
+#: build/trans_presets.java:488 build/trans_presets.java:507
+#: build/trans_presets.java:526 build/trans_presets.java:547
+#: build/trans_presets.java:568 build/trans_presets.java:589
+#: build/trans_presets.java:610 build/trans_presets.java:631
+#: build/trans_presets.java:663 build/trans_presets.java:1306
 msgid "Cutting"
 msgstr "Skjæring"
@@ -14210,18 +14540,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:74 build/trans_presets.java:91
-#: build/trans_presets.java:111 build/trans_presets.java:130
-#: build/trans_presets.java:151 build/trans_presets.java:167
-#: build/trans_presets.java:187 build/trans_presets.java:206
-#: build/trans_presets.java:222 build/trans_presets.java:240
-#: build/trans_presets.java:258 build/trans_presets.java:277
-#: build/trans_presets.java:310 build/trans_presets.java:356
-#: build/trans_presets.java:408 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:468
-#: build/trans_presets.java:488 build/trans_presets.java:507
-#: build/trans_presets.java:526 build/trans_presets.java:547
-#: build/trans_presets.java:568 build/trans_presets.java:589
-#: build/trans_presets.java:610 build/trans_presets.java:631
-#: build/trans_presets.java:663 build/trans_presets.java:1304
+#: build/trans_presets.java:75 build/trans_presets.java:92
+#: build/trans_presets.java:112 build/trans_presets.java:131
+#: build/trans_presets.java:152 build/trans_presets.java:168
+#: build/trans_presets.java:188 build/trans_presets.java:207
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:357
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:469
+#: build/trans_presets.java:489 build/trans_presets.java:508
+#: build/trans_presets.java:527 build/trans_presets.java:548
+#: build/trans_presets.java:569 build/trans_presets.java:590
+#: build/trans_presets.java:611 build/trans_presets.java:632
+#: build/trans_presets.java:664 build/trans_presets.java:1307
 msgid "Embankment"
 msgstr "Øy"
@@ -14229,5 +14559,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Motorway Link"
 msgstr "Av-/påkjørsel for motorvei"
@@ -14236,5 +14566,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:80
+#: build/trans_presets.java:81
 msgid "Edit Motorway Link"
 msgstr "rediger av-/påkjørsel for motorvei"
@@ -14242,5 +14572,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:94
+#: build/trans_presets.java:95
 msgid "Trunk"
 msgstr "Stamvei"
@@ -14249,5 +14579,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:97
+#: build/trans_presets.java:98
 msgid "Edit Trunk"
 msgstr "Rediger stamvei"
@@ -14257,6 +14587,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
 msgid "Motorroad"
 msgstr "Motorsykkel"
@@ -14264,5 +14594,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:114
+#: build/trans_presets.java:115
 msgid "Trunk Link"
 msgstr "Av-/påkjørsel for stamvei"
@@ -14271,5 +14601,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:117
+#: build/trans_presets.java:118
 msgid "Edit Trunk Link"
 msgstr "Rediger av-/påkjørsel for stamvei"
@@ -14282,5 +14612,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:134 build/trans_surveyor.java:76
+#: build/trans_presets.java:135 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Riksvei"
@@ -14289,5 +14619,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:137
+#: build/trans_presets.java:138
 msgid "Edit Primary Road"
 msgstr "Rediger riksvei"
@@ -14295,10 +14625,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:154
+#: build/trans_presets.java:155
 msgid "Primary Link"
 msgstr "Av-/påkjørsel for riksvei"
 
 #. item
-#: build/trans_presets.java:155
+#: build/trans_presets.java:156
 msgid "Edit Primary Link"
 msgstr "Rediger av-/påkjørsel for riksvei"
@@ -14310,5 +14640,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:170 build/trans_surveyor.java:80
+#: build/trans_presets.java:171 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Fylkesvei e.l."
@@ -14318,5 +14648,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:174
+#: build/trans_presets.java:175
 msgid "Edit Secondary Road"
 msgstr "Rediger fylkesvei e.l."
@@ -14324,5 +14654,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:190
+#: build/trans_presets.java:191
 msgid "Tertiary"
 msgstr "Kommunal vei"
@@ -14332,5 +14662,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:194
+#: build/trans_presets.java:195
 msgid "Edit Tertiary Road"
 msgstr "Rediger kommunal vei"
@@ -14342,5 +14672,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:209 build/trans_surveyor.java:84
+#: build/trans_presets.java:210 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Småvei"
@@ -14350,5 +14680,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:213
+#: build/trans_presets.java:214
 msgid "Edit Unclassified Road"
 msgstr "Rediger småvei"
@@ -14375,19 +14705,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:225 build/trans_presets.java:243
-#: build/trans_presets.java:261 build/trans_presets.java:281
-#: build/trans_presets.java:314 build/trans_presets.java:359
-#: build/trans_presets.java:375 build/trans_presets.java:389
-#: build/trans_presets.java:413 build/trans_presets.java:432
-#: build/trans_presets.java:453 build/trans_presets.java:473
-#: build/trans_presets.java:491 build/trans_presets.java:511
-#: build/trans_presets.java:532 build/trans_presets.java:553
-#: build/trans_presets.java:574 build/trans_presets.java:595
-#: build/trans_presets.java:616 build/trans_presets.java:637
-#: build/trans_presets.java:667 build/trans_presets.java:680
-#: build/trans_presets.java:693 build/trans_presets.java:706
-#: build/trans_presets.java:719 build/trans_presets.java:732
-#: build/trans_presets.java:745 build/trans_presets.java:1308
-#: build/trans_presets.java:1498 build/trans_presets.java:1540
+#: build/trans_presets.java:226 build/trans_presets.java:244
+#: build/trans_presets.java:262 build/trans_presets.java:282
+#: build/trans_presets.java:315 build/trans_presets.java:360
+#: build/trans_presets.java:376 build/trans_presets.java:390
+#: build/trans_presets.java:414 build/trans_presets.java:433
+#: build/trans_presets.java:454 build/trans_presets.java:474
+#: build/trans_presets.java:492 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:554
+#: build/trans_presets.java:575 build/trans_presets.java:596
+#: build/trans_presets.java:617 build/trans_presets.java:638
+#: build/trans_presets.java:668 build/trans_presets.java:681
+#: build/trans_presets.java:694 build/trans_presets.java:707
+#: build/trans_presets.java:720 build/trans_presets.java:733
+#: build/trans_presets.java:746 build/trans_presets.java:1311
+#: build/trans_presets.java:1501 build/trans_presets.java:1543
 msgid "Width (meters)"
 msgstr "Bredde ( meter)"
@@ -14399,5 +14729,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:228 build/trans_surveyor.java:88
+#: build/trans_presets.java:229 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Boligfeltvei"
@@ -14406,5 +14736,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:231
+#: build/trans_presets.java:232
 msgid "Edit Residential Street"
 msgstr "Rediger boligfeltvei"
@@ -14429,14 +14759,14 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:611
-#: build/trans_presets.java:632 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "Surface"
 msgstr "Veidekke"
@@ -14457,53 +14787,53 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paved"
 msgstr "fast dekke"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "unpaved"
 msgstr "uten fast dekke"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "concrete"
 msgstr "betong"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
 msgid "metal"
 msgstr ""
@@ -14517,22 +14847,22 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
-#: build/trans_style.java:3367
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
+#: build/trans_style.java:3375
 msgid "wood"
 msgstr "skogsområde"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paving_stones"
 msgstr ""
@@ -14540,77 +14870,77 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "cobblestone"
 msgstr "brostein"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "gravel"
 msgstr "grus"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "grass"
 msgstr "gress"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "sand"
 msgstr "sand"
@@ -14618,13 +14948,13 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "ground"
 msgstr "jord"
@@ -14632,5 +14962,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:246
+#: build/trans_presets.java:247
 msgid "Living Street"
 msgstr "Gatetun"
@@ -14639,5 +14969,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:249
+#: build/trans_presets.java:250
 msgid "Edit Living Street"
 msgstr "Rediger gatetun"
@@ -14645,5 +14975,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:264
+#: build/trans_presets.java:265
 msgid "Service"
 msgstr "oppkjørsel"
@@ -14652,5 +14982,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:267
+#: build/trans_presets.java:268
 msgid "Edit Serviceway"
 msgstr "Rediger oppkjørsel"
@@ -14660,18 +14990,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "Serviceway type"
 msgstr "Type adkomstvei"
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "alley"
 msgstr "Smug"
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "driveway"
 msgstr "Oppkjørsel"
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "parking_aisle"
 msgstr "parking_aisle"
@@ -14679,5 +15009,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:284
+#: build/trans_presets.java:285
 msgid "Parking Aisle"
 msgstr "Parkeringsvei"
@@ -14687,5 +15017,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:288
+#: build/trans_presets.java:289
 msgid "Edit Parking Aisle"
 msgstr "Rediger parkeringsvei"
@@ -14693,5 +15023,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:298
+#: build/trans_presets.java:299
 msgid "Road (Unknown Type)"
 msgstr "Vei (ukjent type)"
@@ -14700,5 +15030,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Edit Road of unknown type"
 msgstr "Rediger vei av ukjent type"
@@ -14707,20 +15037,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:318
+#: build/trans_presets.java:319
 msgid "Road Restrictions"
 msgstr "Restriksjoner"
 
 #. item
-#: build/trans_presets.java:319
+#: build/trans_presets.java:320
 msgid "Edit Road Restrictions"
 msgstr "Rediger restriksjioner"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:321
+#: build/trans_presets.java:322
 msgid "Toll"
 msgstr "Avgift"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:322
+#: build/trans_presets.java:323
 msgid "No exit (cul-de-sac)"
 msgstr "Ingen gjennomkjøring"
@@ -14733,8 +15063,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:323 build/trans_presets.java:529
-#: build/trans_presets.java:550 build/trans_presets.java:571
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:634
+#: build/trans_presets.java:324 build/trans_presets.java:530
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:593 build/trans_presets.java:614
+#: build/trans_presets.java:635
 msgid "Access"
 msgstr "Adkomst"
@@ -14788,29 +15118,29 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1397
-#: build/trans_presets.java:1398 build/trans_presets.java:1399
-#: build/trans_presets.java:1763 build/trans_presets.java:1773
-#: build/trans_presets.java:2397 build/trans_presets.java:2433
-#: build/trans_presets.java:2442 build/trans_presets.java:2443
-#: build/trans_presets.java:2444 build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:1396
+#: build/trans_presets.java:1397 build/trans_presets.java:1400
+#: build/trans_presets.java:1401 build/trans_presets.java:1402
+#: build/trans_presets.java:1767 build/trans_presets.java:1777
+#: build/trans_presets.java:2408 build/trans_presets.java:2444
+#: build/trans_presets.java:2453 build/trans_presets.java:2454
+#: build/trans_presets.java:2455 build/trans_presets.java:2725
 msgid "yes"
 msgstr "ja"
@@ -14823,40 +15153,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:212
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:212
 msgid "private"
 msgstr "privat"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655
 msgid "designated"
 msgstr "brukertype"
@@ -14869,19 +15199,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:219
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:219
 msgid "destination"
 msgstr "destinasjon"
@@ -14904,71 +15234,71 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:205
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:205
 msgid "permissive"
 msgstr "permissive"
 
-#: build/trans_presets.java:323 build/trans_presets.java:327
-#: build/trans_presets.java:330 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636
+#: build/trans_presets.java:324 build/trans_presets.java:328
+#: build/trans_presets.java:331 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637
 msgid "agricultural"
 msgstr "Skog- og Landbruk"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
-#: build/trans_presets.java:2433 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1396 build/trans_presets.java:1397
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
+#: build/trans_presets.java:2444 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
+#: build/trans_presets.java:2725
 msgid "no"
 msgstr "nei"
 
-#: build/trans_presets.java:326
+#: build/trans_presets.java:327
 msgid "Goods"
 msgstr "Varer"
 
-#: build/trans_presets.java:327
+#: build/trans_presets.java:328
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Tung last (hgv)"
@@ -14983,10 +15313,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:328 build/trans_presets.java:651
-#: build/trans_presets.java:858 build/trans_presets.java:891
-#: build/trans_presets.java:913 build/trans_presets.java:950
-#: build/trans_presets.java:963 build/trans_presets.java:975
-#: build/trans_presets.java:987 build/trans_presets.java:999
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:329 build/trans_presets.java:652
+#: build/trans_presets.java:859 build/trans_presets.java:892
+#: build/trans_presets.java:914 build/trans_presets.java:951
+#: build/trans_presets.java:964 build/trans_presets.java:976
+#: build/trans_presets.java:988 build/trans_presets.java:1000
+#: build/trans_presets.java:1040
 msgid "Horse"
 msgstr "Hest"
@@ -15002,13 +15332,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:329 build/trans_presets.java:530
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:635 build/trans_presets.java:859
-#: build/trans_presets.java:877 build/trans_presets.java:892
-#: build/trans_presets.java:914 build/trans_presets.java:951
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:330 build/trans_presets.java:531
+#: build/trans_presets.java:552 build/trans_presets.java:573
+#: build/trans_presets.java:594 build/trans_presets.java:615
+#: build/trans_presets.java:636 build/trans_presets.java:860
+#: build/trans_presets.java:878 build/trans_presets.java:893
+#: build/trans_presets.java:915 build/trans_presets.java:952
+#: build/trans_presets.java:965 build/trans_presets.java:977
+#: build/trans_presets.java:989 build/trans_presets.java:1001
+#: build/trans_presets.java:1041
 msgid "Motorcycle"
 msgstr "Motorsykkel"
@@ -15023,30 +15353,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:330 build/trans_presets.java:531
-#: build/trans_presets.java:552 build/trans_presets.java:573
-#: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:636 build/trans_presets.java:654
-#: build/trans_presets.java:878 build/trans_presets.java:893
-#: build/trans_presets.java:915 build/trans_presets.java:952
-#: build/trans_presets.java:965 build/trans_presets.java:977
-#: build/trans_presets.java:989 build/trans_presets.java:1001
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:331 build/trans_presets.java:532
+#: build/trans_presets.java:553 build/trans_presets.java:574
+#: build/trans_presets.java:595 build/trans_presets.java:616
+#: build/trans_presets.java:637 build/trans_presets.java:655
+#: build/trans_presets.java:879 build/trans_presets.java:894
+#: build/trans_presets.java:916 build/trans_presets.java:953
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1042
 msgid "Motorcar"
 msgstr "Motorkjøretøy"
 
-#: build/trans_presets.java:331
+#: build/trans_presets.java:332
 msgid "Public Service Vehicles (psv)"
 msgstr "Offentlige Tjenestekjøretøy (psv)"
 
-#: build/trans_presets.java:332
+#: build/trans_presets.java:333
 msgid "Motorboat"
 msgstr "Motorbåt"
 
-#: build/trans_presets.java:333
+#: build/trans_presets.java:334
 msgid "Boat"
 msgstr "Båt"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:336
 msgid "Min. speed (km/h)"
 msgstr "Min. hastighet (km/t)"
@@ -15054,25 +15384,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:336 build/trans_presets.java:374
+#: build/trans_presets.java:337 build/trans_presets.java:375
 msgid "Max. weight (tonnes)"
 msgstr "maks totalvekt"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:337
+#: build/trans_presets.java:338
 msgid "Max. Height (meters)"
 msgstr "Max. Høyde (meter)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Max. Width (meters)"
 msgstr "Max. Bredde (meter)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:339
+#: build/trans_presets.java:340
 msgid "Max. Length (meters)"
 msgstr "Max. Lengde (meter)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:341
+#: build/trans_presets.java:342
 msgid "Roundabout"
 msgstr "Rundkjøring"
@@ -15083,5 +15413,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:346
+#: build/trans_presets.java:347
 msgid "Edit Junction"
 msgstr "Rediger kryss"
@@ -15103,9 +15433,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:349 build/trans_presets.java:648
-#: build/trans_presets.java:788 build/trans_presets.java:1135
-#: build/trans_presets.java:1392 build/trans_presets.java:2353
-#: build/trans_presets.java:2901 build/trans_presets.java:2911
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:350 build/trans_presets.java:649
+#: build/trans_presets.java:789 build/trans_presets.java:1137
+#: build/trans_presets.java:1395 build/trans_presets.java:2364
+#: build/trans_presets.java:2913 build/trans_presets.java:2923
+#: build/trans_presets.java:2932
 msgid "Type"
 msgstr "Type"
@@ -15125,10 +15455,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:547
+#: build/trans_presets.java:350 build/trans_style.java:547
 #: build/trans_style.java:555
 msgid "motorway"
 msgstr "motorway"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "motorway_link"
 msgstr "motorway_link"
@@ -15150,10 +15480,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:563
+#: build/trans_presets.java:350 build/trans_style.java:563
 #: build/trans_style.java:571
 msgid "trunk"
 msgstr "trunk"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "trunk_link"
 msgstr "trunk_link"
@@ -15175,10 +15505,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:579
+#: build/trans_presets.java:350 build/trans_style.java:579
 #: build/trans_style.java:587
 msgid "primary"
 msgstr "riksvei"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "primary_link"
 msgstr "tilkjørselsvei_riksvei"
@@ -15200,5 +15530,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:595
+#: build/trans_presets.java:350 build/trans_style.java:595
 #: build/trans_style.java:603
 msgid "secondary"
@@ -15213,9 +15543,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:349 build/trans_style.java:611
+#: build/trans_presets.java:350 build/trans_style.java:611
 msgid "tertiary"
 msgstr "kommunevei"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "unclassified"
 msgstr "småvei"
@@ -15229,9 +15559,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:349 build/trans_style.java:3143
+#: build/trans_presets.java:350 build/trans_style.java:3151
 msgid "residential"
 msgstr "boligvei"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "living_street"
 msgstr "gatetun"
@@ -15261,10 +15591,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:349 build/trans_style.java:667
-#: build/trans_style.java:4244
+#: build/trans_presets.java:350 build/trans_style.java:667
+#: build/trans_style.java:4252
 msgid "service"
 msgstr "adkomstvei"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "bus_guideway"
 msgstr "trikkespor"
@@ -15294,6 +15624,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:349 build/trans_style.java:877
-#: build/trans_style.java:3208 build/trans_style.java:3209
+#: build/trans_presets.java:350 build/trans_style.java:877
+#: build/trans_style.java:3216 build/trans_style.java:3217
 msgid "construction"
 msgstr "veiarbeid"
@@ -15304,10 +15634,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Edit Bridge"
 msgstr "Rediger bro"
 
 #. item
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "Edit Tunnel"
 msgstr "Rediger tunnel"
@@ -15315,19 +15645,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:393
+#: build/trans_presets.java:394
 msgid "Ways"
 msgstr "Gater"
 
 #. group "Ways"
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Construction"
 msgstr "Veiarbeid"
 
 #. item
-#: build/trans_presets.java:395
+#: build/trans_presets.java:396
 msgid "Edit Highway Under Construction"
 msgstr "Rediger vei under bygging"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "Junction"
 msgstr "Kryss"
@@ -15343,5 +15673,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:411 build/trans_style.java:895
+#: build/trans_presets.java:412 build/trans_style.java:895
 msgid "roundabout"
 msgstr "rundkjøring"
@@ -15350,5 +15680,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:417
+#: build/trans_presets.java:418
 msgid "Bridleway"
 msgstr "Ridevei"
@@ -15356,5 +15686,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:419
+#: build/trans_presets.java:420
 msgid "Edit Bridleway"
 msgstr "Rediger ridevei"
@@ -15362,5 +15692,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:435
+#: build/trans_presets.java:436
 msgid "Cycleway"
 msgstr "Sykkelvei"
@@ -15370,10 +15700,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:439
+#: build/trans_presets.java:440
 msgid "Edit Cycleway"
 msgstr "Rediger sykkelvei"
 
 #. item "Ways/Cycleway" check "Embankment"
-#: build/trans_presets.java:449
+#: build/trans_presets.java:450
 msgid "Pedestrians"
 msgstr ""
@@ -15381,5 +15711,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Footway"
 msgstr "Gangvei"
@@ -15388,10 +15718,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Footway"
 msgstr "Rediger gangvei"
 
 #. item "Ways/Footway" check "Embankment"
-#: build/trans_presets.java:469
+#: build/trans_presets.java:470
 msgid "Bikes"
 msgstr ""
@@ -15399,5 +15729,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:476
+#: build/trans_presets.java:477
 msgid "Pedestrian"
 msgstr "Gågate"
@@ -15406,5 +15736,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Edit Pedestrian Street"
 msgstr "Rediger gågate"
@@ -15412,5 +15742,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:494
+#: build/trans_presets.java:495
 msgid "Steps"
 msgstr "Trapper"
@@ -15420,5 +15750,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:498
+#: build/trans_presets.java:499
 msgid "Edit Flight of Steps"
 msgstr "Rediger trapper"
@@ -15427,5 +15757,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:515
+#: build/trans_presets.java:516
 msgid "Track"
 msgstr "Traktorvei"
@@ -15434,5 +15764,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:518
+#: build/trans_presets.java:519
 msgid "Edit Track"
 msgstr "Rediger traktorvei"
@@ -15440,5 +15770,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:535
+#: build/trans_presets.java:536
 msgid "Track Grade 1"
 msgstr "Traktorvei klasse 1"
@@ -15447,5 +15777,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:538
+#: build/trans_presets.java:539
 msgid "Edit Track of grade 1"
 msgstr "Rediger traktorvei klasse 1"
@@ -15453,5 +15783,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:556
+#: build/trans_presets.java:557
 msgid "Track Grade 2"
 msgstr "Traktorvei klasse 2"
@@ -15460,5 +15790,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:559
+#: build/trans_presets.java:560
 msgid "Edit Track of grade 2"
 msgstr "Rediger traktorvei klasse 2"
@@ -15466,5 +15796,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:577
+#: build/trans_presets.java:578
 msgid "Track Grade 3"
 msgstr "Traktorvei klasse 3"
@@ -15473,5 +15803,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:580
+#: build/trans_presets.java:581
 msgid "Edit Track of grade 3"
 msgstr "Rediger traktorvei klasse 3"
@@ -15479,5 +15809,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:598
+#: build/trans_presets.java:599
 msgid "Track Grade 4"
 msgstr "Traktorvei klasse 4"
@@ -15486,5 +15816,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:601
+#: build/trans_presets.java:602
 msgid "Edit Track of grade 4"
 msgstr "Rediger traktorvei klasse 4"
@@ -15492,5 +15822,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:619
+#: build/trans_presets.java:620
 msgid "Track Grade 5"
 msgstr "Traktorvei klasse 5"
@@ -15499,5 +15829,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:622
+#: build/trans_presets.java:623
 msgid "Edit Track of grade 5"
 msgstr "Rediger traktorvei klasse 5"
@@ -15506,5 +15836,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:641
+#: build/trans_presets.java:642
 msgid "Path"
 msgstr "Sti"
@@ -15513,13 +15843,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:644
+#: build/trans_presets.java:645
 msgid "Edit Path"
 msgstr "Rediger sti"
 
-#: build/trans_presets.java:652
+#: build/trans_presets.java:653
 msgid "Ski"
 msgstr "Ski"
 
-#: build/trans_presets.java:653
+#: build/trans_presets.java:654
 msgid "Snowmobile"
 msgstr "Snøscooter"
@@ -15529,6 +15859,6 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:670 build/trans_presets.java:1725
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:671 build/trans_presets.java:1729
+#: build/trans_presets.java:1752
 msgid "Hiking"
 msgstr "Tursti"
@@ -15538,5 +15868,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:674
+#: build/trans_presets.java:675
 msgid "Edit Hiking"
 msgstr "Rediger tursti"
@@ -15544,5 +15874,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:683
+#: build/trans_presets.java:684
 msgid "Mountain Hiking"
 msgstr "Fjellsti"
@@ -15552,5 +15882,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:687
+#: build/trans_presets.java:688
 msgid "Edit Mountain Hiking"
 msgstr "Rediger fjellsti"
@@ -15558,5 +15888,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:696
+#: build/trans_presets.java:697
 msgid "Demanding Mountain Hiking"
 msgstr "Krevende fjellsti"
@@ -15566,5 +15896,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:700
+#: build/trans_presets.java:701
 msgid "Edit Demanding Mountain Hiking"
 msgstr "Rediger krevende fjellsti"
@@ -15572,5 +15902,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:709
+#: build/trans_presets.java:710
 msgid "Alpine Hiking"
 msgstr "Alpin fjellsti"
@@ -15580,5 +15910,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:713
+#: build/trans_presets.java:714
 msgid "Edit Alpine Hiking"
 msgstr "Rediger alpin fjellsti"
@@ -15586,5 +15916,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:723
 msgid "Demanding Alpine Hiking"
 msgstr "Krevende alpin fjellsti"
@@ -15594,5 +15924,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:726
+#: build/trans_presets.java:727
 msgid "Edit Demanding Alpine Hiking"
 msgstr "Rediger krevende alpin fjellsti"
@@ -15600,5 +15930,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:735
+#: build/trans_presets.java:736
 msgid "Difficult Alpine Hiking"
 msgstr "Vanskelig alpin fjellsti"
@@ -15608,5 +15938,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:739
+#: build/trans_presets.java:740
 msgid "Edit Difficult Alpine Hiking"
 msgstr "Rediger vanskelig alpin fjellsti"
@@ -15614,10 +15944,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:749
+#: build/trans_presets.java:750
 msgid "Waypoints"
 msgstr "Veipunkt"
 
 #. group "Waypoints"
-#: build/trans_presets.java:750
+#: build/trans_presets.java:751
 msgid "Motorway Junction"
 msgstr "Motorveikryss"
@@ -15625,15 +15955,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:752
+#: build/trans_presets.java:753
 msgid "Edit Motorway Junction"
 msgstr "Rediger motorveikryss"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:757
 msgid "Number"
 msgstr "Nummer"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:759
 msgid "Services"
 msgstr "Service"
@@ -15641,5 +15971,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:761
 msgid "Edit Service Station"
 msgstr "Rediger Serviceområde"
@@ -15677,15 +16007,15 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:765 build/trans_presets.java:902
-#: build/trans_presets.java:1382 build/trans_presets.java:1406
-#: build/trans_presets.java:1413 build/trans_presets.java:1419
-#: build/trans_presets.java:1427 build/trans_presets.java:1434
-#: build/trans_presets.java:1761 build/trans_presets.java:1771
-#: build/trans_presets.java:2361 build/trans_presets.java:2368
-#: build/trans_presets.java:2384 build/trans_presets.java:2395
-#: build/trans_presets.java:2403 build/trans_presets.java:2410
-#: build/trans_presets.java:2464 build/trans_presets.java:2512
-#: build/trans_presets.java:2678 build/trans_presets.java:2693
-#: build/trans_presets.java:2732 build/trans_presets.java:3151
+#: build/trans_presets.java:766 build/trans_presets.java:903
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
+#: build/trans_presets.java:1416 build/trans_presets.java:1422
+#: build/trans_presets.java:1430 build/trans_presets.java:1437
+#: build/trans_presets.java:1765 build/trans_presets.java:1775
+#: build/trans_presets.java:2372 build/trans_presets.java:2379
+#: build/trans_presets.java:2395 build/trans_presets.java:2406
+#: build/trans_presets.java:2414 build/trans_presets.java:2421
+#: build/trans_presets.java:2475 build/trans_presets.java:2523
+#: build/trans_presets.java:2689 build/trans_presets.java:2704
+#: build/trans_presets.java:2743 build/trans_presets.java:3163
 msgid "Operator"
 msgstr "Operatør"
@@ -15694,5 +16024,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:769
+#: build/trans_presets.java:770
 msgid "Traffic Signal"
 msgstr "Trafikklys"
@@ -15702,5 +16032,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:774
 msgid "Pedestrian crossing type"
 msgstr "Type gangfelt"
@@ -15709,27 +16039,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "uncontrolled"
 msgstr "ukontrollert"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "traffic_signals"
 msgstr "trafikklys"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "island"
 msgstr "trafikkøy"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "unmarked"
 msgstr "umerket"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:774 build/trans_presets.java:790
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:775 build/trans_presets.java:791
+#: build/trans_presets.java:1334
 msgid "Cross on horseback"
 msgstr "Kryssende ridevei"
@@ -15737,6 +16067,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:775 build/trans_presets.java:789
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:776 build/trans_presets.java:790
+#: build/trans_presets.java:1335
 msgid "Cross by bicycle"
 msgstr "Kryssende sykkelvei"
@@ -15745,11 +16075,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:776 build/trans_presets.java:791
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:1336
 msgid "Crossing attendant"
 msgstr "Betjent fotgjengerfelt"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:778
 msgid "Crossing type name (UK)"
 msgstr "Crossing type name (UK)"
@@ -15757,30 +16087,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pelican"
 msgstr "pelican"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "toucan"
 msgstr "toucan"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "puffin"
 msgstr "puffin"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pegasus"
 msgstr "pegasus"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "tiger"
 msgstr "tiger"
 
 #. </optional>
-#: build/trans_presets.java:780
+#: build/trans_presets.java:781
 msgid "Stop"
 msgstr "Full stopp"
@@ -15788,5 +16118,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:783
+#: build/trans_presets.java:784
 msgid "Pedestrian Crossing"
 msgstr "Fotgjengerfelt"
@@ -15795,14 +16125,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:786
+#: build/trans_presets.java:787
 msgid "Edit Crossing"
 msgstr "Rediger fotgjengerfelt"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:793
 msgid "Type name (UK)"
 msgstr "Type name (UK)"
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:795
 msgid "Mini-roundabout"
 msgstr "Mini-rundkjøring"
@@ -15813,14 +16143,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "Direction"
 msgstr "Retning"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "clockwise"
 msgstr "med_klokka"
 
-#: build/trans_presets.java:801
+#: build/trans_presets.java:802
 msgid "Turning Circle"
 msgstr "Vendesirkel"
@@ -15830,20 +16160,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:806
+#: build/trans_presets.java:807
 msgid "City Limit"
 msgstr "Bygrense"
 
 #. item
-#: build/trans_presets.java:807
+#: build/trans_presets.java:808
 msgid "Edit City Limit Sign"
 msgstr "Rediger bygrenseskilt"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:812
+#: build/trans_presets.java:813
 msgid "Second Name"
 msgstr "Annet navn"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:814
+#: build/trans_presets.java:815
 msgid "Speed Camera"
 msgstr "Fotoboks"
@@ -15851,5 +16181,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:817
+#: build/trans_presets.java:818
 msgid "Emergency Phone"
 msgstr "Nødtelefon"
@@ -15857,5 +16187,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:820
+#: build/trans_presets.java:821
 msgid "Incline"
 msgstr "Stigning"
@@ -15863,5 +16193,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:823
+#: build/trans_presets.java:824
 msgid "Incline Steep"
 msgstr "Sterk stigning"
@@ -15870,10 +16200,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:827
+#: build/trans_presets.java:828
 msgid "Ford"
 msgstr "Vadested"
 
 #. item
-#: build/trans_presets.java:828
+#: build/trans_presets.java:829
 msgid "Edit Ford"
 msgstr "Rediger vadested"
@@ -15881,5 +16211,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:835
+#: build/trans_presets.java:836
 msgid "Mountain Pass"
 msgstr "Fjellpass"
@@ -15887,5 +16217,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:837
+#: build/trans_presets.java:838
 msgid "Edit Mountain Pass"
 msgstr "Rediger fjellpass"
@@ -15897,7 +16227,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:842 build/trans_presets.java:1600
-#: build/trans_presets.java:1745 build/trans_presets.java:2845
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:843 build/trans_presets.java:1604
+#: build/trans_presets.java:1749 build/trans_presets.java:2857
+#: build/trans_presets.java:2864 build/trans_presets.java:2871
 msgid "Elevation"
 msgstr "Høyde"
@@ -15905,5 +16235,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:846
+#: build/trans_presets.java:847
 msgid "Barriers"
 msgstr "Stengsel"
@@ -15911,5 +16241,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:849
+#: build/trans_presets.java:850
 msgid "Bollard"
 msgstr "Sperresøyle"
@@ -15917,5 +16247,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:852
 msgid "Edit Bollard"
 msgstr "Rediger sperresøyle"
@@ -15960,16 +16290,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:854 build/trans_presets.java:873
-#: build/trans_presets.java:887 build/trans_presets.java:909
-#: build/trans_presets.java:946 build/trans_presets.java:959
-#: build/trans_presets.java:971 build/trans_presets.java:983
-#: build/trans_presets.java:995 build/trans_presets.java:1007
-#: build/trans_presets.java:1017 build/trans_presets.java:1026
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:855 build/trans_presets.java:874
+#: build/trans_presets.java:888 build/trans_presets.java:910
+#: build/trans_presets.java:947 build/trans_presets.java:960
+#: build/trans_presets.java:972 build/trans_presets.java:984
+#: build/trans_presets.java:996 build/trans_presets.java:1008
+#: build/trans_presets.java:1018 build/trans_presets.java:1027
+#: build/trans_presets.java:1036
 msgid "Allowed traffic:"
 msgstr "Tillatt trafikk:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:861
+#: build/trans_presets.java:862
 msgid "Cycle Barrier"
 msgstr "Halvbommer"
@@ -15978,5 +16308,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:865
+#: build/trans_presets.java:866
 msgid "Block"
 msgstr "Steinblokk"
@@ -15984,5 +16314,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:868
+#: build/trans_presets.java:869
 msgid "Cattle Grid"
 msgstr "Ferist"
@@ -15990,10 +16320,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:870
+#: build/trans_presets.java:871
 msgid "Edit Cattle Grid"
 msgstr "Rediger ferist"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:880
+#: build/trans_presets.java:881
 msgid "Bus Trap"
 msgstr "Bussluse"
@@ -16001,15 +16331,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:883
+#: build/trans_presets.java:884
 msgid "Spikes"
 msgstr "Pigghinder"
 
 #. item
-#: build/trans_presets.java:884
+#: build/trans_presets.java:885
 msgid "Edit Spikes"
 msgstr "Rediger pigghinder"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:896
 msgid "Toll Booth"
 msgstr "Bomstasjon"
@@ -16017,5 +16347,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:897
+#: build/trans_presets.java:898
 msgid "Edit Toll Booth"
 msgstr "Rediger bomstasjon"
@@ -16023,10 +16353,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:905
+#: build/trans_presets.java:906
 msgid "Border Control"
 msgstr "Tollstasjon"
 
 #. item
-#: build/trans_presets.java:906
+#: build/trans_presets.java:907
 msgid "Edit Border Control"
 msgstr "Rediger tollstasjon"
@@ -16036,5 +16366,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:920
+#: build/trans_presets.java:921
 msgid "Hedge"
 msgstr "Hekk"
@@ -16043,5 +16373,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:925
 msgid "Fence"
 msgstr "Gjerde"
@@ -16050,5 +16380,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:929
 msgid "Wall"
 msgstr "Mur"
@@ -16056,5 +16386,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:931
+#: build/trans_presets.java:932
 msgid "City Wall"
 msgstr "Bymur"
@@ -16063,5 +16393,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:935
+#: build/trans_presets.java:936
 msgid "Retaining Wall"
 msgstr "Støttemur"
@@ -16073,15 +16403,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:942
+#: build/trans_presets.java:943
 msgid "Entrance"
 msgstr "Inngang"
 
 #. item
-#: build/trans_presets.java:943
+#: build/trans_presets.java:944
 msgid "Edit Entrance"
 msgstr "Rediger inngang"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:954
+#: build/trans_presets.java:955
 msgid "Gate"
 msgstr "Port"
@@ -16089,50 +16419,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:956
+#: build/trans_presets.java:957
 msgid "Edit Gate"
 msgstr "Rediger port"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:967
+#: build/trans_presets.java:968
 msgid "Lift Gate"
 msgstr "Veibom"
 
 #. item
-#: build/trans_presets.java:968
+#: build/trans_presets.java:969
 msgid "Edit Lift Gate"
 msgstr "Rediger veibom"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:979
+#: build/trans_presets.java:980
 msgid "Hampshire Gate"
 msgstr "Gjerdestengsel"
 
 #. item
-#: build/trans_presets.java:980
+#: build/trans_presets.java:981
 msgid "Edit Hampshire Gate"
 msgstr "Rediger gjerdestengsel"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:991
+#: build/trans_presets.java:992
 msgid "Bump Gate"
 msgstr "Støtfangergjerde"
 
 #. item
-#: build/trans_presets.java:992
+#: build/trans_presets.java:993
 msgid "Edit Bump Gate"
 msgstr "Rediger støtfangergjerde"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:1003
+#: build/trans_presets.java:1004
 msgid "Kissing Gate"
 msgstr "Fotgjengerport"
 
 #. item
-#: build/trans_presets.java:1004
+#: build/trans_presets.java:1005
 msgid "Edit Kissing Gate"
 msgstr "Rediger fotgjengerport"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1013
 msgid "Stile"
 msgstr "Gjerdetrapp"
@@ -16140,25 +16470,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1014
+#: build/trans_presets.java:1015
 msgid "Edit Stile"
 msgstr "Rediger gjerdetrapp"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1023
 msgid "Turnstile"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1024
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1032
 msgid "Sally Port"
 msgstr "Sortiport"
 
 #. item
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1033
 msgid "Edit Sally Port"
 msgstr "Rediger sortiport"
@@ -16166,13 +16496,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #.
-#. <separator/>
+#. group "Water"
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1046 build/trans_presets.java:1089
+#: build/trans_presets.java:1047 build/trans_presets.java:1048
+#: build/trans_presets.java:1091
 msgid "Water"
 msgstr "Vann"
 
 #. group "Water"
-#: build/trans_presets.java:1047
+#: build/trans_presets.java:1049
 msgid "Spring"
 msgstr "Vannkilde"
@@ -16180,5 +16511,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1049
+#: build/trans_presets.java:1051
 msgid "Edit Spring"
 msgstr "Rediger vannkilde"
@@ -16186,5 +16517,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1056
 msgid "Drain"
 msgstr "Drenering"
@@ -16192,10 +16523,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1058
 msgid "Edit Drain"
 msgstr "Rediger drenering"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1064
 msgid "Stream"
 msgstr "Bekk"
@@ -16203,10 +16534,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1066
 msgid "Edit Stream"
 msgstr "Rediger bekk"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1072
 msgid "Canal"
 msgstr "Kanal"
@@ -16214,10 +16545,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1074
 msgid "Edit Canal"
 msgstr "Rediger kanal"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1080
 msgid "River"
 msgstr "Elv"
@@ -16227,5 +16558,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1084
 msgid "Edit River"
 msgstr "Rediger elv"
@@ -16233,15 +16564,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1093
 msgid "Edit Water"
 msgstr "Rediger vann"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1097
 msgid "Land"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1098
 msgid "Edit Land"
 msgstr "Rediger land"
@@ -16249,15 +16580,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1103
 msgid "Basin"
 msgstr "Basseng"
 
 #. item
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1104
 msgid "Edit Basin Landuse"
 msgstr "Rediger basseng"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1109
 msgid "Reservoir"
 msgstr "Drikkevannskilde"
@@ -16265,15 +16596,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1109
+#: build/trans_presets.java:1111
 msgid "Edit Reservoir Landuse"
 msgstr "Rediger drikkevannskilde"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1116
 msgid "Covered Reservoir"
 msgstr "Tildekt drikkevannskilde"
 
 #. item
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1117
 msgid "Edit Covered Reservoir"
 msgstr "Rediger tildekt drikkevannskilde"
@@ -16281,5 +16612,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1120
+#: build/trans_presets.java:1122
 msgid "Riverbank"
 msgstr "Elvebredd"
@@ -16288,10 +16619,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1125
 msgid "Edit Riverbank"
 msgstr "Rediger elvebredd"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1127
+#: build/trans_presets.java:1129
 msgid "Wetland"
 msgstr "Våtmarksområde"
@@ -16302,14 +16633,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1134
 msgid "Edit Wetland"
 msgstr "Rediger våtmarksområde"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "swamp"
 msgstr "Sumpområde"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "bog"
 msgstr "Flytemyr"
@@ -16323,35 +16654,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1135 build/trans_style.java:3384
+#: build/trans_presets.java:1137 build/trans_style.java:3392
 msgid "marsh"
 msgstr "Myrområde"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "reedbed"
 msgstr "Sivområde"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "saltmarsh"
 msgstr "Saltmyr"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "tidalflat"
 msgstr "Tidevannsflate"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "mangrove"
 msgstr "Mangrove"
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1139
 msgid "Mud"
 msgstr "Gjørme"
 
 #. item
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1140
 msgid "Edit Mud"
 msgstr "Rediger gjørme"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1144
 msgid "Beach"
 msgstr "Strand"
@@ -16359,20 +16690,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1144
+#: build/trans_presets.java:1146
 msgid "Edit Beach"
 msgstr "Rediger strand"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1150
 msgid "Bay"
 msgstr "Havbukt"
 
 #. item
-#: build/trans_presets.java:1149
+#: build/trans_presets.java:1151
 msgid "Edit Bay"
 msgstr "Rediger havbukt"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1155
 msgid "Cliff"
 msgstr "Klippe"
@@ -16380,10 +16711,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1157
 msgid "Edit Cliff"
 msgstr "Rediger klippe"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1159
+#: build/trans_presets.java:1161
 msgid "Coastline"
 msgstr "Kystlinje"
@@ -16391,5 +16722,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1163
 msgid "Edit Coastline"
 msgstr "Rediger kystlinje"
@@ -16397,5 +16728,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1168
 msgid "Ferry Route"
 msgstr "Fergerute"
@@ -16403,5 +16734,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1170
 msgid "Edit Ferry"
 msgstr "Rediger fergerute"
@@ -16410,5 +16741,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1176
+#: build/trans_presets.java:1178
 msgid "Boatyard"
 msgstr "Skipsverft"
@@ -16416,10 +16747,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:1180
 msgid "Edit Boatyard"
 msgstr "Rediger skipsverft"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1185
 msgid "Dock"
 msgstr "Tørrdokk"
@@ -16427,5 +16758,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1187
 msgid "Edit Dock"
 msgstr "Rediger tørrdokk"
@@ -16433,5 +16764,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1193
 msgid "Dam"
 msgstr "Demning"
@@ -16439,15 +16770,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1195
 msgid "Edit Dam"
 msgstr "Rediger demning"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1199
+#: build/trans_presets.java:1201
 msgid "Waterway Point"
 msgstr "Punkt i vann"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1202
 msgid "Lock Gate"
 msgstr "Sluseport"
@@ -16456,5 +16787,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1206
 msgid "Weir"
 msgstr "Terskeldam"
@@ -16462,20 +16793,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1208
 msgid "Edit Weir"
 msgstr "Rediger terskeldam"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1213
 msgid "Waterfall"
 msgstr "Foss"
 
 #. item
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1214
 msgid "Edit Waterfall"
 msgstr "Rediger foss"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1219
 msgid "Turning Point"
 msgstr "Snuplass"
@@ -16484,15 +16815,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1221
+#: build/trans_presets.java:1223
 msgid "Marina"
 msgstr "Marina"
 
 #. item
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1224
 msgid "Edit Marina"
 msgstr "Rediger marina"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1228
 msgid "Pier"
 msgstr "Brygge"
@@ -16500,10 +16831,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1230
 msgid "Edit Pier"
 msgstr "Rediger brygge"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1234
 msgid "Ferry Terminal"
 msgstr "Fergeleie"
@@ -16511,10 +16842,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1236
 msgid "Edit Ferry Terminal"
 msgstr "Rediger fergeleie"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1240
 msgid "Slipway"
 msgstr "Båtslipp"
@@ -16524,16 +16855,21 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1244
 msgid "Edit Slipway"
 msgstr "Rediger båtslipp"
 
 #. item "Waterway Point/Slipway" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1250
+#, fuzzy
+msgid "Transport"
+msgstr "Offentlig transport"
+
+#. group "Transport"
+#: build/trans_presets.java:1251
 msgid "Railway"
 msgstr "Jernbane"
 
 #. group "Railway"
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1252
 msgid "Rail"
 msgstr "Jernbane"
@@ -16541,5 +16877,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:1254
 msgid "Edit Rail"
 msgstr "Rediger jernbane"
@@ -16569,8 +16905,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "Optional Types"
 msgstr "Alternative typer"
@@ -16584,35 +16920,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "yard"
 msgstr "Stasjonsområde"
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "siding"
 msgstr "Sidespor"
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "spur"
 msgstr "Privat sidespor"
 
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1259
 msgid "Narrow Gauge Rail"
 msgstr "Smal jernbane"
 
 #. item
-#: build/trans_presets.java:1257
+#: build/trans_presets.java:1260
 msgid "Edit Narrow Gauge Rail"
 msgstr "Rediger smal jernbane"
 
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1265
 msgid "Monorail"
 msgstr "Monorail"
@@ -16620,45 +16956,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1267
 msgid "Edit Monorail"
 msgstr "Rediger Monorail"
 
-#: build/trans_presets.java:1269
+#: build/trans_presets.java:1272
 msgid "Preserved"
 msgstr "Fredet bane"
 
 #. item
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1273
 msgid "Edit Preserved Railway"
 msgstr "Rediger fredet bane"
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1278
 msgid "Light Rail"
 msgstr "Bybane"
 
 #. item
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1279
 msgid "Edit Light Rail"
 msgstr "Rediger bybane"
 
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1284
 msgid "Subway"
 msgstr "T-bane"
 
 #. item
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1285
 msgid "Edit Subway"
 msgstr "Rediger T-bane"
 
-#: build/trans_presets.java:1287
+#: build/trans_presets.java:1290
 msgid "Tram"
 msgstr "Trikk"
 
 #. item
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1291
 msgid "Edit Tram"
 msgstr "Rediger trikk"
 
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1296
 msgid "Bus Guideway"
 msgstr "Busspor"
@@ -16666,5 +17002,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1295
+#: build/trans_presets.java:1298
 msgid "Edit Bus Guideway"
 msgstr "Rediger busspor"
@@ -16673,14 +17009,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1315
 msgid "Disused Rail"
 msgstr "Nedlagt jernbane"
 
 #. item
-#: build/trans_presets.java:1313
+#: build/trans_presets.java:1316
 msgid "Edit Disused Railway"
 msgstr "Rediger nedlagt jernbane"
 
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1321
 msgid "Abandoned Rail"
 msgstr "Revet jernbane"
@@ -16689,5 +17025,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1325
 msgid "Level Crossing"
 msgstr "Planovergang"
@@ -16696,5 +17032,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1329
 msgid "Crossing"
 msgstr "Fotgjengerfelt"
@@ -16704,5 +17040,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1333
 msgid "Crossing type"
 msgstr "Type fotgjengerfelt"
@@ -16710,5 +17046,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1339
 msgid "Turntable"
 msgstr "Dreieskive"
@@ -16717,10 +17053,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1344
 msgid "Aerialway"
 msgstr "Taubaner og -heiser"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1345
 msgid "Chair Lift"
 msgstr "Stolheis"
@@ -16728,10 +17064,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1347
 msgid "Edit Chair Lift"
 msgstr "Rediger stolheis"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1351
 msgid "Drag Lift"
 msgstr "T-krokheis"
@@ -16739,10 +17075,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1353
 msgid "Edit Drag Lift"
 msgstr "Rediger T-krokheis"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1357
 msgid "Cable Car"
 msgstr "Taubane"
@@ -16750,10 +17086,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1359
 msgid "Edit Cable Car"
 msgstr "Rediger taubane"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1360
+#: build/trans_presets.java:1363
 msgid "Gondola"
 msgstr "Gondolbane"
@@ -16761,5 +17097,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1365
 msgid "Edit Gondola"
 msgstr "Rediger gondolbane"
@@ -16767,5 +17103,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1366 build/trans_presets.java:1461
+#: build/trans_presets.java:1369 build/trans_presets.java:1464
 msgid "Station"
 msgstr "Stasjon"
@@ -16776,10 +17112,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1368 build/trans_presets.java:1464
+#: build/trans_presets.java:1371 build/trans_presets.java:1467
 msgid "Edit Station"
 msgstr "Rediger stasjon"
 
 #. group "Car"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1378
 msgid "Fuel"
 msgstr "Bensinstasjon"
@@ -16789,5 +17125,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1382
 msgid "Edit Fuel"
 msgstr "Rediger bensinstasjon"
@@ -16845,32 +17181,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1671 build/trans_presets.java:1678
-#: build/trans_presets.java:1686 build/trans_presets.java:1699
-#: build/trans_presets.java:1713 build/trans_presets.java:1810
-#: build/trans_presets.java:1818 build/trans_presets.java:1909
-#: build/trans_presets.java:1915 build/trans_presets.java:2226
-#: build/trans_presets.java:2250 build/trans_presets.java:2465
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1703
+#: build/trans_presets.java:1717 build/trans_presets.java:1814
+#: build/trans_presets.java:1822 build/trans_presets.java:1919
+#: build/trans_presets.java:1925 build/trans_presets.java:2237
+#: build/trans_presets.java:2261 build/trans_presets.java:2476
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Opening Hours"
 msgstr "Åpningstider"
@@ -16929,91 +17265,91 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -17028,5 +17364,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1385 build/trans_presets.java:1438
+#: build/trans_presets.java:1388 build/trans_presets.java:1441
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -17036,5 +17372,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1391
 msgid "Edit Parking"
 msgstr "Rediger parkering"
@@ -17045,24 +17381,24 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1391 build/trans_presets.java:1762
-#: build/trans_presets.java:1772 build/trans_presets.java:2396
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:1394 build/trans_presets.java:1766
+#: build/trans_presets.java:1776 build/trans_presets.java:2407
+#: build/trans_presets.java:2524
 msgid "Reference number"
 msgstr "Referansenummer"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "multi-storey"
 msgstr "P-hus"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "surface"
 msgstr "Overflateparkering"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "underground"
 msgstr "P-kjeller"
 
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1396
 msgid "Park and Ride"
 msgstr ""
@@ -17071,38 +17407,38 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1394 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
+#: build/trans_presets.java:1397 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
 msgid "Fee"
 msgstr "Gebyr"
 
 #. <space />
-#: build/trans_presets.java:1396
+#: build/trans_presets.java:1399
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1400
 msgid "Spaces for Disabled"
 msgstr "Handicap-plasser"
 
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1401
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1402
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1403
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1405
 msgid "Wash"
 msgstr "Bilvask"
 
 #. item
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1406
 msgid "Edit Car Wash"
 msgstr "Rediger bilvask"
@@ -17110,5 +17446,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1408 build/trans_presets.java:1452
+#: build/trans_presets.java:1411 build/trans_presets.java:1455
 msgid "Shop"
 msgstr "Butikk"
@@ -17116,15 +17452,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1413
 msgid "Edit Car Shop"
 msgstr "Rediger bilforretning"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1418
 msgid "Repair"
 msgstr "Verksted"
 
 #. item
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1419
 msgid "Edit Car Repair"
 msgstr "Rediger verksted"
@@ -17132,5 +17468,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1421 build/trans_presets.java:1445
+#: build/trans_presets.java:1424 build/trans_presets.java:1448
 msgid "Rental"
 msgstr "Bilutleie"
@@ -17139,10 +17475,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1427
 msgid "Edit Car Rental"
 msgstr "Rediger bilutleie"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1432
 msgid "Sharing"
 msgstr "Bildeling"
@@ -17150,5 +17486,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1434
 msgid "Edit Car Sharing"
 msgstr "Rediger bildeling"
@@ -17156,10 +17492,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Parking"
 msgstr "Rediger sykkelparkering"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1446
 msgid "Capacity"
 msgstr "Kapasitet"
@@ -17168,5 +17504,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1448
+#: build/trans_presets.java:1451
 msgid "Edit Bicycle Rental"
 msgstr "Rediger sykkelutleie"
@@ -17175,15 +17511,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1458
 msgid "Edit Bicycle Shop"
 msgstr "Rediger sykkelbutikk"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1463
 msgid "Public Transport"
 msgstr "Offentlig transport"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:1472
 msgid "UIC-Reference"
 msgstr "Internasjonal UIC-jernbanekode"
@@ -17191,5 +17527,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1475
 msgid "Railway Halt"
 msgstr "Jernbanestopp"
@@ -17197,5 +17533,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1477
 msgid "Edit Halt"
 msgstr "Rediger jernbanestopp"
@@ -17203,5 +17539,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1484
 msgid "Tram Stop"
 msgstr "Trikkestopp"
@@ -17210,5 +17546,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1484
+#: build/trans_presets.java:1487
 msgid "Edit Tram Stop"
 msgstr "Rediger trikkestopp"
@@ -17216,5 +17552,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1494
 msgid "Railway Platform"
 msgstr "Jernbaneplattform"
@@ -17223,5 +17559,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1497
 msgid "Edit Railway Platform"
 msgstr "Rediger jernbaneplattform"
@@ -17233,5 +17569,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1497 build/trans_presets.java:1539
+#: build/trans_presets.java:1500 build/trans_presets.java:1542
 msgid "Reference (track number)"
 msgstr "Spornummer"
@@ -17239,10 +17575,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1499 build/trans_presets.java:1541
+#: build/trans_presets.java:1502 build/trans_presets.java:1544
 msgid "Area"
 msgstr "Område"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1504
 msgid "Subway Entrance"
 msgstr "T-baneinngang"
@@ -17251,10 +17587,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1507
 msgid "Edit Subway Entrance"
 msgstr "Rediger T-baneinngang"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1512
 msgid "Wheelchair"
 msgstr "Rullestol"
@@ -17263,5 +17599,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1517
 msgid "Bus Station"
 msgstr "Busstasjon"
@@ -17270,5 +17606,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1520
 msgid "Edit Bus Station"
 msgstr "Rediger busstasjon"
@@ -17276,5 +17612,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1526
 msgid "Bus Stop"
 msgstr "Bussholdeplass"
@@ -17284,5 +17620,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1530
 msgid "Edit Bus Stop"
 msgstr "Rediger bussholdeplass"
@@ -17291,6 +17627,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1532 build/trans_presets.java:1785
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:1535 build/trans_presets.java:1789
+#: build/trans_presets.java:2453
 msgid "Shelter"
 msgstr "Leskur / Ly for natten"
@@ -17298,10 +17634,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1538
 msgid "Bus Platform"
 msgstr "Bussplatform"
 
 #. item
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1539
 msgid "Edit Bus Platform"
 msgstr "Rediger bussplattform"
@@ -17309,5 +17645,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1547
 msgid "Taxi"
 msgstr "Taxi"
@@ -17315,5 +17651,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1549
 msgid "Edit Taxi station"
 msgstr "Rediger taxi-stasjon"
@@ -17321,5 +17657,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1554
 msgid "Airport"
 msgstr "Flyplass"
@@ -17327,15 +17663,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1556
 msgid "Edit Airport"
 msgstr "Rediger flyplass"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1561
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1559
+#: build/trans_presets.java:1562
 msgid "ICAO"
 msgstr "ICAO"
@@ -17343,6 +17679,11 @@
 #. item "Public Transport/Airport" text "ICAO"
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1567
+#, fuzzy
+msgid "Travel"
+msgstr "grus"
+
+#. group "Travel"
+#: build/trans_presets.java:1568
 msgid "Accomodation"
 msgstr "Overnatting"
@@ -17354,5 +17695,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1565 build/trans_surveyor.java:43
+#: build/trans_presets.java:1569 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotell"
@@ -17361,15 +17702,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:1568
+#: build/trans_presets.java:1572
 msgid "Edit Hotel"
 msgstr "Rediger hotell"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1575
 msgid "Stars"
 msgstr "Stjerner"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1577
 msgid "Motel"
 msgstr "Motell"
@@ -17377,20 +17718,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1579
 msgid "Edit Motel"
 msgstr "Rediger motell"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1583
 msgid "Guest House"
 msgstr "Gjestehus"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1584
 msgid "Edit Guest House"
 msgstr "Rediger gjestehus"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1588
 msgid "Chalet"
 msgstr "Feriehytter"
@@ -17398,10 +17739,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1590
 msgid "Edit Chalet"
 msgstr "Rediger feriehytter"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1594
 msgid "Hostel"
 msgstr "Ungdomsherberge"
@@ -17409,30 +17750,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1592
+#: build/trans_presets.java:1596
 msgid "Edit Hostel"
 msgstr "Rediger ungdomsherberge"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1600
 msgid "Alpine Hut"
 msgstr "Fjellstue"
 
 #. item
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1601
 msgid "Edit Alpine Hut"
 msgstr "Rediger fjellstue"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1606
 msgid "Caravan Site"
 msgstr "Campingvognplass"
 
 #. item
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1607
 msgid "Edit Caravan Site"
 msgstr "Rediger campingvognplass"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1611
 msgid "Camping Site"
 msgstr "Campingplass"
@@ -17440,10 +17781,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1613
 msgid "Edit Camping Site"
 msgstr "Rediger campingplass"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1618
 msgid "Food+Drinks"
 msgstr "Mat og drikke"
@@ -17454,5 +17795,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1615 build/trans_surveyor.java:47
+#: build/trans_presets.java:1619 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -17460,5 +17801,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1621
 msgid "Edit Restaurant"
 msgstr "Rediger restaurant"
@@ -17466,5 +17807,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "Cuisine"
 msgstr "Kjøkken"
@@ -17472,61 +17813,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "italian"
 msgstr "italiensk"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "chinese"
 msgstr "kinesisk"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "burger"
 msgstr "gatekjøkken"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "greek"
 msgstr "gresk"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "german"
 msgstr "tysk"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "indian"
 msgstr "indisk"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "regional"
 msgstr "lokal"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "turkish"
 msgstr "tyrkisk"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "asian"
 msgstr "asiatisk"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "mexican"
 msgstr "meksikansk"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "japanese"
 msgstr "japansk"
 
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1627
 msgid "Fast Food"
 msgstr "Gatekjøkken"
@@ -17534,9 +17875,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1629
 msgid "Edit Fast Food Restaurant"
 msgstr "Rediger gatekjøkken"
 
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1635
 msgid "Cafe"
 msgstr "Kafé"
@@ -17544,9 +17885,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1633
+#: build/trans_presets.java:1637
 msgid "Edit Cafe"
 msgstr "Rediger kafé"
 
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1642
 msgid "Pub"
 msgstr "Pub"
@@ -17554,18 +17895,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1644
 msgid "Edit Pub"
 msgstr "Rediger pub"
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1649
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item
-#: build/trans_presets.java:1646
+#: build/trans_presets.java:1650
 msgid "Edit Biergarten"
 msgstr "Rediger Biergarten"
 
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1655
 msgid "Bar"
 msgstr "Bar"
@@ -17573,9 +17914,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1657
 msgid "Edit Bar"
 msgstr "Rediger bar"
 
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1662
 msgid "Nightclub"
 msgstr "Nattklubb"
@@ -17583,24 +17924,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1664
 msgid "Edit Nightclub"
 msgstr "Rediger nattklubb"
 
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1670
 msgid "Tourism"
 msgstr "Turisme"
 
 #. group "Tourism"
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1671
 msgid "Attraction"
 msgstr "Attraksjon"
 
 #. item
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1672
 msgid "Edit Attraction"
 msgstr "Rediger attraksjon"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1677
 msgid "Museum"
 msgstr "Museum"
@@ -17608,9 +17949,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1679
 msgid "Edit Museum"
 msgstr "Rediger museum"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1684
 msgid "Zoo"
 msgstr "Zoologisk hage"
@@ -17619,9 +17960,9 @@
 #. <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:1683
+#: build/trans_presets.java:1687
 msgid "Edit Zoo"
 msgstr "Rediger  zoologisk hage"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1692
 msgid "Viewpoint"
 msgstr "Utsiktspunkt"
@@ -17629,24 +17970,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1694
 msgid "Edit Viewpoint"
 msgstr "Rediger utsiktspunkt"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1697
 msgid "Look-Out Tower"
 msgstr "Utsiktstårn"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1699
 msgid "Theme Park"
 msgstr "Temapark"
 
 #. item
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1700
 msgid "Edit Theme Park"
 msgstr "Rediger temapark"
 
-#: build/trans_presets.java:1701
+#: build/trans_presets.java:1705
 msgid "Artwork"
 msgstr "Kunstverk"
@@ -17654,5 +17995,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1707
 msgid "Edit Artwork"
 msgstr "Rediger kunstverk"
@@ -17660,19 +18001,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1712
 msgid "Information Office"
 msgstr "Turistinformasjon"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1719
 msgid "Map"
 msgstr "Kart"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "topo"
 msgstr ""
@@ -17710,5 +18051,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1720 build/trans_style.java:619
+#: build/trans_presets.java:1724 build/trans_style.java:619
 #: build/trans_style.java:635 build/trans_style.java:651
 #: build/trans_style.java:659
@@ -17716,28 +18057,28 @@
 msgstr "gate"
 
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1722 build/trans_presets.java:1738
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1726 build/trans_presets.java:1742
+#: build/trans_presets.java:1786
 msgid "Closer Description"
 msgstr "Nærmere forklaring"
@@ -17747,5 +18088,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1724 build/trans_presets.java:1747
+#: build/trans_presets.java:1728 build/trans_presets.java:1751
 msgid "Routes shown for:"
 msgstr ""
@@ -17753,6 +18094,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1726 build/trans_presets.java:1749
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1965
 msgid "Cycling"
 msgstr "Sykling"
@@ -17760,5 +18101,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1727 build/trans_presets.java:1750
+#: build/trans_presets.java:1731 build/trans_presets.java:1754
 msgid "Mountainbiking"
 msgstr ""
@@ -17766,6 +18107,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1728 build/trans_presets.java:1751
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:1732 build/trans_presets.java:1755
+#: build/trans_presets.java:2019
 msgid "Skiing"
 msgstr "Ski"
@@ -17773,5 +18114,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1729 build/trans_presets.java:1752
+#: build/trans_presets.java:1733 build/trans_presets.java:1756
 msgid "Riding"
 msgstr ""
@@ -17779,46 +18120,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1734 build/trans_presets.java:1757
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1736
 msgid "Information Board"
 msgstr "Informasjonstavle"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "history"
 msgstr "historisk"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "nature"
 msgstr "natur"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "wildlife"
 msgstr "dyreliv"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1744
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1759
 msgid "Information Terminal"
 msgstr ""
@@ -17826,29 +18167,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1760 build/trans_presets.java:1770
+#: build/trans_presets.java:1764 build/trans_presets.java:1774
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1769
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1779
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1780
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1778
+#: build/trans_presets.java:1782
 msgid "Other Information Points"
 msgstr "Annen informasjon"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1790
 msgid "Edit Shelter"
 msgstr "Rediger ly for natten"
@@ -17856,25 +18197,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1789 build/trans_presets.java:1795
+#: build/trans_presets.java:1793 build/trans_presets.java:1799
 msgid "Fireplace"
 msgstr "Bålplass"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1791
+#: build/trans_presets.java:1795
 msgid "Picnic Site"
 msgstr "Piknik-sted"
 
 #. item
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1796
 msgid "Edit Picnic Site"
 msgstr "Rediger piknik-sted"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1802
 msgid "Historic Places"
 msgstr "Historiske steder"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1799
+#: build/trans_presets.java:1803
 msgid "Castle"
 msgstr "Slott"
@@ -17883,19 +18224,19 @@
 #. <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:1802
+#: build/trans_presets.java:1806
 msgid "Edit Castle"
 msgstr "Rediger slott"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1810
 msgid "Ruins"
 msgstr "Ruiner"
 
 #. item
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1811
 msgid "Edit Ruins"
 msgstr "Rediger ruiner"
 
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1816
 msgid "Archaeological Site"
 msgstr "Arkeologisk plass"
@@ -17904,9 +18245,9 @@
 #. <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:1815
+#: build/trans_presets.java:1819
 msgid "Edit Archaeological Site"
 msgstr "Rediger arkeologisk plass"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1824
 msgid "Battlefield"
 msgstr "Slagmark"
@@ -17914,5 +18255,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1826
 msgid "Edit Battlefield"
 msgstr "Rediger slagmark"
@@ -17920,15 +18261,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1831
 msgid "Monument"
 msgstr "Monument"
 
 #. item
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1832
 msgid "Edit Monument"
 msgstr "Rediger monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1836
 msgid "Memorial"
 msgstr "Minneplatte"
@@ -17936,45 +18277,57 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1838
 msgid "Edit Memorial"
 msgstr "Rediger minneplatte"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1842
 msgid "Wayside Cross"
 msgstr "Kors i veikant"
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1843
 msgid "Edit Wayside Cross"
 msgstr "Rediger kors i veikant"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1847
 msgid "Wayside Shrine"
 msgstr "Veialter"
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1848
 msgid "Edit Wayside Shrine"
 msgstr "Rediger veialter"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1852
+#, fuzzy
+msgid "Boundary Stone"
+msgstr "Grenser"
+
+#. item
+#: build/trans_presets.java:1853
+#, fuzzy
+msgid "Edit Boundary Stone"
+msgstr "Rediger bussholdeplass"
+
+#. item "Historic Places/Boundary Stone" text "Name"
+#: build/trans_presets.java:1858
 msgid "Leisure"
 msgstr "Fritid"
 
 #. group "Leisure"
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1859
 msgid "Water Park"
 msgstr "Badepark"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1860
 msgid "Edit Water Park"
 msgstr "Rediger badepark"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1864
 msgid "Playground"
 msgstr "Lekeplass"
@@ -17982,31 +18335,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1866
 msgid "Edit Playground"
 msgstr "Rediger lekeplass"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1870
 msgid "Fishing"
 msgstr "Fiskeplass"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1871
 msgid "Edit Fishing"
 msgstr "Rediger fiskeplass"
 
 #. item "Leisure/Fishing" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1877 build/trans_presets.java:2669
+msgid "Sports"
+msgstr "Sport"
+
+#. group "Sports"
+#: build/trans_presets.java:1878
 msgid "Sport Facilities"
 msgstr "Sport"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1879
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1880
 msgid "Edit Stadium"
 msgstr "Rediger stadion"
@@ -18020,6 +18377,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1874 build/trans_presets.java:1883
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1902 build/trans_presets.java:1911
 msgid "select sport:"
 msgstr "velg sport:"
@@ -18411,30 +18768,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884 build/trans_style.java:3892
-#: build/trans_style.java:3900 build/trans_style.java:3908
-#: build/trans_style.java:3916 build/trans_style.java:3924
-#: build/trans_style.java:3932
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_style.java:3572 build/trans_style.java:3580
+#: build/trans_style.java:3588 build/trans_style.java:3596
+#: build/trans_style.java:3604 build/trans_style.java:3612
+#: build/trans_style.java:3620 build/trans_style.java:3628
+#: build/trans_style.java:3636 build/trans_style.java:3644
+#: build/trans_style.java:3652 build/trans_style.java:3660
+#: build/trans_style.java:3668 build/trans_style.java:3676
+#: build/trans_style.java:3684 build/trans_style.java:3692
+#: build/trans_style.java:3700 build/trans_style.java:3708
+#: build/trans_style.java:3716 build/trans_style.java:3724
+#: build/trans_style.java:3732 build/trans_style.java:3740
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3764 build/trans_style.java:3772
+#: build/trans_style.java:3780 build/trans_style.java:3788
+#: build/trans_style.java:3796 build/trans_style.java:3804
+#: build/trans_style.java:3812 build/trans_style.java:3820
+#: build/trans_style.java:3828 build/trans_style.java:3836
+#: build/trans_style.java:3844 build/trans_style.java:3852
+#: build/trans_style.java:3860 build/trans_style.java:3868
+#: build/trans_style.java:3876 build/trans_style.java:3884
+#: build/trans_style.java:3892 build/trans_style.java:3900
+#: build/trans_style.java:3908 build/trans_style.java:3916
+#: build/trans_style.java:3924 build/trans_style.java:3932
+#: build/trans_style.java:3940
 msgid "sport"
 msgstr "sport"
@@ -18444,225 +18801,225 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "multi"
 msgstr "flerbruk"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "archery"
 msgstr "bueskyting"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "athletics"
 msgstr "turn"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "australian_football"
 msgstr "australsk fotball"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "bowls"
 msgstr "bowls"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "canoe"
 msgstr "kano"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "climbing"
 msgstr "klatring"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket_nets"
 msgstr "cricketnett"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "croquet"
 msgstr "krocket"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cycling"
 msgstr "sykling"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "dog_racing"
 msgstr "hundeløp"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "equestrian"
 msgstr "ridning"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "football"
 msgstr "football"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "gymnastics"
 msgstr "gymnastikk"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "hockey"
 msgstr "ishockey"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "horse_racing"
 msgstr "hesteløp"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "motor"
 msgstr "motorsport"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "racquet"
 msgstr "racquet"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "shooting"
 msgstr "skyting"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skating"
 msgstr "skøyter"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skiing"
 msgstr "ski"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "soccer"
 msgstr "fotball"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "swimming"
 msgstr "svømming"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "table_tennis"
 msgstr "bordtennis"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1888
 msgid "Sports Centre"
 msgstr "Sportssenter"
 
 #. item
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1889
 msgid "Edit Sports Centre"
 msgstr "Rediger sportssenter"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1897
 msgid "Pitch"
 msgstr "Bane"
 
 #. item
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1898
 msgid "Edit Pitch"
 msgstr "Rediger bane"
 
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1906
 msgid "Racetrack"
 msgstr "Racerbane"
 
 #. item
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1907
 msgid "Edit Racetrack"
 msgstr "Rediger racerbane"
 
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1915
 msgid "Golf Course"
 msgstr "Golfbane"
 
 #. item
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1916
 msgid "Edit Golf Course"
 msgstr "Rediger golfbane"
 
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1921
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1922
 msgid "Edit Miniature Golf"
 msgstr "Rediger minigolf"
 
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1928
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1929
 msgid "Multi"
 msgstr "Flerbruk"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1930
 msgid "Edit Multi"
 msgstr "Rediger flerbruk"
@@ -18701,183 +19058,183 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "pitch"
 msgstr "bane"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "sports_centre"
 msgstr "sportssenter"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1935
 msgid "10pin"
 msgstr "bowling"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1936
 msgid "Edit 10pin"
 msgstr "Rediger bowling"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1941
 msgid "Athletics"
 msgstr "Turn"
 
 #. item
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1942
 msgid "Edit Athletics"
 msgstr "Rediger turn"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1947
 msgid "Archery"
 msgstr "Bueskyting"
 
 #. item
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1948
 msgid "Edit Archery"
 msgstr "Rediger bueskyting"
 
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1953
 msgid "Climbing"
 msgstr "Klatring"
 
 #. item
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:1954
 msgid "Edit Climbing"
 msgstr "Rediger klatring"
 
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1959
 msgid "Canoeing"
 msgstr "Kano"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1960
 msgid "Edit Canoeing"
 msgstr "Rediger kano"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1966
 msgid "Edit Cycling"
 msgstr "Rediger sykling"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1971
 msgid "Dog Racing"
 msgstr "Hundeløp"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1972
 msgid "Edit Dog Racing"
 msgstr "Rediger hundeløp"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1977
 msgid "Equestrian"
 msgstr "Ridning"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1978
 msgid "Edit Equestrian"
 msgstr "Rediger ridning"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1983
 msgid "Horse Racing"
 msgstr "Hesteløp"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1984
 msgid "Edit Horse Racing"
 msgstr "Rediger hesteløp"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1989
 msgid "Gymnastics"
 msgstr "Gymnastikk"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1990
 msgid "Edit Gymnastics"
 msgstr "Rediger gymnastikk"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1995
 msgid "Motor Sports"
 msgstr "Motorsport"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1996
 msgid "Edit Motor Sports"
 msgstr "Rediger motorsport"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2001
 msgid "Skating"
 msgstr "Skøyter"
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2002
 msgid "Edit Skating"
 msgstr "Rediger skøyter"
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2007
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2008
 msgid "Edit Skateboard"
 msgstr "Rediger skateboard"
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2013
 msgid "Swimming"
 msgstr "Svømming"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2014
 msgid "Edit Swimming"
 msgstr "Rediger svømming"
@@ -18885,56 +19242,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2021
 msgid "Edit Skiing"
 msgstr "Rediger ski"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "Piste type"
 msgstr "Løypetype"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "downhill"
 msgstr "slalom"
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "nordic"
 msgstr "langrenn"
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "snow_park"
 msgstr "snøpark"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "Difficulty"
 msgstr "Vanskelighetsgrad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "novice"
 msgstr "begynner"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "easy"
 msgstr "enkel"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "intermediate"
 msgstr "middels"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "advanced"
 msgstr "vanskelig"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "expert"
 msgstr "ekspert"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "freeride"
 msgstr "fristil"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2028
 msgid "Shooting"
 msgstr "Skyting"
@@ -18942,178 +19299,183 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2030
 msgid "Edit Shooting"
 msgstr "Rediger skyting"
 
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2036
 msgid "Sport (Ball)"
 msgstr "Ballsport"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2037
 msgid "Soccer"
 msgstr "Fotball"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2038
 msgid "Edit Soccer"
 msgstr "Rediger fotball"
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2043
 msgid "Football"
 msgstr "Amerikansk fotball"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2044
 msgid "Edit Football"
 msgstr "Rediger amerikansk fotball"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2049
 msgid "Australian Football"
 msgstr "Australsk fotball"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2050
 msgid "Edit Australian Football"
 msgstr "Rediger australsk fotball"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2055
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2056
 msgid "Edit Baseball"
 msgstr "Rediger baseball"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2061
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2062
 msgid "Edit Basketball"
 msgstr "Rediger basketball"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2067
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2068
 msgid "Edit Golf"
 msgstr "Rediger golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2071
 msgid "golf_course"
 msgstr "golfbane"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2073
 msgid "Boule"
 msgstr "Boule"
 
 #. item
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2074
 msgid "Edit Boule"
 msgstr "Rediger boule"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2079
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2080
 msgid "Edit Bowls"
 msgstr "Rediger bowls"
 
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2085
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2086
 msgid "Edit Cricket"
 msgstr "Rediger cricket"
 
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2091
 msgid "Cricket Nets"
 msgstr "Cricketnett"
 
 #. item
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2092
 msgid "Edit Cricket Nets"
 msgstr "Rediger cricketnett"
 
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2097
 msgid "Croquet"
 msgstr "Krocket"
 
 #. item
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2098
 msgid "Edit Croquet"
 msgstr "Rediger krocket"
 
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2103
 msgid "Hockey"
 msgstr "Ishockey"
 
 #. item
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2104
 msgid "Edit Hockey"
 msgstr "Rediger ishockey"
 
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2109
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2110
 msgid "Edit Pelota"
 msgstr "Rediger pelota"
 
-#: build/trans_presets.java:2105
+#: build/trans_presets.java:2115
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2116
 msgid "Edit Racquet"
 msgstr "Rediger racquet"
 
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2121
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2122
 msgid "Edit Rugby"
 msgstr "Rediger rugby"
 
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2127
 msgid "Table Tennis"
 msgstr "Bordtennis"
 
 #. item
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2128
 msgid "Edit Table Tennis"
 msgstr "Rediger bordtennis"
 
-#: build/trans_presets.java:2123
+#: build/trans_presets.java:2133
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2134
 msgid "Edit Tennis"
 msgstr "Rediger tennis"
 
-#. <separator/>
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2141
+#, fuzzy
+msgid "Man-Made"
+msgstr "Menneskeskapt"
+
+#. group "Man-Made"
+#: build/trans_presets.java:2142
 msgid "Buildings"
 msgstr "Bygninger"
 
 #. group "Buildings"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2143
 msgid "Building"
 msgstr "Bygning"
@@ -19121,5 +19483,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Public Building"
 msgstr "Offentlig bygning"
@@ -19127,10 +19489,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2148
 msgid "Edit Public Building"
 msgstr "Rediger offentlig bygning"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2152
 msgid "Town hall"
 msgstr "Rådhus"
@@ -19138,10 +19500,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2154
 msgid "Edit Town hall"
 msgstr "Rediger rådhus"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:2158
 msgid "Embassy"
 msgstr "Ambassade"
@@ -19149,10 +19511,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Edit Embassy"
 msgstr "Rediger ambassade"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2164
 msgid "Courthouse"
 msgstr "Domstol"
@@ -19161,10 +19523,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:2156
+#: build/trans_presets.java:2167
 msgid "Edit Courthouse"
 msgstr "Rediger domstol"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2171
 msgid "Prison"
 msgstr "Fengsel"
@@ -19173,10 +19535,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:2163
+#: build/trans_presets.java:2174
 msgid "Edit Prison"
 msgstr "Rediger fengsel"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2178
 msgid "Police"
 msgstr "Politi"
@@ -19186,10 +19548,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:2171
+#: build/trans_presets.java:2182
 msgid "Edit Police"
 msgstr "Rediger politi"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2186
 msgid "Fire Station"
 msgstr "Brannstasjon"
@@ -19198,10 +19560,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:2178
+#: build/trans_presets.java:2189
 msgid "Edit Fire Station"
 msgstr "Rediger brannstasjon"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "Post Office"
 msgstr "Postkontor"
@@ -19209,5 +19571,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Edit Post Office"
 msgstr "Rediger postkontor"
@@ -19215,15 +19577,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2200
 msgid "Kindergarten"
 msgstr "Barnehage"
 
 #. item
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Kindergarten"
 msgstr "Rediger barnehage"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2205
 msgid "School"
 msgstr "Skole"
@@ -19231,10 +19593,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Edit School"
 msgstr "Rediger skole"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2211
 msgid "University"
 msgstr "Universitet"
@@ -19242,10 +19604,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit University"
 msgstr "Rediger universitet"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "College"
 msgstr "Høyskole"
@@ -19253,5 +19615,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2219
 msgid "Edit College"
 msgstr "Rediger høyskole"
@@ -19259,5 +19621,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2224
 msgid "Cinema"
 msgstr "Kino"
@@ -19266,10 +19628,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:2216
+#: build/trans_presets.java:2227
 msgid "Edit Cinema"
 msgstr "Rediger kino"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2231
 msgid "Library"
 msgstr "Bibliotek"
@@ -19278,9 +19640,9 @@
 #. <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:2223
+#: build/trans_presets.java:2234
 msgid "Edit Library"
 msgstr "Rediger bibliotek"
 
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Arts Centre"
 msgstr "Kunstsenter"
@@ -19288,10 +19650,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Arts Centre"
 msgstr "Rediger kunstsenter"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Theatre"
 msgstr "Teater"
@@ -19300,10 +19662,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:2237
+#: build/trans_presets.java:2248
 msgid "Edit Theatre"
 msgstr "Rediger teater"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2252
 msgid "Place of Worship"
 msgstr "Tilbedelsessted"
@@ -19313,5 +19675,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:2245
+#: build/trans_presets.java:2256
 msgid "Edit Place of Worship"
 msgstr "Rediger tilbedelsessted"
@@ -19320,6 +19682,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "Religion"
 msgstr "Religion"
@@ -19328,66 +19690,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "buddhist"
 msgstr "buddhist"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "christian"
 msgstr "kristen"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jewish"
 msgstr "jødisk"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "muslim"
 msgstr "muslim"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "unitarian"
 msgstr "unitarisk"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "zoroastrian"
 msgstr "zoroastrisk"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "Denomination"
 msgstr "Trosretniing"
@@ -19396,81 +19758,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "anglican"
 msgstr "anglikansk"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "catholic"
 msgstr "katolsk"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "evangelical"
 msgstr "evangelisk"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "jehovahs_witness"
 msgstr "Jehovas vitner"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "lutheran"
 msgstr "luthersk"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "methodist"
 msgstr "metodist"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "mormon"
 msgstr "mormoner"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "orthodox"
 msgstr "ortodoks"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "pentecostal"
 msgstr "pinsebevegelsen"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "presbyterian"
 msgstr "presbyteriansk"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "sunni"
 msgstr "sunni"
 
 #. <separator/>
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2264
 msgid "Addresses"
 msgstr "Adresser"
@@ -19479,5 +19841,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:2256
+#: build/trans_presets.java:2267
 msgid "Edit Address Information"
 msgstr "Rediger adresseinformasjon"
@@ -19485,5 +19847,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2269
 msgid "House number"
 msgstr "Husnummer"
@@ -19491,20 +19853,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "House name"
 msgstr "Husnavn"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "City name"
 msgstr "By/sted"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2274
 msgid "Post code"
 msgstr "Postnummer"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2275
 msgid "Country code"
 msgstr "Landskode"
@@ -19512,5 +19874,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Address Interpolation"
 msgstr "Interpoler adresser"
@@ -19519,5 +19881,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:2270
+#: build/trans_presets.java:2281
 msgid "Edit Address Interpolation"
 msgstr "Rediger interpolasjon"
@@ -19525,67 +19887,67 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "Numbering scheme"
 msgstr "Nummereringsmåte"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "odd"
 msgstr "oddetall"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "even"
 msgstr "partall"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "alphabetic"
 msgstr "alfabetisk"
 
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2286
 msgid "Man Made"
 msgstr "Menneskeskapt"
 
 #. group "Man Made"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Works"
 msgstr "Fabrikk"
 
 #. item
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2288
 msgid "Edit Works"
 msgstr "Rediger fabrikk"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2292
 msgid "Tower"
 msgstr "Tårn"
 
 #. item
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2293
 msgid "Edit Tower"
 msgstr "Rediger tårn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Water Tower"
 msgstr "Vanntårn"
 
 #. item
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2298
 msgid "Edit Water Tower"
 msgstr "Rediger vanntårn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Gasometer"
 msgstr "Gassbeholder"
 
 #. item
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2303
 msgid "Edit Gasometer"
 msgstr "Rediger gassbeholder"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Lighthouse"
 msgstr "Fyrtårn"
@@ -19593,10 +19955,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2309
 msgid "Edit Lighthouse"
 msgstr "Rediger fyrtårn"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Windmill"
 msgstr "Vindmølle"
@@ -19604,10 +19966,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2315
 msgid "Edit Windmill"
 msgstr "Rediger vindmølle"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2319
 msgid "Pipeline"
 msgstr "Rørledning"
@@ -19615,10 +19977,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Edit Pipeline"
 msgstr "Rediger rørledning"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2325
 msgid "Wastewater Plant"
 msgstr "Kloakkrenseanlegg"
@@ -19628,10 +19990,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:2318
+#: build/trans_presets.java:2329
 msgid "Edit Wastewater Plant"
 msgstr "Rediger kloakkrenseanlegg"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2333
 msgid "Crane"
 msgstr "Kran"
@@ -19639,10 +20001,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2335
 msgid "Edit Crane"
 msgstr "Rediger kran"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Beacon"
 msgstr "Fyrlykt"
@@ -19650,10 +20012,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2341
 msgid "Edit Beacon"
 msgstr "Rediger fyrlykt"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2345
 msgid "Survey Point"
 msgstr "Trigonometrisk punkt"
@@ -19661,10 +20023,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Edit Survey Point"
 msgstr "Rediger trigonometrisk punkt"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2351
 msgid "Surveillance"
 msgstr "Overvåkingskamera"
@@ -19672,5 +20034,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2353
 msgid "Edit Surveillance Camera"
 msgstr "Rediger overvåkingskamera"
@@ -19678,5 +20040,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Power Generator"
 msgstr "Kraftverk"
@@ -19686,39 +20048,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:2351
+#: build/trans_presets.java:2362
 msgid "Edit Power Generator"
 msgstr "Rediger kraftverk"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "wind"
 msgstr "vind"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "hydro"
 msgstr "vann"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "nuclear"
 msgstr "atom"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "coal"
 msgstr "kull"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "photovoltaic"
 msgstr "solcelle"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "gas"
 msgstr "gass"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2367
 msgid "Power Station"
 msgstr "Kraftstasjon"
@@ -19727,10 +20089,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:2359
+#: build/trans_presets.java:2370
 msgid "Edit Power Station"
 msgstr "Rediger kraftstasjon"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2374
 msgid "Power Sub Station"
 msgstr "Transformatorstasjon"
@@ -19739,5 +20101,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:2366
+#: build/trans_presets.java:2377
 msgid "Edit Power Sub Station"
 msgstr "Rediger transformatorstasjon"
@@ -19745,10 +20107,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2369 build/trans_presets.java:2385
+#: build/trans_presets.java:2380 build/trans_presets.java:2396
 msgid "Line reference"
 msgstr "Linjenummer"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2382
 msgid "Power Tower"
 msgstr "Kraftmast"
@@ -19759,5 +20121,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:2376
+#: build/trans_presets.java:2387
 msgid "Edit Power Tower"
 msgstr "Rediger kraftmast"
@@ -19765,5 +20127,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2390
 msgid "Power Line"
 msgstr "Kraftlinje"
@@ -19772,40 +20134,40 @@
 #. <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:2382
+#: build/trans_presets.java:2393
 msgid "Edit Power Line"
 msgstr "Rediger kraftlinje"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Voltage"
 msgstr "Spenning"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2398
 msgid "Amount of Wires"
 msgstr "Antall ledere"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Amenities"
 msgstr "Fasiliteter"
 
 #. group "Amenities"
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2402
 msgid "Toilets"
 msgstr "Toaletter"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2398 build/trans_presets.java:2514
+#: build/trans_presets.java:2409 build/trans_presets.java:2525
 msgid "Note"
 msgstr "Kommentar"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2411
 msgid "Post Box"
 msgstr "Postkasse"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2416
 msgid "Telephone"
 msgstr "Telefon"
@@ -19814,5 +20176,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:2408
+#: build/trans_presets.java:2419
 msgid "Edit Telephone"
 msgstr "Rediger telefon"
@@ -19820,5 +20182,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2411 build/trans_presets.java:2515
+#: build/trans_presets.java:2422 build/trans_presets.java:2526
 msgid "Coins"
 msgstr "Mynter"
@@ -19826,5 +20188,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2412 build/trans_presets.java:2516
+#: build/trans_presets.java:2423 build/trans_presets.java:2527
 msgid "Notes"
 msgstr "Sedler"
@@ -19832,5 +20194,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2413 build/trans_presets.java:2517
+#: build/trans_presets.java:2424 build/trans_presets.java:2528
 msgid "Electronic purses and Charge cards"
 msgstr "Elektronisk lommebok eller betalingskort"
@@ -19838,5 +20200,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2414 build/trans_presets.java:2518
+#: build/trans_presets.java:2425 build/trans_presets.java:2529
 msgid "Debit cards"
 msgstr "Bankkort"
@@ -19844,15 +20206,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2415 build/trans_presets.java:2519
+#: build/trans_presets.java:2426 build/trans_presets.java:2530
 msgid "Credit cards"
 msgstr "Kredittkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2427
 msgid "Telephone cards"
 msgstr "Telefonkort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2429
 msgid "Recycling"
 msgstr "Returstasjon"
@@ -19861,5 +20223,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:2421
+#: build/trans_presets.java:2432
 msgid "Edit Recycling station"
 msgstr "Rediger returstasjon"
@@ -19867,35 +20229,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Batteries"
 msgstr "Batterier"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2435
 msgid "Cans"
 msgstr "Bokser"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Clothes"
 msgstr "Klær"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2437
 msgid "Glass"
 msgstr "Glass"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2438
 msgid "Paper"
 msgstr "Papir"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2439
 msgid "Scrap Metal"
 msgstr "Metall"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2441
 msgid "Bench"
 msgstr "Benk"
@@ -19904,40 +20266,33 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2433
-#, fuzzy
+#: build/trans_presets.java:2444
 msgid "Backrest"
-msgstr "Tilbake"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "Material"
-msgstr "Minneplatte"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2434
-#, fuzzy
+#: build/trans_presets.java:2445
 msgid "stone"
-msgstr "ingen"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "plastic"
-msgstr "sted"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "Colour"
-msgstr "Farge"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "black"
-msgstr "Tilbake"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "brown"
-msgstr "ned"
+msgstr ""
 
 #. color historic
@@ -20006,39 +20361,35 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2435 build/trans_style.java:3055
-#: build/trans_style.java:3063 build/trans_style.java:3071
-#: build/trans_style.java:3079 build/trans_style.java:3127
-#: build/trans_style.java:3135 build/trans_style.java:3233
-#: build/trans_style.java:3241
+#: build/trans_presets.java:2446 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3135
+#: build/trans_style.java:3143 build/trans_style.java:3241
+#: build/trans_style.java:3249
 msgid "green"
 msgstr "grønn"
 
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "red"
-msgstr "avslutt"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "blue"
-msgstr "Verdi"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "white"
-msgstr "vann"
-
-#: build/trans_presets.java:2436
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2447
 msgid "Amount of Seats"
-msgstr "Antall ledere"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2449
 msgid "Hunting Stand"
 msgstr "Jaktpost"
 
 #. item
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2450
 msgid "Edit Hunting Stand"
 msgstr "Rediger jaktpost"
@@ -20047,30 +20398,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2441 build/trans_presets.java:2902
+#: build/trans_presets.java:2452 build/trans_presets.java:2914
 msgid "Height"
 msgstr "Høyde"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "low"
 msgstr "lav"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "half"
 msgstr "halv"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "full"
 msgstr "full"
 
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2454
 msgid "Hide"
 msgstr "Skjul"
 
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2455
 msgid "Lock"
 msgstr "Lås"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Fountain"
 msgstr "Fontene"
@@ -20079,10 +20430,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:2449
+#: build/trans_presets.java:2460
 msgid "Edit Fountain"
 msgstr "Rediger fontene"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2464
 msgid "Drinking Water"
 msgstr "Drikkevann"
@@ -20091,10 +20442,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:2456
+#: build/trans_presets.java:2467
 msgid "Edit Drinking Water"
 msgstr "Rediger drikkevann"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2471
 msgid "Baby Hatch"
 msgstr "Stellebord"
@@ -20102,33 +20453,33 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Baby Hatch"
 msgstr "Rediger stellebord"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2479
 msgid "Shops"
 msgstr "Butikker"
 
 #. group "Shops"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2480
 msgid "Supermarket"
 msgstr "Supermarked"
 
 #. item
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2481
 msgid "Edit Supermarket"
 msgstr "Rediger supermarked"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2486
 msgid "Chemist"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2487
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2492
 msgid "Convenience Store"
 msgstr "Minimarked"
@@ -20136,9 +20487,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Edit Convenience Store"
 msgstr "Rediger Minimarked"
 
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2499
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -20146,27 +20497,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Kiosk"
 msgstr "Rediger kiosk"
 
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Book Store"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2507
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2512
 msgid "Travel Agency"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2513
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2518
 msgid "Vending machine"
 msgstr "Automat"
@@ -20174,5 +20525,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Edit Vending machine"
 msgstr "Rediger automat"
@@ -20180,88 +20531,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "Vending products"
 msgstr "Automatprodukter"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_tickets"
 msgstr "billetter"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_plans"
 msgstr "buss-, trikk- og togkart"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "parking_tickets"
 msgstr "parkeringsbillett"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "food"
 msgstr "mat"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "drinks"
 msgstr "drikke"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "sweets"
 msgstr "godter"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "cigarettes"
 msgstr "sigaretter"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "photos"
 msgstr "foto"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "animal_food"
 msgstr "dyremat"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "news_papers"
 msgstr "aviser"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "toys"
 msgstr "leker"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "stamps"
 msgstr "frimerke"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "SIM-cards"
 msgstr "SIM-kort"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "telephone_vouchers"
 msgstr "telefonkort"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "vouchers"
 msgstr "sedler"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "condoms"
 msgstr "kondomer"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "tampons"
 msgstr "tamponger"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "excrement_bags"
 msgstr "hundeposer"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Account or loyalty cards"
 msgstr "kundekort"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Butcher"
 msgstr "Slakter"
@@ -20269,9 +20620,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2535
 msgid "Edit Butcher"
 msgstr "Rediger slakter"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2540
 msgid "Baker"
 msgstr "Baker"
@@ -20279,9 +20630,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2542
 msgid "Edit Baker"
 msgstr "Rediger baker"
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2547
 msgid "Florist"
 msgstr "Blomster"
@@ -20289,18 +20640,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Florist"
 msgstr "Rediger blomster"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2554
 msgid "Organic"
 msgstr "Økologisk"
 
 #. item
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Edit Organic Shop"
 msgstr "Rediger økologisk"
 
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2560
 msgid "Alcohol"
 msgstr "Sprit og vin"
@@ -20308,54 +20659,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2562
 msgid "Edit Alcohol Shop"
 msgstr "Rediger sprit og vin"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2567
 msgid "Beverages"
 msgstr "Drikke"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2568
 msgid "Edit Beverages Shop"
 msgstr "Rediger drikke"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2573
 msgid "Computer"
 msgstr "Dataelektronikk"
 
 #. item
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2574
 msgid "Edit Computer Shop"
 msgstr "Rediger dataelektronikk"
 
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Electronics"
 msgstr "Elektronikk"
 
 #. item
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2580
 msgid "Edit Electronics Shop"
 msgstr "Rediger elektronikk"
 
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2585
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2586
 msgid "Edit Hifi Shop"
 msgstr "Rediger hifi"
 
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2591
 msgid "Furniture"
 msgstr "Møbler"
 
 #. item
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Edit Furniture Shop"
 msgstr "Rediger møbler"
 
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Garden Centre"
 msgstr "Hagesenter"
@@ -20363,9 +20714,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2599
 msgid "Edit Garden Centre"
 msgstr "Rediger hagesenter"
 
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Hardware"
 msgstr "Jernvarehandel"
@@ -20373,9 +20724,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2606
 msgid "Edit Hardware Store"
 msgstr "Rediger jernvarehandel"
 
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "Do-it-yourself-store"
 msgstr "Byggevare"
@@ -20383,54 +20734,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2613
 msgid "Edit Do-it-yourself-store"
 msgstr "Rediger byggevare"
 
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2618
 msgid "Stationery"
 msgstr "Kontor"
 
 #. item
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2619
 msgid "Edit Stationery Shop"
 msgstr "Rediger kontor"
 
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Hairdresser"
 msgstr "Frisør"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Hairdresser"
 msgstr "Rediger frisør"
 
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Shoes"
 msgstr "Sko"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Shoe Shop"
 msgstr "Rediger sko"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2636
 msgid "Toys"
 msgstr "Leker"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit Toy Shop"
 msgstr "Rediger leker"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Video"
 msgstr "Video"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Video Shop"
 msgstr "Rediger video"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "Dry Cleaning"
 msgstr "Renseri"
@@ -20438,9 +20789,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2650
 msgid "Edit Dry Cleaning"
 msgstr "Rediger renseri"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "Laundry"
 msgstr "Vaskeri"
@@ -20448,9 +20799,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2657
 msgid "Edit Laundry"
 msgstr "Rediger vaskeri"
 
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2662
 msgid "Outdoor"
 msgstr "Friluftsutstyr"
@@ -20458,32 +20809,28 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2664
 msgid "Edit Outdoor Shop"
 msgstr "Rediger friluftsutstyr"
 
-#: build/trans_presets.java:2658
-msgid "Sports"
-msgstr "Sport"
-
-#. item
-#: build/trans_presets.java:2659
+#. item
+#: build/trans_presets.java:2670
 msgid "Edit Sports Shop"
 msgstr "Rediger sport"
 
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Optician"
 msgstr "Optiker"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Optician"
 msgstr "Rediger optiker"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2683
 msgid "Cash"
 msgstr "Valuta"
 
 #. group "Cash"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2684
 msgid "Bank"
 msgstr "Bank"
@@ -20491,14 +20838,14 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2686
 msgid "Edit Bank"
 msgstr "Rediger bank"
 
-#: build/trans_presets.java:2680 build/trans_presets.java:2689
+#: build/trans_presets.java:2691 build/trans_presets.java:2700
 msgid "Automated Teller Machine"
 msgstr "Minibank"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2693
 msgid "Money Exchange"
 msgstr "Veksle valuta"
@@ -20506,5 +20853,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Edit Money Exchange"
 msgstr "Rediger valutaveksling"
@@ -20512,15 +20859,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2691
+#: build/trans_presets.java:2702
 msgid "Edit Automated Teller Machine"
 msgstr "Rediger minibank"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2707
 msgid "Health"
 msgstr "Helse"
 
 #. group "Health"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2708
 msgid "Doctors"
 msgstr "Lege"
@@ -20528,18 +20875,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2710
 msgid "Edit Doctors"
 msgstr "Rediger lege"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2715
 msgid "Dentist"
 msgstr "Tannlege"
 
 #. item
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Edit Dentist"
 msgstr "Rediger tannlege"
 
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2721
 msgid "Pharmacy"
 msgstr "Apotek"
@@ -20547,5 +20894,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Edit Pharmacy"
 msgstr "Rediger apotek"
@@ -20553,9 +20900,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Dispensing"
 msgstr "Reseptlevering"
 
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2729
 msgid "Hospital"
 msgstr "Sykehus"
@@ -20563,10 +20910,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Edit Hospital"
 msgstr "Rediger sykehus"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2735
 msgid "Emergency Access Point"
 msgstr "Redningsmøtepunkt"
@@ -20575,5 +20922,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:2727
+#: build/trans_presets.java:2738
 msgid "Edit Emergency Access Point"
 msgstr "Rediger redningsmøtepunkt"
@@ -20582,20 +20929,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2741
 msgid "Point Number"
 msgstr "Punktnummer"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2742
 msgid "Point Name"
 msgstr "Navn på punkt"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Bruk internasjonalt nummer, f.eks. +12-345-67890)"
@@ -20603,5 +20950,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2748
 msgid "Veterinary"
 msgstr "Veterinær"
@@ -20610,55 +20957,59 @@
 #. <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:2740
+#: build/trans_presets.java:2751
 msgid "Edit Veterinary"
 msgstr "Rediger veterinær"
 
+#: build/trans_presets.java:2758
+msgid "Geography"
+msgstr ""
+
 #. group "Places"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2760
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2761
 msgid "Edit Continent"
 msgstr "Rediger kontinent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2766
 msgid "Country"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2767
 msgid "Edit Country"
 msgstr "Rediger land"
 
 #. item "Places/Country" text "Name"
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2772
 msgid "State"
 msgstr "Delstat/provins"
 
 #. item
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2773
 msgid "Edit State"
 msgstr "Rediger delstat/provins"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2778
 msgid "Region"
 msgstr "Region"
 
 #. item
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2779
 msgid "Edit Region"
 msgstr "Rediger region (fylke)"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2784
 msgid "County"
 msgstr "Kommune"
 
 #. item
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2785
 msgid "Edit County"
 msgstr "Rediger kommune"
@@ -20666,15 +21017,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2791
 msgid "City"
 msgstr "Storby"
 
 #. item
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2792
 msgid "Edit City"
 msgstr "Rediger storby"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2797
 msgid "Town"
 msgstr "By"
@@ -20682,10 +21033,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2799
 msgid "Edit Town"
 msgstr "Rediger by"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2804
 msgid "Suburb"
 msgstr "Forstad/bydel"
@@ -20693,25 +21044,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2806
 msgid "Edit Suburb"
 msgstr "Rediger forstad/bydel"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2811
 msgid "Village"
 msgstr "Landsby"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2812
 msgid "Edit Village"
 msgstr "Rediger landsby"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2817
 msgid "Hamlet"
 msgstr "Grend"
 
 #. item
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2818
 msgid "Edit Hamlet"
 msgstr "Rediger grend"
@@ -20719,5 +21070,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2824
 msgid "Locality"
 msgstr "Lokalitet"
@@ -20725,10 +21076,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2826
 msgid "Edit Locality"
 msgstr "Rediger lokalitet"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2831
 msgid "Island"
 msgstr "Øy"
@@ -20736,10 +21087,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2833
 msgid "Edit Island"
 msgstr "Rediger øy"
 
 #. item "Places/Island" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2838
 msgid "Islet"
 msgstr ""
@@ -20747,5 +21098,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2840
 msgid "Edit Islet"
 msgstr ""
@@ -20753,5 +21104,5 @@
 #. item "Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2846
 msgid "Cave Entrance"
 msgstr "Huleinngang"
@@ -20759,10 +21110,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2848
 msgid "Edit Cave Entrance"
 msgstr "Rediger huleinngang"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2852
 msgid "Peak"
 msgstr "Fjelltopp"
@@ -20770,10 +21121,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2854
 msgid "Edit Peak"
 msgstr "Rediger fjelltopp"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2859
 msgid "Glacier"
 msgstr "Isbre"
@@ -20781,10 +21132,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2861
 msgid "Edit Glacier"
 msgstr "Rediger isbre"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2854
+#: build/trans_presets.java:2866
 msgid "Volcano"
 msgstr "Vulkan"
@@ -20792,70 +21143,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2868
 msgid "Edit Volcano"
 msgstr "Rediger vulkan"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2874
 msgid "Boundaries"
 msgstr "Grenser"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2875
 msgid "National"
 msgstr "Nasjonal"
 
 #. item
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2876
 msgid "Edit National Boundary"
 msgstr "Rediger landegrense"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2881
 msgid "Administrative"
 msgstr "Fylkesgrense"
 
 #. item
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2882
 msgid "Edit Administrative Boundary"
 msgstr "Rediger fylkesgrense"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:2887
 msgid "Civil"
 msgstr "Kommunegrense"
 
 #. item
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2888
 msgid "Edit Civil Boundary"
 msgstr "Rediger kommunegrense"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2893
 msgid "Political"
 msgstr "Politisk"
 
 #. item
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2894
 msgid "Edit Political Boundary"
 msgstr "Rediger politisk grense"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2899
 msgid "National park"
 msgstr "Nasjonalpark"
 
 #. item
-#: build/trans_presets.java:2888
+#: build/trans_presets.java:2900
 msgid "Edit National Park Boundary"
 msgstr "Rediger nasjonalparkgrense"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2906
 msgid "Land use"
 msgstr "Bruk av grunn"
 
 #. group "Land use"
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2907
 msgid "Tree"
 msgstr "Tre"
@@ -20864,15 +21215,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:2898
+#: build/trans_presets.java:2910
 msgid "Edit Tree"
 msgstr "Rediger tre"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2915
 msgid "Botanical Name"
 msgstr "Botanisk navn"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2917
 msgid "Wood"
 msgstr "Skogsområde"
@@ -20881,5 +21232,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:2908
+#: build/trans_presets.java:2920
 msgid "Edit Wood"
 msgstr "Rediger skogsområde"
@@ -20887,17 +21238,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "coniferous"
 msgstr "barskog"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "deciduous"
 msgstr "løvskog"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "mixed"
 msgstr "blandingsskog"
 
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2925
 msgid "Forest"
 msgstr "Skog"
@@ -20906,14 +21257,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:2916
+#: build/trans_presets.java:2928
 msgid "Edit Forest Landuse"
 msgstr "Rediger skog"
 
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2934
 msgid "Nature Reserve"
 msgstr "Naturreservat"
 
 #. item
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2935
 msgid "Edit Nature Reserve"
 msgstr "Rediger naturreservat"
@@ -20921,25 +21272,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2940
 msgid "Scree"
 msgstr "Steinur"
 
 #. item
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2941
 msgid "Edit Scree"
 msgstr "Rediger steinur"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2945
 msgid "Scrub"
 msgstr "Krattskog"
 
 #. item
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2946
 msgid "Edit Scrub"
 msgstr "Rediger krattskog"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2950
 msgid "Fell"
 msgstr "Fjell"
@@ -20947,10 +21298,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2952
 msgid "Edit Fell"
 msgstr "Rediger fjell"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2956
 msgid "Heath"
 msgstr "Beite"
@@ -20958,5 +21309,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2958
 msgid "Edit Heath"
 msgstr "Rediger beite"
@@ -20964,5 +21315,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2963
 msgid "Farmyard"
 msgstr "Gårdstun"
@@ -20971,45 +21322,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:2954
+#: build/trans_presets.java:2966
 msgid "Edit Farmyard Landuse"
 msgstr "Rediger gårdstun"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2971
 msgid "Farmland"
 msgstr "Åkerland"
 
 #. item
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2972
 msgid "Edit Farmland Landuse"
 msgstr "Rediger åkerland"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2977
 msgid "Meadow"
 msgstr "Eng"
 
 #. item
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2978
 msgid "Edit Meadow Landuse"
 msgstr "Rediger eng"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2983
 msgid "Vineyard"
 msgstr "Vingård"
 
 #. item
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2984
 msgid "Edit Vineyard Landuse"
 msgstr "Rediger vingård"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:2989
 msgid "Allotments"
 msgstr "Hageparseller"
 
 #. item
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2990
 msgid "Edit Allotments Landuse"
 msgstr "Rediger hageparseller"
@@ -21017,25 +21368,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2996
 msgid "Garden"
 msgstr "Hage"
 
 #. item
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2997
 msgid "Edit Garden"
 msgstr "Rediger hage"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3001
 msgid "Grass"
 msgstr "Gress"
 
 #. item
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3002
 msgid "Edit Grass Landuse"
 msgstr "Rediger gress"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3007
 msgid "Village Green"
 msgstr "Friområde"
@@ -21043,10 +21394,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3009
 msgid "Edit Village Green Landuse"
 msgstr "Rediger friområde"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3014
 msgid "Common"
 msgstr "Offentlig"
@@ -21054,20 +21405,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3004
+#: build/trans_presets.java:3016
 msgid "Edit Common"
 msgstr "Rediger offentlig"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3020
 msgid "Park"
 msgstr "Park"
 
 #. item
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3021
 msgid "Edit Park"
 msgstr "Rediger park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3025
 msgid "Recreation Ground"
 msgstr "Friluftsområde"
@@ -21075,5 +21426,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3027
 msgid "Edit Recreation Ground Landuse"
 msgstr "Rediger friluftsområde"
@@ -21081,15 +21432,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3033
 msgid "Residential area"
 msgstr "Boligområde"
 
 #. item
-#: build/trans_presets.java:3022
+#: build/trans_presets.java:3034
 msgid "Edit Residential Landuse"
 msgstr "Rediger boligområde"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3039
 msgid "Graveyard"
 msgstr "Gravlund"
@@ -21097,9 +21448,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3029
+#: build/trans_presets.java:3041
 msgid "Edit Graveyard"
 msgstr "Rediger gravlund"
 
-#: build/trans_presets.java:3035
+#: build/trans_presets.java:3047
 msgid "Cemetery"
 msgstr "Kirkegård"
@@ -21107,39 +21458,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3049
 msgid "Edit Cemetery Landuse"
 msgstr "Rediger kirkegård"
 
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3056
 msgid "Retail"
 msgstr "Forretninger"
 
 #. item
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3057
 msgid "Edit Retail Landuse"
 msgstr "Rediger forretninger"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3062
 msgid "Commercial"
 msgstr "Næringsområde"
 
 #. item
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3063
 msgid "Edit Commercial Landuse"
 msgstr "Rediger næringsområde"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3056
+#: build/trans_presets.java:3068
 msgid "Industrial"
 msgstr "Industriområde"
 
 #. item
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3069
 msgid "Edit Industrial Landuse"
 msgstr "Rediger industriområde"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3074
 msgid "Railway land"
 msgstr "Jernbanegrunn"
@@ -21147,15 +21498,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3076
 msgid "Edit Railway Landuse"
 msgstr "Rediger jernbanegrunn"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3081
 msgid "Military"
 msgstr "Millitært"
 
 #. item
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3082
 msgid "Edit Military Landuse"
 msgstr "Rediger millitært"
@@ -21163,55 +21514,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3088
 msgid "Construction area"
 msgstr "Byggeplass"
 
 #. item
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3089
 msgid "Edit Construction Landuse"
 msgstr "Rediger byggeplass"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3094
 msgid "Brownfield"
 msgstr "Rivningsområde"
 
 #. item
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3095
 msgid "Edit Brownfield Landuse"
 msgstr "Rediger rivningsområde"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3100
 msgid "Greenfield"
 msgstr "Byggeområde"
 
 #. item
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3101
 msgid "Edit Greenfield Landuse"
 msgstr "Rediger byggeområde"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3106
 msgid "Landfill"
 msgstr "Avfallsdeponi"
 
 #. item
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3107
 msgid "Edit Landfill Landuse"
 msgstr "Rediger avfallsdeponi"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3112
 msgid "Quarry"
 msgstr "Steinbrudd"
 
 #. item
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3113
 msgid "Edit Quarry Landuse"
 msgstr "Rediger steinbrudd"
 
 #. group "Relations"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3122
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -21221,5 +21572,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:3114
+#: build/trans_presets.java:3126
 msgid "Edit Multipolygon"
 msgstr "Rediger multipolygon"
@@ -21228,10 +21579,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3132
 msgid "outer segment"
 msgstr "ytre linjesegment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3133
 msgid "inner segment"
 msgstr "indre linjesegment"
@@ -21239,5 +21590,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3136
 msgid "Turn restriction"
 msgstr "Svingeforbud"
@@ -21246,5 +21597,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3139
 msgid "Edit Turn Restriction"
 msgstr "Rediger svingeforbud"
@@ -21252,34 +21603,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "Restriction"
 msgstr "Forbud"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_left_turn"
 msgstr "venstresving forbudt"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_right_turn"
 msgstr "høyresving forbudt"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_straight_on"
 msgstr "rett frem forbudt"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_u_turn"
 msgstr "u-sving forbudt"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_right_turn"
 msgstr "påbudt høyresving"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_left_turn"
 msgstr "påbudt venstresving"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_straight_on"
 msgstr "påbudt rett frem"
@@ -21288,15 +21639,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3146
 msgid "from way"
 msgstr "fra linje"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3147
 msgid "via node or way"
 msgstr "via node eller linje"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3148
 msgid "to way"
 msgstr "til linje"
@@ -21304,5 +21655,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3151
 msgid "Route"
 msgstr "Rute"
@@ -21311,5 +21662,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3154
 msgid "Edit Route"
 msgstr "Rediger rute"
@@ -21317,5 +21668,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "Route type"
 msgstr "Rutetype"
@@ -21387,5 +21738,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3144 build/trans_style.java:233
+#: build/trans_presets.java:3156 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -21394,17 +21745,17 @@
 msgstr "sykkel"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "bus"
 msgstr "buss"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "road"
 msgstr "vei"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ferry"
 msgstr "ferge"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ski"
 msgstr "ski"
@@ -21457,5 +21808,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3144 build/trans_style.java:247
+#: build/trans_presets.java:3156 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -21464,13 +21815,13 @@
 msgstr "fotgjenger"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "hiking"
 msgstr "tur"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "tram"
 msgstr "trikk"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "detour"
 msgstr "omkjøring"
@@ -21484,10 +21835,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3144 build/trans_style.java:1206
+#: build/trans_presets.java:3156 build/trans_style.java:1206
 msgid "subway"
 msgstr "T-bane"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3159
 msgid "Symbol description"
 msgstr "Symbolforklaring"
@@ -21495,31 +21846,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3162
 msgid "Network"
 msgstr "Nettverk"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "proposed"
 msgstr "planlagt"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "alternate"
 msgstr "alternativ"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "temporary"
 msgstr "midlertidig"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "connection"
 msgstr "forbindelse"
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "Color (hex)"
 msgstr "Farge (hex)"
@@ -21528,30 +21879,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3168
 msgid "route segment"
 msgstr "rutesegment"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3169
 msgid "forward segment"
 msgstr "neste segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3170
 msgid "backward segment"
 msgstr "forrige segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3171
 msgid "halt point"
 msgstr "stoppepunkt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3172
 msgid "forward halt point"
 msgstr "neste stoppunkt"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3173
 msgid "backward halt point"
 msgstr "forrige stoppunkt"
@@ -21989,11 +22340,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3375 build/trans_style.java:3376
-#: build/trans_style.java:3946 build/trans_style.java:4254
-#: build/trans_style.java:4263 build/trans_style.java:4272
-#: build/trans_style.java:4281 build/trans_style.java:4290
-#: build/trans_style.java:4299 build/trans_style.java:4308
-#: build/trans_style.java:4309 build/trans_style.java:4318
-#: build/trans_style.java:4327
+#: build/trans_style.java:3383 build/trans_style.java:3384
+#: build/trans_style.java:3954 build/trans_style.java:4262
+#: build/trans_style.java:4271 build/trans_style.java:4280
+#: build/trans_style.java:4289 build/trans_style.java:4298
+#: build/trans_style.java:4307 build/trans_style.java:4316
+#: build/trans_style.java:4317 build/trans_style.java:4326
+#: build/trans_style.java:4335
 msgid "deprecated"
 msgstr "uønsket"
@@ -24017,5 +24368,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3294
+#: build/trans_style.java:3302
 msgid "light_water"
 msgstr "light_vann"
@@ -24697,8 +25048,17 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="boundary_stone"/>
+#. <icon annotate="true" src="historic/boundary_stone.png"/>
 #: build/trans_style.java:2990 build/trans_style.java:2998
 #: build/trans_style.java:3006 build/trans_style.java:3014
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
+#: build/trans_style.java:3054
 msgid "historic"
 msgstr "historisk"
@@ -24712,5 +25072,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3095
 msgid "quarry"
 msgstr "steinbrudd"
@@ -24724,5 +25084,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "landfill"
 msgstr "avfallsdeponi"
@@ -24744,5 +25104,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3103 build/trans_style.java:3111
+#: build/trans_style.java:3111 build/trans_style.java:3119
 msgid "basin"
 msgstr "vannmagasin"
@@ -24756,5 +25116,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3127
 msgid "forest"
 msgstr "skog"
@@ -24768,5 +25128,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3159
 msgid "farmyard"
 msgstr "gårdstun"
@@ -24789,5 +25149,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3160 build/trans_style.java:3168
+#: build/trans_style.java:3168 build/trans_style.java:3176
 msgid "retail"
 msgstr "butikker"
@@ -24801,5 +25161,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3176
+#: build/trans_style.java:3184
 msgid "industrial"
 msgstr "industri"
@@ -24813,5 +25173,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "brownfield"
 msgstr "rivningsområde"
@@ -24825,5 +25185,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "greenfield"
 msgstr "byggeområde"
@@ -24837,5 +25197,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "railland"
 msgstr "jernbanegrunn"
@@ -24892,7 +25252,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3217 build/trans_style.java:3252
-#: build/trans_style.java:3260 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3225 build/trans_style.java:3260
+#: build/trans_style.java:3268 build/trans_style.java:3276
+#: build/trans_style.java:3284 build/trans_style.java:3292
 msgid "military"
 msgstr "millitært"
@@ -24906,5 +25266,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3225
+#: build/trans_style.java:3233
 msgid "cemetery"
 msgstr "gravlund"
@@ -24917,5 +25277,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3301
+#: build/trans_style.java:3309
 msgid "peak"
 msgstr "fjelltopp"
@@ -24930,5 +25290,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3310
+#: build/trans_style.java:3318
 msgid "glacier"
 msgstr "isbre"
@@ -24942,5 +25302,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "volcano"
 msgstr "vulkan"
@@ -24995,8 +25355,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3326 build/trans_style.java:3327
-#: build/trans_style.java:3335 build/trans_style.java:3351
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440
+#: build/trans_style.java:3334 build/trans_style.java:3335
+#: build/trans_style.java:3343 build/trans_style.java:3359
+#: build/trans_style.java:3432 build/trans_style.java:3440
+#: build/trans_style.java:3448
 msgid "natural"
 msgstr "natur"
@@ -25010,5 +25370,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3343
+#: build/trans_style.java:3351
 msgid "scrub"
 msgstr "krattskog"
@@ -25022,5 +25382,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3359
+#: build/trans_style.java:3367
 msgid "heath"
 msgstr "beiteområde"
@@ -25034,5 +25394,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3408
+#: build/trans_style.java:3416
 msgid "mud"
 msgstr "søle"
@@ -25046,5 +25406,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "beach"
 msgstr "strand"
@@ -25122,8 +25482,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
-#: build/trans_style.java:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496 build/trans_style.java:3504
+#: build/trans_style.java:3512 build/trans_style.java:3520
 msgid "route"
 msgstr "rute"
@@ -25171,7 +25531,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3522 build/trans_style.java:3530
-#: build/trans_style.java:3538 build/trans_style.java:3546
-#: build/trans_style.java:3554
+#: build/trans_style.java:3530 build/trans_style.java:3538
+#: build/trans_style.java:3546 build/trans_style.java:3554
+#: build/trans_style.java:3562
 msgid "boundary"
 msgstr "grense"
@@ -25321,11 +25681,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090
+#: build/trans_style.java:4002 build/trans_style.java:4010
+#: build/trans_style.java:4018 build/trans_style.java:4026
+#: build/trans_style.java:4034 build/trans_style.java:4042
+#: build/trans_style.java:4050 build/trans_style.java:4058
+#: build/trans_style.java:4066 build/trans_style.java:4074
+#: build/trans_style.java:4082 build/trans_style.java:4090
+#: build/trans_style.java:4098
 msgid "place"
 msgstr "sted"
@@ -25373,6 +25733,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4207 build/trans_style.java:4214
-#: build/trans_style.java:4221 build/trans_style.java:4228
+#: build/trans_style.java:4215 build/trans_style.java:4222
+#: build/trans_style.java:4229 build/trans_style.java:4236
 msgid "address"
 msgstr "adresse"
@@ -25680,12 +26040,25 @@
 msgstr ""
 
-#~ msgid "All the ways were empty"
-#~ msgstr "Alle linjene var tomme"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Samle noder med forskjellige relasjoner?"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Samle noder allikevel"
+#~ msgid "- running version is {0}"
+#~ msgstr "- aktive versjon er {0}"
+
+#~ msgid "Move"
+#~ msgstr "Flytt"
+
+#~ msgid "Some of the nodes are (almost) in the line"
+#~ msgstr "Noen av nodene er (nesten) på linje"
+
+#~ msgid "Email"
+#~ msgstr "E-post"
+
+#~ 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 ""
@@ -25696,43 +26069,9 @@
 #~ "samle noder?"
 
-#~ msgid "Unknown version"
-#~ msgstr "Ukjent versjon"
-
-#~ msgid "Version number missing from OSM data"
-#~ msgstr "Versjon nummer mangler i OSM data"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "Fant <nd> element i ikke_linje."
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> har zero ref"
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Fandt <member>-element i en ikke-relation."
-
-#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
-#~ msgstr "Uventet «type» for medlem {0} i relasjon {1} – leste {2}."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Feil id for node"
-
-#~ msgid "Move"
-#~ msgstr "Flytt"
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Noen av nodene er (nesten) på linje"
-
-#~ msgid "Email"
-#~ msgstr "E-post"
-
-#~ 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 "Merge nodes with different memberships?"
+#~ msgstr "Samle noder med forskjellige relasjoner?"
+
+#~ msgid "Merge Anyway"
+#~ msgstr "Samle noder allikevel"
 
 #~ msgid "unnamed"
@@ -25838,7 +26177,4 @@
 #~ msgstr "Konflikter: {0}"
 
-#~ msgid "Delete Layer"
-#~ msgstr "Slett Lag"
-
 #~ msgid "Layers: {0}"
 #~ msgstr "Lag: {0}"
@@ -25858,7 +26194,4 @@
 #~ msgid "Basic"
 #~ msgstr "Enkel"
-
-#~ msgid "Add Selected"
-#~ msgstr "Legg til utvalgte"
 
 #~ msgid "Move Up"
@@ -25899,4 +26232,7 @@
 #~ "andre kan lese det.</b></html>"
 
+#~ msgid "Unknown version"
+#~ msgstr "Ukjent versjon"
+
 #~ msgid "Delete and Download"
 #~ msgstr "Slett og last ned"
@@ -25913,4 +26249,10 @@
 #~ msgid "Cannot read numeric value from response"
 #~ msgstr "Finner ikke tallverdi i svaret"
+
+#~ msgid "Version number missing from OSM data"
+#~ msgstr "Versjon nummer mangler i OSM data"
+
+#~ msgid "<nd> has zero ref"
+#~ msgstr "<nd> har zero ref"
 
 #~ msgid "Data upload failed for unknown reason"
@@ -25923,4 +26265,10 @@
 #~ "Intern feil i Server. Prøv med et mindre område eller vent litt før du "
 #~ "prøver på nytt."
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "Feil id for node"
+
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "Fandt <member>-element i en ikke-relation."
 
 #~ msgid "{0} Plugin successfully updated. Please restart JOSM."
@@ -26085,4 +26433,7 @@
 #~ msgstr "Last inn TCX filer direkte fra JOSM."
 
+#~ msgid "All the ways were empty"
+#~ msgstr "Alle linjene var tomme"
+
 #~ msgid "Please select ways with almost right angles to orthogonalize."
 #~ msgstr "Velg linjer med tilnærmet vinkelrette knekk for vinkling."
@@ -26097,4 +26448,7 @@
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr "Ignorerer en linje fordi den har en node som ikke eksisterer: {0}\n"
+
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "Fant <nd> element i ikke_linje."
 
 #~ msgid "Map Type"
@@ -26230,10 +26584,10 @@
 #~ "Ikke last opp data etter  denne meldingen."
 
-#~ msgid "changesets"
-#~ msgstr "endringssett"
-
 #~ msgid "Apply partial resolutions"
 #~ msgstr "Bruk ufullstendige løsninger"
 
+#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
+#~ msgstr "Uventet «type» for medlem {0} i relasjon {1} – leste {2}."
+
 #~ msgid "Adjust the position of the WMS layer (raster images only)"
 #~ msgstr "Juster posisjonen på WMS-laget (kun rasterbilder)"
Index: applications/editors/josm/i18n/po/nl.po
===================================================================
--- applications/editors/josm/i18n/po/nl.po	(revision 17655)
+++ applications/editors/josm/i18n/po/nl.po	(revision 17697)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-12 18:11+0200\n"
-"PO-Revision-Date: 2009-09-06 13:31+0000\n"
+"POT-Creation-Date: 2009-09-19 13:00+0200\n"
+"PO-Revision-Date: 2009-09-15 04:44+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-09-12 16:06+0000\n"
+"X-Launchpad-Export-Date: 2009-09-19 10:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -42,10 +42,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:543
 #: ../core/src/org/openstreetmap/josm/Main.java:551
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -70,5 +70,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -86,6 +86,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:358
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
@@ -101,6 +101,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
@@ -124,10 +124,10 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
 msgid "Save and Exit"
 msgstr "Sla op en verlaat JOSM"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
 msgid "Discard and Exit"
 msgstr "Negeer veranderingen en verlaat JOSM"
@@ -138,4 +138,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
@@ -143,27 +144,28 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:296
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:258
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:613
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
@@ -171,5 +173,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -189,6 +191,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
@@ -205,17 +207,17 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:654
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1528
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -226,6 +228,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
@@ -278,9 +280,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:607
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:609
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -340,5 +342,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
 msgid "Plugins"
@@ -389,5 +391,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr ""
@@ -475,5 +477,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -486,4 +488,5 @@
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -519,6 +522,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
@@ -527,6 +530,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:346
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
@@ -638,4 +641,46 @@
 msgstr "Geen conflicten om op in te zoomen"
 
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#, fuzzy
+msgid "Close open changesets"
+msgstr "Changeset sluiten"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#, fuzzy
+msgid "Closes open changesets"
+msgstr "Changeset sluiten"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
+#: ../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:114
+#, java-format
+msgid "File: {0}"
+msgstr "Bestand: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
+#, fuzzy
+msgid "There are no open changesets"
+msgstr "Server ondersteunt geen changesets"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
+#, fuzzy
+msgid "No open changesets"
+msgstr "Changeset sluiten"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
+#, fuzzy
+msgid "Downloading open changesets ..."
+msgstr "Changeset sluiten"
+
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
@@ -735,10 +780,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:123
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
@@ -781,31 +827,30 @@
 msgstr "De geselecteerde knopen equidistant langs een lijn verdelen."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
 msgid "Download from OSM..."
 msgstr "Downloaden vanuit OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
 msgid "Download map data from the OSM server."
 msgstr "Kaart downloaden van de OSM-server."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
-#, java-format
-msgid "File: {0}"
-msgstr "Bestand: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
 msgid "Download"
 msgstr "Downloaden"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
 msgid "Please select at least one task to download"
 msgstr "Selecteer tenminste één taak om te downloaden"
@@ -826,5 +871,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1527
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307
@@ -844,6 +889,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:376
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1415
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
 msgid "Duplicate"
 msgstr "Dupliceren"
@@ -915,10 +960,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
@@ -1002,25 +1048,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 msgid "Merge Nodes"
 msgstr "Knopen samenvoegen"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
 msgid "Merge nodes into the oldest one."
 msgstr "Knopen in de oudste samenvoegen"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
 msgid "Please select at least two nodes to merge."
 msgstr "Minstens twee knopen selecteren om samen te voegen."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:394
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
@@ -1036,8 +1083,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -1063,6 +1110,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
@@ -1071,5 +1122,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
@@ -1077,5 +1128,5 @@
 "in gebruik is."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283
 #, java-format
 msgid "Merge {0} nodes"
@@ -1147,5 +1198,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "New"
 msgstr "Nieuw"
@@ -1420,14 +1471,15 @@
 msgstr "Hulp: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
 msgid "Status Report"
 msgstr "Statusrapport"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 msgid "Copy to clipboard and close"
 msgstr "Klembord kopiëren en sluiten"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
@@ -1509,25 +1561,4 @@
 msgstr "Weg {0} in {1} delen splitsen"
 
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24
-msgid "Close current changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-msgid "Close the current changeset ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41
-msgid "There is currently no changeset open."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42
-msgid "No open changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60
-msgid "Closing changeset"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
@@ -1698,14 +1729,14 @@
 msgstr "Selectie leeg"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Naar OSM uploaden..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 msgid "Upload all changes to the OSM server."
 msgstr "Upload alle aanpassingen naar de OSM-server."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
 #, java-format
 msgid ""
@@ -1714,23 +1745,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
 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:166
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 msgid "No changes to upload."
 msgstr "Geen aanpassingen aanwezig om te uploaden."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Synchroniseer alleen {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
 msgid "Synchronize entire dataset"
 msgstr "Synchroniseer alle gegevens"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
 #, java-format
 msgid ""
@@ -1744,17 +1775,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
 msgid "Conflict detected"
 msgstr "Tegenstrijdigheid ontdekt"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:267
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
 #, java-format
 msgid ""
@@ -1765,28 +1796,40 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
+msgid ""
+"<html>Uploading <strong>failed</strong> because you've been "
+"using<br>changeset {0} which was already closed at {1}.<br>Please upload "
+"again with a new or an existing open changeset."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+#, fuzzy
+msgid "Changeset closed"
+msgstr "Waarden aanpassen?"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
 msgid "Upload to OSM API failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -2005,14 +2048,14 @@
 msgstr "Knoop in weg voegen en verbinden"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:930
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:932
 msgid "Create new node."
 msgstr "Nieuwe node maken."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
 msgid "Select node under cursor."
 msgstr "Selecteer de node onder de cursor."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939
 #, java-format
 msgid "Insert new node into way."
@@ -2021,14 +2064,14 @@
 msgstr[1] "Nieuwe nodes toevoegen aan {0} wegen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
 msgid "Start new way from last node."
 msgstr "Start een nieuwe weg vanaf de node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951
 msgid "Continue way from last node."
 msgstr "Weg voortzetten vanaf laatste knoop."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:972
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:974
 msgid "Finish drawing."
 msgstr "Tekenen beëindigen"
@@ -2151,60 +2194,70 @@
 "omlaag, rechts; verplaats met rechter knop"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Zoeken..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Naar objecten zoeken."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
 msgid "Can't search because there is no loaded data."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
+#, fuzzy
+msgid "Please enter a filter string."
+msgstr "Voer een zoekopdracht in:"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
 msgid "Please enter a search string."
 msgstr "Voer een zoekopdracht in:"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
 msgid "replace selection"
 msgstr "Selectie vervangen"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72
 msgid "add to selection"
 msgstr "Toevoegen aan selectie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73
 msgid "remove from selection"
 msgstr "Verwijderen uit selectie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
+#, fuzzy
+msgid "find in selection"
+msgstr "Toevoegen aan selectie"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81
 msgid "case sensitive"
 msgstr "Hoofdlettergevoelig"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82
 msgid "regular expression"
 msgstr "Reguliere expressie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
 msgstr "<b>Lange straat</b> - 'Lange' en 'straat' in een sleutel of naam."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
 msgstr "<b>\"Lange straat\"</b> - 'Lange' en 'straat' in een sleutel of naam."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
 msgstr "<b>name:Lange</b> - 'Lang' ergens in de naam."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
 msgstr "<b>type=route</b> - sleutel 'type' met exacte waarde 'route'."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid ""
 "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
@@ -2214,110 +2267,127 @@
 "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
 msgstr "<b>-name:Lange</b> - geen 'Lang' in de naam."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - sleutel=foot, met een willekeurige waarde."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
 msgid "<u>Special targets:</u>"
 msgstr "<u>Speciale zoekopdrachten:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr "<b>type:</b> - objecttype (<b>node</b>, <b>way</b>, <b>relation</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>gebruiker:</b>... - alle objecten veranderd door gebruiker"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 msgid "<b>nodes:</b>... - object with given number of nodes"
 msgstr "<b>nodes:</b>... - object met opgegeven aantal knopen"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - alle aangepaste objecten"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - alle geselecteerde objecten"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - alle incomplete objecten"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>ongetagd</b> - alle objecten zonder tag"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Gebruik <b>|</b> of <b>OR</b> om te combineren met een logische OR"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
 "Gebruik <b>\"</b> om operanten aan te halen (b.v. als sleutel \":\" bevat)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Gebruik <b>(</b> en <b>)</b> om expressies te groeperen"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
+msgid "Filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Zoeken"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
+msgid "Submit filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "Start Search"
 msgstr "Start zoeken"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Geen overeenkomst gevonden voor ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Zoeken naar ''{0}'' heeft de selectie niet uitgebreid."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Zoeken naar ''{0}'' heeft de selectie niet verkleind."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#, fuzzy, java-format
+msgid "Nothing find in selection by searching for ''{0}''"
+msgstr "Zoeken naar ''{0}'' heeft de selectie niet uitgebreid."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262
 #, java-format
 msgid "Found {0} matches"
 msgstr "{0} overeenkomsten gevonden"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283
 msgid "RX"
 msgstr "RX"
@@ -2503,5 +2573,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
 msgid "Double conflict"
 msgstr ""
@@ -2747,4 +2817,5 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:134
 msgid "Old value"
 msgstr "Oude waarde"
@@ -2908,27 +2979,59 @@
 
 #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
 msgid "E"
 msgstr "O"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:59
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:203
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
 msgid "Changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:323
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:325
-#, fuzzy, java-format
-msgid "paramete''{0}'' must not be null"
-msgstr "Parameter \"{0}\" mag niet leeg zijn."
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331
-#, fuzzy, java-format
-msgid "unsupported value ''{0}'' or parameter ''{1}''"
-msgstr "Geen zinvolle rol \"{0}\" voor weg \"{1}\"."
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "H"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "Text"
+msgstr "tekst"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "C"
+msgstr "CS"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "I"
+msgstr "CI"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "M"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#, fuzzy
+msgid "R"
+msgstr "RX"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+msgid "A"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+msgid "D"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+msgid "F"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
@@ -2942,29 +3045,29 @@
 msgstr "Waarschuwing: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
+#, java-format
 msgid "expected id >= 0. Got {0}"
-msgstr "Onverwacht token: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:257
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
 msgid "a primitive with id=0 can't be invisible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:293
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
+#, java-format
 msgid "id > 0 expected. Got {0}"
-msgstr "Onverwacht token: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
+#, java-format
 msgid "version > 0 expected. Got {0}"
-msgstr "Onverwacht token: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
 msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
 msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
@@ -3031,9 +3134,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:247
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:249
 msgid "Area style way is not closed."
 msgstr "Oppervlak van weg is niet gesloten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:478
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:482
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
@@ -3042,118 +3145,118 @@
 #. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
 #. TODO Remove useless nullcheck when RelationMember.member is encalupsed
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:851
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855
 msgid "Empty member in relation."
 msgstr "Relatie bevat leeg lid."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:853
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Lid \"{0}\" in relatie wissen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:864
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Weg \"{0}\" met minder dan twee punten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "More than one \"from\" way found."
 msgstr "Meer dan een \"van\"-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "More than one \"to\" way found."
 msgstr "Meer dan een \"naar\"-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "More than one \"via\" found."
 msgstr "Meer dan éé \"via\" gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Onbekende rol \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Onbekend lidtype voor \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"from\" way found."
 msgstr "Geen \"van\"-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"to\" way found."
 msgstr "Geen \"naar\"-weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652
 msgid "No \"via\" node or way found."
 msgstr "Geen \"via\"-knoop of -weg gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "De \"van\"-weg begint of eindigt niet bij een \"via\"-knoop."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "De \"naar\"-weg begint of eindigt niet bij een \"via\"-knoop/"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "De \"vanaf\"-weg begint of eindigt niet bij een \"via\"-weg."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "De \"naar\"-weg begint of eindigt niet bij een \"via\"-weg."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Stijl voor beperking {0} is niet gevonden."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Geen zinvolle rol \"{0}\" voor weg \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:885
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Niet-weg \"{0}\" in multipolygoon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:943
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Geen buitenweg voor multipolygoon \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1032
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Kruising tussen wegen \"{0}\" en \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1044
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Binnenweg \"{0}\" is uitwendig."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1097
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Stijl voor binnenweg \"{0}\" komt overeen met multipolygoon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1123
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Stijl voor buitenweg \"{0}\" komt niet overeen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1327
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331
 msgid "untagged"
 msgstr "niet-getagd"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1328
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332
 msgid "text"
 msgstr "tekst"
@@ -3174,5 +3277,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
@@ -3193,5 +3296,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
@@ -3246,5 +3349,5 @@
 msgstr "Lambert-zone (Frankrijk)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambert-zone (Estland)"
@@ -3286,9 +3389,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:38
 msgid "Do not show again"
 msgstr "Niet meer tonen"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
 #, java-format
@@ -3296,31 +3399,31 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:91
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:116
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154
 msgid "incomplete"
 msgstr "onvolledig"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
 msgid "highway"
 msgstr "snelweg"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
-#: build/trans_presets.java:3144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: build/trans_presets.java:3156
 msgid "railway"
 msgstr "spoorweg"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
 msgid "waterway"
 msgstr "waterweg"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "landuse"
 msgstr "grondgebruik"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:474
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
@@ -3330,5 +3433,5 @@
 msgstr[1] "{0} knopen"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
 #, java-format
 msgid "{0} member"
@@ -3358,7 +3461,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
-#, fuzzy
 msgid "Bad Request"
-msgstr "Badminton bewerken"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144
@@ -3374,10 +3476,5 @@
 msgstr "Melding van de dag niet beschikbaar"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67
-#, java-format
-msgid "- running version is {0}"
-msgstr "- uitgevoerde versie is {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:95
 msgid "Downloading \"Message of the day\""
 msgstr "\"Dagmelding\" downloaden"
@@ -3451,10 +3548,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:162
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
 msgid "Username"
 msgstr "Gebruikersnaam"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
 msgid "Password"
 msgstr "Wachtwoord"
@@ -3579,5 +3676,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226
 msgid "Presets"
 msgstr "Voorkeuze"
@@ -3651,38 +3748,49 @@
 msgstr "schalen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
 msgid "The geographic longitude at the mouse pointer."
 msgstr "De geografische lengtegraad bij de cursor."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The name of the object at the mouse pointer."
 msgstr "De naam van het object bij de cursor."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The geographic latitude at the mouse pointer."
 msgstr "De geografische breedtegraad bij de cursor."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The angle between the previous and the current way segment."
 msgstr "De hoek tussen het vorige en het huidige wegsegment."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "De (kompas)richting van het lijnsegment dat wordt getekend."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The length of the new way segment being drawn."
 msgstr "De lengte van het nieuwe wegsegment dat wordt getekend."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199
+msgid ""
+"Middle click again to cycle through.<br>Hold CTRL to select directly from "
+"this list with the mouse.<hr>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290
 msgid "(no object)"
 msgstr "(geen object)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:301
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418
+#, fuzzy
+msgid "User:"
+msgstr "Gebruiker"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
 msgid "layer not in list."
 msgstr "laag niet in lijst."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:488
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3755,7 +3863,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:224
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Tags"
 msgstr "Tags"
@@ -3770,5 +3878,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
@@ -3949,4 +4057,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
 msgid "Up"
 msgstr "Omhoog"
@@ -3957,4 +4066,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Down"
 msgstr "Omlaag"
@@ -3967,5 +4077,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
@@ -4388,23 +4498,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:236
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239
 msgid "No conflicts to resolve"
-msgstr "Geen tag-conflicten om op te lossen"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:295
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254
 msgid "Cancel conflict resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:310
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269
 msgid "Apply resolved conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Apply"
 msgstr ""
@@ -4416,5 +4525,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "all"
 msgstr "alles"
@@ -4458,7 +4567,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
-msgid "not yet decided"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:213
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
@@ -4485,7 +4591,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
@@ -4495,7 +4601,7 @@
 msgstr[1] "{0} wegen"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:152
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
@@ -4505,20 +4611,20 @@
 msgstr[1] "{0} relaties"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "Paste ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "From ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:372
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "To ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:428
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
 #, java-format
 msgid "{0} tag"
@@ -4534,13 +4640,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
-#, fuzzy
 msgid "Remove this relation member from the relation"
-msgstr "De leden in de huidige tabelrij uit deze relatie verwijderen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-#, fuzzy
 msgid "Replace"
-msgstr "plaats"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
@@ -4551,11 +4655,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
-#, fuzzy
 msgid "Undecided"
-msgstr "<ongedefinieerd>"
+msgstr ""
 
 #. --- role editing
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:56
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510
 msgid "Role:"
 msgstr ""
@@ -4571,7 +4674,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70
-#, fuzzy
 msgid "Value:"
-msgstr "Waarde"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86
@@ -4584,12 +4686,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51
-#, fuzzy
 msgid "Orig. Way"
-msgstr "Éénrichting"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
-#, fuzzy
 msgid "Decision"
-msgstr "Revisie"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -4605,6 +4705,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
@@ -4697,169 +4798,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-msgid "History"
-msgstr "Geschiedenis"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-msgid "Display the history of all selected items."
-msgstr "De geschiedenis van alle geselecteerde items tonen."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
-#, java-format
-msgid "index out of bounds Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
-msgid "History item"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Alle geselecteerde objecten herladen en de lijst verversen."
-
-#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
-msgid "Show"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
-msgid "Dialog not created yet. Invoke createInstance() first"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
-msgid "Layers"
-msgstr "Lagen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-msgid "Open a list of all loaded layers."
-msgstr "Een lijst met alle geladen lagen openen."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:297
-msgid "Delete the selected layer."
-msgstr "De geselecteerde laag verwijderen."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:367
-msgid "Show/Hide"
-msgstr "Tonen/Verbergen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:378
-msgid "Toggle visible state of the selected layer."
-msgstr "Zichtbaarheid van een laag in- of uitschakelen."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:420
-msgid "Activate the selected layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:475
-msgid "Merge this layer into another layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:581
-msgid "Move the selected layer one row up."
-msgstr "De geselecteerde laag een rij omhoog verplaatsen."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:600
-msgid "Move the selected layer one row down."
-msgstr "De geselecteerde laag een rij omlaag verplaatsen."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
-msgid "Information about layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
-#, java-format
-msgid "This will change up to {0} object."
-msgid_plural "This will change up to {0} objects."
-msgstr[0] "Dit verandert {0} object."
-msgstr[1] "Dit verandert {0} objecten."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
-msgid "An empty value deletes the key."
-msgstr "Een lege waarde verwijdert de sleutel."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
-msgid "<different>"
-msgstr "<verschillend>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
-msgid "Change values?"
-msgstr "Waarden aanpassen?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
-#, java-format
-msgid "Change properties of up to {0} object"
-msgid_plural "Change properties of up to {0} objects"
-msgstr[0] "Eigenschappen van {0} object aanpassen"
-msgstr[1] "Eigenschappen van {0} objecten aanpassen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
-msgid "Please select a key"
-msgstr "Selecteer een sleutel"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
-msgid "Please select a value"
-msgstr "Selecteer een waarde"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
-msgid "Please select the objects you want to change properties for."
-msgstr "Selecteer de objecten waarvan de eigenschappen moet veranderen."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
-msgid "Properties/Memberships"
-msgstr "Eigenschappen/Lidmaatschappen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-msgid "Properties for selected objects."
-msgstr "Eigenschappen voor geselecteerde objecten."
-
-#. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-msgid "Member Of"
-msgstr "Lid van"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
-msgid "Add Properties"
-msgstr "Eigenschappen toevoegen"
-
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+msgid "Filter objects and hide/disable them."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
@@ -4873,4 +4818,212 @@
 msgstr "Toevoegen"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#, fuzzy
+msgid "Add filter."
+msgstr "Selectie toevoegen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
+#, fuzzy
+msgid "Edit filter."
+msgstr "Pier bewerken"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#, fuzzy
+msgid "Delete filter."
+msgstr "Laag verwijderen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
+#, fuzzy
+msgid "Move filter up."
+msgstr "Omhoog verplaatsen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
+#, fuzzy
+msgid "Move filter down."
+msgstr "Omlaag verplaatsen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128
+msgid "Enable filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
+#, fuzzy
+msgid "Hide elements"
+msgstr "Individuele elementen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
+msgid "Apply also for children"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
+msgid "Inverse filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
+#, fuzzy
+msgid "Filter mode"
+msgstr "Verwijdermodus"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
+msgid "History"
+msgstr "Geschiedenis"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+msgid "Display the history of all selected items."
+msgstr "De geschiedenis van alle geselecteerde items tonen."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
+msgid "History item"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
+msgid "Reload all currently selected objects and refresh the list."
+msgstr "Alle geselecteerde objecten herladen en de lijst verversen."
+
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
+msgid "Show"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
+msgid "Display the history of the selected primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84
+msgid "Dialog not created yet. Invoke createInstance() first"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
+msgid "Layers"
+msgstr "Lagen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+msgid "Open a list of all loaded layers."
+msgstr "Een lijst met alle geladen lagen openen."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294
+msgid "Delete the selected layer."
+msgstr "De geselecteerde laag verwijderen."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364
+msgid "Show/Hide"
+msgstr "Tonen/Verbergen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375
+msgid "Toggle visible state of the selected layer."
+msgstr "Zichtbaarheid van een laag in- of uitschakelen."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgid "Activate"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417
+msgid "Activate the selected layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472
+msgid "Merge this layer into another layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578
+msgid "Move the selected layer one row up."
+msgstr "De geselecteerde laag een rij omhoog verplaatsen."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597
+msgid "Move the selected layer one row down."
+msgstr "De geselecteerde laag een rij omlaag verplaatsen."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+msgid "Information about layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+#, java-format
+msgid "This will change up to {0} object."
+msgid_plural "This will change up to {0} objects."
+msgstr[0] "Dit verandert {0} object."
+msgstr[1] "Dit verandert {0} objecten."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+msgid "An empty value deletes the key."
+msgstr "Een lege waarde verwijdert de sleutel."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+msgid "<different>"
+msgstr "<verschillend>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+msgid "Change values?"
+msgstr "Waarden aanpassen?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#, java-format
+msgid "Change properties of up to {0} object"
+msgid_plural "Change properties of up to {0} objects"
+msgstr[0] "Eigenschappen van {0} object aanpassen"
+msgstr[1] "Eigenschappen van {0} objecten aanpassen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+msgid "Please select a key"
+msgstr "Selecteer een sleutel"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+msgid "Please select a value"
+msgstr "Selecteer een waarde"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
+msgid "Please select the objects you want to change properties for."
+msgstr "Selecteer de objecten waarvan de eigenschappen moet veranderen."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
+msgid "Properties/Memberships"
+msgstr "Eigenschappen/Lidmaatschappen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+msgid "Properties for selected objects."
+msgstr "Eigenschappen voor geselecteerde objecten."
+
+#. setting up the membership table
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+msgid "Member Of"
+msgstr "Lid van"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
+msgid "Add Properties"
+msgstr "Eigenschappen toevoegen"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574
 msgid "Add a new key/value pair to all objects"
@@ -4912,10 +5065,9 @@
 
 #. item "Land use/Quarry" text "Name"
-#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
-#: build/trans_presets.java:3109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168
+#: build/trans_presets.java:3121
 msgid "Relations"
 msgstr "Relaties"
@@ -4925,23 +5077,23 @@
 msgstr "Een lijst met alle relaties openen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relaties: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276
 msgid "Open an editor for the selected relation"
 msgstr "Een editor voor de geselecteerde relatie openen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
 msgid "Delete the selected relation"
 msgstr "De geselecteerde relatie verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349
 msgid "Create a new relation"
 msgstr "Een nieuwe relatie aanmaken"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:373
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1412
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
@@ -4974,5 +5126,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4984,9 +5136,9 @@
 msgstr "Selectie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441
 msgid "Undock the panel"
 msgstr "Laat paneel drijven"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -4995,5 +5147,5 @@
 "werkbalk."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:457
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Klik om de paneelinhoud te verkleinen/vergroten"
@@ -5054,5 +5206,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5076,5 +5228,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1502
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1370
 msgid "Download relation members"
 msgstr ""
@@ -5104,5 +5256,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -5110,18 +5262,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
 msgid "Tags and Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:167
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5130,14 +5282,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613
 #, java-format
 msgid ""
@@ -5147,9 +5299,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid ""
@@ -5159,15 +5311,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5175,5 +5327,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5181,20 +5333,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849
 #, java-format
 msgid ""
@@ -5203,57 +5355,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:961
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909
 msgid "Move the currently selected members up"
 msgstr "De geselecteerde leden omhoog verplaatsen"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:979
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:912
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928
 msgid "Move the currently selected members down"
 msgstr "De geselecteerde leden omlaag verplaatsen"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:998
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:931
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5262,9 +5414,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1058
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
 #, java-format
 msgid ""
@@ -5273,56 +5425,41 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090
+msgid "Apply the current updates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123
+msgid "Apply the updates and close the dialog"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
-msgid "Apply the current updates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
-msgid "Apply the updates and close the dialog"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
-msgid "Delete the currently selected tags"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Alle incomplete wegen en daarbij behorende knopen downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 msgid "Download Members"
 msgstr "Leden downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1208
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1211
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1356
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 #, java-format
 msgid ""
@@ -5332,13 +5469,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1229
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1367
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
 msgid "Confirm empty role"
 msgstr ""
@@ -5425,37 +5562,37 @@
 msgstr "Bladwijzers"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:82
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
 msgid "Please enter the desired coordinates first."
 msgstr "Voer eerst de gewenste coördinaten in."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
 msgid "Please enter a name for the location."
 msgstr "Voer een naam in voor de locatie."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:107
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
 msgid "Select a bookmark first."
 msgstr "Selecteer eerst een bladwijzer."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
 msgid "min lat"
 msgstr "min lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
 msgid "min lon"
 msgstr "min lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid "max lat"
 msgstr "max lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
 msgid "max lon"
 msgstr "max lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5465,26 +5602,26 @@
 "downloaden)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
 msgid "Bounding Box"
 msgstr "Omvattend gebied"
 
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
 msgid "Data Sources and Types"
 msgstr "Gegevensbronnen en -soorten"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
 msgid "Download as new layer"
 msgstr "Als nieuwe laag downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
 msgid "Download Area"
 msgstr "Gebied downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
 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:219
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
 msgid "Download area ok, size probably acceptable to server"
 msgstr ""
@@ -5511,7 +5648,7 @@
 msgstr "Voer een plaats in om naar te zoeken:"
 
-#. <separator/>
+#. group "Geography"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2759
 msgid "Places"
 msgstr "Locaties"
@@ -5558,21 +5695,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "type"
 msgstr "soort"
@@ -5589,5 +5726,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-#, fuzzy
 msgid ""
 "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
@@ -5595,6 +5731,4 @@
 "Hold left mousebutton and draw a frame."
 msgstr ""
-"Zoom: muiswiel of dubbelklik.  Verplaats kaart: rechter muisknop indrukken "
-"en muis bewegen. Selecteer"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
@@ -6055,4 +6189,6 @@
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
 #. <key key="historic" value="wayside_shrine" />
+#. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
+#. <key key="historic" value="boundary_stone" />
 #. item "Leisure/Water Park" label "Edit Water Park"
 #. <key key="leisure" value="water_park" />
@@ -6424,153 +6560,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/trans_presets.java:66 build/trans_presets.java:102
-#: build/trans_presets.java:142 build/trans_presets.java:179
-#: build/trans_presets.java:199 build/trans_presets.java:217
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:272 build/trans_presets.java:305
-#: build/trans_presets.java:351 build/trans_presets.java:371
-#: build/trans_presets.java:386 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:463 build/trans_presets.java:482
-#: build/trans_presets.java:502 build/trans_presets.java:522
-#: build/trans_presets.java:543 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627 build/trans_presets.java:658
-#: build/trans_presets.java:679 build/trans_presets.java:692
-#: build/trans_presets.java:705 build/trans_presets.java:718
-#: build/trans_presets.java:731 build/trans_presets.java:744
-#: build/trans_presets.java:755 build/trans_presets.java:764
-#: build/trans_presets.java:811 build/trans_presets.java:832
-#: build/trans_presets.java:841 build/trans_presets.java:901
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1067 build/trans_presets.java:1075
-#: build/trans_presets.java:1085 build/trans_presets.java:1093
-#: build/trans_presets.java:1098 build/trans_presets.java:1105
-#: build/trans_presets.java:1112 build/trans_presets.java:1117
-#: build/trans_presets.java:1125 build/trans_presets.java:1134
-#: build/trans_presets.java:1140 build/trans_presets.java:1146
-#: build/trans_presets.java:1151 build/trans_presets.java:1157
-#: build/trans_presets.java:1163 build/trans_presets.java:1172
-#: build/trans_presets.java:1181 build/trans_presets.java:1188
-#: build/trans_presets.java:1196 build/trans_presets.java:1209
-#: build/trans_presets.java:1215 build/trans_presets.java:1224
-#: build/trans_presets.java:1230 build/trans_presets.java:1236
-#: build/trans_presets.java:1244 build/trans_presets.java:1299
-#: build/trans_presets.java:1346 build/trans_presets.java:1352
-#: build/trans_presets.java:1358 build/trans_presets.java:1364
-#: build/trans_presets.java:1370 build/trans_presets.java:1381
-#: build/trans_presets.java:1390 build/trans_presets.java:1405
-#: build/trans_presets.java:1412 build/trans_presets.java:1418
-#: build/trans_presets.java:1426 build/trans_presets.java:1433
-#: build/trans_presets.java:1442 build/trans_presets.java:1450
-#: build/trans_presets.java:1457 build/trans_presets.java:1468
-#: build/trans_presets.java:1478 build/trans_presets.java:1488
-#: build/trans_presets.java:1508 build/trans_presets.java:1520
-#: build/trans_presets.java:1531 build/trans_presets.java:1548
-#: build/trans_presets.java:1555 build/trans_presets.java:1570
-#: build/trans_presets.java:1577 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1594
-#: build/trans_presets.java:1599 build/trans_presets.java:1605
-#: build/trans_presets.java:1611 build/trans_presets.java:1619
-#: build/trans_presets.java:1627 build/trans_presets.java:1635
-#: build/trans_presets.java:1642 build/trans_presets.java:1648
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1670 build/trans_presets.java:1677
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1712 build/trans_presets.java:1719
-#: build/trans_presets.java:1736 build/trans_presets.java:1744
-#: build/trans_presets.java:1759 build/trans_presets.java:1769
-#: build/trans_presets.java:1781 build/trans_presets.java:1788
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:1809 build/trans_presets.java:1817
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1841
-#: build/trans_presets.java:1846 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1864
-#: build/trans_presets.java:1872 build/trans_presets.java:1881
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1908 build/trans_presets.java:1914
-#: build/trans_presets.java:1922 build/trans_presets.java:1928
-#: build/trans_presets.java:1934 build/trans_presets.java:1940
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2013
-#: build/trans_presets.java:2022 build/trans_presets.java:2030
-#: build/trans_presets.java:2036 build/trans_presets.java:2042
-#: build/trans_presets.java:2048 build/trans_presets.java:2054
-#: build/trans_presets.java:2060 build/trans_presets.java:2066
-#: build/trans_presets.java:2072 build/trans_presets.java:2078
-#: build/trans_presets.java:2084 build/trans_presets.java:2090
-#: build/trans_presets.java:2096 build/trans_presets.java:2102
-#: build/trans_presets.java:2108 build/trans_presets.java:2114
-#: build/trans_presets.java:2120 build/trans_presets.java:2126
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2158
-#: build/trans_presets.java:2165 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2186
-#: build/trans_presets.java:2192 build/trans_presets.java:2198
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2218 build/trans_presets.java:2225
-#: build/trans_presets.java:2232 build/trans_presets.java:2239
-#: build/trans_presets.java:2247 build/trans_presets.java:2279
-#: build/trans_presets.java:2284 build/trans_presets.java:2289
-#: build/trans_presets.java:2294 build/trans_presets.java:2300
-#: build/trans_presets.java:2306 build/trans_presets.java:2312
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2354
-#: build/trans_presets.java:2451 build/trans_presets.java:2458
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2485 build/trans_presets.java:2492
-#: build/trans_presets.java:2498 build/trans_presets.java:2504
-#: build/trans_presets.java:2526 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2553 build/trans_presets.java:2559
-#: build/trans_presets.java:2565 build/trans_presets.java:2571
-#: build/trans_presets.java:2577 build/trans_presets.java:2583
-#: build/trans_presets.java:2590 build/trans_presets.java:2597
-#: build/trans_presets.java:2604 build/trans_presets.java:2610
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2661
-#: build/trans_presets.java:2667 build/trans_presets.java:2677
-#: build/trans_presets.java:2686 build/trans_presets.java:2701
-#: build/trans_presets.java:2707 build/trans_presets.java:2715
-#: build/trans_presets.java:2722 build/trans_presets.java:2742
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2783
-#: build/trans_presets.java:2790 build/trans_presets.java:2797
-#: build/trans_presets.java:2803 build/trans_presets.java:2809
-#: build/trans_presets.java:2817 build/trans_presets.java:2824
-#: build/trans_presets.java:2831 build/trans_presets.java:2838
-#: build/trans_presets.java:2844 build/trans_presets.java:2851
-#: build/trans_presets.java:2858 build/trans_presets.java:2867
-#: build/trans_presets.java:2873 build/trans_presets.java:2879
-#: build/trans_presets.java:2885 build/trans_presets.java:2891
-#: build/trans_presets.java:2900 build/trans_presets.java:2910
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2948
-#: build/trans_presets.java:2957 build/trans_presets.java:2963
-#: build/trans_presets.java:2969 build/trans_presets.java:2975
-#: build/trans_presets.java:2981 build/trans_presets.java:2987
-#: build/trans_presets.java:2993 build/trans_presets.java:3000
-#: build/trans_presets.java:3006 build/trans_presets.java:3011
-#: build/trans_presets.java:3018 build/trans_presets.java:3025
-#: build/trans_presets.java:3031 build/trans_presets.java:3040
-#: build/trans_presets.java:3048 build/trans_presets.java:3054
-#: build/trans_presets.java:3060 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3080
-#: build/trans_presets.java:3086 build/trans_presets.java:3092
-#: build/trans_presets.java:3098 build/trans_presets.java:3104
-#: build/trans_presets.java:3117 build/trans_presets.java:3131
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:67 build/trans_presets.java:103
+#: build/trans_presets.java:143 build/trans_presets.java:180
+#: build/trans_presets.java:200 build/trans_presets.java:218
+#: build/trans_presets.java:235 build/trans_presets.java:253
+#: build/trans_presets.java:273 build/trans_presets.java:306
+#: build/trans_presets.java:352 build/trans_presets.java:372
+#: build/trans_presets.java:387 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:503 build/trans_presets.java:523
+#: build/trans_presets.java:544 build/trans_presets.java:565
+#: build/trans_presets.java:586 build/trans_presets.java:607
+#: build/trans_presets.java:628 build/trans_presets.java:659
+#: build/trans_presets.java:680 build/trans_presets.java:693
+#: build/trans_presets.java:706 build/trans_presets.java:719
+#: build/trans_presets.java:732 build/trans_presets.java:745
+#: build/trans_presets.java:756 build/trans_presets.java:765
+#: build/trans_presets.java:812 build/trans_presets.java:833
+#: build/trans_presets.java:842 build/trans_presets.java:902
+#: build/trans_presets.java:1053 build/trans_presets.java:1061
+#: build/trans_presets.java:1069 build/trans_presets.java:1077
+#: build/trans_presets.java:1087 build/trans_presets.java:1095
+#: build/trans_presets.java:1100 build/trans_presets.java:1107
+#: build/trans_presets.java:1114 build/trans_presets.java:1119
+#: build/trans_presets.java:1127 build/trans_presets.java:1136
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1153 build/trans_presets.java:1159
+#: build/trans_presets.java:1165 build/trans_presets.java:1174
+#: build/trans_presets.java:1183 build/trans_presets.java:1190
+#: build/trans_presets.java:1198 build/trans_presets.java:1211
+#: build/trans_presets.java:1217 build/trans_presets.java:1226
+#: build/trans_presets.java:1232 build/trans_presets.java:1238
+#: build/trans_presets.java:1246 build/trans_presets.java:1302
+#: build/trans_presets.java:1349 build/trans_presets.java:1355
+#: build/trans_presets.java:1361 build/trans_presets.java:1367
+#: build/trans_presets.java:1373 build/trans_presets.java:1384
+#: build/trans_presets.java:1393 build/trans_presets.java:1408
+#: build/trans_presets.java:1415 build/trans_presets.java:1421
+#: build/trans_presets.java:1429 build/trans_presets.java:1436
+#: build/trans_presets.java:1445 build/trans_presets.java:1453
+#: build/trans_presets.java:1460 build/trans_presets.java:1471
+#: build/trans_presets.java:1481 build/trans_presets.java:1491
+#: build/trans_presets.java:1511 build/trans_presets.java:1523
+#: build/trans_presets.java:1534 build/trans_presets.java:1551
+#: build/trans_presets.java:1558 build/trans_presets.java:1574
+#: build/trans_presets.java:1581 build/trans_presets.java:1586
+#: build/trans_presets.java:1592 build/trans_presets.java:1598
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1646 build/trans_presets.java:1652
+#: build/trans_presets.java:1659 build/trans_presets.java:1666
+#: build/trans_presets.java:1674 build/trans_presets.java:1681
+#: build/trans_presets.java:1689 build/trans_presets.java:1696
+#: build/trans_presets.java:1702 build/trans_presets.java:1709
+#: build/trans_presets.java:1716 build/trans_presets.java:1723
+#: build/trans_presets.java:1740 build/trans_presets.java:1748
+#: build/trans_presets.java:1763 build/trans_presets.java:1773
+#: build/trans_presets.java:1785 build/trans_presets.java:1792
+#: build/trans_presets.java:1798 build/trans_presets.java:1808
+#: build/trans_presets.java:1813 build/trans_presets.java:1821
+#: build/trans_presets.java:1828 build/trans_presets.java:1834
+#: build/trans_presets.java:1840 build/trans_presets.java:1845
+#: build/trans_presets.java:1850 build/trans_presets.java:1855
+#: build/trans_presets.java:1862 build/trans_presets.java:1868
+#: build/trans_presets.java:1873 build/trans_presets.java:1882
+#: build/trans_presets.java:1891 build/trans_presets.java:1900
+#: build/trans_presets.java:1909 build/trans_presets.java:1918
+#: build/trans_presets.java:1924 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 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:2023 build/trans_presets.java:2032
+#: build/trans_presets.java:2040 build/trans_presets.java:2046
+#: build/trans_presets.java:2052 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 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:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2150
+#: build/trans_presets.java:2156 build/trans_presets.java:2162
+#: build/trans_presets.java:2169 build/trans_presets.java:2176
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2197 build/trans_presets.java:2203
+#: build/trans_presets.java:2209 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2229
+#: build/trans_presets.java:2236 build/trans_presets.java:2243
+#: build/trans_presets.java:2250 build/trans_presets.java:2258
+#: build/trans_presets.java:2290 build/trans_presets.java:2295
+#: build/trans_presets.java:2300 build/trans_presets.java:2305
+#: build/trans_presets.java:2311 build/trans_presets.java:2317
+#: build/trans_presets.java:2323 build/trans_presets.java:2331
+#: build/trans_presets.java:2337 build/trans_presets.java:2343
+#: build/trans_presets.java:2349 build/trans_presets.java:2355
+#: build/trans_presets.java:2365 build/trans_presets.java:2462
+#: build/trans_presets.java:2469 build/trans_presets.java:2483
+#: build/trans_presets.java:2489 build/trans_presets.java:2496
+#: build/trans_presets.java:2503 build/trans_presets.java:2509
+#: build/trans_presets.java:2515 build/trans_presets.java:2537
+#: build/trans_presets.java:2544 build/trans_presets.java:2551
+#: build/trans_presets.java:2557 build/trans_presets.java:2564
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2594 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2615
+#: build/trans_presets.java:2621 build/trans_presets.java:2627
+#: build/trans_presets.java:2633 build/trans_presets.java:2639
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2672 build/trans_presets.java:2678
+#: build/trans_presets.java:2688 build/trans_presets.java:2697
+#: build/trans_presets.java:2712 build/trans_presets.java:2718
+#: build/trans_presets.java:2726 build/trans_presets.java:2733
+#: build/trans_presets.java:2753 build/trans_presets.java:2764
+#: build/trans_presets.java:2770 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2788
+#: build/trans_presets.java:2795 build/trans_presets.java:2802
+#: build/trans_presets.java:2809 build/trans_presets.java:2815
+#: build/trans_presets.java:2821 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2912
+#: build/trans_presets.java:2922 build/trans_presets.java:2931
+#: build/trans_presets.java:2937 build/trans_presets.java:2943
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 build/trans_presets.java:2981
+#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:2999 build/trans_presets.java:3005
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3023 build/trans_presets.java:3030
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3066 build/trans_presets.java:3072
+#: build/trans_presets.java:3079 build/trans_presets.java:3085
+#: build/trans_presets.java:3092 build/trans_presets.java:3098
+#: build/trans_presets.java:3104 build/trans_presets.java:3110
+#: build/trans_presets.java:3116 build/trans_presets.java:3129
+#: build/trans_presets.java:3143 build/trans_presets.java:3157
 msgid "Name"
 msgstr "Naam"
@@ -6604,4 +6741,58 @@
 msgid "Version"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
+#, fuzzy
+msgid "Changeset id:"
+msgstr "Relatie wijzigen"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
+#, fuzzy
+msgid "Created at:"
+msgstr "Gebieden aanmaken"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
+#, fuzzy
+msgid "Changeset comment:"
+msgstr "Opmerking bevestigen"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
+msgid "No open changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48
+#, fuzzy
+msgid "<html>Please select the changesets you want to close</html>"
+msgstr "Selecteer welke wijzigingen in eigenschappen je wilt toepassen."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
+#, fuzzy
+msgid "Open changesets"
+msgstr "Changeset sluiten"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101
+#, fuzzy
+msgid "Close changesets"
+msgstr "Changeset sluiten"
+
+#. putValue(SMALL_ICON, ImageProvider.get("cancel"));
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
+#, fuzzy
+msgid "Close the selected open changesets"
+msgstr "Geselecteerde objecten verwijderen."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126
+#, fuzzy
+msgid "Cancel closeing of changesets"
+msgstr "Changeset sluiten"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37
+msgid "Closing changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77
+#, fuzzy, java-format
+msgid "Closing changeset {0}"
+msgstr "Changeset sluiten"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
@@ -6630,5 +6821,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be uploaded"
+msgid "Layer ''{0}'' has no modifications to be uploaded."
 msgstr ""
 
@@ -6636,5 +6827,5 @@
 #, java-format
 msgid ""
-"Layer ''{0}'' has modifications which should be saved to its assoicated file "
+"Layer ''{0}'' has modifications which should be saved to its associated file "
 "''{1}''."
 msgstr ""
@@ -6642,5 +6833,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be saved"
+msgid "Layer ''{0}'' has no modifications to be saved."
 msgstr ""
 
@@ -6674,17 +6865,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113
 msgid "Unsaved changes - Save/Upload before exiting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194
 #, java-format
 msgid ""
@@ -6697,10 +6888,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205
 msgid "Unsaved data and conflicts"
-msgstr "Conflicten oplossen"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212
 #, java-format
 msgid ""
@@ -6714,9 +6904,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223
 msgid "Unsaved data and missing associated file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230
 #, java-format
 msgid ""
@@ -6731,42 +6921,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243
 msgid "Unsaved data non-writable files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
 msgid "Close this dialog and resume editing in JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322
+msgid "Discard and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
-msgid "Discard and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354
+msgid "Save and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
-msgid "Save and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
 msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402
 #, java-format
 msgid "Preparing layer ''{0}'' for upload ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
@@ -6774,5 +6964,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491
 msgid "Incomplete upload and/or save"
 msgstr ""
@@ -6812,21 +7002,21 @@
 #. item "Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:200
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:278
-#: build/trans_presets.java:311 build/trans_presets.java:357
-#: build/trans_presets.java:372 build/trans_presets.java:387
-#: build/trans_presets.java:409 build/trans_presets.java:429
-#: build/trans_presets.java:450 build/trans_presets.java:470
-#: build/trans_presets.java:489 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:549
-#: build/trans_presets.java:570 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:633
-#: build/trans_presets.java:664 build/trans_presets.java:1060
-#: build/trans_presets.java:1068 build/trans_presets.java:1076
-#: build/trans_presets.java:1086 build/trans_presets.java:1305
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:242
+#: build/trans_presets.java:260 build/trans_presets.java:279
+#: build/trans_presets.java:312 build/trans_presets.java:358
+#: build/trans_presets.java:373 build/trans_presets.java:388
+#: build/trans_presets.java:410 build/trans_presets.java:430
+#: build/trans_presets.java:451 build/trans_presets.java:471
+#: build/trans_presets.java:490 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:665 build/trans_presets.java:1062
+#: build/trans_presets.java:1070 build/trans_presets.java:1078
+#: build/trans_presets.java:1088 build/trans_presets.java:1308
 msgid "Layer"
 msgstr "laag"
@@ -6845,67 +7035,32 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:200
 msgid "Upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-msgid "Use a new changeset and close it"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
-msgid ""
-"Select to upload the data using a new changeset and to close the changeset "
-"after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
-msgid "Use a new changeset and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
-msgid ""
-"Select to upload the data using a new changeset and to leave the changeset "
-"open after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
-msgid "Upload to a new or to an existing changeset?"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
-msgid "upload all changes in one request"
+msgid "Settings"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
-msgid ""
-"Enable to upload all changes in one request, disable to use one request per "
-"changed primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "Beschrijf kort de veranderingen die je upload:"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:216
-msgid "Settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908
 msgid "Tags of new changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:221
 msgid "Objects to add:"
 msgstr "Objecten om toe te voegen:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:227
 msgid "Objects to modify:"
 msgstr "Objecten om te bewerken:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:233
 msgid "Objects to delete:"
 msgstr "Objecten om aan te verwijderen:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
 #, java-format
 msgid "{0} object to add:"
@@ -6914,5 +7069,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:277
 #, java-format
 msgid "{0} object to modifiy:"
@@ -6921,5 +7076,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:286
 #, java-format
 msgid "{0} object to delete:"
@@ -6928,53 +7083,86 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422
-#, java-format
-msgid "Use the existing changeset {0} and close it after upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:423
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to close the changeset "
-"after this upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426
-#, java-format
-msgid "Use the existing changeset {0} and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:427
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to leave the changeset "
-"open for further uploads"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
-#, java-format
-msgid "Tags of changeset {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:470
 msgid "Upload Changes"
 msgstr "Aanpassingen uploaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472
+msgid "Upload the changed primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
+msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:479
+msgid "Illegal upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
+msgid "Cancel the upload and resume editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606
 #, fuzzy
-msgid "Upload the changed primitives"
-msgstr "Deze veranderingen uploaden?"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592
+msgid "Upload all changes in one request"
+msgstr "Upload alle aanpassingen naar de OSM-server."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607
+msgid ""
+"Enable to upload all changes in one request, disable to use one request per "
+"changed primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:617
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "Beschrijf kort de veranderingen die je upload:"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672
+msgid "Open a new changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
+msgid "Open a new changeset and use it in the next upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
 #, fuzzy
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "Voer een naam in voor de locatie."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:593
-msgid "Illegal upload comment"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
-msgid "Cancel the upload and resume editing"
+msgid "Use an open changeset"
+msgstr "Niet-opgeslagen wijzigingen"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
+msgid "Upload data to an already opened changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
+#, fuzzy
+msgid "Close changeset after upload"
+msgstr "Geen aanpassingen aanwezig om te uploaden."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
+msgid "Select to close the changeset after the next upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922
+#, java-format
+msgid "Tags of changeset {0}"
+msgstr ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
+#, fuzzy
+msgid "Load the list of your open changesets from the server"
+msgstr "De huidige voorkeuren naar de server uploaden"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
+#, fuzzy
+msgid "Close the currently selected open changeset"
+msgstr "De geselecteerde leden omhoog verplaatsen"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
+#, java-format
+msgid "changeset id > 0 expected. Got {1}"
 msgstr ""
 
@@ -7053,5 +7241,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
@@ -7089,5 +7277,5 @@
 msgstr "Ingevoerde tijd kon niet worden ontleed."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
@@ -7095,30 +7283,30 @@
 msgstr "GPS-punt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
 msgid "Customize line drawing"
 msgstr "Lijntekening aanpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
 msgid "Use global settings."
 msgstr "Algemene instellingen gebruiken."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Draw lines between points for this layer."
 msgstr "Lijnen tussen punten in deze laag tekenen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Do not draw lines between points for this layer."
 msgstr "Geen lijnen tussen punten in deze laag tekenen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 msgid "Select line drawing options"
 msgstr "Lijntekenopties selecteren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7126,5 +7314,5 @@
 msgstr "Kleur aanpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7133,5 +7321,5 @@
 msgstr "Standaard"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7140,38 +7328,75 @@
 msgstr "Kies een kleur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
 msgid "Markers From Named Points"
 msgstr "Markers van benoemde punten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Benoemde trackpunten van {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
 msgid "Import Audio"
 msgstr "Geluid importeren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave-geluidsbestanden (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Geluidsmarkers van {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
 msgid "Import images"
 msgstr "Afbeeldingen importeren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#, java-format
+msgid "Name: {0}"
+msgstr "Naam: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#, java-format
+msgid "Description: {0}"
+msgstr "Beschrijving: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#, fuzzy, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
 msgstr[0] "{0} track, "
 msgstr[1] "{0} tracks, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
+#: build/trans_presets.java:3160
+msgid "Description"
+msgstr "Beschrijving"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#, fuzzy
+msgid "Timespan"
+msgstr "Tijdsperiode: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#, fuzzy
+msgid "Length"
+msgstr "Lengte: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
+msgid "URL"
+msgstr "URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+msgid "Length: "
+msgstr "Lengte: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
 #, java-format
 msgid "{0} route, "
@@ -7180,5 +7405,5 @@
 msgstr[1] "{0} routes, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 #, java-format
 msgid "{0} waypoint"
@@ -7187,29 +7412,10 @@
 msgstr[1] "{0} waypoints"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
-#, java-format
-msgid "Name: {0}"
-msgstr "Naam: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
-#, java-format
-msgid "Description: {0}"
-msgstr "Beschrijving: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
-msgid "Timespan: "
-msgstr "Tijdsperiode: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
-msgid "Length: "
-msgstr "Lengte: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Naar gegevenslaag omzetten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7219,10 +7425,10 @@
 "zijn.<br>Als je sporen wilt uploaden, kijk dan hier:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -7233,29 +7439,29 @@
 msgstr "Omgezet van: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
 msgid "Download from OSM along this track"
 msgstr "Uit OSM langs deze track downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
 msgid "Download everything within:"
 msgstr "Alles downloaden binnen:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
 #, java-format
 msgid "{0} meters"
 msgstr "{0} meters"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 msgid "Maximum area per request:"
 msgstr "Maximum oppervlak per verzoek:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
 #, java-format
 msgid ""
@@ -7266,13 +7472,13 @@
 "verder<br>gaan?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
 msgid "Download data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
 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:1143
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7282,5 +7488,5 @@
 "de track zijn overgeslagen of naar de start verplaatst."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7333,30 +7539,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
-#, fuzzy
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
 "<br>If you want to upload traces, look here:</html>"
 msgstr ""
-"<html>Onverwerkte GPS-gegevens uploaden als kaartgegevens kan schadelijk "
-"zijn.<br>Als je sporen wilt uploaden, kijk dan hier:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "track"
 msgid_plural "tracks"
@@ -7493,4 +7696,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
@@ -7734,13 +7938,18 @@
 msgstr "Grote GPS-punten tekenen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+msgid "Draw a circle form HDOP value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Snelheid (rood = langzaam, groen = snel)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Afwijking van locatie (rood = hoog, groen = laag, indien beschikbaar)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Enkele kleur (kan voor lagen met een naam ingesteld worden)"
@@ -7748,6 +7957,6 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1374
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:1377
 msgid "Car"
 msgstr "Auto"
@@ -7768,14 +7977,14 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:324 build/trans_presets.java:650
-#: build/trans_presets.java:857 build/trans_presets.java:876
-#: build/trans_presets.java:890 build/trans_presets.java:912
-#: build/trans_presets.java:949 build/trans_presets.java:962
-#: build/trans_presets.java:974 build/trans_presets.java:986
-#: build/trans_presets.java:998 build/trans_presets.java:1010
-#: build/trans_presets.java:1020 build/trans_presets.java:1029
-#: build/trans_presets.java:1038 build/trans_presets.java:1437
-#: build/trans_presets.java:1510
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:325 build/trans_presets.java:651
+#: build/trans_presets.java:858 build/trans_presets.java:877
+#: build/trans_presets.java:891 build/trans_presets.java:913
+#: build/trans_presets.java:950 build/trans_presets.java:963
+#: build/trans_presets.java:975 build/trans_presets.java:987
+#: build/trans_presets.java:999 build/trans_presets.java:1011
+#: build/trans_presets.java:1021 build/trans_presets.java:1030
+#: build/trans_presets.java:1039 build/trans_presets.java:1440
+#: build/trans_presets.java:1513
 msgid "Bicycle"
 msgstr "Fiets"
@@ -7808,62 +8017,62 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:325 build/trans_presets.java:649
-#: build/trans_presets.java:856 build/trans_presets.java:875
-#: build/trans_presets.java:889 build/trans_presets.java:911
-#: build/trans_presets.java:948 build/trans_presets.java:961
-#: build/trans_presets.java:973 build/trans_presets.java:985
-#: build/trans_presets.java:997 build/trans_presets.java:1009
-#: build/trans_presets.java:1019 build/trans_presets.java:1028
-#: build/trans_presets.java:1037
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:326 build/trans_presets.java:650
+#: build/trans_presets.java:857 build/trans_presets.java:876
+#: build/trans_presets.java:890 build/trans_presets.java:912
+#: build/trans_presets.java:949 build/trans_presets.java:962
+#: build/trans_presets.java:974 build/trans_presets.java:986
+#: build/trans_presets.java:998 build/trans_presets.java:1010
+#: build/trans_presets.java:1020 build/trans_presets.java:1029
+#: build/trans_presets.java:1038
 msgid "Foot"
 msgstr "Te voet"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Teken richting pijlen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Sneltekenen (minder fraai)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Alleen interessante richtingwijzers (b.v. met éénrichtingstag)."
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Only on the head of a way."
 msgstr "Alleen op de kop van een weg."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Nummers segmentvolgorde tekenen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Grenzen gedownload gebied tekenen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Virtuele knopen in selectiemodus tekenen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Inactieve lagen in andere kleur tekenen"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Gladde kaartafbeeldingen (anti-aliasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:82
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -7871,9 +8080,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
@@ -7882,10 +8091,10 @@
 "tekenen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length (meters)"
 msgstr "Maximum lengte (meters)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -7894,10 +8103,10 @@
 "bevatten."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:129
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Richtingspijlen voor lijnen tekenen, de GPS-punten verbindend."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:135
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -7906,5 +8115,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:141
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -7913,13 +8122,13 @@
 "Geen pijlen tekenen als  ze niet minstens deze afstand hebben tot de vorige."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:144
 msgid "Minimum distance (pixels)"
 msgstr "Minimum afstand (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Draw larger dots for the GPS points."
 msgstr "De GPS-punten groter tekenen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -7929,9 +8138,9 @@
 "ingesteld in Laagbeheer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Colors points and track segments by velocity."
 msgstr "Kleur punten en tracksegmenten op basis van snelheid."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -7941,28 +8150,28 @@
 "(HDOP). Uw GPS-logger moet deze informatie wel registreren."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 "Staat toe om de kleur van de track te variëren naar gemiddelde snelheden."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid "Track and Point Coloring"
 msgstr "Track- en puntkleuring"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202
 msgid "GPS Points"
 msgstr "GPS-punten"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "Draw direction hints for way segments."
 msgstr "Richtingwijzers voor wegsegmenten tekenen."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:237
 msgid "Draw the order numbers of all segments within their way."
 msgstr "De volgordenummers van alle segmenten binnen hun weg tekenen."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -7971,10 +8180,10 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "De grenzen van de gegevens tekenen die geladen zijn van de server."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -7982,9 +8191,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257
 msgid "Draw the inactive data layers in a different color."
 msgstr "De inactieve gegevenslagen in een andere kleur tekenen."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "OSM Data"
 msgstr "OSM-gegevens"
@@ -8064,45 +8273,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Configure available plugins."
 msgstr "Beschikbare plugins configureren"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50
+#. buttons at the bottom
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
 msgid "Download List"
 msgstr "Lijst downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:100
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 msgid "Update"
 msgstr "Update"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Configure Sites..."
 msgstr "Sites configureren..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:125
 msgid "Add JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:126
 msgid "Enter URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:162
 msgid "Please select an entry."
 msgstr "Selecteer een invoer."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:147
 msgid "Edit JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:148
 msgid "JOSM Plugin description URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:175
 msgid "Configure Plugin Sites"
 msgstr "Plugin-site configureren"
@@ -8457,6 +8667,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:369
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341
 #, java-format
 msgid "Remove old keys from up to {0} object"
@@ -8465,9 +8675,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135
 msgid "Add a new tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160
 msgid "Delete the selection in the tag table"
 msgstr ""
@@ -8502,7 +8712,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:68
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:75
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -8546,4 +8756,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24
+#, fuzzy, java-format
+msgid "Preset group ''{0}'' of group ''{1}''"
+msgstr "Voorkeuze ''{0}'' van groep ''{1}'' gebruiken"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
 #, java-format
 msgid "Preset group ''{0}''"
@@ -8564,4 +8779,10 @@
 msgstr "Downloaden van punten {0} tot {1}..."
 
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, fuzzy, java-format
+msgid "parameter ''{0}'' > 0 expected. Got {1}"
+msgstr "Parameter \"{0}\" mag niet leeg zijn."
+
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8670,5 +8891,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "Ontleedfout: documentstructuur van GPX-bestand is ongeldig"
@@ -8788,10 +9009,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -8799,75 +9021,79 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315
 msgid "Creating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
 #, java-format
 msgid "Successfully opened changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#, java-format
+msgid "id of changeset > 0 required. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
-#, java-format
-msgid "Changeset {0} is unchanged. Skipping update."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
 #, java-format
 msgid "Updating changeset {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
-msgid ""
-"Failed to update changeset. Either there is no current changeset or the id "
-"of the current changeset is 0"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
 msgid "Closing changeset..."
 msgstr "Changeset sluiten"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
-#, java-format
-msgid "Closing changeset {0}..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
-#, java-format
-msgid "Leaving changeset {0} open..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
 msgid "No changeset present for diff upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414
 msgid "Preparing..."
 msgstr "Voorbereiden…"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419
 msgid "Uploading..."
 msgstr "Uploaden..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438
 msgid "Waiting 10 seconds ... "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449
 msgid "OK - trying again."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:485
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517
 #, java-format
 msgid "Starting retry {0} of {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
+msgid "current changeset is null. Can't upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
+#, java-format
+msgid "id of current changeset > required. Current id is {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
+#, java-format
+msgid "Open changeset expected. Got closed changeset with id {0}"
 msgstr ""
 
@@ -8893,33 +9119,92 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
+#, java-format
+msgid "missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:128
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:134
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
+#, java-format
+msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
+#, java-format
+msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
+#, java-format
+msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#, java-format
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#, java-format
+msgid "Unsupported version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:176
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Aborting."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#, java-format
+msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
+#, fuzzy
+msgid "Parsing list of changesets..."
+msgstr "Changeset sluiten"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
 msgid "Incorrect password or username."
 msgstr "Verkeerd wachtwoord of gebruikersnaam."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:168
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Waarschuwing: het wachtwoord wordt onversleuteld verstuurd."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Save user and password (unencrypted)"
 msgstr "Gebruikersnaam en wachtwoord opslaan (onversleuteld)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
 msgid "Enter Password"
 msgstr "Voer wachtwoord in"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 msgid "Login"
 msgstr "Login"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:242
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
 msgid "The base URL for the OSM server (REST API)"
 msgstr "De basis-URL voor de OSM-server (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -8927,17 +9212,17 @@
 "Wachtwoord van het OSM-account. Laat leeg om wachtwoord niet te bewaren."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
 msgid "Base Server URL"
 msgstr "URL-basisserver"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
 msgid "OSM password"
 msgstr "OSM-wachtwoord"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -8946,5 +9231,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:51
+#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #, java-format
 msgid "(at line {0}, column {1})"
@@ -9034,20 +9319,5 @@
 msgstr "Fout tijdens ontleden."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124
-#, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
-#, fuzzy, java-format
-msgid "Missing mandatory attribute ''{0}''"
-msgstr "Verplicht attribuut \"{0}\" ontbreekt."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
-#, fuzzy, java-format
-msgid "Unsupported version: {0}"
-msgstr "API-versie: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:155
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -9056,38 +9326,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
 msgid "found XML element <nd> element not as direct child of element <way>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
 msgid "Found XML element <member> not as direct child of element <relation>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
 #, java-format
 msgid ""
@@ -9095,24 +9365,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Incomplete <member>-specificatie met ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
-#, java-format
-msgid "Warning: Undefined element ''{0}'' found in input stream. Skipping."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
-#, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Skipping."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
 msgid "Illegal object with id=0"
 msgstr "Ongeldig object met id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #, java-format
 msgid ""
@@ -9120,5 +9385,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:303
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
 #, java-format
 msgid ""
@@ -9127,5 +9392,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
 #, java-format
 msgid ""
@@ -9134,5 +9399,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
@@ -9142,25 +9407,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:316
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with id {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#, java-format
 msgid "Missing required attribute ''{0}''."
-msgstr "Verplicht attribuut \"{0}\" ontbreekt."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
 #, java-format
 msgid ""
@@ -9168,5 +9433,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
 #, java-format
 msgid ""
@@ -9175,5 +9440,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
 #, java-format
 msgid ""
@@ -9181,5 +9446,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
 #, java-format
 msgid ""
@@ -9188,17 +9453,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
 msgid "Prepare OSM data..."
 msgstr "OSM-gegevens voorbereiden..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 msgid "Parsing OSM data..."
-msgstr "OSM-gegevens voorbereiden..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
 msgid "Preparing data set..."
-msgstr "Gegevens voorbereiden..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
@@ -9219,4 +9482,24 @@
 msgid "Downloading referring relations ..."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51
+#, fuzzy
+msgid "Reading changesets..."
+msgstr "Changeset sluiten"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
+#, fuzzy
+msgid "Downloading changesets ..."
+msgstr "Changeset sluiten"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85
+#, fuzzy, java-format
+msgid "Reading changeset {0} ..."
+msgstr "Lezen {0}..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91
+#, fuzzy, java-format
+msgid "Downloading changeset {0} ..."
+msgstr "Changeset sluiten"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
@@ -9233,10 +9516,14 @@
 msgstr "Met server verbinden..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
 msgid "Failed to open connection to API {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
+msgid "Error: failed to add authentication credentials to the connection."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -9244,33 +9531,52 @@
 "Kan niet met de OSM-server verbinden. Controleer je internetverbinding."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+msgid "XML tag <user> is missing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
+#, fuzzy, java-format
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgstr "Voorkeuze ''{0}'' van groep ''{1}'' gebruiken"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
+#, java-format
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
 msgid "Starting to upload with one request per primitive ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
 msgid "Starting to upload in one request ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:171
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135
 msgid "Uploading data ..."
-msgstr "Uploaden..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:178
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
 msgid ""
 "WARNING: no API version defined for data to upload. Falling back to version "
@@ -9278,5 +9584,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147
 #, java-format
 msgid ""
@@ -9286,10 +9592,10 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
 msgid "Update Plugins"
 msgstr "Plugins bijwerken"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 msgid "Download Plugins"
 msgstr "Plugins downloaden"
@@ -9450,5 +9756,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -9457,18 +9763,18 @@
 msgstr[1] "Plugin-informatie van {0} sites downloaden"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
 msgid "No plugin information found."
 msgstr "Geen plugin-informatie gevonden."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:93
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
 msgid "All installed plugins are up to date."
 msgstr "Alle geïnstalleerde plugins zijn bijgewerkt."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
 #, java-format
 msgid ""
@@ -9481,9 +9787,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
 msgid "Download missing plugins"
 msgstr "Ontbrekende plugins downloaden"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
 #, java-format
 msgid ""
@@ -9498,43 +9804,43 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
 msgid "unknown"
 msgstr "onbekend"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: versie {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 msgid "Plugin bundled with JOSM"
 msgstr "Plugin gebundeld met JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:357
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -9656,5 +9962,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:165
-#, fuzzy
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -9662,6 +9967,4 @@
 "community."
 msgstr ""
-"De grootte van het maximale omvattende gebied is 0.25 en je verzoek is te "
-"groot. Kies een kleiner gebied of gebruik planet.osm"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:168
@@ -9853,10 +10156,4 @@
 msgid "(What does that mean?)"
 msgstr ""
-
-#. item "Relations/Route" text "Symbol description"
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3148
-msgid "Description"
-msgstr "Beschrijving"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
@@ -10634,6 +10931,7 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
-msgid "Set "
-msgstr ""
+#, fuzzy, java-format
+msgid "Set {0} Lambert coordinates"
+msgstr "Hun coördinaten houden"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -11261,6 +11559,6 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 #: build/trans_style.java:990 build/trans_style.java:1007
-#: build/trans_style.java:1023 build/trans_style.java:3392
-#: build/trans_style.java:3400
+#: build/trans_style.java:1023 build/trans_style.java:3400
+#: build/trans_style.java:3408
 msgid "water"
 msgstr "water"
@@ -11556,4 +11854,55 @@
 msgstr "Metingen"
 
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Michigan Left"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Adds no left turn for sets of 4 or 5 ways."
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45
+#, fuzzy
+msgid "Please select 4 or 5 ways to assign no left turns."
+msgstr "Één of meer gesloten wegen met minstens vier knopen selecteren."
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61
+#, fuzzy, java-format
+msgid "{0} extrem nodes."
+msgstr "{0} knoop"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69
+#, java-format
+msgid "Via node {0}, {1}"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75
+#, fuzzy, java-format
+msgid "{0} via nodes."
+msgstr "{0} knoop"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78
+msgid "Unable to find via nodes. Please check your selection"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98
+#, fuzzy, java-format
+msgid "MIddle way: {0}"
+msgstr "Modus: {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121
+msgid "Create Michigan left turn restriction"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129
+#, fuzzy, java-format
+msgid "Processing {0}"
+msgstr "Versie {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142
+#, java-format
+msgid "Relation: from {0} to {1} via {2}"
+msgstr ""
+
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
 msgid "OpenLayers"
@@ -11707,7 +12056,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
-#, fuzzy
 msgid "create new objects"
-msgstr "Nieuwe node maken."
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
@@ -11771,7 +12119,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
-#, fuzzy
 msgid "Remote Control has been asked to create a new node."
-msgstr "Afstandsbediening is gevraagd gegevens uit de API te laden."
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
@@ -12032,5 +12379,5 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:158
 msgid "JOSM Tag Editor Plugin"
 msgstr ""
@@ -12040,5 +12387,5 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:370
 #, java-format
 msgid "Updating properties of up to {0} object"
@@ -12047,18 +12394,4 @@
 msgstr[1] ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44
-msgid "INFO: entering compatibilty mode for JOSM with Main.ds"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47
-msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49
-msgid ""
-"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-"found."
-msgstr ""
-
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
 msgid "Group"
@@ -12067,9 +12400,4 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
 msgid "Item"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-msgid "Filter"
 msgstr ""
 
@@ -12156,5 +12484,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2272
 msgid "Street name"
 msgstr "Straatnaam"
@@ -12324,8 +12652,4 @@
 msgid "Zoom (in metres)"
 msgstr "Zoom (in metres)"
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
-msgid "URL"
-msgstr "URL"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -12536,7 +12860,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501
-#, fuzzy
 msgid "Updating map ..."
-msgstr "Uploaden..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69
@@ -13034,7 +13357,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
-#: build/trans_style.java:4179
+#: build/trans_style.java:4159 build/trans_style.java:4166
+#: build/trans_style.java:4173 build/trans_style.java:4180
+#: build/trans_style.java:4187
 msgid "building"
 msgstr "gebouw"
@@ -13048,5 +13371,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4186
+#: build/trans_style.java:4194
 msgid "area"
 msgstr "gebied"
@@ -13177,10 +13500,10 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:148
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:155
 msgid "Reached a junction"
 msgstr ""
@@ -13473,7 +13796,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
-#, fuzzy
 msgid "Overlap tiles"
-msgstr "Overlappende gebieden"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
@@ -13482,7 +13804,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
-#, fuzzy
 msgid "% of north:"
-msgstr "noord"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -13631,6 +13952,11 @@
 msgstr ""
 
+#. Plugin michigan_left
+#: build/trans_plugins.java:35
+msgid "Adds no left turn for sets of 4 or 5 ways"
+msgstr ""
+
 #. Plugin nearclick
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid ""
 "Simulates a click when you do a small and short drag. This is usefull for "
@@ -13640,15 +13966,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13656,5 +13982,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13662,5 +13988,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13669,15 +13995,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13686,10 +14012,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13698,15 +14024,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -13716,10 +14042,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin usertools
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -13728,5 +14054,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -13735,5 +14061,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -13742,5 +14068,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -13749,10 +14075,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -13808,4 +14134,10 @@
 #. <annotations>
 #: build/trans_presets.java:57
+#, fuzzy
+msgid "Highways"
+msgstr "snelweg"
+
+#. group "Highways"
+#: build/trans_presets.java:58
 msgid "Streets"
 msgstr "Straten"
@@ -13816,5 +14148,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:58 build/trans_surveyor.java:72
+#: build/trans_presets.java:59 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Autosnelweg"
@@ -13823,5 +14155,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:61
+#: build/trans_presets.java:62
 msgid "Edit Motorway"
 msgstr "Een snelweg bewerken"
@@ -13848,8 +14180,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:120 build/trans_presets.java:140
-#: build/trans_presets.java:177 build/trans_presets.java:197
-#: build/trans_presets.java:1557 build/trans_presets.java:3146
+#: build/trans_presets.java:65 build/trans_presets.java:101
+#: build/trans_presets.java:121 build/trans_presets.java:141
+#: build/trans_presets.java:178 build/trans_presets.java:198
+#: build/trans_presets.java:1560 build/trans_presets.java:3158
 msgid "Reference"
 msgstr "Referentie"
@@ -13863,8 +14195,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:358
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:359
 msgid "Lanes"
 msgstr "Lanen"
@@ -13881,15 +14213,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:224 build/trans_presets.java:280
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:373 build/trans_presets.java:388
-#: build/trans_presets.java:412 build/trans_presets.java:431
-#: build/trans_presets.java:452 build/trans_presets.java:472
-#: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1307
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:225 build/trans_presets.java:281
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:374 build/trans_presets.java:389
+#: build/trans_presets.java:413 build/trans_presets.java:432
+#: build/trans_presets.java:453 build/trans_presets.java:473
+#: build/trans_presets.java:511 build/trans_presets.java:667
+#: build/trans_presets.java:1310
 msgid "Max. speed (km/h)"
 msgstr "Max. snelheid (km/u)"
@@ -13926,16 +14258,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:293 build/trans_presets.java:306
-#: build/trans_presets.java:320 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:464
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:659 build/trans_presets.java:1300
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:294 build/trans_presets.java:307
+#: build/trans_presets.java:321 build/trans_presets.java:353
+#: build/trans_presets.java:405 build/trans_presets.java:425
+#: build/trans_presets.java:445 build/trans_presets.java:465
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:660 build/trans_presets.java:1303
 msgid "Oneway"
 msgstr "Éénrichtingsweg"
@@ -13977,19 +14309,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:353
-#: build/trans_presets.java:362 build/trans_presets.java:405
-#: build/trans_presets.java:425 build/trans_presets.java:445
-#: build/trans_presets.java:465 build/trans_presets.java:485
-#: build/trans_presets.java:504 build/trans_presets.java:523
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:586 build/trans_presets.java:607
-#: build/trans_presets.java:628 build/trans_presets.java:660
-#: build/trans_presets.java:1301 build/trans_surveyor.java:12
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:354
+#: build/trans_presets.java:363 build/trans_presets.java:406
+#: build/trans_presets.java:426 build/trans_presets.java:446
+#: build/trans_presets.java:466 build/trans_presets.java:486
+#: build/trans_presets.java:505 build/trans_presets.java:524
+#: build/trans_presets.java:545 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629 build/trans_presets.java:661
+#: build/trans_presets.java:1304 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Brug"
@@ -14025,19 +14357,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:354
-#: build/trans_presets.java:378 build/trans_presets.java:406
-#: build/trans_presets.java:426 build/trans_presets.java:446
-#: build/trans_presets.java:466 build/trans_presets.java:486
-#: build/trans_presets.java:505 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629 build/trans_presets.java:661
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:355
+#: build/trans_presets.java:379 build/trans_presets.java:407
+#: build/trans_presets.java:427 build/trans_presets.java:447
+#: build/trans_presets.java:467 build/trans_presets.java:487
+#: build/trans_presets.java:506 build/trans_presets.java:525
+#: build/trans_presets.java:546 build/trans_presets.java:567
+#: build/trans_presets.java:588 build/trans_presets.java:609
+#: build/trans_presets.java:630 build/trans_presets.java:662
+#: build/trans_presets.java:1305
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -14071,18 +14403,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:73 build/trans_presets.java:90
-#: build/trans_presets.java:110 build/trans_presets.java:129
-#: build/trans_presets.java:150 build/trans_presets.java:166
-#: build/trans_presets.java:186 build/trans_presets.java:205
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:355
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:467
-#: build/trans_presets.java:487 build/trans_presets.java:506
-#: build/trans_presets.java:525 build/trans_presets.java:546
-#: build/trans_presets.java:567 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:630
-#: build/trans_presets.java:662 build/trans_presets.java:1303
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:356
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:468
+#: build/trans_presets.java:488 build/trans_presets.java:507
+#: build/trans_presets.java:526 build/trans_presets.java:547
+#: build/trans_presets.java:568 build/trans_presets.java:589
+#: build/trans_presets.java:610 build/trans_presets.java:631
+#: build/trans_presets.java:663 build/trans_presets.java:1306
 msgid "Cutting"
 msgstr "Verdieping"
@@ -14116,18 +14448,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:74 build/trans_presets.java:91
-#: build/trans_presets.java:111 build/trans_presets.java:130
-#: build/trans_presets.java:151 build/trans_presets.java:167
-#: build/trans_presets.java:187 build/trans_presets.java:206
-#: build/trans_presets.java:222 build/trans_presets.java:240
-#: build/trans_presets.java:258 build/trans_presets.java:277
-#: build/trans_presets.java:310 build/trans_presets.java:356
-#: build/trans_presets.java:408 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:468
-#: build/trans_presets.java:488 build/trans_presets.java:507
-#: build/trans_presets.java:526 build/trans_presets.java:547
-#: build/trans_presets.java:568 build/trans_presets.java:589
-#: build/trans_presets.java:610 build/trans_presets.java:631
-#: build/trans_presets.java:663 build/trans_presets.java:1304
+#: build/trans_presets.java:75 build/trans_presets.java:92
+#: build/trans_presets.java:112 build/trans_presets.java:131
+#: build/trans_presets.java:152 build/trans_presets.java:168
+#: build/trans_presets.java:188 build/trans_presets.java:207
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:357
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:469
+#: build/trans_presets.java:489 build/trans_presets.java:508
+#: build/trans_presets.java:527 build/trans_presets.java:548
+#: build/trans_presets.java:569 build/trans_presets.java:590
+#: build/trans_presets.java:611 build/trans_presets.java:632
+#: build/trans_presets.java:664 build/trans_presets.java:1307
 msgid "Embankment"
 msgstr "Verhoging"
@@ -14135,5 +14467,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Motorway Link"
 msgstr "Autosnelwegverbinding"
@@ -14142,5 +14474,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:80
+#: build/trans_presets.java:81
 msgid "Edit Motorway Link"
 msgstr "Een autosnelwegverbinding bewerken"
@@ -14148,5 +14480,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:94
+#: build/trans_presets.java:95
 msgid "Trunk"
 msgstr "Autoweg"
@@ -14155,5 +14487,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:97
+#: build/trans_presets.java:98
 msgid "Edit Trunk"
 msgstr "Een autoweg bewerken"
@@ -14163,6 +14495,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
 msgid "Motorroad"
 msgstr ""
@@ -14170,5 +14502,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:114
+#: build/trans_presets.java:115
 msgid "Trunk Link"
 msgstr "Autowegverbinding"
@@ -14177,5 +14509,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:117
+#: build/trans_presets.java:118
 msgid "Edit Trunk Link"
 msgstr "Een autowegverbinding bewerken"
@@ -14188,5 +14520,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:134 build/trans_surveyor.java:76
+#: build/trans_presets.java:135 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Provinciale hoofdweg"
@@ -14195,5 +14527,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:137
+#: build/trans_presets.java:138
 msgid "Edit Primary Road"
 msgstr "Een S-weg bewerken"
@@ -14201,10 +14533,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:154
+#: build/trans_presets.java:155
 msgid "Primary Link"
 msgstr "S-wegverbinding"
 
 #. item
-#: build/trans_presets.java:155
+#: build/trans_presets.java:156
 msgid "Edit Primary Link"
 msgstr "Een S-wegverbinding bewerken"
@@ -14216,5 +14548,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:170 build/trans_surveyor.java:80
+#: build/trans_presets.java:171 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "N-weg>400"
@@ -14224,5 +14556,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:174
+#: build/trans_presets.java:175
 msgid "Edit Secondary Road"
 msgstr "Een provinciale weg bewerken"
@@ -14230,5 +14562,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:190
+#: build/trans_presets.java:191
 msgid "Tertiary"
 msgstr "Tweebaansweg"
@@ -14238,5 +14570,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:194
+#: build/trans_presets.java:195
 msgid "Edit Tertiary Road"
 msgstr "Een tweebaansweg bewerken"
@@ -14248,5 +14580,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:209 build/trans_surveyor.java:84
+#: build/trans_presets.java:210 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Ongeklassificeerd"
@@ -14256,5 +14588,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:213
+#: build/trans_presets.java:214
 msgid "Edit Unclassified Road"
 msgstr "Een enkelbaansweg bewerken"
@@ -14281,19 +14613,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:225 build/trans_presets.java:243
-#: build/trans_presets.java:261 build/trans_presets.java:281
-#: build/trans_presets.java:314 build/trans_presets.java:359
-#: build/trans_presets.java:375 build/trans_presets.java:389
-#: build/trans_presets.java:413 build/trans_presets.java:432
-#: build/trans_presets.java:453 build/trans_presets.java:473
-#: build/trans_presets.java:491 build/trans_presets.java:511
-#: build/trans_presets.java:532 build/trans_presets.java:553
-#: build/trans_presets.java:574 build/trans_presets.java:595
-#: build/trans_presets.java:616 build/trans_presets.java:637
-#: build/trans_presets.java:667 build/trans_presets.java:680
-#: build/trans_presets.java:693 build/trans_presets.java:706
-#: build/trans_presets.java:719 build/trans_presets.java:732
-#: build/trans_presets.java:745 build/trans_presets.java:1308
-#: build/trans_presets.java:1498 build/trans_presets.java:1540
+#: build/trans_presets.java:226 build/trans_presets.java:244
+#: build/trans_presets.java:262 build/trans_presets.java:282
+#: build/trans_presets.java:315 build/trans_presets.java:360
+#: build/trans_presets.java:376 build/trans_presets.java:390
+#: build/trans_presets.java:414 build/trans_presets.java:433
+#: build/trans_presets.java:454 build/trans_presets.java:474
+#: build/trans_presets.java:492 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:554
+#: build/trans_presets.java:575 build/trans_presets.java:596
+#: build/trans_presets.java:617 build/trans_presets.java:638
+#: build/trans_presets.java:668 build/trans_presets.java:681
+#: build/trans_presets.java:694 build/trans_presets.java:707
+#: build/trans_presets.java:720 build/trans_presets.java:733
+#: build/trans_presets.java:746 build/trans_presets.java:1311
+#: build/trans_presets.java:1501 build/trans_presets.java:1543
 msgid "Width (meters)"
 msgstr "Breedte (meters)"
@@ -14305,5 +14637,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:228 build/trans_surveyor.java:88
+#: build/trans_presets.java:229 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Woongebied"
@@ -14312,5 +14644,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:231
+#: build/trans_presets.java:232
 msgid "Edit Residential Street"
 msgstr "Een straat bewerken"
@@ -14335,14 +14667,14 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:611
-#: build/trans_presets.java:632 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "Surface"
 msgstr "Oppervlakte"
@@ -14363,53 +14695,53 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paved"
 msgstr "verhard"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "unpaved"
 msgstr "onverhard"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
 msgid "metal"
 msgstr ""
@@ -14423,22 +14755,22 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
-#: build/trans_style.java:3367
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
+#: build/trans_style.java:3375
 msgid "wood"
 msgstr "oerbos"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paving_stones"
 msgstr ""
@@ -14446,77 +14778,77 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "cobblestone"
 msgstr "kinderhoofdjes"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "gravel"
 msgstr "gravel"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "grass"
 msgstr "gras"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "sand"
 msgstr "zand"
@@ -14524,13 +14856,13 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "ground"
 msgstr "gebied"
@@ -14538,5 +14870,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:246
+#: build/trans_presets.java:247
 msgid "Living Street"
 msgstr "Woonerf"
@@ -14545,5 +14877,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:249
+#: build/trans_presets.java:250
 msgid "Edit Living Street"
 msgstr "Een woonerf bewerken"
@@ -14551,5 +14883,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:264
+#: build/trans_presets.java:265
 msgid "Service"
 msgstr "Toegangsweg"
@@ -14558,5 +14890,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:267
+#: build/trans_presets.java:268
 msgid "Edit Serviceway"
 msgstr "Een toegangsweg bewerken"
@@ -14566,18 +14898,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "driveway"
 msgstr "oprit"
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "parking_aisle"
 msgstr ""
@@ -14585,5 +14917,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:284
+#: build/trans_presets.java:285
 msgid "Parking Aisle"
 msgstr "Parkeergang"
@@ -14593,5 +14925,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:288
+#: build/trans_presets.java:289
 msgid "Edit Parking Aisle"
 msgstr "Een parkeergang bewerken"
@@ -14599,5 +14931,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:298
+#: build/trans_presets.java:299
 msgid "Road (Unknown Type)"
 msgstr "Weg (onbekend soort)"
@@ -14606,5 +14938,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Edit Road of unknown type"
 msgstr "Een weg van onbekend soort bewerken"
@@ -14613,20 +14945,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:318
+#: build/trans_presets.java:319
 msgid "Road Restrictions"
 msgstr "Toegangsbeperkingen"
 
 #. item
-#: build/trans_presets.java:319
+#: build/trans_presets.java:320
 msgid "Edit Road Restrictions"
 msgstr "Toegangsbeperkingen bewerken"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:321
+#: build/trans_presets.java:322
 msgid "Toll"
 msgstr "Tol"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:322
+#: build/trans_presets.java:323
 msgid "No exit (cul-de-sac)"
 msgstr "Doodlopende weg"
@@ -14639,8 +14971,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:323 build/trans_presets.java:529
-#: build/trans_presets.java:550 build/trans_presets.java:571
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:634
+#: build/trans_presets.java:324 build/trans_presets.java:530
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:593 build/trans_presets.java:614
+#: build/trans_presets.java:635
 msgid "Access"
 msgstr "Toegang"
@@ -14694,29 +15026,29 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1397
-#: build/trans_presets.java:1398 build/trans_presets.java:1399
-#: build/trans_presets.java:1763 build/trans_presets.java:1773
-#: build/trans_presets.java:2397 build/trans_presets.java:2433
-#: build/trans_presets.java:2442 build/trans_presets.java:2443
-#: build/trans_presets.java:2444 build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:1396
+#: build/trans_presets.java:1397 build/trans_presets.java:1400
+#: build/trans_presets.java:1401 build/trans_presets.java:1402
+#: build/trans_presets.java:1767 build/trans_presets.java:1777
+#: build/trans_presets.java:2408 build/trans_presets.java:2444
+#: build/trans_presets.java:2453 build/trans_presets.java:2454
+#: build/trans_presets.java:2455 build/trans_presets.java:2725
 msgid "yes"
 msgstr "ja"
@@ -14729,40 +15061,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:212
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:212
 msgid "private"
 msgstr "privé"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655
 msgid "designated"
 msgstr "bestemmingsverkeer"
@@ -14775,19 +15107,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:219
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:219
 msgid "destination"
 msgstr "bestemming"
@@ -14810,71 +15142,71 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:205
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:205
 msgid "permissive"
 msgstr "toestemming"
 
-#: build/trans_presets.java:323 build/trans_presets.java:327
-#: build/trans_presets.java:330 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636
+#: build/trans_presets.java:324 build/trans_presets.java:328
+#: build/trans_presets.java:331 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637
 msgid "agricultural"
 msgstr "landbouw"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
-#: build/trans_presets.java:2433 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1396 build/trans_presets.java:1397
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
+#: build/trans_presets.java:2444 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
+#: build/trans_presets.java:2725
 msgid "no"
 msgstr "nee"
 
-#: build/trans_presets.java:326
+#: build/trans_presets.java:327
 msgid "Goods"
 msgstr "Goederen"
 
-#: build/trans_presets.java:327
+#: build/trans_presets.java:328
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Zwaar vrachtverkeer"
@@ -14889,10 +15221,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:328 build/trans_presets.java:651
-#: build/trans_presets.java:858 build/trans_presets.java:891
-#: build/trans_presets.java:913 build/trans_presets.java:950
-#: build/trans_presets.java:963 build/trans_presets.java:975
-#: build/trans_presets.java:987 build/trans_presets.java:999
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:329 build/trans_presets.java:652
+#: build/trans_presets.java:859 build/trans_presets.java:892
+#: build/trans_presets.java:914 build/trans_presets.java:951
+#: build/trans_presets.java:964 build/trans_presets.java:976
+#: build/trans_presets.java:988 build/trans_presets.java:1000
+#: build/trans_presets.java:1040
 msgid "Horse"
 msgstr "Ruiters"
@@ -14908,13 +15240,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:329 build/trans_presets.java:530
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:635 build/trans_presets.java:859
-#: build/trans_presets.java:877 build/trans_presets.java:892
-#: build/trans_presets.java:914 build/trans_presets.java:951
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:330 build/trans_presets.java:531
+#: build/trans_presets.java:552 build/trans_presets.java:573
+#: build/trans_presets.java:594 build/trans_presets.java:615
+#: build/trans_presets.java:636 build/trans_presets.java:860
+#: build/trans_presets.java:878 build/trans_presets.java:893
+#: build/trans_presets.java:915 build/trans_presets.java:952
+#: build/trans_presets.java:965 build/trans_presets.java:977
+#: build/trans_presets.java:989 build/trans_presets.java:1001
+#: build/trans_presets.java:1041
 msgid "Motorcycle"
 msgstr "Motorfiets"
@@ -14929,30 +15261,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:330 build/trans_presets.java:531
-#: build/trans_presets.java:552 build/trans_presets.java:573
-#: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:636 build/trans_presets.java:654
-#: build/trans_presets.java:878 build/trans_presets.java:893
-#: build/trans_presets.java:915 build/trans_presets.java:952
-#: build/trans_presets.java:965 build/trans_presets.java:977
-#: build/trans_presets.java:989 build/trans_presets.java:1001
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:331 build/trans_presets.java:532
+#: build/trans_presets.java:553 build/trans_presets.java:574
+#: build/trans_presets.java:595 build/trans_presets.java:616
+#: build/trans_presets.java:637 build/trans_presets.java:655
+#: build/trans_presets.java:879 build/trans_presets.java:894
+#: build/trans_presets.java:916 build/trans_presets.java:953
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1042
 msgid "Motorcar"
 msgstr "Gemotoriseerd verkeer"
 
-#: build/trans_presets.java:331
+#: build/trans_presets.java:332
 msgid "Public Service Vehicles (psv)"
 msgstr "Openbaar vervoer"
 
-#: build/trans_presets.java:332
+#: build/trans_presets.java:333
 msgid "Motorboat"
 msgstr "Motorboot"
 
-#: build/trans_presets.java:333
+#: build/trans_presets.java:334
 msgid "Boat"
 msgstr "Pleziervaart"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:336
 msgid "Min. speed (km/h)"
 msgstr "Min. snelheid (km/u)"
@@ -14960,25 +15292,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:336 build/trans_presets.java:374
+#: build/trans_presets.java:337 build/trans_presets.java:375
 msgid "Max. weight (tonnes)"
 msgstr "Max. gewicht (tonnen)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:337
+#: build/trans_presets.java:338
 msgid "Max. Height (meters)"
 msgstr "Max. hoogte (meters)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Max. Width (meters)"
 msgstr "Max. breedte (meters)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:339
+#: build/trans_presets.java:340
 msgid "Max. Length (meters)"
 msgstr "Max. lengte (meters)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:341
+#: build/trans_presets.java:342
 msgid "Roundabout"
 msgstr "Rotonde"
@@ -14989,5 +15321,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:346
+#: build/trans_presets.java:347
 msgid "Edit Junction"
 msgstr "Een splitsing bewerken"
@@ -15009,9 +15341,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:349 build/trans_presets.java:648
-#: build/trans_presets.java:788 build/trans_presets.java:1135
-#: build/trans_presets.java:1392 build/trans_presets.java:2353
-#: build/trans_presets.java:2901 build/trans_presets.java:2911
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:350 build/trans_presets.java:649
+#: build/trans_presets.java:789 build/trans_presets.java:1137
+#: build/trans_presets.java:1395 build/trans_presets.java:2364
+#: build/trans_presets.java:2913 build/trans_presets.java:2923
+#: build/trans_presets.java:2932
 msgid "Type"
 msgstr "Soort"
@@ -15031,10 +15363,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:547
+#: build/trans_presets.java:350 build/trans_style.java:547
 #: build/trans_style.java:555
 msgid "motorway"
 msgstr "Autosnelweg"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "motorway_link"
 msgstr "op- en afrit autosnelweg"
@@ -15056,10 +15388,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:563
+#: build/trans_presets.java:350 build/trans_style.java:563
 #: build/trans_style.java:571
 msgid "trunk"
 msgstr "autoweg"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "trunk_link"
 msgstr "op- en afrit autoweg"
@@ -15081,10 +15413,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:579
+#: build/trans_presets.java:350 build/trans_style.java:579
 #: build/trans_style.java:587
 msgid "primary"
 msgstr "provinciale weg"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "primary_link"
 msgstr "op- en afrit provinciale weg"
@@ -15106,5 +15438,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:595
+#: build/trans_presets.java:350 build/trans_style.java:595
 #: build/trans_style.java:603
 msgid "secondary"
@@ -15119,9 +15451,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:349 build/trans_style.java:611
+#: build/trans_presets.java:350 build/trans_style.java:611
 msgid "tertiary"
 msgstr "weg buiten bebouwde kom"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "unclassified"
 msgstr "niet geklassificeerd"
@@ -15135,9 +15467,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:349 build/trans_style.java:3143
+#: build/trans_presets.java:350 build/trans_style.java:3151
 msgid "residential"
 msgstr "woongebied"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "living_street"
 msgstr "woonerf"
@@ -15167,10 +15499,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:349 build/trans_style.java:667
-#: build/trans_style.java:4244
+#: build/trans_presets.java:350 build/trans_style.java:667
+#: build/trans_style.java:4252
 msgid "service"
 msgstr "toegangsweg"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "bus_guideway"
 msgstr "busbaan"
@@ -15200,6 +15532,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:349 build/trans_style.java:877
-#: build/trans_style.java:3208 build/trans_style.java:3209
+#: build/trans_presets.java:350 build/trans_style.java:877
+#: build/trans_style.java:3216 build/trans_style.java:3217
 msgid "construction"
 msgstr "werkzaamheden"
@@ -15210,10 +15542,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Edit Bridge"
 msgstr "Een brug bewerken"
 
 #. item
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "Edit Tunnel"
 msgstr "Een tunnel bewerken"
@@ -15221,19 +15553,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:393
+#: build/trans_presets.java:394
 msgid "Ways"
 msgstr "Wegen"
 
 #. group "Ways"
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Construction"
 msgstr "Werkzaamheden"
 
 #. item
-#: build/trans_presets.java:395
+#: build/trans_presets.java:396
 msgid "Edit Highway Under Construction"
 msgstr "Een autosnelweg met werkzaamheden bewerken"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "Junction"
 msgstr "Splitsing"
@@ -15249,5 +15581,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:411 build/trans_style.java:895
+#: build/trans_presets.java:412 build/trans_style.java:895
 msgid "roundabout"
 msgstr "rotonde"
@@ -15256,5 +15588,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:417
+#: build/trans_presets.java:418
 msgid "Bridleway"
 msgstr "Ruiterpad"
@@ -15262,5 +15594,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:419
+#: build/trans_presets.java:420
 msgid "Edit Bridleway"
 msgstr "Ruiterpad bewerken"
@@ -15268,5 +15600,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:435
+#: build/trans_presets.java:436
 msgid "Cycleway"
 msgstr "Fietspad"
@@ -15276,10 +15608,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:439
+#: build/trans_presets.java:440
 msgid "Edit Cycleway"
 msgstr "Fietspad bewerken"
 
 #. item "Ways/Cycleway" check "Embankment"
-#: build/trans_presets.java:449
+#: build/trans_presets.java:450
 msgid "Pedestrians"
 msgstr ""
@@ -15287,5 +15619,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Footway"
 msgstr "Voetpad"
@@ -15294,10 +15626,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Footway"
 msgstr "Voetpad bewerken"
 
 #. item "Ways/Footway" check "Embankment"
-#: build/trans_presets.java:469
+#: build/trans_presets.java:470
 msgid "Bikes"
 msgstr ""
@@ -15305,5 +15637,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:476
+#: build/trans_presets.java:477
 msgid "Pedestrian"
 msgstr "Voetgangers"
@@ -15312,5 +15644,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Edit Pedestrian Street"
 msgstr "Voetgangerszone bewerken"
@@ -15318,5 +15650,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:494
+#: build/trans_presets.java:495
 msgid "Steps"
 msgstr "Trap"
@@ -15326,5 +15658,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:498
+#: build/trans_presets.java:499
 msgid "Edit Flight of Steps"
 msgstr "Trap bewerken"
@@ -15333,5 +15665,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:515
+#: build/trans_presets.java:516
 msgid "Track"
 msgstr "Track"
@@ -15340,5 +15672,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:518
+#: build/trans_presets.java:519
 msgid "Edit Track"
 msgstr "Track bewerken"
@@ -15346,5 +15678,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:535
+#: build/trans_presets.java:536
 msgid "Track Grade 1"
 msgstr "Track (klasse 1)"
@@ -15353,5 +15685,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:538
+#: build/trans_presets.java:539
 msgid "Edit Track of grade 1"
 msgstr "Klasse-1-track bewerken"
@@ -15359,5 +15691,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:556
+#: build/trans_presets.java:557
 msgid "Track Grade 2"
 msgstr "Track (klasse 2)"
@@ -15366,5 +15698,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:559
+#: build/trans_presets.java:560
 msgid "Edit Track of grade 2"
 msgstr "Klasse-2-track bewerken"
@@ -15372,5 +15704,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:577
+#: build/trans_presets.java:578
 msgid "Track Grade 3"
 msgstr "Track (klasse 3)"
@@ -15379,5 +15711,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:580
+#: build/trans_presets.java:581
 msgid "Edit Track of grade 3"
 msgstr "Klasse-3-track bewerken"
@@ -15385,5 +15717,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:598
+#: build/trans_presets.java:599
 msgid "Track Grade 4"
 msgstr "Track (klasse 4)"
@@ -15392,5 +15724,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:601
+#: build/trans_presets.java:602
 msgid "Edit Track of grade 4"
 msgstr "Klasse-4-track bewerken"
@@ -15398,5 +15730,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:619
+#: build/trans_presets.java:620
 msgid "Track Grade 5"
 msgstr "Track (klasse 5)"
@@ -15405,5 +15737,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:622
+#: build/trans_presets.java:623
 msgid "Edit Track of grade 5"
 msgstr "Klasse-5-track bewerken"
@@ -15412,5 +15744,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:641
+#: build/trans_presets.java:642
 msgid "Path"
 msgstr "Pad"
@@ -15419,13 +15751,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:644
+#: build/trans_presets.java:645
 msgid "Edit Path"
 msgstr "Pad bewerken"
 
-#: build/trans_presets.java:652
+#: build/trans_presets.java:653
 msgid "Ski"
 msgstr "Ski"
 
-#: build/trans_presets.java:653
+#: build/trans_presets.java:654
 msgid "Snowmobile"
 msgstr "Sneeuwscooter"
@@ -15435,6 +15767,6 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:670 build/trans_presets.java:1725
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:671 build/trans_presets.java:1729
+#: build/trans_presets.java:1752
 msgid "Hiking"
 msgstr "Wandelen"
@@ -15444,5 +15776,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:674
+#: build/trans_presets.java:675
 msgid "Edit Hiking"
 msgstr "Wandelen bewerken"
@@ -15450,5 +15782,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:683
+#: build/trans_presets.java:684
 msgid "Mountain Hiking"
 msgstr "Bergwandelen"
@@ -15458,5 +15790,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:687
+#: build/trans_presets.java:688
 msgid "Edit Mountain Hiking"
 msgstr "Bergwandelen bewerken"
@@ -15464,5 +15796,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:696
+#: build/trans_presets.java:697
 msgid "Demanding Mountain Hiking"
 msgstr "Bergwandelen (stevig)"
@@ -15472,5 +15804,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:700
+#: build/trans_presets.java:701
 msgid "Edit Demanding Mountain Hiking"
 msgstr "Bergwandelen (stevig) bewerken"
@@ -15478,5 +15810,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:709
+#: build/trans_presets.java:710
 msgid "Alpine Hiking"
 msgstr "Bergklimmen"
@@ -15486,5 +15818,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:713
+#: build/trans_presets.java:714
 msgid "Edit Alpine Hiking"
 msgstr "Bergklimmen bewerken"
@@ -15492,5 +15824,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:723
 msgid "Demanding Alpine Hiking"
 msgstr "Bergklimmen (stevig)"
@@ -15500,5 +15832,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:726
+#: build/trans_presets.java:727
 msgid "Edit Demanding Alpine Hiking"
 msgstr "Bergklimmen (stevig) bewerken"
@@ -15506,5 +15838,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:735
+#: build/trans_presets.java:736
 msgid "Difficult Alpine Hiking"
 msgstr "Bergklimmen (moeilijk)"
@@ -15514,5 +15846,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:739
+#: build/trans_presets.java:740
 msgid "Edit Difficult Alpine Hiking"
 msgstr "Bergklimmen (moeilijk) bewerken"
@@ -15520,10 +15852,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:749
+#: build/trans_presets.java:750
 msgid "Waypoints"
 msgstr "Waypoints"
 
 #. group "Waypoints"
-#: build/trans_presets.java:750
+#: build/trans_presets.java:751
 msgid "Motorway Junction"
 msgstr "Snelwegkruising"
@@ -15531,15 +15863,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:752
+#: build/trans_presets.java:753
 msgid "Edit Motorway Junction"
 msgstr "Snelwegkruising bewerken"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:757
 msgid "Number"
 msgstr "Nummer"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:759
 msgid "Services"
 msgstr "Diensten"
@@ -15547,5 +15879,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:761
 msgid "Edit Service Station"
 msgstr "Rustplaats bewerken"
@@ -15583,15 +15915,15 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:765 build/trans_presets.java:902
-#: build/trans_presets.java:1382 build/trans_presets.java:1406
-#: build/trans_presets.java:1413 build/trans_presets.java:1419
-#: build/trans_presets.java:1427 build/trans_presets.java:1434
-#: build/trans_presets.java:1761 build/trans_presets.java:1771
-#: build/trans_presets.java:2361 build/trans_presets.java:2368
-#: build/trans_presets.java:2384 build/trans_presets.java:2395
-#: build/trans_presets.java:2403 build/trans_presets.java:2410
-#: build/trans_presets.java:2464 build/trans_presets.java:2512
-#: build/trans_presets.java:2678 build/trans_presets.java:2693
-#: build/trans_presets.java:2732 build/trans_presets.java:3151
+#: build/trans_presets.java:766 build/trans_presets.java:903
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
+#: build/trans_presets.java:1416 build/trans_presets.java:1422
+#: build/trans_presets.java:1430 build/trans_presets.java:1437
+#: build/trans_presets.java:1765 build/trans_presets.java:1775
+#: build/trans_presets.java:2372 build/trans_presets.java:2379
+#: build/trans_presets.java:2395 build/trans_presets.java:2406
+#: build/trans_presets.java:2414 build/trans_presets.java:2421
+#: build/trans_presets.java:2475 build/trans_presets.java:2523
+#: build/trans_presets.java:2689 build/trans_presets.java:2704
+#: build/trans_presets.java:2743 build/trans_presets.java:3163
 msgid "Operator"
 msgstr "Bedrijf"
@@ -15600,5 +15932,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:769
+#: build/trans_presets.java:770
 msgid "Traffic Signal"
 msgstr "Verkeerslicht"
@@ -15608,5 +15940,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:774
 msgid "Pedestrian crossing type"
 msgstr "Soort voetgangersoversteekplaats"
@@ -15615,27 +15947,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "uncontrolled"
 msgstr "zonder verkeerslichten"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "traffic_signals"
 msgstr "verkeerslichten"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "island"
 msgstr "eiland"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "unmarked"
 msgstr "ongemarkeerd"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:774 build/trans_presets.java:790
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:775 build/trans_presets.java:791
+#: build/trans_presets.java:1334
 msgid "Cross on horseback"
 msgstr "Als ruiter oversteken"
@@ -15643,6 +15975,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:775 build/trans_presets.java:789
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:776 build/trans_presets.java:790
+#: build/trans_presets.java:1335
 msgid "Cross by bicycle"
 msgstr "Op de fiets oversteken"
@@ -15651,11 +15983,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:776 build/trans_presets.java:791
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:1336
 msgid "Crossing attendant"
 msgstr "Klaar-over"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:778
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -15663,30 +15995,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pelican"
 msgstr "pelicaan"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:780
+#: build/trans_presets.java:781
 msgid "Stop"
 msgstr "Stop"
@@ -15694,5 +16026,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:783
+#: build/trans_presets.java:784
 msgid "Pedestrian Crossing"
 msgstr "Voetgangersoversteekplaats"
@@ -15701,14 +16033,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:786
+#: build/trans_presets.java:787
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:793
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:795
 msgid "Mini-roundabout"
 msgstr "Mini-rotonde"
@@ -15719,14 +16051,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "Direction"
 msgstr "Richting"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "clockwise"
 msgstr "met de klok mee"
 
-#: build/trans_presets.java:801
+#: build/trans_presets.java:802
 msgid "Turning Circle"
 msgstr "Draaicirkel"
@@ -15736,20 +16068,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:806
+#: build/trans_presets.java:807
 msgid "City Limit"
 msgstr "Stadsgrens"
 
 #. item
-#: build/trans_presets.java:807
+#: build/trans_presets.java:808
 msgid "Edit City Limit Sign"
 msgstr "Bord stadsgrens bewerken"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:812
+#: build/trans_presets.java:813
 msgid "Second Name"
 msgstr "Tweede naam"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:814
+#: build/trans_presets.java:815
 msgid "Speed Camera"
 msgstr "Snelheidscamera"
@@ -15757,5 +16089,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:817
+#: build/trans_presets.java:818
 msgid "Emergency Phone"
 msgstr "Praatpaal"
@@ -15763,5 +16095,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:820
+#: build/trans_presets.java:821
 msgid "Incline"
 msgstr ""
@@ -15769,5 +16101,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:823
+#: build/trans_presets.java:824
 msgid "Incline Steep"
 msgstr ""
@@ -15776,10 +16108,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:827
+#: build/trans_presets.java:828
 msgid "Ford"
 msgstr "Doorwaadplek"
 
 #. item
-#: build/trans_presets.java:828
+#: build/trans_presets.java:829
 msgid "Edit Ford"
 msgstr "Doorwaadplek bewerken"
@@ -15787,5 +16119,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:835
+#: build/trans_presets.java:836
 msgid "Mountain Pass"
 msgstr "Bergpas"
@@ -15793,5 +16125,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:837
+#: build/trans_presets.java:838
 msgid "Edit Mountain Pass"
 msgstr "Bergpas bewerken"
@@ -15803,7 +16135,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:842 build/trans_presets.java:1600
-#: build/trans_presets.java:1745 build/trans_presets.java:2845
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:843 build/trans_presets.java:1604
+#: build/trans_presets.java:1749 build/trans_presets.java:2857
+#: build/trans_presets.java:2864 build/trans_presets.java:2871
 msgid "Elevation"
 msgstr "Stijging"
@@ -15811,5 +16143,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:846
+#: build/trans_presets.java:847
 msgid "Barriers"
 msgstr "Barrières"
@@ -15817,5 +16149,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:849
+#: build/trans_presets.java:850
 msgid "Bollard"
 msgstr "Verkeerspaal"
@@ -15823,5 +16155,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:852
 msgid "Edit Bollard"
 msgstr "Verkeerspaal bewerken"
@@ -15866,16 +16198,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:854 build/trans_presets.java:873
-#: build/trans_presets.java:887 build/trans_presets.java:909
-#: build/trans_presets.java:946 build/trans_presets.java:959
-#: build/trans_presets.java:971 build/trans_presets.java:983
-#: build/trans_presets.java:995 build/trans_presets.java:1007
-#: build/trans_presets.java:1017 build/trans_presets.java:1026
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:855 build/trans_presets.java:874
+#: build/trans_presets.java:888 build/trans_presets.java:910
+#: build/trans_presets.java:947 build/trans_presets.java:960
+#: build/trans_presets.java:972 build/trans_presets.java:984
+#: build/trans_presets.java:996 build/trans_presets.java:1008
+#: build/trans_presets.java:1018 build/trans_presets.java:1027
+#: build/trans_presets.java:1036
 msgid "Allowed traffic:"
 msgstr "Toegestaan verkeer:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:861
+#: build/trans_presets.java:862
 msgid "Cycle Barrier"
 msgstr ""
@@ -15884,5 +16216,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:865
+#: build/trans_presets.java:866
 msgid "Block"
 msgstr "Blok"
@@ -15890,5 +16222,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:868
+#: build/trans_presets.java:869
 msgid "Cattle Grid"
 msgstr "Wildrooster"
@@ -15896,10 +16228,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:870
+#: build/trans_presets.java:871
 msgid "Edit Cattle Grid"
 msgstr "Wildrooster bewerken"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:880
+#: build/trans_presets.java:881
 msgid "Bus Trap"
 msgstr "Bussluis"
@@ -15907,15 +16239,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:883
+#: build/trans_presets.java:884
 msgid "Spikes"
 msgstr "Pennen"
 
 #. item
-#: build/trans_presets.java:884
+#: build/trans_presets.java:885
 msgid "Edit Spikes"
 msgstr "Spijkers bewerken"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:896
 msgid "Toll Booth"
 msgstr "Tolpoort"
@@ -15923,5 +16255,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:897
+#: build/trans_presets.java:898
 msgid "Edit Toll Booth"
 msgstr "Tolpoort bewerken"
@@ -15929,10 +16261,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:905
+#: build/trans_presets.java:906
 msgid "Border Control"
 msgstr "Grenspost"
 
 #. item
-#: build/trans_presets.java:906
+#: build/trans_presets.java:907
 msgid "Edit Border Control"
 msgstr "Grenspost bewerken"
@@ -15942,5 +16274,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:920
+#: build/trans_presets.java:921
 msgid "Hedge"
 msgstr "Haag"
@@ -15949,5 +16281,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:925
 msgid "Fence"
 msgstr "Hek"
@@ -15956,5 +16288,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:929
 msgid "Wall"
 msgstr "Muur"
@@ -15962,5 +16294,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:931
+#: build/trans_presets.java:932
 msgid "City Wall"
 msgstr "Stadsmuur"
@@ -15969,5 +16301,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:935
+#: build/trans_presets.java:936
 msgid "Retaining Wall"
 msgstr "Stutmuur"
@@ -15979,15 +16311,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:942
+#: build/trans_presets.java:943
 msgid "Entrance"
 msgstr "Ingang"
 
 #. item
-#: build/trans_presets.java:943
+#: build/trans_presets.java:944
 msgid "Edit Entrance"
 msgstr "Ingang bewerken"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:954
+#: build/trans_presets.java:955
 msgid "Gate"
 msgstr "Poort"
@@ -15995,50 +16327,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:956
+#: build/trans_presets.java:957
 msgid "Edit Gate"
 msgstr "Poort bewerken"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:967
+#: build/trans_presets.java:968
 msgid "Lift Gate"
 msgstr "Slagboom"
 
 #. item
-#: build/trans_presets.java:968
+#: build/trans_presets.java:969
 msgid "Edit Lift Gate"
 msgstr "Slagboom bewerken"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:979
+#: build/trans_presets.java:980
 msgid "Hampshire Gate"
 msgstr "Draadhek"
 
 #. item
-#: build/trans_presets.java:980
+#: build/trans_presets.java:981
 msgid "Edit Hampshire Gate"
 msgstr "Draadhek bewerken"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:991
+#: build/trans_presets.java:992
 msgid "Bump Gate"
 msgstr "Botspoort"
 
 #. item
-#: build/trans_presets.java:992
+#: build/trans_presets.java:993
 msgid "Edit Bump Gate"
 msgstr "Botspoort bewerken"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:1003
+#: build/trans_presets.java:1004
 msgid "Kissing Gate"
 msgstr "Sluipdoorhek"
 
 #. item
-#: build/trans_presets.java:1004
+#: build/trans_presets.java:1005
 msgid "Edit Kissing Gate"
 msgstr "Sluipdoorhek bewerken"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1013
 msgid "Stile"
 msgstr "Overstap"
@@ -16046,25 +16378,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1014
+#: build/trans_presets.java:1015
 msgid "Edit Stile"
 msgstr "Overstap bewerken"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1023
 msgid "Turnstile"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1024
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1032
 msgid "Sally Port"
 msgstr "Gekoppelde deuren"
 
 #. item
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1033
 msgid "Edit Sally Port"
 msgstr "Gekoppelde deuren bewerken"
@@ -16072,13 +16404,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #.
-#. <separator/>
+#. group "Water"
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1046 build/trans_presets.java:1089
+#: build/trans_presets.java:1047 build/trans_presets.java:1048
+#: build/trans_presets.java:1091
 msgid "Water"
 msgstr "Water"
 
 #. group "Water"
-#: build/trans_presets.java:1047
+#: build/trans_presets.java:1049
 msgid "Spring"
 msgstr "Bron"
@@ -16086,5 +16419,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1049
+#: build/trans_presets.java:1051
 msgid "Edit Spring"
 msgstr "Bron bewerken"
@@ -16092,5 +16425,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1056
 msgid "Drain"
 msgstr "Sloot"
@@ -16098,10 +16431,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1058
 msgid "Edit Drain"
 msgstr "Sloot bewerken"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1064
 msgid "Stream"
 msgstr "Stroom"
@@ -16109,10 +16442,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1066
 msgid "Edit Stream"
 msgstr "Stroom bewerken"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1072
 msgid "Canal"
 msgstr "Kanaal"
@@ -16120,10 +16453,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1074
 msgid "Edit Canal"
 msgstr "Kanaal bewerken"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1080
 msgid "River"
 msgstr "Rivier"
@@ -16133,5 +16466,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1084
 msgid "Edit River"
 msgstr "Rivier bewerken"
@@ -16139,15 +16472,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1093
 msgid "Edit Water"
 msgstr "Water bewerken"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1097
 msgid "Land"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1098
 msgid "Edit Land"
 msgstr "Land bewerken"
@@ -16155,15 +16488,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1103
 msgid "Basin"
 msgstr "Estuarium"
 
 #. item
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1104
 msgid "Edit Basin Landuse"
 msgstr "Estuarium bewerken"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1109
 msgid "Reservoir"
 msgstr "Reservoir"
@@ -16171,15 +16504,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1109
+#: build/trans_presets.java:1111
 msgid "Edit Reservoir Landuse"
 msgstr "Reservoir bewerken"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1116
 msgid "Covered Reservoir"
 msgstr "Ondergronds reservoir"
 
 #. item
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1117
 msgid "Edit Covered Reservoir"
 msgstr "Ondergronds reservoir bewerken"
@@ -16187,5 +16520,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1120
+#: build/trans_presets.java:1122
 msgid "Riverbank"
 msgstr "Rivierbank"
@@ -16194,10 +16527,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1125
 msgid "Edit Riverbank"
 msgstr "Rivierbank bewerken"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1127
+#: build/trans_presets.java:1129
 msgid "Wetland"
 msgstr "Drasland"
@@ -16208,14 +16541,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1134
 msgid "Edit Wetland"
 msgstr "Drasland bewerken"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "swamp"
 msgstr "Moeras"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "bog"
 msgstr "veen"
@@ -16229,35 +16562,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1135 build/trans_style.java:3384
+#: build/trans_presets.java:1137 build/trans_style.java:3392
 msgid "marsh"
 msgstr "moeras"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "reedbed"
 msgstr "rietveld"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "saltmarsh"
 msgstr "Zoutwatermoeras"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "tidalflat"
 msgstr "slik"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "mangrove"
 msgstr "mangroven"
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1139
 msgid "Mud"
 msgstr "Modder"
 
 #. item
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1140
 msgid "Edit Mud"
 msgstr "Modder bewerken"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1144
 msgid "Beach"
 msgstr "Strand"
@@ -16265,20 +16598,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1144
+#: build/trans_presets.java:1146
 msgid "Edit Beach"
 msgstr "Strand bewerken"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1150
 msgid "Bay"
 msgstr "Baai"
 
 #. item
-#: build/trans_presets.java:1149
+#: build/trans_presets.java:1151
 msgid "Edit Bay"
 msgstr "Baai bewerken"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1155
 msgid "Cliff"
 msgstr "Klif"
@@ -16286,10 +16619,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1157
 msgid "Edit Cliff"
 msgstr "Klif bewerken"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1159
+#: build/trans_presets.java:1161
 msgid "Coastline"
 msgstr "Kustlijn"
@@ -16297,5 +16630,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1163
 msgid "Edit Coastline"
 msgstr "Kustlijn bewerken"
@@ -16303,5 +16636,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1168
 msgid "Ferry Route"
 msgstr "Veerpontroute"
@@ -16309,5 +16642,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1170
 msgid "Edit Ferry"
 msgstr "Veerpontroute bewerken"
@@ -16316,5 +16649,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1176
+#: build/trans_presets.java:1178
 msgid "Boatyard"
 msgstr "Scheepswerf"
@@ -16322,10 +16655,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:1180
 msgid "Edit Boatyard"
 msgstr "Scheepswerf bewerken"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1185
 msgid "Dock"
 msgstr "Dok"
@@ -16333,5 +16666,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1187
 msgid "Edit Dock"
 msgstr "Dok bewerken"
@@ -16339,5 +16672,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1193
 msgid "Dam"
 msgstr "Dam"
@@ -16345,15 +16678,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1195
 msgid "Edit Dam"
 msgstr "Dam bewerken"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1199
+#: build/trans_presets.java:1201
 msgid "Waterway Point"
 msgstr "Waterwegpunt"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1202
 msgid "Lock Gate"
 msgstr "Sluis"
@@ -16362,5 +16695,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1206
 msgid "Weir"
 msgstr "Stuw"
@@ -16368,20 +16701,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1208
 msgid "Edit Weir"
 msgstr "Stuw bewerken"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1213
 msgid "Waterfall"
 msgstr "Waterval"
 
 #. item
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1214
 msgid "Edit Waterfall"
 msgstr "Waterval bewerken"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1219
 msgid "Turning Point"
 msgstr "Zwaaiplaats"
@@ -16390,15 +16723,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1221
+#: build/trans_presets.java:1223
 msgid "Marina"
 msgstr "Jachthaven"
 
 #. item
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1224
 msgid "Edit Marina"
 msgstr "Jachthaven bewerken"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1228
 msgid "Pier"
 msgstr "Pier"
@@ -16406,10 +16739,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1230
 msgid "Edit Pier"
 msgstr "Pier bewerken"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1234
 msgid "Ferry Terminal"
 msgstr "Veerbootterminal"
@@ -16417,10 +16750,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1236
 msgid "Edit Ferry Terminal"
 msgstr "Veerbootterminal bewerken"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1240
 msgid "Slipway"
 msgstr "Trailerhelling"
@@ -16430,16 +16763,21 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1244
 msgid "Edit Slipway"
 msgstr "Trailerhelling bewerken"
 
 #. item "Waterway Point/Slipway" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1250
+#, fuzzy
+msgid "Transport"
+msgstr "Openbaar vervoer"
+
+#. group "Transport"
+#: build/trans_presets.java:1251
 msgid "Railway"
 msgstr "Spoorweg"
 
 #. group "Railway"
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1252
 msgid "Rail"
 msgstr "Spoor"
@@ -16447,5 +16785,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:1254
 msgid "Edit Rail"
 msgstr "Spoor bewerken"
@@ -16475,8 +16813,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "Optional Types"
 msgstr "Optionele soorten"
@@ -16490,35 +16828,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "yard"
 msgstr "tuin"
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "siding"
 msgstr "nevenweg"
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "spur"
 msgstr "privéoprit"
 
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1259
 msgid "Narrow Gauge Rail"
 msgstr "Smalspoor"
 
 #. item
-#: build/trans_presets.java:1257
+#: build/trans_presets.java:1260
 msgid "Edit Narrow Gauge Rail"
 msgstr "Smalspoor bewerken"
 
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1265
 msgid "Monorail"
 msgstr "Monorail"
@@ -16526,45 +16864,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1267
 msgid "Edit Monorail"
 msgstr "Monorail bewerken"
 
-#: build/trans_presets.java:1269
+#: build/trans_presets.java:1272
 msgid "Preserved"
 msgstr "Museumspoor"
 
 #. item
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1273
 msgid "Edit Preserved Railway"
 msgstr "Een museumspoorweg bewerken"
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1278
 msgid "Light Rail"
 msgstr "Sneltram"
 
 #. item
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1279
 msgid "Edit Light Rail"
 msgstr "Sneltram bewerken"
 
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1284
 msgid "Subway"
 msgstr "Metro"
 
 #. item
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1285
 msgid "Edit Subway"
 msgstr "Metro bewerken"
 
-#: build/trans_presets.java:1287
+#: build/trans_presets.java:1290
 msgid "Tram"
 msgstr "Tram"
 
 #. item
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1291
 msgid "Edit Tram"
 msgstr "Tram bewerken"
 
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1296
 msgid "Bus Guideway"
 msgstr "Busbaan"
@@ -16572,5 +16910,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1295
+#: build/trans_presets.java:1298
 msgid "Edit Bus Guideway"
 msgstr "Busbaan bewerken"
@@ -16579,14 +16917,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1315
 msgid "Disused Rail"
 msgstr "Ongebruikt spoor"
 
 #. item
-#: build/trans_presets.java:1313
+#: build/trans_presets.java:1316
 msgid "Edit Disused Railway"
 msgstr "Ongebruikt spoor bewerken"
 
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1321
 msgid "Abandoned Rail"
 msgstr "Verwijderd spoor"
@@ -16595,5 +16933,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1325
 msgid "Level Crossing"
 msgstr "Bewaakte spoorwegovergang"
@@ -16602,5 +16940,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1329
 msgid "Crossing"
 msgstr "Onbewaakte spporwegovergang"
@@ -16610,5 +16948,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1333
 msgid "Crossing type"
 msgstr ""
@@ -16616,5 +16954,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1339
 msgid "Turntable"
 msgstr "Draaiplateau"
@@ -16623,10 +16961,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1344
 msgid "Aerialway"
 msgstr "Kabelbaan"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1345
 msgid "Chair Lift"
 msgstr "Stoeltjeslift"
@@ -16634,10 +16972,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1347
 msgid "Edit Chair Lift"
 msgstr "Stoeltjeslift bewerken"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1351
 msgid "Drag Lift"
 msgstr "Sleeplift"
@@ -16645,10 +16983,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1353
 msgid "Edit Drag Lift"
 msgstr "Sleeplift bewerken"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1357
 msgid "Cable Car"
 msgstr "Kabinebaan"
@@ -16656,10 +16994,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1359
 msgid "Edit Cable Car"
 msgstr "Kabinebaan bewerken"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1360
+#: build/trans_presets.java:1363
 msgid "Gondola"
 msgstr ""
@@ -16667,5 +17005,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1365
 msgid "Edit Gondola"
 msgstr ""
@@ -16673,5 +17011,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1366 build/trans_presets.java:1461
+#: build/trans_presets.java:1369 build/trans_presets.java:1464
 msgid "Station"
 msgstr "Station"
@@ -16682,10 +17020,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1368 build/trans_presets.java:1464
+#: build/trans_presets.java:1371 build/trans_presets.java:1467
 msgid "Edit Station"
 msgstr "Station bewerken"
 
 #. group "Car"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1378
 msgid "Fuel"
 msgstr "Brandstof"
@@ -16695,5 +17033,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1382
 msgid "Edit Fuel"
 msgstr "Brandstof bewerken"
@@ -16751,32 +17089,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1671 build/trans_presets.java:1678
-#: build/trans_presets.java:1686 build/trans_presets.java:1699
-#: build/trans_presets.java:1713 build/trans_presets.java:1810
-#: build/trans_presets.java:1818 build/trans_presets.java:1909
-#: build/trans_presets.java:1915 build/trans_presets.java:2226
-#: build/trans_presets.java:2250 build/trans_presets.java:2465
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1703
+#: build/trans_presets.java:1717 build/trans_presets.java:1814
+#: build/trans_presets.java:1822 build/trans_presets.java:1919
+#: build/trans_presets.java:1925 build/trans_presets.java:2237
+#: build/trans_presets.java:2261 build/trans_presets.java:2476
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Opening Hours"
 msgstr "Openingstijden"
@@ -16835,91 +17173,91 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -16934,5 +17272,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1385 build/trans_presets.java:1438
+#: build/trans_presets.java:1388 build/trans_presets.java:1441
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -16942,5 +17280,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1391
 msgid "Edit Parking"
 msgstr "Parkeerplaats bewerken"
@@ -16951,24 +17289,24 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1391 build/trans_presets.java:1762
-#: build/trans_presets.java:1772 build/trans_presets.java:2396
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:1394 build/trans_presets.java:1766
+#: build/trans_presets.java:1776 build/trans_presets.java:2407
+#: build/trans_presets.java:2524
 msgid "Reference number"
 msgstr "Referentienummer"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "multi-storey"
 msgstr "meerlaags"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "surface"
 msgstr "oppervlak"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "underground"
 msgstr "ondergronds"
 
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1396
 msgid "Park and Ride"
 msgstr ""
@@ -16977,38 +17315,38 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1394 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
+#: build/trans_presets.java:1397 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
 msgid "Fee"
 msgstr "Parkeergeld"
 
 #. <space />
-#: build/trans_presets.java:1396
+#: build/trans_presets.java:1399
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1400
 msgid "Spaces for Disabled"
 msgstr "Gehandicaptenplaats"
 
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1401
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1402
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1403
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1405
 msgid "Wash"
 msgstr "Wasstraat"
 
 #. item
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1406
 msgid "Edit Car Wash"
 msgstr "Autowasstraat bewerken"
@@ -17016,5 +17354,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1408 build/trans_presets.java:1452
+#: build/trans_presets.java:1411 build/trans_presets.java:1455
 msgid "Shop"
 msgstr "Winkel"
@@ -17022,15 +17360,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1413
 msgid "Edit Car Shop"
 msgstr "Winkel met autoonderdelen bewerken"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1418
 msgid "Repair"
 msgstr "Garage"
 
 #. item
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1419
 msgid "Edit Car Repair"
 msgstr "Autogarage bewerken"
@@ -17038,5 +17376,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1421 build/trans_presets.java:1445
+#: build/trans_presets.java:1424 build/trans_presets.java:1448
 msgid "Rental"
 msgstr "Verhuur"
@@ -17045,10 +17383,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1427
 msgid "Edit Car Rental"
 msgstr "Autoverhuur bewerken"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1432
 msgid "Sharing"
 msgstr "Autodelen"
@@ -17056,5 +17394,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1434
 msgid "Edit Car Sharing"
 msgstr "Autodelen bewerken"
@@ -17062,10 +17400,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Parking"
 msgstr "Fietsenstalling bewerken"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1446
 msgid "Capacity"
 msgstr "Capaciteit"
@@ -17074,5 +17412,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1448
+#: build/trans_presets.java:1451
 msgid "Edit Bicycle Rental"
 msgstr "Fietsenverhuur bewerken"
@@ -17081,15 +17419,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1458
 msgid "Edit Bicycle Shop"
 msgstr "Fietswinkel bewerken"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1463
 msgid "Public Transport"
 msgstr "Openbaar vervoer"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:1472
 msgid "UIC-Reference"
 msgstr "UIC-referentie"
@@ -17097,5 +17435,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1475
 msgid "Railway Halt"
 msgstr "Onbemand station"
@@ -17103,5 +17441,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1477
 msgid "Edit Halt"
 msgstr "Onbemand station bewerken"
@@ -17109,5 +17447,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1484
 msgid "Tram Stop"
 msgstr "Tramhalte"
@@ -17116,5 +17454,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1484
+#: build/trans_presets.java:1487
 msgid "Edit Tram Stop"
 msgstr "Tramhalte bewerken"
@@ -17122,5 +17460,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1494
 msgid "Railway Platform"
 msgstr "Perron"
@@ -17129,5 +17467,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1497
 msgid "Edit Railway Platform"
 msgstr "Perron bewerken"
@@ -17139,5 +17477,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1497 build/trans_presets.java:1539
+#: build/trans_presets.java:1500 build/trans_presets.java:1542
 msgid "Reference (track number)"
 msgstr "Referentie (tracknummer)"
@@ -17145,10 +17483,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1499 build/trans_presets.java:1541
+#: build/trans_presets.java:1502 build/trans_presets.java:1544
 msgid "Area"
 msgstr "Gebied"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1504
 msgid "Subway Entrance"
 msgstr "Metroingang"
@@ -17157,10 +17495,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1507
 msgid "Edit Subway Entrance"
 msgstr "Metroingang bewerken"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1512
 msgid "Wheelchair"
 msgstr "Rolstoel"
@@ -17169,5 +17507,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1517
 msgid "Bus Station"
 msgstr "Busstation"
@@ -17176,5 +17514,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1520
 msgid "Edit Bus Station"
 msgstr "Busstation bewerken"
@@ -17182,5 +17520,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1526
 msgid "Bus Stop"
 msgstr "Bushalte"
@@ -17190,5 +17528,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1530
 msgid "Edit Bus Stop"
 msgstr "Bushalte bewerken"
@@ -17197,6 +17535,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1532 build/trans_presets.java:1785
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:1535 build/trans_presets.java:1789
+#: build/trans_presets.java:2453
 msgid "Shelter"
 msgstr "Schuilplaats"
@@ -17204,10 +17542,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1538
 msgid "Bus Platform"
 msgstr "Busstation"
 
 #. item
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1539
 msgid "Edit Bus Platform"
 msgstr "Busplatform bewerken"
@@ -17215,5 +17553,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1547
 msgid "Taxi"
 msgstr "Taxi"
@@ -17221,5 +17559,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1549
 msgid "Edit Taxi station"
 msgstr "Taxistandplaats bewerken"
@@ -17227,5 +17565,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1554
 msgid "Airport"
 msgstr "Luchthaven"
@@ -17233,15 +17571,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1556
 msgid "Edit Airport"
 msgstr ""
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1561
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1559
+#: build/trans_presets.java:1562
 msgid "ICAO"
 msgstr "ICAO"
@@ -17249,6 +17587,11 @@
 #. item "Public Transport/Airport" text "ICAO"
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1567
+#, fuzzy
+msgid "Travel"
+msgstr "gravel"
+
+#. group "Travel"
+#: build/trans_presets.java:1568
 msgid "Accomodation"
 msgstr "Accomodatie"
@@ -17260,5 +17603,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1565 build/trans_surveyor.java:43
+#: build/trans_presets.java:1569 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -17267,15 +17610,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:1568
+#: build/trans_presets.java:1572
 msgid "Edit Hotel"
 msgstr "Hotel bewerken"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1575
 msgid "Stars"
 msgstr "Sterren"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1577
 msgid "Motel"
 msgstr "Motel"
@@ -17283,20 +17626,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1579
 msgid "Edit Motel"
 msgstr "Motel bewerken"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1583
 msgid "Guest House"
 msgstr "Pension"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1584
 msgid "Edit Guest House"
 msgstr "Pension bewerken"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1588
 msgid "Chalet"
 msgstr "Chalet"
@@ -17304,10 +17647,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1590
 msgid "Edit Chalet"
 msgstr "Chalet bewerken"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1594
 msgid "Hostel"
 msgstr "Hostel"
@@ -17315,30 +17658,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1592
+#: build/trans_presets.java:1596
 msgid "Edit Hostel"
 msgstr "Hostel bewerken"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1600
 msgid "Alpine Hut"
 msgstr "Berghut"
 
 #. item
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1601
 msgid "Edit Alpine Hut"
 msgstr "Berghut bewerken"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1606
 msgid "Caravan Site"
 msgstr "Caravanpark"
 
 #. item
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1607
 msgid "Edit Caravan Site"
 msgstr "Caravanpark bewerken"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1611
 msgid "Camping Site"
 msgstr "Kampeerterrein"
@@ -17346,10 +17689,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1613
 msgid "Edit Camping Site"
 msgstr "Kampeerterrein bewerken"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1618
 msgid "Food+Drinks"
 msgstr "Eten en drinken"
@@ -17360,5 +17703,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1615 build/trans_surveyor.java:47
+#: build/trans_presets.java:1619 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -17366,5 +17709,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1621
 msgid "Edit Restaurant"
 msgstr "Restaurant bewerken"
@@ -17372,5 +17715,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "Cuisine"
 msgstr "Keuken"
@@ -17378,61 +17721,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "italian"
 msgstr "Italiaanse keuken"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "chinese"
 msgstr "Chinese keuken"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "greek"
 msgstr "Grieks"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "german"
 msgstr "Duits"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "indian"
 msgstr "Indiaas"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "regional"
 msgstr "lokaal"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "kebab"
 msgstr "Kebab"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "turkish"
 msgstr "Turks"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "asian"
 msgstr "Oosters"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "thai"
 msgstr "Thais"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "mexican"
 msgstr "Mexicaans"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "japanese"
 msgstr "Japans"
 
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1627
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -17440,9 +17783,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1629
 msgid "Edit Fast Food Restaurant"
 msgstr "Fast-Food-restaurant bewerken"
 
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1635
 msgid "Cafe"
 msgstr "Café"
@@ -17450,9 +17793,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1633
+#: build/trans_presets.java:1637
 msgid "Edit Cafe"
 msgstr "Café bewerken"
 
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1642
 msgid "Pub"
 msgstr "Kroeg"
@@ -17460,18 +17803,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1644
 msgid "Edit Pub"
 msgstr "Kroeg bewerken"
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1649
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item
-#: build/trans_presets.java:1646
+#: build/trans_presets.java:1650
 msgid "Edit Biergarten"
 msgstr "Biergarten bewerken"
 
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1655
 msgid "Bar"
 msgstr ""
@@ -17479,9 +17822,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1657
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1662
 msgid "Nightclub"
 msgstr "Nachtclub"
@@ -17489,24 +17832,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1664
 msgid "Edit Nightclub"
 msgstr "Nachtclub bewerken"
 
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1670
 msgid "Tourism"
 msgstr "Toerisme"
 
 #. group "Tourism"
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1671
 msgid "Attraction"
 msgstr "Attractie"
 
 #. item
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1672
 msgid "Edit Attraction"
 msgstr "Attractie bewerken"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1677
 msgid "Museum"
 msgstr "Museum"
@@ -17514,9 +17857,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1679
 msgid "Edit Museum"
 msgstr "Museum bewerken"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1684
 msgid "Zoo"
 msgstr "Dierentuin"
@@ -17525,9 +17868,9 @@
 #. <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:1683
+#: build/trans_presets.java:1687
 msgid "Edit Zoo"
 msgstr "Dierentuin bewerken"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1692
 msgid "Viewpoint"
 msgstr "Uitkijkpunt"
@@ -17535,24 +17878,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1694
 msgid "Edit Viewpoint"
 msgstr "Uitkijkpunt bewerken"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1697
 msgid "Look-Out Tower"
 msgstr "Uitkijktoren"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1699
 msgid "Theme Park"
 msgstr "Themapark"
 
 #. item
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1700
 msgid "Edit Theme Park"
 msgstr "Themapart bewerken"
 
-#: build/trans_presets.java:1701
+#: build/trans_presets.java:1705
 msgid "Artwork"
 msgstr "Kunstwerk"
@@ -17560,5 +17903,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1707
 msgid "Edit Artwork"
 msgstr "Kunstwerk bewerken"
@@ -17566,19 +17909,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1712
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1719
 msgid "Map"
 msgstr "Kaart"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "topo"
 msgstr ""
@@ -17616,5 +17959,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1720 build/trans_style.java:619
+#: build/trans_presets.java:1724 build/trans_style.java:619
 #: build/trans_style.java:635 build/trans_style.java:651
 #: build/trans_style.java:659
@@ -17622,28 +17965,28 @@
 msgstr "straat"
 
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1722 build/trans_presets.java:1738
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1726 build/trans_presets.java:1742
+#: build/trans_presets.java:1786
 msgid "Closer Description"
 msgstr ""
@@ -17653,5 +17996,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1724 build/trans_presets.java:1747
+#: build/trans_presets.java:1728 build/trans_presets.java:1751
 msgid "Routes shown for:"
 msgstr ""
@@ -17659,6 +18002,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1726 build/trans_presets.java:1749
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1965
 msgid "Cycling"
 msgstr "Fietsen"
@@ -17666,5 +18009,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1727 build/trans_presets.java:1750
+#: build/trans_presets.java:1731 build/trans_presets.java:1754
 msgid "Mountainbiking"
 msgstr ""
@@ -17672,6 +18015,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1728 build/trans_presets.java:1751
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:1732 build/trans_presets.java:1755
+#: build/trans_presets.java:2019
 msgid "Skiing"
 msgstr "Skiën"
@@ -17679,5 +18022,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1729 build/trans_presets.java:1752
+#: build/trans_presets.java:1733 build/trans_presets.java:1756
 msgid "Riding"
 msgstr ""
@@ -17685,46 +18028,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1734 build/trans_presets.java:1757
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1736
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "history"
 msgstr "geschiedenis"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "nature"
 msgstr "natuur"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "wildlife"
 msgstr "Wild"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1744
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1759
 msgid "Information Terminal"
 msgstr ""
@@ -17732,29 +18075,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1760 build/trans_presets.java:1770
+#: build/trans_presets.java:1764 build/trans_presets.java:1774
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1769
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1779
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1780
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1778
+#: build/trans_presets.java:1782
 msgid "Other Information Points"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1790
 msgid "Edit Shelter"
 msgstr "Schuilplaats bewerken"
@@ -17762,25 +18105,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1789 build/trans_presets.java:1795
+#: build/trans_presets.java:1793 build/trans_presets.java:1799
 msgid "Fireplace"
 msgstr "Vuurplaats"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1791
+#: build/trans_presets.java:1795
 msgid "Picnic Site"
 msgstr "Picnicplek"
 
 #. item
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1796
 msgid "Edit Picnic Site"
 msgstr "Picnicplek bewerken"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1802
 msgid "Historic Places"
 msgstr "Historische locaties"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1799
+#: build/trans_presets.java:1803
 msgid "Castle"
 msgstr "Kasteel"
@@ -17789,19 +18132,19 @@
 #. <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:1802
+#: build/trans_presets.java:1806
 msgid "Edit Castle"
 msgstr "Kasteel bewerken"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1810
 msgid "Ruins"
 msgstr "Ruïne"
 
 #. item
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1811
 msgid "Edit Ruins"
 msgstr "Ruïne bewerken"
 
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1816
 msgid "Archaeological Site"
 msgstr "Archeologische plaats"
@@ -17810,9 +18153,9 @@
 #. <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:1815
+#: build/trans_presets.java:1819
 msgid "Edit Archaeological Site"
 msgstr "Archeologische plaats bewerken"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1824
 msgid "Battlefield"
 msgstr "Slagveld"
@@ -17820,5 +18163,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1826
 msgid "Edit Battlefield"
 msgstr "Slagveld bewerken"
@@ -17826,15 +18169,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1831
 msgid "Monument"
 msgstr "Monument"
 
 #. item
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1832
 msgid "Edit Monument"
 msgstr "Monument bewerken"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1836
 msgid "Memorial"
 msgstr "Herdenkingsplek"
@@ -17842,45 +18185,57 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1838
 msgid "Edit Memorial"
 msgstr "Herdenkingsplek bewerken"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1842
 msgid "Wayside Cross"
 msgstr "Kruis langs de weg"
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1843
 msgid "Edit Wayside Cross"
 msgstr "Kruis langs de weg bewerken"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1847
 msgid "Wayside Shrine"
 msgstr "Kapelletje langs de weg"
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1848
 msgid "Edit Wayside Shrine"
 msgstr "Kapelletje bewerken"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1852
+#, fuzzy
+msgid "Boundary Stone"
+msgstr "Grenzen"
+
+#. item
+#: build/trans_presets.java:1853
+#, fuzzy
+msgid "Edit Boundary Stone"
+msgstr "Bushalte bewerken"
+
+#. item "Historic Places/Boundary Stone" text "Name"
+#: build/trans_presets.java:1858
 msgid "Leisure"
 msgstr "Vrije tijd"
 
 #. group "Leisure"
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1859
 msgid "Water Park"
 msgstr "Zwembad"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1860
 msgid "Edit Water Park"
 msgstr "Zwembad bewerken"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1864
 msgid "Playground"
 msgstr "Speelveld"
@@ -17888,31 +18243,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1866
 msgid "Edit Playground"
 msgstr "Speelveld bewerken"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1870
 msgid "Fishing"
 msgstr "Visstek"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1871
 msgid "Edit Fishing"
 msgstr "Visstek bewerken"
 
 #. item "Leisure/Fishing" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1877 build/trans_presets.java:2669
+msgid "Sports"
+msgstr ""
+
+#. group "Sports"
+#: build/trans_presets.java:1878
 msgid "Sport Facilities"
 msgstr "Sportfaciliteiten"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1879
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1880
 msgid "Edit Stadium"
 msgstr "Stadion bewerken"
@@ -17926,6 +18285,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1874 build/trans_presets.java:1883
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1902 build/trans_presets.java:1911
 msgid "select sport:"
 msgstr "sport selecteren:"
@@ -18317,30 +18676,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884 build/trans_style.java:3892
-#: build/trans_style.java:3900 build/trans_style.java:3908
-#: build/trans_style.java:3916 build/trans_style.java:3924
-#: build/trans_style.java:3932
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_style.java:3572 build/trans_style.java:3580
+#: build/trans_style.java:3588 build/trans_style.java:3596
+#: build/trans_style.java:3604 build/trans_style.java:3612
+#: build/trans_style.java:3620 build/trans_style.java:3628
+#: build/trans_style.java:3636 build/trans_style.java:3644
+#: build/trans_style.java:3652 build/trans_style.java:3660
+#: build/trans_style.java:3668 build/trans_style.java:3676
+#: build/trans_style.java:3684 build/trans_style.java:3692
+#: build/trans_style.java:3700 build/trans_style.java:3708
+#: build/trans_style.java:3716 build/trans_style.java:3724
+#: build/trans_style.java:3732 build/trans_style.java:3740
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3764 build/trans_style.java:3772
+#: build/trans_style.java:3780 build/trans_style.java:3788
+#: build/trans_style.java:3796 build/trans_style.java:3804
+#: build/trans_style.java:3812 build/trans_style.java:3820
+#: build/trans_style.java:3828 build/trans_style.java:3836
+#: build/trans_style.java:3844 build/trans_style.java:3852
+#: build/trans_style.java:3860 build/trans_style.java:3868
+#: build/trans_style.java:3876 build/trans_style.java:3884
+#: build/trans_style.java:3892 build/trans_style.java:3900
+#: build/trans_style.java:3908 build/trans_style.java:3916
+#: build/trans_style.java:3924 build/trans_style.java:3932
+#: build/trans_style.java:3940
 msgid "sport"
 msgstr "sport"
@@ -18350,225 +18709,225 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "multi"
 msgstr "Meervoudig"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "archery"
 msgstr "Boogschieten"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "athletics"
 msgstr "Atletiek"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "australian_football"
 msgstr "Australisch football"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "baseball"
 msgstr "Honkbal"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "basketball"
 msgstr "Basketball"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "boules"
 msgstr "Boules"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "bowls"
 msgstr "Bowling"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "canoe"
 msgstr "Kanoën"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "climbing"
 msgstr "Klimmen"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket"
 msgstr "Cricket"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket_nets"
 msgstr "Cricket netten"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "croquet"
 msgstr "Croquet"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cycling"
 msgstr "Fietsen"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "dog_racing"
 msgstr "Hondenraces"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "equestrian"
 msgstr "Paardensport"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "football"
 msgstr "Football"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "golf"
 msgstr "Golf"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "gymnastics"
 msgstr "Turnen"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "hockey"
 msgstr "Hockey"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "horse_racing"
 msgstr "Paardenraces"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "motor"
 msgstr "Motorsport"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "pelota"
 msgstr "Pelota"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "racquet"
 msgstr "Badminton"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "rugby"
 msgstr "Rugby"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "shooting"
 msgstr "Schieten"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skateboard"
 msgstr "Skateboarden"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skating"
 msgstr "Schaatsen"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skiing"
 msgstr "Skiën"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "soccer"
 msgstr "Voetbal"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "swimming"
 msgstr "Zwemmen"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "table_tennis"
 msgstr "Tafeltennis"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "tennis"
 msgstr "Tennis"
 
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1888
 msgid "Sports Centre"
 msgstr "Sportcentrum"
 
 #. item
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1889
 msgid "Edit Sports Centre"
 msgstr "Sportcentrum bewerken"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1897
 msgid "Pitch"
 msgstr "Sportveld"
 
 #. item
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1898
 msgid "Edit Pitch"
 msgstr "Sportveld bewerken"
 
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1906
 msgid "Racetrack"
 msgstr "Wedstrijdbaan"
 
 #. item
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1907
 msgid "Edit Racetrack"
 msgstr "Wedstrijdbaan bewerken"
 
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1915
 msgid "Golf Course"
 msgstr "Golfbaan"
 
 #. item
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1916
 msgid "Edit Golf Course"
 msgstr "Golfbaan bewerken"
 
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1921
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1922
 msgid "Edit Miniature Golf"
 msgstr "Minigolf bewerken"
 
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1928
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1929
 msgid "Multi"
 msgstr "Verzameling"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1930
 msgid "Edit Multi"
 msgstr "Verzameling bewerken"
@@ -18607,183 +18966,183 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "pitch"
 msgstr "Sportveld"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "sports_centre"
 msgstr "Sportcentrum"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "stadium"
 msgstr "Stadion"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1935
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1936
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1941
 msgid "Athletics"
 msgstr "Atletiek"
 
 #. item
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1942
 msgid "Edit Athletics"
 msgstr "Atletiek bewerken"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1947
 msgid "Archery"
 msgstr "Boogschieten"
 
 #. item
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1948
 msgid "Edit Archery"
 msgstr "Boogschieten bewerken"
 
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1953
 msgid "Climbing"
 msgstr "Klimmen"
 
 #. item
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:1954
 msgid "Edit Climbing"
 msgstr "Klimmen bewerken"
 
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1959
 msgid "Canoeing"
 msgstr "Kanoën"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1960
 msgid "Edit Canoeing"
 msgstr "Kanoën bewerken"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1966
 msgid "Edit Cycling"
 msgstr "Fietsen bewerken"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1971
 msgid "Dog Racing"
 msgstr "Hondenracen"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1972
 msgid "Edit Dog Racing"
 msgstr "Hondenracen bewerken"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1977
 msgid "Equestrian"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1978
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1983
 msgid "Horse Racing"
 msgstr "Paardenracen"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1984
 msgid "Edit Horse Racing"
 msgstr "Paardenracen bewerken"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1989
 msgid "Gymnastics"
 msgstr "Turnen"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1990
 msgid "Edit Gymnastics"
 msgstr "Turnen bewerken"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1995
 msgid "Motor Sports"
 msgstr "Motorracen"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1996
 msgid "Edit Motor Sports"
 msgstr "Motorracen bewerken"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2001
 msgid "Skating"
 msgstr "Schaatsen"
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2002
 msgid "Edit Skating"
 msgstr "Schaatsen bewerken"
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2007
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2008
 msgid "Edit Skateboard"
 msgstr "Skateboard bewerken"
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2013
 msgid "Swimming"
 msgstr "Zwemmen"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2014
 msgid "Edit Swimming"
 msgstr "Zwemmen bewerken"
@@ -18791,56 +19150,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2021
 msgid "Edit Skiing"
 msgstr "Skiën bewerken"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "Piste type"
 msgstr "Soort piste"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "downhill"
 msgstr "bergafwaarts"
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "nordic"
 msgstr "Scandinavisch"
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "Difficulty"
 msgstr "Moeilijkheidsgraad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "novice"
 msgstr "beginner"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "easy"
 msgstr "eenvoudig"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2028
 msgid "Shooting"
 msgstr "Schieten"
@@ -18848,178 +19207,183 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2030
 msgid "Edit Shooting"
 msgstr "Schieten bewerken"
 
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2036
 msgid "Sport (Ball)"
 msgstr "Balsporten"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2037
 msgid "Soccer"
 msgstr "Voetbal"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2038
 msgid "Edit Soccer"
 msgstr "Voetbal bewerken"
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2043
 msgid "Football"
 msgstr "Football"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2044
 msgid "Edit Football"
 msgstr "Football bewerken"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2049
 msgid "Australian Football"
 msgstr "Australisch football"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2050
 msgid "Edit Australian Football"
 msgstr "Australisch football bewerken"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2055
 msgid "Baseball"
 msgstr "Honkbal"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2056
 msgid "Edit Baseball"
 msgstr "Honkbal bewerken"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2061
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2062
 msgid "Edit Basketball"
 msgstr "Basketball bewerken"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2067
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2068
 msgid "Edit Golf"
 msgstr "Golf bewerken"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2071
 msgid "golf_course"
 msgstr "golfbaan"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2073
 msgid "Boule"
 msgstr "Boule"
 
 #. item
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2074
 msgid "Edit Boule"
 msgstr "Boule bewerken"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2079
 msgid "Bowls"
 msgstr "Bowlen"
 
 #. item
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2080
 msgid "Edit Bowls"
 msgstr "Bowlen bewerken"
 
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2085
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2086
 msgid "Edit Cricket"
 msgstr "Cricket bewerken"
 
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2091
 msgid "Cricket Nets"
 msgstr "Cricketnetten"
 
 #. item
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2092
 msgid "Edit Cricket Nets"
 msgstr "Cricketnetten bewerken"
 
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2097
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2098
 msgid "Edit Croquet"
 msgstr "Croquet bewerken"
 
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2103
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2104
 msgid "Edit Hockey"
 msgstr "Hockey bewerken"
 
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2109
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2110
 msgid "Edit Pelota"
 msgstr "Pelota bewerken"
 
-#: build/trans_presets.java:2105
+#: build/trans_presets.java:2115
 msgid "Racquet"
 msgstr "Badminton"
 
 #. item
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2116
 msgid "Edit Racquet"
 msgstr "Badminton bewerken"
 
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2121
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2122
 msgid "Edit Rugby"
 msgstr "Rugby bewerken"
 
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2127
 msgid "Table Tennis"
 msgstr "Tafeltennis"
 
 #. item
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2128
 msgid "Edit Table Tennis"
 msgstr "Tafeltennis bewerken"
 
-#: build/trans_presets.java:2123
+#: build/trans_presets.java:2133
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2134
 msgid "Edit Tennis"
 msgstr "Tennis bewerken"
 
-#. <separator/>
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2141
+#, fuzzy
+msgid "Man-Made"
+msgstr "Bouwwerken"
+
+#. group "Man-Made"
+#: build/trans_presets.java:2142
 msgid "Buildings"
 msgstr "Gebouwen"
 
 #. group "Buildings"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2143
 msgid "Building"
 msgstr "Gebouw"
@@ -19027,5 +19391,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Public Building"
 msgstr "Openbare gebouw"
@@ -19033,10 +19397,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2148
 msgid "Edit Public Building"
 msgstr "Openbare gebouwen bewerken"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2152
 msgid "Town hall"
 msgstr "Stadhuis"
@@ -19044,10 +19408,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2154
 msgid "Edit Town hall"
 msgstr "Stadhuis bewerken"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:2158
 msgid "Embassy"
 msgstr "Ambassade"
@@ -19055,10 +19419,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Edit Embassy"
 msgstr "Ambassade bewerken"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2164
 msgid "Courthouse"
 msgstr "Gerechtsgebouw"
@@ -19067,10 +19431,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:2156
+#: build/trans_presets.java:2167
 msgid "Edit Courthouse"
 msgstr "Gerechtsgebouw bewerken"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2171
 msgid "Prison"
 msgstr "Gevangenis"
@@ -19079,10 +19443,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:2163
+#: build/trans_presets.java:2174
 msgid "Edit Prison"
 msgstr "Gevangenis bewerken"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2178
 msgid "Police"
 msgstr "Politie"
@@ -19092,10 +19456,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:2171
+#: build/trans_presets.java:2182
 msgid "Edit Police"
 msgstr "Politie bewerken"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2186
 msgid "Fire Station"
 msgstr "Brandweerkazerne"
@@ -19104,10 +19468,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:2178
+#: build/trans_presets.java:2189
 msgid "Edit Fire Station"
 msgstr "Brandweerkazerne bewerken"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "Post Office"
 msgstr "Postkantoor"
@@ -19115,5 +19479,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Edit Post Office"
 msgstr "Postkantoor bewerken"
@@ -19121,15 +19485,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2200
 msgid "Kindergarten"
 msgstr "Kinderopvang"
 
 #. item
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Kindergarten"
 msgstr "Kinderopvang bewerken"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2205
 msgid "School"
 msgstr "School"
@@ -19137,10 +19501,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Edit School"
 msgstr "School bewerken"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2211
 msgid "University"
 msgstr "Universiteit"
@@ -19148,10 +19512,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit University"
 msgstr "Universiteit bewerken"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "College"
 msgstr "Campus"
@@ -19159,5 +19523,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2219
 msgid "Edit College"
 msgstr "Campus bewerken"
@@ -19165,5 +19529,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2224
 msgid "Cinema"
 msgstr "Bioscoop"
@@ -19172,10 +19536,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:2216
+#: build/trans_presets.java:2227
 msgid "Edit Cinema"
 msgstr "Bioscoop bewerken"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2231
 msgid "Library"
 msgstr "Bibliotheek"
@@ -19184,9 +19548,9 @@
 #. <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:2223
+#: build/trans_presets.java:2234
 msgid "Edit Library"
 msgstr "Bibliotheek bewerken"
 
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Arts Centre"
 msgstr "Kunstcentrum"
@@ -19194,10 +19558,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Arts Centre"
 msgstr "Kunstcentrum bewerken"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Theatre"
 msgstr "Theater"
@@ -19206,10 +19570,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:2237
+#: build/trans_presets.java:2248
 msgid "Edit Theatre"
 msgstr "Theater bewerken"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2252
 msgid "Place of Worship"
 msgstr "Religieus gebouw"
@@ -19219,5 +19583,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:2245
+#: build/trans_presets.java:2256
 msgid "Edit Place of Worship"
 msgstr "Religieus gebouw bewerken"
@@ -19226,6 +19590,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "Religion"
 msgstr "Religie"
@@ -19234,66 +19598,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "bahai"
 msgstr "Bahai"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "buddhist"
 msgstr "Boeddhisme"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "christian"
 msgstr "Christelijk"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "hindu"
 msgstr "Hindoestaans"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jain"
 msgstr "Jain"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jewish"
 msgstr "Joods"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "muslim"
 msgstr "Moslim"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "sikh"
 msgstr "Sikh"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "spiritualist"
 msgstr "Spirtualist"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "taoist"
 msgstr "Taoist"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "Denomination"
 msgstr "Benaming"
@@ -19302,81 +19666,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "anglican"
 msgstr "Anglicaan"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "baptist"
 msgstr "Baptist"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "catholic"
 msgstr "Katholiek"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "evangelical"
 msgstr "Evangelist"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "jehovahs_witness"
 msgstr "Jehovahs getuigen"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "lutheran"
 msgstr "Luthers"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "methodist"
 msgstr "Methodist"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "mormon"
 msgstr "Mormoon"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "orthodox"
 msgstr "Orthodox"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "protestant"
 msgstr "Protestant"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "quaker"
 msgstr "Quaker"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2264
 msgid "Addresses"
 msgstr "Adressen"
@@ -19385,5 +19749,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:2256
+#: build/trans_presets.java:2267
 msgid "Edit Address Information"
 msgstr "Adresinformatie bewerken"
@@ -19391,5 +19755,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2269
 msgid "House number"
 msgstr "Huisnummer"
@@ -19397,20 +19761,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "House name"
 msgstr "Huisnaam"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "City name"
 msgstr "Stadsnaam"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2274
 msgid "Post code"
 msgstr "Postcode"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2275
 msgid "Country code"
 msgstr "Landcode"
@@ -19418,5 +19782,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Address Interpolation"
 msgstr "Adresinterpolatie"
@@ -19425,5 +19789,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:2270
+#: build/trans_presets.java:2281
 msgid "Edit Address Interpolation"
 msgstr "Adresinterpolatie bewerken"
@@ -19431,67 +19795,67 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "Numbering scheme"
 msgstr "Nummeringschema"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "odd"
 msgstr "oneven"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "even"
 msgstr "even"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2286
 msgid "Man Made"
 msgstr "Bouwwerken"
 
 #. group "Man Made"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Works"
 msgstr "Fabriek"
 
 #. item
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2288
 msgid "Edit Works"
 msgstr "Fabriek bewerken"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2292
 msgid "Tower"
 msgstr "Toren"
 
 #. item
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2293
 msgid "Edit Tower"
 msgstr "Toren bewerken"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Water Tower"
 msgstr "Watertoren"
 
 #. item
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2298
 msgid "Edit Water Tower"
 msgstr "Watertoren bewerken"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Gasometer"
 msgstr "Olieopslag"
 
 #. item
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2303
 msgid "Edit Gasometer"
 msgstr "Olieopslag bewerken"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Lighthouse"
 msgstr "Vuurtoren"
@@ -19499,10 +19863,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2309
 msgid "Edit Lighthouse"
 msgstr "Vuurtoren bewerken"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Windmill"
 msgstr "Windmolen"
@@ -19510,10 +19874,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2315
 msgid "Edit Windmill"
 msgstr "Windmolen bewerken"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2319
 msgid "Pipeline"
 msgstr "Pijplijn"
@@ -19521,10 +19885,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Edit Pipeline"
 msgstr "Pijplijn bewerken"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2325
 msgid "Wastewater Plant"
 msgstr "Afvalzuivering"
@@ -19534,10 +19898,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:2318
+#: build/trans_presets.java:2329
 msgid "Edit Wastewater Plant"
 msgstr "Afvalzuivering bewerken"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2333
 msgid "Crane"
 msgstr "Kraan"
@@ -19545,10 +19909,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2335
 msgid "Edit Crane"
 msgstr "Kraan bewerken"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Beacon"
 msgstr "Baken"
@@ -19556,10 +19920,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2341
 msgid "Edit Beacon"
 msgstr "Baken bewerken"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2345
 msgid "Survey Point"
 msgstr "Uitkijkpunt"
@@ -19567,10 +19931,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Edit Survey Point"
 msgstr "Uitkijkpunt bewerken"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2351
 msgid "Surveillance"
 msgstr "Bewakingscamera"
@@ -19578,5 +19942,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2353
 msgid "Edit Surveillance Camera"
 msgstr "Bewakingscamera bewerken"
@@ -19584,5 +19948,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Power Generator"
 msgstr "Energievoorziening"
@@ -19592,39 +19956,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:2351
+#: build/trans_presets.java:2362
 msgid "Edit Power Generator"
 msgstr "Energievoorziening bewerken"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "wind"
 msgstr "wind"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "hydro"
 msgstr "water"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "fossil"
 msgstr "fossiele brandstoffen"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "nuclear"
 msgstr "nucleair"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "coal"
 msgstr "kolen"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "photovoltaic"
 msgstr "fotovoltage"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "gas"
 msgstr "gas"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2367
 msgid "Power Station"
 msgstr "Verdeelstation"
@@ -19633,10 +19997,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:2359
+#: build/trans_presets.java:2370
 msgid "Edit Power Station"
 msgstr "Verdeelstation bewerken"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2374
 msgid "Power Sub Station"
 msgstr "Transformatorstation"
@@ -19645,5 +20009,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:2366
+#: build/trans_presets.java:2377
 msgid "Edit Power Sub Station"
 msgstr "Transformatorstation bewerken"
@@ -19651,10 +20015,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2369 build/trans_presets.java:2385
+#: build/trans_presets.java:2380 build/trans_presets.java:2396
 msgid "Line reference"
 msgstr "Lijnreferentie"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2382
 msgid "Power Tower"
 msgstr "Hoogspanningsmast"
@@ -19665,5 +20029,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:2376
+#: build/trans_presets.java:2387
 msgid "Edit Power Tower"
 msgstr "Hoogspanningsmast bewerken"
@@ -19671,5 +20035,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2390
 msgid "Power Line"
 msgstr "Hoogspanningskabel"
@@ -19678,40 +20042,40 @@
 #. <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:2382
+#: build/trans_presets.java:2393
 msgid "Edit Power Line"
 msgstr "Hoogspanningskabels bewerken"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Voltage"
 msgstr "Voltage"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2398
 msgid "Amount of Wires"
 msgstr "Hoeveelheid draden"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Amenities"
 msgstr "Voorzieningen"
 
 #. group "Amenities"
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2402
 msgid "Toilets"
 msgstr "Toiletten"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2398 build/trans_presets.java:2514
+#: build/trans_presets.java:2409 build/trans_presets.java:2525
 msgid "Note"
 msgstr "Opmerking"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2411
 msgid "Post Box"
 msgstr "Postbus"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2416
 msgid "Telephone"
 msgstr "Telefoon"
@@ -19720,5 +20084,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:2408
+#: build/trans_presets.java:2419
 msgid "Edit Telephone"
 msgstr "Een telefoon bewerken"
@@ -19726,5 +20090,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2411 build/trans_presets.java:2515
+#: build/trans_presets.java:2422 build/trans_presets.java:2526
 msgid "Coins"
 msgstr "Munten"
@@ -19732,5 +20096,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2412 build/trans_presets.java:2516
+#: build/trans_presets.java:2423 build/trans_presets.java:2527
 msgid "Notes"
 msgstr "Briefgeld"
@@ -19738,5 +20102,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2413 build/trans_presets.java:2517
+#: build/trans_presets.java:2424 build/trans_presets.java:2528
 msgid "Electronic purses and Charge cards"
 msgstr "Chipknip"
@@ -19744,5 +20108,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2414 build/trans_presets.java:2518
+#: build/trans_presets.java:2425 build/trans_presets.java:2529
 msgid "Debit cards"
 msgstr "Pinpas"
@@ -19750,15 +20114,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2415 build/trans_presets.java:2519
+#: build/trans_presets.java:2426 build/trans_presets.java:2530
 msgid "Credit cards"
 msgstr "Creditkaart"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2427
 msgid "Telephone cards"
 msgstr "Telefoonkaart"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2429
 msgid "Recycling"
 msgstr "Recycling"
@@ -19767,5 +20131,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:2421
+#: build/trans_presets.java:2432
 msgid "Edit Recycling station"
 msgstr "Recyclebakken"
@@ -19773,35 +20137,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Batteries"
 msgstr "Batterijen"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2435
 msgid "Cans"
 msgstr "Flessen"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Clothes"
 msgstr "Kleding"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2437
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2438
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2439
 msgid "Scrap Metal"
 msgstr "Schroot"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2441
 msgid "Bench"
 msgstr "Bank"
@@ -19810,40 +20174,33 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2433
-#, fuzzy
+#: build/trans_presets.java:2444
 msgid "Backrest"
-msgstr "Achteruit"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "Material"
-msgstr "Herdenkingsplek"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2434
-#, fuzzy
+#: build/trans_presets.java:2445
 msgid "stone"
-msgstr "geen"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "plastic"
-msgstr "plaats"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "Colour"
-msgstr "Kleur"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "black"
-msgstr "Achteruit"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "brown"
-msgstr "omlaag"
+msgstr ""
 
 #. color historic
@@ -19912,39 +20269,35 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2435 build/trans_style.java:3055
-#: build/trans_style.java:3063 build/trans_style.java:3071
-#: build/trans_style.java:3079 build/trans_style.java:3127
-#: build/trans_style.java:3135 build/trans_style.java:3233
-#: build/trans_style.java:3241
+#: build/trans_presets.java:2446 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3135
+#: build/trans_style.java:3143 build/trans_style.java:3241
+#: build/trans_style.java:3249
 msgid "green"
 msgstr "groen"
 
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "red"
-msgstr "einde"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "blue"
-msgstr "Waarde"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "white"
-msgstr "water"
-
-#: build/trans_presets.java:2436
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2447
 msgid "Amount of Seats"
-msgstr "Hoeveelheid draden"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2449
 msgid "Hunting Stand"
 msgstr "Vogeluitkijkpost"
 
 #. item
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2450
 msgid "Edit Hunting Stand"
 msgstr "Vogeluitkijkpost bewerken"
@@ -19953,30 +20306,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2441 build/trans_presets.java:2902
+#: build/trans_presets.java:2452 build/trans_presets.java:2914
 msgid "Height"
 msgstr "Hoogte"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "low"
 msgstr "Kruiphoogte"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "half"
 msgstr "Bukhoogte"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "full"
 msgstr "Stahoogte"
 
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2454
 msgid "Hide"
 msgstr "Verborgen"
 
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2455
 msgid "Lock"
 msgstr "Afgesloten"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Fountain"
 msgstr "Fontein"
@@ -19985,10 +20338,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:2449
+#: build/trans_presets.java:2460
 msgid "Edit Fountain"
 msgstr "Fontein bewerken"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2464
 msgid "Drinking Water"
 msgstr "Drinkwater"
@@ -19997,10 +20350,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:2456
+#: build/trans_presets.java:2467
 msgid "Edit Drinking Water"
 msgstr "Drinkwater bewerken"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2471
 msgid "Baby Hatch"
 msgstr ""
@@ -20008,33 +20361,33 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2479
 msgid "Shops"
 msgstr "Winkels"
 
 #. group "Shops"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2480
 msgid "Supermarket"
 msgstr "Supermarkt"
 
 #. item
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2481
 msgid "Edit Supermarket"
 msgstr "Supermarkt bewerken"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2486
 msgid "Chemist"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2487
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2492
 msgid "Convenience Store"
 msgstr ""
@@ -20042,9 +20395,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2499
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -20052,27 +20405,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Kiosk"
 msgstr "Kiosk bewerken"
 
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Book Store"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2507
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2512
 msgid "Travel Agency"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2513
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2518
 msgid "Vending machine"
 msgstr "Verkoopautomaat"
@@ -20080,5 +20433,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Edit Vending machine"
 msgstr "Verkoopautomaat bewerken"
@@ -20086,88 +20439,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "Vending products"
 msgstr "Producten"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_tickets"
 msgstr "vervoerskaarten"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_plans"
 msgstr "overzichtskaart"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "parking_tickets"
 msgstr "parkeerbiljet"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "food"
 msgstr "voedsel"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "drinks"
 msgstr "frisdranken"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "sweets"
 msgstr "snoepgoed"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "cigarettes"
 msgstr "sigaretten"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "photos"
 msgstr "foto's"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "animal_food"
 msgstr "diervoeder"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "news_papers"
 msgstr "kranten"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "toys"
 msgstr "speelgoed"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "stamps"
 msgstr "postzegels"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "SIM-cards"
 msgstr "SIM-kaarten"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "telephone_vouchers"
 msgstr "prepaid-kaarten"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "vouchers"
 msgstr "tegoedbonnen"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "condoms"
 msgstr "condooms"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "excrement_bags"
 msgstr "hondenpoepzakjes"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Account or loyalty cards"
 msgstr "Klantenkaarten"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Butcher"
 msgstr "Slager"
@@ -20175,9 +20528,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2535
 msgid "Edit Butcher"
 msgstr "Slager bewerken"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2540
 msgid "Baker"
 msgstr "Bakker"
@@ -20185,9 +20538,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2542
 msgid "Edit Baker"
 msgstr "Bakker bewerken"
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2547
 msgid "Florist"
 msgstr "Bloemist"
@@ -20195,18 +20548,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Florist"
 msgstr "Bloemist bewerken"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2554
 msgid "Organic"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Edit Organic Shop"
 msgstr ""
 
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2560
 msgid "Alcohol"
 msgstr ""
@@ -20214,54 +20567,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2562
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2567
 msgid "Beverages"
 msgstr "Dranken"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2568
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2573
 msgid "Computer"
 msgstr "Computer"
 
 #. item
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2574
 msgid "Edit Computer Shop"
 msgstr "Computerwinkel bewerken"
 
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Electronics"
 msgstr "Elektronica"
 
 #. item
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2580
 msgid "Edit Electronics Shop"
 msgstr "Elektronicawinkel bewerken"
 
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2585
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2586
 msgid "Edit Hifi Shop"
 msgstr "Hifi-winkel bewerken"
 
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2591
 msgid "Furniture"
 msgstr "Meubels"
 
 #. item
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Edit Furniture Shop"
 msgstr "Meubelzaak bewerken"
 
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Garden Centre"
 msgstr "Tuincentrum"
@@ -20269,9 +20622,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2599
 msgid "Edit Garden Centre"
 msgstr "Tuincentrum bewerken"
 
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Hardware"
 msgstr ""
@@ -20279,9 +20632,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2606
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "Do-it-yourself-store"
 msgstr "Doe-het-zelfzaak"
@@ -20289,54 +20642,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2613
 msgid "Edit Do-it-yourself-store"
 msgstr "Doe-het-zelfzaak bewerken"
 
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2618
 msgid "Stationery"
 msgstr "Kantoorartikelen"
 
 #. item
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2619
 msgid "Edit Stationery Shop"
 msgstr "Kantoorartikelenwinkel bewerken"
 
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Hairdresser"
 msgstr "Kapper"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Hairdresser"
 msgstr "Kapper bewerken"
 
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Shoes"
 msgstr "Schoenen"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Shoe Shop"
 msgstr "Schoenenwinkel bewerken"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2636
 msgid "Toys"
 msgstr "Speelgoed"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit Toy Shop"
 msgstr "Speelgoedwinkel bewerken"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Video"
 msgstr "Videotheek"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Video Shop"
 msgstr "Videotheek bewerken"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "Dry Cleaning"
 msgstr "Stomerij"
@@ -20344,9 +20697,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2650
 msgid "Edit Dry Cleaning"
 msgstr "Stomerij bewerken"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "Laundry"
 msgstr "Wasserette"
@@ -20354,9 +20707,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2657
 msgid "Edit Laundry"
 msgstr "Wasserette bewerken"
 
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2662
 msgid "Outdoor"
 msgstr "Buitensport"
@@ -20364,32 +20717,28 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2664
 msgid "Edit Outdoor Shop"
 msgstr "Buitensportzaak bewerken"
 
-#: build/trans_presets.java:2658
-msgid "Sports"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2659
+#. item
+#: build/trans_presets.java:2670
 msgid "Edit Sports Shop"
 msgstr "Sportzaak bewerken"
 
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Optician"
 msgstr "Opticiën bewerken"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2683
 msgid "Cash"
 msgstr "Geldzaken"
 
 #. group "Cash"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2684
 msgid "Bank"
 msgstr "Bank"
@@ -20397,14 +20746,14 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2686
 msgid "Edit Bank"
 msgstr "Bank bewerken"
 
-#: build/trans_presets.java:2680 build/trans_presets.java:2689
+#: build/trans_presets.java:2691 build/trans_presets.java:2700
 msgid "Automated Teller Machine"
 msgstr "Geldautomaat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2693
 msgid "Money Exchange"
 msgstr "Geldwisselkantoor"
@@ -20412,5 +20761,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Edit Money Exchange"
 msgstr "Geldwisselkantoor bewerken"
@@ -20418,15 +20767,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2691
+#: build/trans_presets.java:2702
 msgid "Edit Automated Teller Machine"
 msgstr "Geldautomaat bewerken"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2707
 msgid "Health"
 msgstr "Gezondheid"
 
 #. group "Health"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2708
 msgid "Doctors"
 msgstr "Huisarts"
@@ -20434,18 +20783,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2710
 msgid "Edit Doctors"
 msgstr "Huisarts bewerken"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2715
 msgid "Dentist"
 msgstr "Tandarts"
 
 #. item
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Edit Dentist"
 msgstr "Tandarts bewerken"
 
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2721
 msgid "Pharmacy"
 msgstr "Apotheek"
@@ -20453,5 +20802,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Edit Pharmacy"
 msgstr "Apotheek bewerken"
@@ -20459,9 +20808,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2729
 msgid "Hospital"
 msgstr "Ziekenhuis"
@@ -20469,10 +20818,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Edit Hospital"
 msgstr "Ziekenhuis bewerken"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2735
 msgid "Emergency Access Point"
 msgstr "EHBO-post"
@@ -20481,5 +20830,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:2727
+#: build/trans_presets.java:2738
 msgid "Edit Emergency Access Point"
 msgstr "EHBO-post bewerken"
@@ -20488,20 +20837,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2741
 msgid "Point Number"
 msgstr "Puntnummer"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2742
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Phone Number"
 msgstr "Telefoonnummer"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Gebruik de landtoegangscode, b.v. +31 20-3456789)"
@@ -20509,5 +20858,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2748
 msgid "Veterinary"
 msgstr "Dierenarts"
@@ -20516,55 +20865,59 @@
 #. <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:2740
+#: build/trans_presets.java:2751
 msgid "Edit Veterinary"
 msgstr "Dierenarts bewerken"
 
+#: build/trans_presets.java:2758
+msgid "Geography"
+msgstr ""
+
 #. group "Places"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2760
 msgid "Continent"
 msgstr "Continent"
 
 #. item
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2761
 msgid "Edit Continent"
 msgstr "Een continent bewerken"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2766
 msgid "Country"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2767
 msgid "Edit Country"
 msgstr "Land bewerken"
 
 #. item "Places/Country" text "Name"
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2772
 msgid "State"
 msgstr "Provincie"
 
 #. item
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2773
 msgid "Edit State"
 msgstr "Provincie bewerken"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2778
 msgid "Region"
 msgstr "Regio"
 
 #. item
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2779
 msgid "Edit Region"
 msgstr "Regio bewerken"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2784
 msgid "County"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2785
 msgid "Edit County"
 msgstr ""
@@ -20572,15 +20925,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2791
 msgid "City"
 msgstr "Stad"
 
 #. item
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2792
 msgid "Edit City"
 msgstr "Stad bewerken"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2797
 msgid "Town"
 msgstr "Dorp"
@@ -20588,10 +20941,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2799
 msgid "Edit Town"
 msgstr "Dorp bewerken"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2804
 msgid "Suburb"
 msgstr "Deelgemeente"
@@ -20599,25 +20952,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2806
 msgid "Edit Suburb"
 msgstr "Deelgemeente bewerken"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2811
 msgid "Village"
 msgstr "Klein dorp"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2812
 msgid "Edit Village"
 msgstr "Klein dorp bewerken"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2817
 msgid "Hamlet"
 msgstr "Gehucht"
 
 #. item
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2818
 msgid "Edit Hamlet"
 msgstr "Gehucht bewerken"
@@ -20625,5 +20978,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2824
 msgid "Locality"
 msgstr ""
@@ -20631,10 +20984,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2826
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2831
 msgid "Island"
 msgstr "Eiland"
@@ -20642,10 +20995,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2833
 msgid "Edit Island"
 msgstr "Eiland bewerken"
 
 #. item "Places/Island" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2838
 msgid "Islet"
 msgstr ""
@@ -20653,5 +21006,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2840
 msgid "Edit Islet"
 msgstr ""
@@ -20659,5 +21012,5 @@
 #. item "Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2846
 msgid "Cave Entrance"
 msgstr "Grotingang"
@@ -20665,10 +21018,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2848
 msgid "Edit Cave Entrance"
 msgstr "Grotingang bewerken"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2852
 msgid "Peak"
 msgstr "Bergtop"
@@ -20676,10 +21029,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2854
 msgid "Edit Peak"
 msgstr "Bergtop bewerken"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2859
 msgid "Glacier"
 msgstr "Gletsjer"
@@ -20687,10 +21040,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2861
 msgid "Edit Glacier"
 msgstr "Gletsjer bewerken"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2854
+#: build/trans_presets.java:2866
 msgid "Volcano"
 msgstr "Vulkaan"
@@ -20698,70 +21051,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2868
 msgid "Edit Volcano"
 msgstr "Vulkaan bewerken"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2874
 msgid "Boundaries"
 msgstr "Grenzen"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2875
 msgid "National"
 msgstr "Landsgrens"
 
 #. item
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2876
 msgid "Edit National Boundary"
 msgstr "Landsgrens bewerken"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2881
 msgid "Administrative"
 msgstr "Provincie -of gemeentegrens"
 
 #. item
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2882
 msgid "Edit Administrative Boundary"
 msgstr "Provincie -of gemeentegrens bewerken"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:2887
 msgid "Civil"
 msgstr "Grens bebouwde kom"
 
 #. item
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2888
 msgid "Edit Civil Boundary"
 msgstr "Grens bebouwde kom bewerken"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2893
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2894
 msgid "Edit Political Boundary"
 msgstr "Grens kiesdistrict bewerken"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2899
 msgid "National park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2888
+#: build/trans_presets.java:2900
 msgid "Edit National Park Boundary"
 msgstr "Grens Nationaal park bewerken"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2906
 msgid "Land use"
 msgstr "Grondgebruik"
 
 #. group "Land use"
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2907
 msgid "Tree"
 msgstr "Boom"
@@ -20770,15 +21123,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:2898
+#: build/trans_presets.java:2910
 msgid "Edit Tree"
 msgstr "Boom bewerken"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2915
 msgid "Botanical Name"
 msgstr "Botanische naam"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2917
 msgid "Wood"
 msgstr "Bos"
@@ -20787,5 +21140,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:2908
+#: build/trans_presets.java:2920
 msgid "Edit Wood"
 msgstr "Bos bewerken"
@@ -20793,17 +21146,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "coniferous"
 msgstr "naaldbomen"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "deciduous"
 msgstr "loofbomen"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "mixed"
 msgstr "gemengd"
 
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2925
 msgid "Forest"
 msgstr "Bosbouw"
@@ -20812,14 +21165,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:2916
+#: build/trans_presets.java:2928
 msgid "Edit Forest Landuse"
 msgstr "Bosbouw bewerken"
 
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2934
 msgid "Nature Reserve"
 msgstr "Natuurreservaat"
 
 #. item
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2935
 msgid "Edit Nature Reserve"
 msgstr "Natuurreservaat bewerken"
@@ -20827,25 +21180,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2940
 msgid "Scree"
 msgstr "Puinhelling"
 
 #. item
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2941
 msgid "Edit Scree"
 msgstr "Puinhelling bewerken"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2945
 msgid "Scrub"
 msgstr "Kreupelhout"
 
 #. item
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2946
 msgid "Edit Scrub"
 msgstr "Kreupelhout bewerken"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2950
 msgid "Fell"
 msgstr ""
@@ -20853,10 +21206,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2952
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2956
 msgid "Heath"
 msgstr "Heide"
@@ -20864,5 +21217,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2958
 msgid "Edit Heath"
 msgstr "Heide bewerken"
@@ -20870,5 +21223,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2963
 msgid "Farmyard"
 msgstr "Boerenerf"
@@ -20877,45 +21230,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:2954
+#: build/trans_presets.java:2966
 msgid "Edit Farmyard Landuse"
 msgstr "Boerenerf bewerken"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2971
 msgid "Farmland"
 msgstr "Landbouwgrond"
 
 #. item
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2972
 msgid "Edit Farmland Landuse"
 msgstr "Landbouwgrond bewerken"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2977
 msgid "Meadow"
 msgstr "Weide"
 
 #. item
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2978
 msgid "Edit Meadow Landuse"
 msgstr "Weideland bewerken"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2983
 msgid "Vineyard"
 msgstr "Wijngaard"
 
 #. item
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2984
 msgid "Edit Vineyard Landuse"
 msgstr "Wijngaard bewerken"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:2989
 msgid "Allotments"
 msgstr "Volkstuinen"
 
 #. item
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2990
 msgid "Edit Allotments Landuse"
 msgstr "Volkstuinen bewerken"
@@ -20923,25 +21276,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2996
 msgid "Garden"
 msgstr "Tuin"
 
 #. item
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2997
 msgid "Edit Garden"
 msgstr "Tuin bewerken"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3001
 msgid "Grass"
 msgstr "Gras"
 
 #. item
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3002
 msgid "Edit Grass Landuse"
 msgstr "Gras bewerken"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3007
 msgid "Village Green"
 msgstr "Stadsgroen"
@@ -20949,10 +21302,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3009
 msgid "Edit Village Green Landuse"
 msgstr "Stadsgroen bewerken"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3014
 msgid "Common"
 msgstr "Algemeen"
@@ -20960,20 +21313,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3004
+#: build/trans_presets.java:3016
 msgid "Edit Common"
 msgstr "Algemeen bewerken"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3020
 msgid "Park"
 msgstr "Park"
 
 #. item
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3021
 msgid "Edit Park"
 msgstr "Park bewerken"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3025
 msgid "Recreation Ground"
 msgstr "Recreatiegebied"
@@ -20981,5 +21334,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3027
 msgid "Edit Recreation Ground Landuse"
 msgstr "Recreatiegebied bewerken"
@@ -20987,15 +21340,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3033
 msgid "Residential area"
 msgstr "Woongebied"
 
 #. item
-#: build/trans_presets.java:3022
+#: build/trans_presets.java:3034
 msgid "Edit Residential Landuse"
 msgstr "Woongebied bewerken"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3039
 msgid "Graveyard"
 msgstr "Begraafplaats"
@@ -21003,9 +21356,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3029
+#: build/trans_presets.java:3041
 msgid "Edit Graveyard"
 msgstr "Begraafplaats bewerken"
 
-#: build/trans_presets.java:3035
+#: build/trans_presets.java:3047
 msgid "Cemetery"
 msgstr "Begraafplaats"
@@ -21013,39 +21366,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3049
 msgid "Edit Cemetery Landuse"
 msgstr "Begraafplaats bewerken"
 
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3056
 msgid "Retail"
 msgstr "Winkelcentrum"
 
 #. item
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3057
 msgid "Edit Retail Landuse"
 msgstr "Winkelcentrum bewerken"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3062
 msgid "Commercial"
 msgstr "Kantoren"
 
 #. item
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3063
 msgid "Edit Commercial Landuse"
 msgstr "Kantoren bewerken"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3056
+#: build/trans_presets.java:3068
 msgid "Industrial"
 msgstr "Industrieterrein"
 
 #. item
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3069
 msgid "Edit Industrial Landuse"
 msgstr "Industrieterrein bewerken"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3074
 msgid "Railway land"
 msgstr ""
@@ -21053,15 +21406,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3076
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3081
 msgid "Military"
 msgstr "Militair terrein"
 
 #. item
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3082
 msgid "Edit Military Landuse"
 msgstr "Militair terrein bewerken"
@@ -21069,55 +21422,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3088
 msgid "Construction area"
 msgstr "Bouwterrein"
 
 #. item
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3089
 msgid "Edit Construction Landuse"
 msgstr "Bouwterrein bewerken"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3094
 msgid "Brownfield"
 msgstr "Braakliggende grond"
 
 #. item
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3095
 msgid "Edit Brownfield Landuse"
 msgstr "Braakliggende grond bewerken"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3100
 msgid "Greenfield"
 msgstr "Ontwikkelingsgebied"
 
 #. item
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3101
 msgid "Edit Greenfield Landuse"
 msgstr "Ontwikkelingsgebied bewerken"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3106
 msgid "Landfill"
 msgstr "Vuilstortplaats"
 
 #. item
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3107
 msgid "Edit Landfill Landuse"
 msgstr "Vuilstortplaats bewerken"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3112
 msgid "Quarry"
 msgstr "Mijnbouw"
 
 #. item
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3113
 msgid "Edit Quarry Landuse"
 msgstr "Mijnbouw bewerken"
 
 #. group "Relations"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3122
 msgid "Multipolygon"
 msgstr "Multipolygoon"
@@ -21127,5 +21480,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:3114
+#: build/trans_presets.java:3126
 msgid "Edit Multipolygon"
 msgstr "Multipolygoon bewerken"
@@ -21134,10 +21487,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3132
 msgid "outer segment"
 msgstr "buitensegment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3133
 msgid "inner segment"
 msgstr "binnensegment"
@@ -21145,5 +21498,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3136
 msgid "Turn restriction"
 msgstr "Verkeersbeperking"
@@ -21152,5 +21505,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3139
 msgid "Edit Turn Restriction"
 msgstr "Verkeersbeperking bewerken"
@@ -21158,34 +21511,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "Restriction"
 msgstr "Beperking"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_left_turn"
 msgstr "niet linksaf"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_right_turn"
 msgstr "niet rechtsaf"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_straight_on"
 msgstr "niet rechtdoor"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_u_turn"
 msgstr "niet keren"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_right_turn"
 msgstr "alleen rechtsaf"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_left_turn"
 msgstr "alleen linksaf"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_straight_on"
 msgstr "alleen rechtdoor"
@@ -21194,15 +21547,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3146
 msgid "from way"
 msgstr "vanaf weg"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3147
 msgid "via node or way"
 msgstr "via knoop of weg"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3148
 msgid "to way"
 msgstr "naar weg"
@@ -21210,5 +21563,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3151
 msgid "Route"
 msgstr ""
@@ -21217,5 +21570,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3154
 msgid "Edit Route"
 msgstr ""
@@ -21223,5 +21576,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "Route type"
 msgstr ""
@@ -21293,5 +21646,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3144 build/trans_style.java:233
+#: build/trans_presets.java:3156 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -21300,17 +21653,17 @@
 msgstr "fiets"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ski"
 msgstr ""
@@ -21363,5 +21716,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3144 build/trans_style.java:247
+#: build/trans_presets.java:3156 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -21370,13 +21723,13 @@
 msgstr "voet"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "detour"
 msgstr ""
@@ -21390,10 +21743,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3144 build/trans_style.java:1206
+#: build/trans_presets.java:3156 build/trans_style.java:1206
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3159
 msgid "Symbol description"
 msgstr ""
@@ -21401,31 +21754,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3162
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "Color (hex)"
 msgstr ""
@@ -21434,30 +21787,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3168
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3169
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3170
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3171
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3172
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3173
 msgid "backward halt point"
 msgstr ""
@@ -21895,11 +22248,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3375 build/trans_style.java:3376
-#: build/trans_style.java:3946 build/trans_style.java:4254
-#: build/trans_style.java:4263 build/trans_style.java:4272
-#: build/trans_style.java:4281 build/trans_style.java:4290
-#: build/trans_style.java:4299 build/trans_style.java:4308
-#: build/trans_style.java:4309 build/trans_style.java:4318
-#: build/trans_style.java:4327
+#: build/trans_style.java:3383 build/trans_style.java:3384
+#: build/trans_style.java:3954 build/trans_style.java:4262
+#: build/trans_style.java:4271 build/trans_style.java:4280
+#: build/trans_style.java:4289 build/trans_style.java:4298
+#: build/trans_style.java:4307 build/trans_style.java:4316
+#: build/trans_style.java:4317 build/trans_style.java:4326
+#: build/trans_style.java:4335
 msgid "deprecated"
 msgstr "vervallen"
@@ -23923,5 +24276,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3294
+#: build/trans_style.java:3302
 msgid "light_water"
 msgstr "licht_water"
@@ -24603,8 +24956,17 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="boundary_stone"/>
+#. <icon annotate="true" src="historic/boundary_stone.png"/>
 #: build/trans_style.java:2990 build/trans_style.java:2998
 #: build/trans_style.java:3006 build/trans_style.java:3014
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
+#: build/trans_style.java:3054
 msgid "historic"
 msgstr "historisch"
@@ -24618,5 +24980,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3095
 msgid "quarry"
 msgstr "mijnbouw"
@@ -24630,5 +24992,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "landfill"
 msgstr "vuilstortplaats"
@@ -24650,5 +25012,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3103 build/trans_style.java:3111
+#: build/trans_style.java:3111 build/trans_style.java:3119
 msgid "basin"
 msgstr "estuarium"
@@ -24662,5 +25024,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3127
 msgid "forest"
 msgstr "bosbouw"
@@ -24674,5 +25036,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3159
 msgid "farmyard"
 msgstr "landbouwgrond"
@@ -24695,5 +25057,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3160 build/trans_style.java:3168
+#: build/trans_style.java:3168 build/trans_style.java:3176
 msgid "retail"
 msgstr "winkelcentrum"
@@ -24707,5 +25069,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3176
+#: build/trans_style.java:3184
 msgid "industrial"
 msgstr "industrieel"
@@ -24719,5 +25081,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "brownfield"
 msgstr "braakliggend gebied"
@@ -24731,5 +25093,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "greenfield"
 msgstr "ontwikkelingsgebied"
@@ -24743,5 +25105,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "railland"
 msgstr "Rangeerterrein"
@@ -24798,7 +25160,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3217 build/trans_style.java:3252
-#: build/trans_style.java:3260 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3225 build/trans_style.java:3260
+#: build/trans_style.java:3268 build/trans_style.java:3276
+#: build/trans_style.java:3284 build/trans_style.java:3292
 msgid "military"
 msgstr "militair gebruik"
@@ -24812,5 +25174,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3225
+#: build/trans_style.java:3233
 msgid "cemetery"
 msgstr "begraafplaats"
@@ -24823,5 +25185,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3301
+#: build/trans_style.java:3309
 msgid "peak"
 msgstr "berg of -heuveltop"
@@ -24836,5 +25198,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3310
+#: build/trans_style.java:3318
 msgid "glacier"
 msgstr "gletsjer"
@@ -24848,5 +25210,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "volcano"
 msgstr "vulkaan"
@@ -24901,8 +25263,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3326 build/trans_style.java:3327
-#: build/trans_style.java:3335 build/trans_style.java:3351
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440
+#: build/trans_style.java:3334 build/trans_style.java:3335
+#: build/trans_style.java:3343 build/trans_style.java:3359
+#: build/trans_style.java:3432 build/trans_style.java:3440
+#: build/trans_style.java:3448
 msgid "natural"
 msgstr "Natuurlijk"
@@ -24916,5 +25278,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3343
+#: build/trans_style.java:3351
 msgid "scrub"
 msgstr "ruig land"
@@ -24928,5 +25290,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3359
+#: build/trans_style.java:3367
 msgid "heath"
 msgstr "heide"
@@ -24940,5 +25302,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3408
+#: build/trans_style.java:3416
 msgid "mud"
 msgstr "slikgronden"
@@ -24952,5 +25314,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "beach"
 msgstr "strand"
@@ -25028,8 +25390,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
-#: build/trans_style.java:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496 build/trans_style.java:3504
+#: build/trans_style.java:3512 build/trans_style.java:3520
 msgid "route"
 msgstr "route"
@@ -25077,7 +25439,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3522 build/trans_style.java:3530
-#: build/trans_style.java:3538 build/trans_style.java:3546
-#: build/trans_style.java:3554
+#: build/trans_style.java:3530 build/trans_style.java:3538
+#: build/trans_style.java:3546 build/trans_style.java:3554
+#: build/trans_style.java:3562
 msgid "boundary"
 msgstr "grens"
@@ -25227,11 +25589,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090
+#: build/trans_style.java:4002 build/trans_style.java:4010
+#: build/trans_style.java:4018 build/trans_style.java:4026
+#: build/trans_style.java:4034 build/trans_style.java:4042
+#: build/trans_style.java:4050 build/trans_style.java:4058
+#: build/trans_style.java:4066 build/trans_style.java:4074
+#: build/trans_style.java:4082 build/trans_style.java:4090
+#: build/trans_style.java:4098
 msgid "place"
 msgstr "plaats"
@@ -25279,6 +25641,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4207 build/trans_style.java:4214
-#: build/trans_style.java:4221 build/trans_style.java:4228
+#: build/trans_style.java:4215 build/trans_style.java:4222
+#: build/trans_style.java:4229 build/trans_style.java:4236
 msgid "address"
 msgstr "adres"
@@ -25586,12 +25948,139 @@
 msgstr ""
 
+#~ msgid "- running version is {0}"
+#~ msgstr "- uitgevoerde versie is {0}"
+
+#~ msgid "Unknown version"
+#~ msgstr "Onbekende versie"
+
+#~ msgid "position"
+#~ msgstr "positie"
+
+#~ msgid "Aborting..."
+#~ msgstr "Afbreken..."
+
+#~ msgid "different"
+#~ msgstr "verschillend"
+
+#~ msgid "true"
+#~ msgstr "Waar"
+
+#~ msgid "Change"
+#~ msgstr "Aanpassen"
+
+#~ msgid "Move"
+#~ msgstr "Verplaatsen"
+
+#~ msgid "Resolve Conflicts"
+#~ msgstr "Conflicten oplossen"
+
+#~ msgid "unnamed"
+#~ msgstr "Onbenoemd"
+
 #~ msgid "All the ways were empty"
 #~ msgstr "Alle wegen zijn leeg"
 
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Knopen met verschillende relaties samenvoegen?"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Toch samenvoegen"
+#~ 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 "Found <nd> element in non-way."
+#~ msgstr "<nd>-element in niet-weg gevonden."
+
+#~ msgid "<nd> has zero ref"
+#~ msgstr "<nd> heeft geen referenties"
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "Misvormde knoop-id"
+
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "<member>-element in niet-relatie gevonden."
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "Verzending is afgebroken vanwege een fout (zal 5 seconden wachten):"
+
+#~ msgid "Plugin requires JOSM update: {0}."
+#~ msgstr "Plugin vereist JOSM-update: {0}"
+
+#~ msgid "Hint: Some changes came from uploading new data to the server."
+#~ msgstr ""
+#~ "Tip: enkele wijzigingen zijn afkomstig uit het uploaden van nieuwe "
+#~ "gegevens naar de server."
+
+#~ msgid "Contacting the OSM server..."
+#~ msgstr "Met OSM-server verbinden..."
+
+#~ msgid "Tags (empty value deletes tag)"
+#~ msgstr "Tags (lege waarde verwijdert de tag)"
+
+#~ msgid "Occupied By"
+#~ msgstr "Bezet door"
+
+#~ msgid "Add all currently selected objects as members"
+#~ msgstr "Alle geselecteerde objecten als leden toevoegen"
+
+#~ msgid "Error parsing server response."
+#~ msgstr "Ontleden van de serverreactie is mislukt."
+
+#~ msgid "There were conflicts during import."
+#~ msgstr "Er zijn conflicten tijdens het importeren."
+
+#~ msgid "Date"
+#~ msgstr "Datum"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Klik Herladen om lijst te verversen"
+
+#~ msgid "Revert"
+#~ msgstr "Terugdraaien"
+
+#~ msgid "Cannot connect to server."
+#~ msgstr "Kan niet met server verbinden."
+
+#~ msgid "Object"
+#~ msgstr "Object"
+
+#~ msgid ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr ""
+#~ "De staat van alle geselecteerde objecten terugdraaien naar de versie "
+#~ "geselecteerd in de geschiedenislijst."
+
+#~ msgid "Add either site-josm.xml or Wiki Pages."
+#~ msgstr "site-josm.xml of Wiki-paginas toevoegen."
+
+#~ msgid "Error deleting plugin file: {0}"
+#~ msgstr "Fout tijdens verwijderen plugin-bestand: {0}"
+
+#~ msgid "Plugin already exists"
+#~ msgstr "Plugin bestaat al"
+
+#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
+#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
+#~ msgstr[0] "{0} plugin bijgewerkt. Herstart JOSM a.u.b."
+#~ msgstr[1] "{0} plugins bijgewerkt. Herstart JOSM a.u.b."
+
+#~ msgid "Could not download plugin: {0} from {1}"
+#~ msgstr "Kan plugin niet downloaden: {0} van {1}"
+
+#~ msgid "Delete {1} {0}"
+#~ msgstr "{1} {0} verwijderen"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
+#~ msgid "Some of the nodes are (almost) in the line"
+#~ msgstr "Sommige knopen zitten (bijna) op de lijn"
+
+#~ msgid ""
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
+#~ msgstr ""
+#~ "Interne fout: kan voorwaarden voor geen laag niet controleren. Rapporteer "
+#~ "dit als fout a.u.b."
 
 #~ msgid ""
@@ -25602,139 +26091,6 @@
 #~ "toch samenvoegen?"
 
-#~ msgid "Unknown version"
-#~ msgstr "Onbekende versie"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "<nd>-element in niet-weg gevonden."
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> heeft geen referenties"
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "<member>-element in niet-relatie gevonden."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Misvormde knoop-id"
-
-#~ msgid "position"
-#~ msgstr "positie"
-
-#~ msgid "Aborting..."
-#~ msgstr "Afbreken..."
-
-#~ msgid "different"
-#~ msgstr "verschillend"
-
-#~ msgid "true"
-#~ msgstr "Waar"
-
-#~ msgid "Change"
-#~ msgstr "Aanpassen"
-
-#~ msgid "Move"
-#~ msgstr "Verplaatsen"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Conflicten oplossen"
-
-#~ msgid "unnamed"
-#~ msgstr "Onbenoemd"
-
-#~ 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"
-#~ msgstr "Opmerking bevestigen"
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Verzending is afgebroken vanwege een fout (zal 5 seconden wachten):"
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "Plugin vereist JOSM-update: {0}"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr ""
-#~ "Tip: enkele wijzigingen zijn afkomstig uit het uploaden van nieuwe "
-#~ "gegevens naar de server."
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Met OSM-server verbinden..."
-
-#~ msgid "Add Selected"
-#~ msgstr "Selectie toevoegen"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Tags (lege waarde verwijdert de tag)"
-
-#~ msgid "Occupied By"
-#~ msgstr "Bezet door"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Alle geselecteerde objecten als leden toevoegen"
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Ontleden van de serverreactie is mislukt."
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Er zijn conflicten tijdens het importeren."
-
-#~ msgid "Date"
-#~ msgstr "Datum"
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Klik Herladen om lijst te verversen"
-
-#~ msgid "Revert"
-#~ msgstr "Terugdraaien"
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Kan niet met server verbinden."
-
-#~ msgid "Object"
-#~ msgstr "Object"
-
-#~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-#~ msgstr ""
-#~ "De staat van alle geselecteerde objecten terugdraaien naar de versie "
-#~ "geselecteerd in de geschiedenislijst."
-
-#~ msgid "Add either site-josm.xml or Wiki Pages."
-#~ msgstr "site-josm.xml of Wiki-paginas toevoegen."
-
-#~ msgid "Error deleting plugin file: {0}"
-#~ msgstr "Fout tijdens verwijderen plugin-bestand: {0}"
-
-#~ msgid "Plugin already exists"
-#~ msgstr "Plugin bestaat al"
-
-#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
-#~ msgid_plural "{0} Plugins successfully updated. Please restart JOSM."
-#~ msgstr[0] "{0} plugin bijgewerkt. Herstart JOSM a.u.b."
-#~ msgstr[1] "{0} plugins bijgewerkt. Herstart JOSM a.u.b."
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Kan plugin niet downloaden: {0} van {1}"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "{1} {0} verwijderen"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Sommige knopen zitten (bijna) op de lijn"
-
-#~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
-#~ msgstr ""
-#~ "Interne fout: kan voorwaarden voor geen laag niet controleren. Rapporteer "
-#~ "dit als fout a.u.b."
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "Knopen met verschillende relaties samenvoegen?"
 
 #~ msgid "Please select ways with almost right angles to orthogonalize."
@@ -25952,7 +26308,4 @@
 #~ msgstr "samengevoegde versie:"
 
-#~ msgid "Server does not support changesets"
-#~ msgstr "Server ondersteunt geen changesets"
-
 #~ msgid "YAHOO (GNOME)"
 #~ msgstr "YAHOO (GNOME)"
@@ -26038,7 +26391,4 @@
 #~ msgstr "Omhoog bewegen"
 
-#~ msgid "Delete Layer"
-#~ msgstr "Laag verwijderen"
-
 #~ msgid "Delete and Download"
 #~ msgstr "Verwijder en download"
@@ -26050,4 +26400,7 @@
 #~ "Selecteer a.u.b. minstens één knoop, weg of relatie. Alleen elementen die "
 #~ "reeds geupload zijn hebben een geschiedenis."
+
+#~ msgid "Merge Anyway"
+#~ msgstr "Toch samenvoegen"
 
 #~ msgid ""
Index: applications/editors/josm/i18n/po/pl.po
===================================================================
--- applications/editors/josm/i18n/po/pl.po	(revision 17655)
+++ applications/editors/josm/i18n/po/pl.po	(revision 17697)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-12 18:11+0200\n"
-"PO-Revision-Date: 2009-09-08 10:07+0000\n"
-"Last-Translator: t4fun <Unknown>\n"
+"POT-Creation-Date: 2009-09-19 13:00+0200\n"
+"PO-Revision-Date: 2009-09-19 10:21+0000\n"
+"Last-Translator: pp/bs <Unknown>\n"
 "Language-Team: Polish <josm-lang-pl@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2009-09-12 16:05+0000\n"
+"X-Launchpad-Export-Date: 2009-09-19 10:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: POLAND\n"
@@ -46,10 +46,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:543
 #: ../core/src/org/openstreetmap/josm/Main.java:551
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -74,5 +74,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -90,6 +90,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:358
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
@@ -105,6 +105,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
@@ -120,6 +120,7 @@
 msgid_plural ""
 "There are unsaved changes in {0} layers. Discard the changes and continue?"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Nie zapisano zmian na {0} warstwie. Porzucić zmiany i kontynuować?"
+msgstr[1] "Nie zapisano zmian na {0} warstwach. Porzucić zmiany i kontynuować?"
+msgstr[2] "Nie zapisano zmian na {0} warstwach. Porzucić zmiany i kontynuować?"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:453
@@ -128,10 +129,10 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
 msgid "Save and Exit"
 msgstr "Zapisz i wyjdź"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
 msgid "Discard and Exit"
 msgstr "Porzuć i wyjdź"
@@ -142,4 +143,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
@@ -147,27 +149,28 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:296
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:258
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:613
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
@@ -175,5 +178,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -193,6 +196,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
@@ -209,17 +212,17 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:654
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1528
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -230,6 +233,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
@@ -260,5 +263,5 @@
 #, java-format
 msgid "<html>Could not read file ''{0}''.<br> Error is: <br>{1}</html>"
-msgstr ""
+msgstr "<html>Nie można odczytać pliku ''{0}''.<br> Błąd: <br>{1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:73
@@ -282,9 +285,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:607
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:609
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -344,5 +347,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
 msgid "Plugins"
@@ -392,5 +395,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Połącz"
@@ -402,4 +405,6 @@
 "</html>"
 msgstr ""
+"<html>Nie ma warstw, z którymi można by połączyć warstwę "
+"źródłową<br>''{0}''<br>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90
@@ -478,5 +483,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -489,4 +494,5 @@
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -522,6 +528,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
@@ -530,6 +536,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:346
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
@@ -639,4 +645,46 @@
 msgstr "Brak konfliktów, które można pokazać"
 
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#, fuzzy
+msgid "Close open changesets"
+msgstr "Zamykanie zestawu zmian..."
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#, fuzzy
+msgid "Closes open changesets"
+msgstr "Zamykanie zestawu zmian..."
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
+#: ../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:114
+#, java-format
+msgid "File: {0}"
+msgstr "Plik: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
+#, fuzzy
+msgid "There are no open changesets"
+msgstr "Serwer nie wspiera wersjonowania"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
+#, fuzzy
+msgid "No open changesets"
+msgstr "Zamykanie zestawu zmian..."
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
+#, fuzzy
+msgid "Downloading open changesets ..."
+msgstr "Zamykanie zestawu zmian..."
+
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
@@ -734,10 +782,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:123
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
@@ -782,31 +831,30 @@
 "jednej linii."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
 msgid "Download from OSM..."
 msgstr "Pobierz z OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
 msgid "Download map data from the OSM server."
 msgstr "Pobiera dane mapy z serwera OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
-#, java-format
-msgid "File: {0}"
-msgstr "Plik: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
 msgid "Download"
 msgstr "Pobieranie"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
 msgid "Please select at least one task to download"
 msgstr "Należy wybrać przynajmniej jeden element do pobrania"
@@ -827,5 +875,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1527
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307
@@ -845,6 +893,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:376
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1415
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
 msgid "Duplicate"
 msgstr "Powiel"
@@ -916,10 +964,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
@@ -1005,25 +1054,26 @@
 msgstr "Włącz  aktualną warstwę do innej."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 msgid "Merge Nodes"
 msgstr "Połącz węzły"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
 msgid "Merge nodes into the oldest one."
 msgstr "Scala wybrane węzły z najstarszym."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
 msgid "Please select at least two nodes to merge."
 msgstr "Proszę wybierz przynajmniej dwa węzły aby scalić."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:394
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
@@ -1039,8 +1089,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -1066,6 +1116,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
@@ -1074,5 +1128,5 @@
 msgstr "parameter ''{0}'' nie może być pusty (null)"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
@@ -1080,5 +1134,5 @@
 "używana."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283
 #, java-format
 msgid "Merge {0} nodes"
@@ -1150,5 +1204,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "New"
 msgstr "Nowa"
@@ -1424,14 +1478,15 @@
 msgstr "Pomoc: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
 msgid "Status Report"
 msgstr "Raport konfiguracji"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 msgid "Copy to clipboard and close"
 msgstr "Skopiuj do schowka i zamknij"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
@@ -1511,25 +1566,4 @@
 msgstr "Rozdziel drogę {0} na {1} części"
 
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24
-msgid "Close current changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-msgid "Close the current changeset ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41
-msgid "There is currently no changeset open."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42
-msgid "No open changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60
-msgid "Closing changeset"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
@@ -1695,14 +1729,14 @@
 msgstr "Wybrano zbiór pusty."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Wyślij do OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 msgid "Upload all changes to the OSM server."
 msgstr "Wysyła wszystkie zmiany na serwer OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
 #, java-format
 msgid ""
@@ -1711,23 +1745,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
 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:166
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 msgid "No changes to upload."
 msgstr "Brak zmian do wysłania."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
 msgid "Synchronize entire dataset"
 msgstr "Synchronizuj cały zestaw danych"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
 #, java-format
 msgid ""
@@ -1741,17 +1775,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
 msgid "Conflict detected"
 msgstr "Wykryto konflikt"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr "niespodziewana wartość powrotna. Dostałem {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:267
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
 #, java-format
 msgid ""
@@ -1762,28 +1796,40 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
+msgid ""
+"<html>Uploading <strong>failed</strong> because you've been "
+"using<br>changeset {0} which was already closed at {1}.<br>Please upload "
+"again with a new or an existing open changeset."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+#, fuzzy
+msgid "Changeset closed"
+msgstr "Zmienić wartości?"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr "<html>Załadunek się <strong>nie</strong> powiódł.<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
 msgid "Upload to OSM API failed"
 msgstr "Załadunek do API OSM się nie udał."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -2002,14 +2048,14 @@
 msgstr "Dodaj węzeł do drogi i połącz"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:930
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:932
 msgid "Create new node."
 msgstr "Utwórz nowy węzeł."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
 msgid "Select node under cursor."
 msgstr "Zaznacz węzeł pod kursorem."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939
 #, java-format
 msgid "Insert new node into way."
@@ -2018,14 +2064,14 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
 msgid "Start new way from last node."
 msgstr "Zacznij nową drogę od ostatniego węzła"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951
 msgid "Continue way from last node."
 msgstr "Kontynuuj drogę od ostatniego węzła."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:972
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:974
 msgid "Finish drawing."
 msgstr "Zakończ rysowanie."
@@ -2107,8 +2153,11 @@
 "Really move them?"
 msgstr ""
+"Przesunąłeś więcej niż {0} elementów. Przesunięcie dużej liczby elementów "
+"jest często wynikiem pomyłki.\n"
+"Czy na pewno je przesunąć?"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:478
 msgid "Always move and don't show dialog again"
-msgstr ""
+msgstr "Zawsze przesuwaj i nie pokazuj tego okna dialogowego"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:549
@@ -2142,61 +2191,71 @@
 "+góra, lewo, dół, prawo; przesuń powiększenie prawym przyciskiem"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Szukaj..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Szukaj obiektów"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
 msgid "Can't search because there is no loaded data."
 msgstr "Nie mogę szukać ponieważ nie załadowano danych."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
+#, fuzzy
+msgid "Please enter a filter string."
+msgstr "Podaj proszę czego szukać."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
 msgid "Please enter a search string."
 msgstr "Podaj proszę czego szukać."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
 msgid "replace selection"
 msgstr "zamień zaznaczenie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72
 msgid "add to selection"
 msgstr "dodaj do zaznaczenia"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73
 msgid "remove from selection"
 msgstr "usuń z zaznaczenia"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
+#, fuzzy
+msgid "find in selection"
+msgstr "dodaj do zaznaczenia"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81
 msgid "case sensitive"
 msgstr "uwzględnij wielkość liter"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82
 msgid "regular expression"
 msgstr "wyrażenie regularne"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
 msgstr ""
 "<b>Baker Street</b> - 'Baker' oraz 'Street' w dowolnym kluczu lub nazwie."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
 msgstr "<b>\"Baker Street\"</b> - 'Baker Street' w dowolnym kluczu lub nazwie."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
 msgstr "<b>name:Bak</b> - 'Bak' gdziekolwiek w nazwie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid ""
 "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
@@ -2204,17 +2263,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
 msgstr "<b>-name:Bak</b> - brak 'Bak' w nazwie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - klucz=foot ustawiony na dowolną wartość"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
 msgid "<u>Special targets:</u>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
@@ -2222,92 +2281,109 @@
 "<b>type:</b> - rodzaj obiektu (<b>node</b>, <b>way</b>, <b>relation</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - wszystkie obiekty zmienione przez użytkownika"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 msgid "<b>nodes:</b>... - object with given number of nodes"
 msgstr "<b>nodes:</b>... - obiekt z podaną liczbą węzłów"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - wszystkie zmienione obiekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - wszystkie zaznaczone obiekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - wszystkie niekompletne obiekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - wszystkie obiekty bez tagów"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Użyj <b>I</b> lub <b>OR</b> by połączyć logicznym \"lub\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr "Użyj <b>\"</b> aby wpisać operator (np.: jeżeli klucz zawiera :)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Użyj <b>(</b> oraz <b>)</b> aby pogrupować wyrażenia"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
+msgid "Filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Szukaj"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
+msgid "Submit filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "Start Search"
 msgstr "Rozpocznij szukanie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Nie znaleziono nic szukając ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Niczego nie dodano do zaznaczenia szukając \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Niczego nie usunięto z zaznaczenia szukając \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#, fuzzy, java-format
+msgid "Nothing find in selection by searching for ''{0}''"
+msgstr "Niczego nie dodano do zaznaczenia szukając \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262
 #, java-format
 msgid "Found {0} matches"
 msgstr "Znaleziono {0} pasujących."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CS"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CI"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283
 msgid "RX"
 msgstr ""
@@ -2490,5 +2566,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
 msgid "Double conflict"
 msgstr ""
@@ -2733,4 +2809,5 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:134
 msgid "Old value"
 msgstr "Stara wartość"
@@ -2894,27 +2971,57 @@
 
 #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
 msgid "E"
 msgstr "E"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:59
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:203
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
 msgid "Changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:323
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:325
-#, fuzzy, java-format
-msgid "paramete''{0}'' must not be null"
-msgstr "parameter ''{0}'' nie może być pusty (null)"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331
-#, fuzzy, java-format
-msgid "unsupported value ''{0}'' or parameter ''{1}''"
-msgstr "Używa szablon \"{0}\" z grupy \"{1}\""
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "H"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "Text"
+msgstr "tekst"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "C"
+msgstr "WC"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "I"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "M"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+msgid "R"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+msgid "A"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+msgid "D"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+msgid "F"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
@@ -2928,29 +3035,29 @@
 msgstr "Uwaga: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
+#, java-format
 msgid "expected id >= 0. Got {0}"
-msgstr "niespodziewana wartość powrotna. Dostałem {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:257
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
 msgid "a primitive with id=0 can't be invisible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:293
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
+#, java-format
 msgid "id > 0 expected. Got {0}"
-msgstr "niespodziewana wartość powrotna. Dostałem {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
 msgid "version > 0 expected. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
 msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
 msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
@@ -3017,9 +3124,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:247
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:249
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:478
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:482
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
@@ -3028,118 +3135,118 @@
 #. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
 #. TODO Remove useless nullcheck when RelationMember.member is encalupsed
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:851
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855
 msgid "Empty member in relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:853
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:864
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Nieznana rola \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652
 msgid "No \"via\" node or way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:885
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:943
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1032
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1044
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1097
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1123
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1327
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331
 msgid "untagged"
 msgstr "nieotagowany"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1328
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332
 msgid "text"
 msgstr "tekst"
@@ -3160,5 +3267,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
@@ -3181,5 +3288,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
@@ -3229,5 +3336,5 @@
 msgstr "odwzorowanie Lamberta (Francja)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
 msgid "Lambert Zone (Estonia)"
 msgstr "odwzorowanie Lamberta (Estonia)"
@@ -3269,9 +3376,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:38
 msgid "Do not show again"
 msgstr "Nie pokazuj ponownie"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
 #, java-format
@@ -3279,31 +3386,31 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:91
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:116
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154
 msgid "incomplete"
 msgstr "niekompletne"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
 msgid "highway"
 msgstr "droga"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
-#: build/trans_presets.java:3144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: build/trans_presets.java:3156
 msgid "railway"
 msgstr "tory kolejowe"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
 msgid "waterway"
 msgstr "szlak wodny"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "landuse"
 msgstr "zagospodarowanie przestrzenne"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:474
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
@@ -3314,5 +3421,5 @@
 msgstr[2] "{0} węzłów"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
 #, java-format
 msgid "{0} member"
@@ -3358,10 +3465,5 @@
 msgstr "Wiadomość dnia jest niedostępna"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67
-#, java-format
-msgid "- running version is {0}"
-msgstr "- używasz wersji {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:95
 msgid "Downloading \"Message of the day\""
 msgstr "Pobieranie wiadomości dnia"
@@ -3427,10 +3529,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:162
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
 msgid "Username"
 msgstr "Nazwa użytkownika"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
 msgid "Password"
 msgstr "Hasło"
@@ -3551,5 +3653,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226
 msgid "Presets"
 msgstr "Szablony"
@@ -3623,38 +3725,49 @@
 msgstr "skala"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Długość geograficzna punktu wskazywanego przez kursor."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The name of the object at the mouse pointer."
 msgstr "Nazwa obiektu wskazywanego przez kursor."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Szerokość geograficzna punktu wskazywanego przez kursor."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The angle between the previous and the current way segment."
 msgstr "Kąt pomiędzy poprzednim i bieżącym segmentem tworzonej drogi."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "Namiar (kompasowy) tworzonego odcinka."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The length of the new way segment being drawn."
 msgstr "Długość nowego, tworzonego odcinka."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199
+msgid ""
+"Middle click again to cycle through.<br>Hold CTRL to select directly from "
+"this list with the mouse.<hr>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290
 msgid "(no object)"
 msgstr "(brak obiektu)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:301
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418
+#, fuzzy
+msgid "User:"
+msgstr "Użytkownik"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
 msgid "layer not in list."
 msgstr "warstwa nie jest na liście."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:488
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3724,7 +3837,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:224
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Tags"
 msgstr "Etykiety"
@@ -3739,5 +3852,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
@@ -3918,4 +4031,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
 msgid "Up"
 msgstr ""
@@ -3926,4 +4040,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Down"
 msgstr ""
@@ -3936,5 +4051,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
@@ -4357,23 +4472,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:236
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239
 msgid "No conflicts to resolve"
-msgstr "Brak konfliktów, które można pokazać"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:295
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254
 msgid "Cancel conflict resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:310
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269
 msgid "Apply resolved conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Apply"
 msgstr ""
@@ -4385,5 +4499,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "all"
 msgstr "wszystkie"
@@ -4427,7 +4541,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
-msgid "not yet decided"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:213
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
@@ -4454,7 +4565,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
@@ -4465,7 +4576,7 @@
 msgstr[2] "{0} dróg"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:152
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
@@ -4476,20 +4587,20 @@
 msgstr[2] "{0} relacji"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "Paste ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "From ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:372
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "To ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:428
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
 #, java-format
 msgid "{0} tag"
@@ -4505,13 +4616,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
-#, fuzzy
 msgid "Remove this relation member from the relation"
-msgstr "Usuń z relacji członka zawartego w aktualnym wierszu tabeli z"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-#, fuzzy
 msgid "Replace"
-msgstr "Miejsce"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
@@ -4527,5 +4636,5 @@
 #. --- role editing
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:56
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510
 msgid "Role:"
 msgstr ""
@@ -4541,7 +4650,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70
-#, fuzzy
 msgid "Value:"
-msgstr "Wartość"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86
@@ -4554,12 +4662,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51
-#, fuzzy
 msgid "Orig. Way"
-msgstr "Jednokierunkowa"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
-#, fuzzy
 msgid "Decision"
-msgstr "Wersja"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -4575,6 +4681,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
@@ -4663,171 +4770,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-msgid "History"
-msgstr "Historia"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-msgid "Display the history of all selected items."
-msgstr "Wyświetla historię wszystkich zaznaczonych elementów."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
-#, java-format
-msgid "index out of bounds Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
-msgid "History item"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Ponownie wczytuje wszystkie zaznaczone obiekty i odświeża listę."
-
-#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
-msgid "Show"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
-msgid "Dialog not created yet. Invoke createInstance() first"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
-msgid "Layers"
-msgstr "Warstwy"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-msgid "Open a list of all loaded layers."
-msgstr "Otwiera listę wszystkich wczytanych warstw."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:297
-msgid "Delete the selected layer."
-msgstr "Usuń zaznaczoną warstwę."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:367
-msgid "Show/Hide"
-msgstr "Pokaż/Ukryj"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:378
-msgid "Toggle visible state of the selected layer."
-msgstr "Zmienia widocznoś zaznaczonej warstwy."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:420
-msgid "Activate the selected layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:475
-msgid "Merge this layer into another layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:581
-msgid "Move the selected layer one row up."
-msgstr "Przesuwa wybraną warstwę o jeden wiersz do góry."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:600
-msgid "Move the selected layer one row down."
-msgstr "Przesuwa wybraną warstwę o jedno odczo do dołu."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
-msgid "Information about layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
-#, java-format
-msgid "This will change up to {0} object."
-msgid_plural "This will change up to {0} objects."
-msgstr[0] "Ta operacja może zmienić {0} obiekt."
-msgstr[1] "Ta operacja może zmienić {0} obiekty."
-msgstr[2] "Ta operacja może zmienić {0} obiektów."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
-msgid "An empty value deletes the key."
-msgstr "Ustawienie wartości na pustą usuwa klucz"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
-msgid "<different>"
-msgstr "<różne>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
-msgid "Change values?"
-msgstr "Zmienić wartości?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
-#, java-format
-msgid "Change properties of up to {0} object"
-msgid_plural "Change properties of up to {0} objects"
-msgstr[0] "Zmiana właściwości {0} obiektu."
-msgstr[1] "Zmiana właściwości {0} obiektów."
-msgstr[2] "Zmiana właściwości {0} obiektów."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
-msgid "Please select a key"
-msgstr "Proszę wybierz klucz"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
-msgid "Please select a value"
-msgstr "Proszę wybierz wartość"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
-msgid "Please select the objects you want to change properties for."
-msgstr "Zaznacz proszę te obiekty, których właściwości chcesz zmienić."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
-msgid "Properties/Memberships"
-msgstr "Właściwości/członkostwo"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-msgid "Properties for selected objects."
-msgstr "Właściwości zaznaczonych obiektów."
-
-#. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-msgid "Member Of"
-msgstr "Członek"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
-msgid "Add Properties"
-msgstr "Dodaj właściwości"
-
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+msgid "Filter objects and hide/disable them."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
@@ -4841,4 +4790,214 @@
 msgstr "Dodaj"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#, fuzzy
+msgid "Add filter."
+msgstr "Dodaj zaznaczone"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
+#, fuzzy
+msgid "Edit filter."
+msgstr "Edycja molo"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#, fuzzy
+msgid "Delete filter."
+msgstr "Usuń warstwę"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
+#, fuzzy
+msgid "Move filter up."
+msgstr "Przesuń do góry"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
+#, fuzzy
+msgid "Move filter down."
+msgstr "Przesuń w dół"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128
+msgid "Enable filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
+#, fuzzy
+msgid "Hide elements"
+msgstr "Pojedyncze elementy"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
+msgid "Apply also for children"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
+msgid "Inverse filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
+#, fuzzy
+msgid "Filter mode"
+msgstr "Tryb kasowania"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
+msgid "History"
+msgstr "Historia"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+msgid "Display the history of all selected items."
+msgstr "Wyświetla historię wszystkich zaznaczonych elementów."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
+msgid "History item"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
+msgid "Reload all currently selected objects and refresh the list."
+msgstr "Ponownie wczytuje wszystkie zaznaczone obiekty i odświeża listę."
+
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
+msgid "Show"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
+msgid "Display the history of the selected primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84
+msgid "Dialog not created yet. Invoke createInstance() first"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
+msgid "Layers"
+msgstr "Warstwy"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+msgid "Open a list of all loaded layers."
+msgstr "Otwiera listę wszystkich wczytanych warstw."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294
+msgid "Delete the selected layer."
+msgstr "Usuń zaznaczoną warstwę."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364
+msgid "Show/Hide"
+msgstr "Pokaż/Ukryj"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375
+msgid "Toggle visible state of the selected layer."
+msgstr "Zmienia widocznoś zaznaczonej warstwy."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgid "Activate"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417
+msgid "Activate the selected layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472
+msgid "Merge this layer into another layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578
+msgid "Move the selected layer one row up."
+msgstr "Przesuwa wybraną warstwę o jeden wiersz do góry."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597
+msgid "Move the selected layer one row down."
+msgstr "Przesuwa wybraną warstwę o jedno odczo do dołu."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+msgid "Information about layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+#, java-format
+msgid "This will change up to {0} object."
+msgid_plural "This will change up to {0} objects."
+msgstr[0] "Ta operacja może zmienić {0} obiekt."
+msgstr[1] "Ta operacja może zmienić {0} obiekty."
+msgstr[2] "Ta operacja może zmienić {0} obiektów."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+msgid "An empty value deletes the key."
+msgstr "Ustawienie wartości na pustą usuwa klucz"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+msgid "<different>"
+msgstr "<różne>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+msgid "Change values?"
+msgstr "Zmienić wartości?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#, java-format
+msgid "Change properties of up to {0} object"
+msgid_plural "Change properties of up to {0} objects"
+msgstr[0] "Zmiana właściwości {0} obiektu."
+msgstr[1] "Zmiana właściwości {0} obiektów."
+msgstr[2] "Zmiana właściwości {0} obiektów."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+msgid "Please select a key"
+msgstr "Proszę wybierz klucz"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+msgid "Please select a value"
+msgstr "Proszę wybierz wartość"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
+msgid "Please select the objects you want to change properties for."
+msgstr "Zaznacz proszę te obiekty, których właściwości chcesz zmienić."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
+msgid "Properties/Memberships"
+msgstr "Właściwości/członkostwo"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+msgid "Properties for selected objects."
+msgstr "Właściwości zaznaczonych obiektów."
+
+#. setting up the membership table
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+msgid "Member Of"
+msgstr "Członek"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
+msgid "Add Properties"
+msgstr "Dodaj właściwości"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574
 msgid "Add a new key/value pair to all objects"
@@ -4880,10 +5039,9 @@
 
 #. item "Land use/Quarry" text "Name"
-#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
-#: build/trans_presets.java:3109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168
+#: build/trans_presets.java:3121
 msgid "Relations"
 msgstr "Relacje"
@@ -4893,23 +5051,23 @@
 msgstr "Otwiera listę wszystkich relacji"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relacje: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276
 msgid "Open an editor for the selected relation"
 msgstr "Otwiera okno edycji dla zaznaczonej relacji."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
 msgid "Delete the selected relation"
 msgstr "Usuwa zaznaczoną relację."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349
 msgid "Create a new relation"
 msgstr "Utwórz nową relację"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:373
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1412
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
@@ -4942,5 +5100,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4952,9 +5110,9 @@
 msgstr "Zaznaczenie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441
 msgid "Undock the panel"
 msgstr "Oderwij panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -4962,5 +5120,5 @@
 "Zamknij panel. Możesz ponownie go otworzyć używając przycisków po lewej."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:457
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Kliknij aby zminimalizować/maksymalizować zawartość panela"
@@ -5021,5 +5179,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5043,5 +5201,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1502
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1370
 msgid "Download relation members"
 msgstr ""
@@ -5071,5 +5229,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -5077,18 +5235,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
 msgid "Tags and Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:167
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5097,14 +5255,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613
 #, java-format
 msgid ""
@@ -5114,9 +5272,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid ""
@@ -5126,15 +5284,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5142,5 +5300,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5148,20 +5306,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849
 #, java-format
 msgid ""
@@ -5170,57 +5328,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:961
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909
 msgid "Move the currently selected members up"
 msgstr "Przesuń aktualnie zaznaczonych członkół w górę"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:979
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:912
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928
 msgid "Move the currently selected members down"
 msgstr "Przesuwa wybrane węzły tak, aby znajdowały się w jednej linii."
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:998
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:931
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5229,9 +5387,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1058
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
 #, java-format
 msgid ""
@@ -5240,56 +5398,41 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090
+msgid "Apply the current updates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123
+msgid "Apply the updates and close the dialog"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
-msgid "Apply the current updates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
-msgid "Apply the updates and close the dialog"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
-msgid "Delete the currently selected tags"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Pobierz wszystkie niekompletne drogi i węzły w relacji"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 msgid "Download Members"
 msgstr "Pobierz członków"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1208
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1211
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1356
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 #, java-format
 msgid ""
@@ -5299,13 +5442,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1229
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1367
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
 msgid "Confirm empty role"
 msgstr ""
@@ -5392,37 +5535,37 @@
 msgstr "Zakładki"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:82
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
 msgid "Please enter the desired coordinates first."
 msgstr "Proszę wcześniej podać wybrane współrzędne."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
 msgid "Please enter a name for the location."
 msgstr "Proszę podać nazwę lokalizacji."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:107
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
 msgid "Select a bookmark first."
 msgstr "Wybierz najpierw zakładkę."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
 msgid "min lat"
 msgstr "min szer."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
 msgid "min lon"
 msgstr "min dł."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid "max lat"
 msgstr "max szer."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
 msgid "max lon"
 msgstr "max dł."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5431,27 +5574,27 @@
 "Adres URL z www.openstreetmap.org (można wkleić adres aby pobrać obszar)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
 msgid "Bounding Box"
 msgstr "Wybrany obszar"
 
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
 msgid "Data Sources and Types"
 msgstr "Źródła i rodzaje danych"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
 msgid "Download as new layer"
 msgstr "Pobierz jako nową warstwę"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
 msgid "Download Area"
 msgstr "Pobierany obszar"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
 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:219
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
 msgid "Download area ok, size probably acceptable to server"
 msgstr ""
@@ -5477,7 +5620,7 @@
 msgstr "Wpisz nazwę miejsce do odnalezienia:"
 
-#. <separator/>
+#. group "Geography"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2759
 msgid "Places"
 msgstr "Miejsca"
@@ -5524,21 +5667,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "type"
 msgstr "rodzaj"
@@ -6018,4 +6161,6 @@
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
 #. <key key="historic" value="wayside_shrine" />
+#. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
+#. <key key="historic" value="boundary_stone" />
 #. item "Leisure/Water Park" label "Edit Water Park"
 #. <key key="leisure" value="water_park" />
@@ -6387,153 +6532,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/trans_presets.java:66 build/trans_presets.java:102
-#: build/trans_presets.java:142 build/trans_presets.java:179
-#: build/trans_presets.java:199 build/trans_presets.java:217
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:272 build/trans_presets.java:305
-#: build/trans_presets.java:351 build/trans_presets.java:371
-#: build/trans_presets.java:386 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:463 build/trans_presets.java:482
-#: build/trans_presets.java:502 build/trans_presets.java:522
-#: build/trans_presets.java:543 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627 build/trans_presets.java:658
-#: build/trans_presets.java:679 build/trans_presets.java:692
-#: build/trans_presets.java:705 build/trans_presets.java:718
-#: build/trans_presets.java:731 build/trans_presets.java:744
-#: build/trans_presets.java:755 build/trans_presets.java:764
-#: build/trans_presets.java:811 build/trans_presets.java:832
-#: build/trans_presets.java:841 build/trans_presets.java:901
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1067 build/trans_presets.java:1075
-#: build/trans_presets.java:1085 build/trans_presets.java:1093
-#: build/trans_presets.java:1098 build/trans_presets.java:1105
-#: build/trans_presets.java:1112 build/trans_presets.java:1117
-#: build/trans_presets.java:1125 build/trans_presets.java:1134
-#: build/trans_presets.java:1140 build/trans_presets.java:1146
-#: build/trans_presets.java:1151 build/trans_presets.java:1157
-#: build/trans_presets.java:1163 build/trans_presets.java:1172
-#: build/trans_presets.java:1181 build/trans_presets.java:1188
-#: build/trans_presets.java:1196 build/trans_presets.java:1209
-#: build/trans_presets.java:1215 build/trans_presets.java:1224
-#: build/trans_presets.java:1230 build/trans_presets.java:1236
-#: build/trans_presets.java:1244 build/trans_presets.java:1299
-#: build/trans_presets.java:1346 build/trans_presets.java:1352
-#: build/trans_presets.java:1358 build/trans_presets.java:1364
-#: build/trans_presets.java:1370 build/trans_presets.java:1381
-#: build/trans_presets.java:1390 build/trans_presets.java:1405
-#: build/trans_presets.java:1412 build/trans_presets.java:1418
-#: build/trans_presets.java:1426 build/trans_presets.java:1433
-#: build/trans_presets.java:1442 build/trans_presets.java:1450
-#: build/trans_presets.java:1457 build/trans_presets.java:1468
-#: build/trans_presets.java:1478 build/trans_presets.java:1488
-#: build/trans_presets.java:1508 build/trans_presets.java:1520
-#: build/trans_presets.java:1531 build/trans_presets.java:1548
-#: build/trans_presets.java:1555 build/trans_presets.java:1570
-#: build/trans_presets.java:1577 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1594
-#: build/trans_presets.java:1599 build/trans_presets.java:1605
-#: build/trans_presets.java:1611 build/trans_presets.java:1619
-#: build/trans_presets.java:1627 build/trans_presets.java:1635
-#: build/trans_presets.java:1642 build/trans_presets.java:1648
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1670 build/trans_presets.java:1677
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1712 build/trans_presets.java:1719
-#: build/trans_presets.java:1736 build/trans_presets.java:1744
-#: build/trans_presets.java:1759 build/trans_presets.java:1769
-#: build/trans_presets.java:1781 build/trans_presets.java:1788
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:1809 build/trans_presets.java:1817
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1841
-#: build/trans_presets.java:1846 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1864
-#: build/trans_presets.java:1872 build/trans_presets.java:1881
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1908 build/trans_presets.java:1914
-#: build/trans_presets.java:1922 build/trans_presets.java:1928
-#: build/trans_presets.java:1934 build/trans_presets.java:1940
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2013
-#: build/trans_presets.java:2022 build/trans_presets.java:2030
-#: build/trans_presets.java:2036 build/trans_presets.java:2042
-#: build/trans_presets.java:2048 build/trans_presets.java:2054
-#: build/trans_presets.java:2060 build/trans_presets.java:2066
-#: build/trans_presets.java:2072 build/trans_presets.java:2078
-#: build/trans_presets.java:2084 build/trans_presets.java:2090
-#: build/trans_presets.java:2096 build/trans_presets.java:2102
-#: build/trans_presets.java:2108 build/trans_presets.java:2114
-#: build/trans_presets.java:2120 build/trans_presets.java:2126
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2158
-#: build/trans_presets.java:2165 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2186
-#: build/trans_presets.java:2192 build/trans_presets.java:2198
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2218 build/trans_presets.java:2225
-#: build/trans_presets.java:2232 build/trans_presets.java:2239
-#: build/trans_presets.java:2247 build/trans_presets.java:2279
-#: build/trans_presets.java:2284 build/trans_presets.java:2289
-#: build/trans_presets.java:2294 build/trans_presets.java:2300
-#: build/trans_presets.java:2306 build/trans_presets.java:2312
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2354
-#: build/trans_presets.java:2451 build/trans_presets.java:2458
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2485 build/trans_presets.java:2492
-#: build/trans_presets.java:2498 build/trans_presets.java:2504
-#: build/trans_presets.java:2526 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2553 build/trans_presets.java:2559
-#: build/trans_presets.java:2565 build/trans_presets.java:2571
-#: build/trans_presets.java:2577 build/trans_presets.java:2583
-#: build/trans_presets.java:2590 build/trans_presets.java:2597
-#: build/trans_presets.java:2604 build/trans_presets.java:2610
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2661
-#: build/trans_presets.java:2667 build/trans_presets.java:2677
-#: build/trans_presets.java:2686 build/trans_presets.java:2701
-#: build/trans_presets.java:2707 build/trans_presets.java:2715
-#: build/trans_presets.java:2722 build/trans_presets.java:2742
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2783
-#: build/trans_presets.java:2790 build/trans_presets.java:2797
-#: build/trans_presets.java:2803 build/trans_presets.java:2809
-#: build/trans_presets.java:2817 build/trans_presets.java:2824
-#: build/trans_presets.java:2831 build/trans_presets.java:2838
-#: build/trans_presets.java:2844 build/trans_presets.java:2851
-#: build/trans_presets.java:2858 build/trans_presets.java:2867
-#: build/trans_presets.java:2873 build/trans_presets.java:2879
-#: build/trans_presets.java:2885 build/trans_presets.java:2891
-#: build/trans_presets.java:2900 build/trans_presets.java:2910
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2948
-#: build/trans_presets.java:2957 build/trans_presets.java:2963
-#: build/trans_presets.java:2969 build/trans_presets.java:2975
-#: build/trans_presets.java:2981 build/trans_presets.java:2987
-#: build/trans_presets.java:2993 build/trans_presets.java:3000
-#: build/trans_presets.java:3006 build/trans_presets.java:3011
-#: build/trans_presets.java:3018 build/trans_presets.java:3025
-#: build/trans_presets.java:3031 build/trans_presets.java:3040
-#: build/trans_presets.java:3048 build/trans_presets.java:3054
-#: build/trans_presets.java:3060 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3080
-#: build/trans_presets.java:3086 build/trans_presets.java:3092
-#: build/trans_presets.java:3098 build/trans_presets.java:3104
-#: build/trans_presets.java:3117 build/trans_presets.java:3131
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:67 build/trans_presets.java:103
+#: build/trans_presets.java:143 build/trans_presets.java:180
+#: build/trans_presets.java:200 build/trans_presets.java:218
+#: build/trans_presets.java:235 build/trans_presets.java:253
+#: build/trans_presets.java:273 build/trans_presets.java:306
+#: build/trans_presets.java:352 build/trans_presets.java:372
+#: build/trans_presets.java:387 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:503 build/trans_presets.java:523
+#: build/trans_presets.java:544 build/trans_presets.java:565
+#: build/trans_presets.java:586 build/trans_presets.java:607
+#: build/trans_presets.java:628 build/trans_presets.java:659
+#: build/trans_presets.java:680 build/trans_presets.java:693
+#: build/trans_presets.java:706 build/trans_presets.java:719
+#: build/trans_presets.java:732 build/trans_presets.java:745
+#: build/trans_presets.java:756 build/trans_presets.java:765
+#: build/trans_presets.java:812 build/trans_presets.java:833
+#: build/trans_presets.java:842 build/trans_presets.java:902
+#: build/trans_presets.java:1053 build/trans_presets.java:1061
+#: build/trans_presets.java:1069 build/trans_presets.java:1077
+#: build/trans_presets.java:1087 build/trans_presets.java:1095
+#: build/trans_presets.java:1100 build/trans_presets.java:1107
+#: build/trans_presets.java:1114 build/trans_presets.java:1119
+#: build/trans_presets.java:1127 build/trans_presets.java:1136
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1153 build/trans_presets.java:1159
+#: build/trans_presets.java:1165 build/trans_presets.java:1174
+#: build/trans_presets.java:1183 build/trans_presets.java:1190
+#: build/trans_presets.java:1198 build/trans_presets.java:1211
+#: build/trans_presets.java:1217 build/trans_presets.java:1226
+#: build/trans_presets.java:1232 build/trans_presets.java:1238
+#: build/trans_presets.java:1246 build/trans_presets.java:1302
+#: build/trans_presets.java:1349 build/trans_presets.java:1355
+#: build/trans_presets.java:1361 build/trans_presets.java:1367
+#: build/trans_presets.java:1373 build/trans_presets.java:1384
+#: build/trans_presets.java:1393 build/trans_presets.java:1408
+#: build/trans_presets.java:1415 build/trans_presets.java:1421
+#: build/trans_presets.java:1429 build/trans_presets.java:1436
+#: build/trans_presets.java:1445 build/trans_presets.java:1453
+#: build/trans_presets.java:1460 build/trans_presets.java:1471
+#: build/trans_presets.java:1481 build/trans_presets.java:1491
+#: build/trans_presets.java:1511 build/trans_presets.java:1523
+#: build/trans_presets.java:1534 build/trans_presets.java:1551
+#: build/trans_presets.java:1558 build/trans_presets.java:1574
+#: build/trans_presets.java:1581 build/trans_presets.java:1586
+#: build/trans_presets.java:1592 build/trans_presets.java:1598
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1646 build/trans_presets.java:1652
+#: build/trans_presets.java:1659 build/trans_presets.java:1666
+#: build/trans_presets.java:1674 build/trans_presets.java:1681
+#: build/trans_presets.java:1689 build/trans_presets.java:1696
+#: build/trans_presets.java:1702 build/trans_presets.java:1709
+#: build/trans_presets.java:1716 build/trans_presets.java:1723
+#: build/trans_presets.java:1740 build/trans_presets.java:1748
+#: build/trans_presets.java:1763 build/trans_presets.java:1773
+#: build/trans_presets.java:1785 build/trans_presets.java:1792
+#: build/trans_presets.java:1798 build/trans_presets.java:1808
+#: build/trans_presets.java:1813 build/trans_presets.java:1821
+#: build/trans_presets.java:1828 build/trans_presets.java:1834
+#: build/trans_presets.java:1840 build/trans_presets.java:1845
+#: build/trans_presets.java:1850 build/trans_presets.java:1855
+#: build/trans_presets.java:1862 build/trans_presets.java:1868
+#: build/trans_presets.java:1873 build/trans_presets.java:1882
+#: build/trans_presets.java:1891 build/trans_presets.java:1900
+#: build/trans_presets.java:1909 build/trans_presets.java:1918
+#: build/trans_presets.java:1924 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 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:2023 build/trans_presets.java:2032
+#: build/trans_presets.java:2040 build/trans_presets.java:2046
+#: build/trans_presets.java:2052 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 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:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2150
+#: build/trans_presets.java:2156 build/trans_presets.java:2162
+#: build/trans_presets.java:2169 build/trans_presets.java:2176
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2197 build/trans_presets.java:2203
+#: build/trans_presets.java:2209 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2229
+#: build/trans_presets.java:2236 build/trans_presets.java:2243
+#: build/trans_presets.java:2250 build/trans_presets.java:2258
+#: build/trans_presets.java:2290 build/trans_presets.java:2295
+#: build/trans_presets.java:2300 build/trans_presets.java:2305
+#: build/trans_presets.java:2311 build/trans_presets.java:2317
+#: build/trans_presets.java:2323 build/trans_presets.java:2331
+#: build/trans_presets.java:2337 build/trans_presets.java:2343
+#: build/trans_presets.java:2349 build/trans_presets.java:2355
+#: build/trans_presets.java:2365 build/trans_presets.java:2462
+#: build/trans_presets.java:2469 build/trans_presets.java:2483
+#: build/trans_presets.java:2489 build/trans_presets.java:2496
+#: build/trans_presets.java:2503 build/trans_presets.java:2509
+#: build/trans_presets.java:2515 build/trans_presets.java:2537
+#: build/trans_presets.java:2544 build/trans_presets.java:2551
+#: build/trans_presets.java:2557 build/trans_presets.java:2564
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2594 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2615
+#: build/trans_presets.java:2621 build/trans_presets.java:2627
+#: build/trans_presets.java:2633 build/trans_presets.java:2639
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2672 build/trans_presets.java:2678
+#: build/trans_presets.java:2688 build/trans_presets.java:2697
+#: build/trans_presets.java:2712 build/trans_presets.java:2718
+#: build/trans_presets.java:2726 build/trans_presets.java:2733
+#: build/trans_presets.java:2753 build/trans_presets.java:2764
+#: build/trans_presets.java:2770 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2788
+#: build/trans_presets.java:2795 build/trans_presets.java:2802
+#: build/trans_presets.java:2809 build/trans_presets.java:2815
+#: build/trans_presets.java:2821 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2912
+#: build/trans_presets.java:2922 build/trans_presets.java:2931
+#: build/trans_presets.java:2937 build/trans_presets.java:2943
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 build/trans_presets.java:2981
+#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:2999 build/trans_presets.java:3005
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3023 build/trans_presets.java:3030
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3066 build/trans_presets.java:3072
+#: build/trans_presets.java:3079 build/trans_presets.java:3085
+#: build/trans_presets.java:3092 build/trans_presets.java:3098
+#: build/trans_presets.java:3104 build/trans_presets.java:3110
+#: build/trans_presets.java:3116 build/trans_presets.java:3129
+#: build/trans_presets.java:3143 build/trans_presets.java:3157
 msgid "Name"
 msgstr "Nazwa"
@@ -6567,4 +6713,58 @@
 msgid "Version"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
+#, fuzzy
+msgid "Changeset id:"
+msgstr "Zmień relację"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
+#, fuzzy
+msgid "Created at:"
+msgstr "Tworzenie obszarów."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
+#, fuzzy
+msgid "Changeset comment:"
+msgstr "Komentarz zmiany"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
+msgid "No open changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48
+#, fuzzy
+msgid "<html>Please select the changesets you want to close</html>"
+msgstr "Wybierz, które właściwości chcesz zmienić."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
+#, fuzzy
+msgid "Open changesets"
+msgstr "Zamykanie zestawu zmian..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101
+#, fuzzy
+msgid "Close changesets"
+msgstr "Zamykanie zestawu zmian..."
+
+#. putValue(SMALL_ICON, ImageProvider.get("cancel"));
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
+#, fuzzy
+msgid "Close the selected open changesets"
+msgstr "Usuwa wybrane obiekty"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126
+#, fuzzy
+msgid "Cancel closeing of changesets"
+msgstr "Zamykanie zestawu zmian..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37
+msgid "Closing changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77
+#, fuzzy, java-format
+msgid "Closing changeset {0}"
+msgstr "Zamykanie zestawu zmian..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
@@ -6593,5 +6793,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be uploaded"
+msgid "Layer ''{0}'' has no modifications to be uploaded."
 msgstr ""
 
@@ -6599,5 +6799,5 @@
 #, java-format
 msgid ""
-"Layer ''{0}'' has modifications which should be saved to its assoicated file "
+"Layer ''{0}'' has modifications which should be saved to its associated file "
 "''{1}''."
 msgstr ""
@@ -6605,5 +6805,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be saved"
+msgid "Layer ''{0}'' has no modifications to be saved."
 msgstr ""
 
@@ -6637,17 +6837,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113
 msgid "Unsaved changes - Save/Upload before exiting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194
 #, java-format
 msgid ""
@@ -6660,9 +6860,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205
 msgid "Unsaved data and conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212
 #, java-format
 msgid ""
@@ -6676,9 +6876,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223
 msgid "Unsaved data and missing associated file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230
 #, java-format
 msgid ""
@@ -6693,42 +6893,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243
 msgid "Unsaved data non-writable files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
 msgid "Close this dialog and resume editing in JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322
+msgid "Discard and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
-msgid "Discard and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354
+msgid "Save and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
-msgid "Save and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
 msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402
 #, java-format
 msgid "Preparing layer ''{0}'' for upload ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
@@ -6736,5 +6936,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491
 msgid "Incomplete upload and/or save"
 msgstr ""
@@ -6774,21 +6974,21 @@
 #. item "Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:200
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:278
-#: build/trans_presets.java:311 build/trans_presets.java:357
-#: build/trans_presets.java:372 build/trans_presets.java:387
-#: build/trans_presets.java:409 build/trans_presets.java:429
-#: build/trans_presets.java:450 build/trans_presets.java:470
-#: build/trans_presets.java:489 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:549
-#: build/trans_presets.java:570 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:633
-#: build/trans_presets.java:664 build/trans_presets.java:1060
-#: build/trans_presets.java:1068 build/trans_presets.java:1076
-#: build/trans_presets.java:1086 build/trans_presets.java:1305
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:242
+#: build/trans_presets.java:260 build/trans_presets.java:279
+#: build/trans_presets.java:312 build/trans_presets.java:358
+#: build/trans_presets.java:373 build/trans_presets.java:388
+#: build/trans_presets.java:410 build/trans_presets.java:430
+#: build/trans_presets.java:451 build/trans_presets.java:471
+#: build/trans_presets.java:490 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:665 build/trans_presets.java:1062
+#: build/trans_presets.java:1070 build/trans_presets.java:1078
+#: build/trans_presets.java:1088 build/trans_presets.java:1308
 msgid "Layer"
 msgstr "Warstwa"
@@ -6807,67 +7007,32 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:200
 msgid "Upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-msgid "Use a new changeset and close it"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
-msgid ""
-"Select to upload the data using a new changeset and to close the changeset "
-"after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
-msgid "Use a new changeset and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
-msgid ""
-"Select to upload the data using a new changeset and to leave the changeset "
-"open after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
-msgid "Upload to a new or to an existing changeset?"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
-msgid "upload all changes in one request"
-msgstr "Załadunek wszystkich zmian w jednym żądaniu."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
-msgid ""
-"Enable to upload all changes in one request, disable to use one request per "
-"changed primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171
-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/gui/io/UploadDialog.java:216
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908
 msgid "Tags of new changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:221
 msgid "Objects to add:"
 msgstr "Obiekty do dodania:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:227
 msgid "Objects to modify:"
 msgstr "Obiekty do zmiany:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:233
 msgid "Objects to delete:"
 msgstr "Obiekty do usunięcia:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
 #, java-format
 msgid "{0} object to add:"
@@ -6876,5 +7041,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:277
 #, java-format
 msgid "{0} object to modifiy:"
@@ -6883,5 +7048,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:286
 #, java-format
 msgid "{0} object to delete:"
@@ -6890,53 +7055,86 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422
-#, java-format
-msgid "Use the existing changeset {0} and close it after upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:423
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to close the changeset "
-"after this upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426
-#, java-format
-msgid "Use the existing changeset {0} and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:427
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to leave the changeset "
-"open for further uploads"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
-#, java-format
-msgid "Tags of changeset {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:470
 msgid "Upload Changes"
 msgstr "Wyślij zmiany"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472
+msgid "Upload the changed primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
+msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:479
+msgid "Illegal upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
+msgid "Cancel the upload and resume editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606
 #, fuzzy
-msgid "Upload the changed primitives"
-msgstr "Czy wysłać te zmiany?"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592
+msgid "Upload all changes in one request"
+msgstr "Załadunek wszystkich zmian w jednym żądaniu."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607
+msgid ""
+"Enable to upload all changes in one request, disable to use one request per "
+"changed primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:617
+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/gui/io/UploadDialog.java:672
+msgid "Open a new changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
+msgid "Open a new changeset and use it in the next upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
 #, fuzzy
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "Proszę podać nazwę lokalizacji."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:593
-msgid "Illegal upload comment"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
-msgid "Cancel the upload and resume editing"
+msgid "Use an open changeset"
+msgstr "Niezapisane zmiany"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
+msgid "Upload data to an already opened changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
+#, fuzzy
+msgid "Close changeset after upload"
+msgstr "Brak zmian do wysłania."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
+msgid "Select to close the changeset after the next upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922
+#, java-format
+msgid "Tags of changeset {0}"
+msgstr ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
+#, fuzzy
+msgid "Load the list of your open changesets from the server"
+msgstr "Wyślij bieżące ustawienia na serwer"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
+#, fuzzy
+msgid "Close the currently selected open changeset"
+msgstr "Przesuń aktualnie zaznaczonych członkół w górę"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
+#, java-format
+msgid "changeset id > 0 expected. Got {1}"
 msgstr ""
 
@@ -7016,5 +7214,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
@@ -7052,5 +7250,5 @@
 msgstr "Podany czas nie został rozpoznany."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
@@ -7058,30 +7256,30 @@
 msgstr "punkt GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
 msgid "Customize line drawing"
 msgstr "Dostosuj rysowanie linii"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
 msgid "Use global settings."
 msgstr "Użyj ustawień globalnych."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Draw lines between points for this layer."
 msgstr "Rysuj linie pomiędzy punktami na tej warstwie."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Do not draw lines between points for this layer."
 msgstr "Nie rysuj linii pomiędzy punktami na tej warstwie."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 msgid "Select line drawing options"
 msgstr "Wybierz opcje rysowania linii"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7089,5 +7287,5 @@
 msgstr "Dostosuj kolor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7096,5 +7294,5 @@
 msgstr "Domyślny"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7103,39 +7301,76 @@
 msgstr "Wybierz kolor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
 msgid "Markers From Named Points"
 msgstr "Znaczniki nazwanych punktów"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Nazwane punkty GPS z {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
 msgid "Import Audio"
 msgstr "Importuj dźwięk"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
 msgid "Wave Audio files (*.wav)"
 msgstr "Pliki audio Wave (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Markery audio z {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
 msgid "Import images"
 msgstr "Importuj obrazki"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#, java-format
+msgid "Name: {0}"
+msgstr "Nazwa: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#, java-format
+msgid "Description: {0}"
+msgstr "Opis: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#, fuzzy, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
 msgstr[0] "{0} ślad, "
 msgstr[1] "{0} ślady, "
 msgstr[2] "{0} śladów, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
+#: build/trans_presets.java:3160
+msgid "Description"
+msgstr "Opis"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#, fuzzy
+msgid "Timespan"
+msgstr "Okres czasu: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#, fuzzy
+msgid "Length"
+msgstr "Długość: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
+msgid "URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+msgid "Length: "
+msgstr "Długość: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
 #, java-format
 msgid "{0} route, "
@@ -7145,5 +7380,5 @@
 msgstr[2] "{0} tras, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 #, java-format
 msgid "{0} waypoint"
@@ -7153,29 +7388,10 @@
 msgstr[2] "{0} punktów"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
-#, java-format
-msgid "Name: {0}"
-msgstr "Nazwa: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
-#, java-format
-msgid "Description: {0}"
-msgstr "Opis: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
-msgid "Timespan: "
-msgstr "Okres czasu: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
-msgid "Length: "
-msgstr "Długość: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Przekształć w warstwę danych"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7185,10 +7401,10 @@
 "za niebezpieczne.<br>Jeśli chcesz wysłać same ślady zajrzyj tu:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -7199,29 +7415,29 @@
 msgstr "Przekonwertowany z: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
 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:769
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
 msgid "Download everything within:"
 msgstr "Pobierz wszystko pomiędzy:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metrów"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 msgid "Maximum area per request:"
 msgstr "Maksymalny obszar na zapytanie:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km kw."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
 #, java-format
 msgid ""
@@ -7232,9 +7448,9 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
 msgid "Download data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
@@ -7242,5 +7458,5 @@
 "danymi dźwiękowymi."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7248,5 +7464,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7297,30 +7513,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
-#, fuzzy
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
 "<br>If you want to upload traces, look here:</html>"
 msgstr ""
-"<html>Wysyłanie nieprzetworzonych danych GPS jako danych mapy jest uznawane "
-"za niebezpieczne.<br>Jeśli chcesz wysłać same ślady zajrzyj tu:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "track"
 msgid_plural "tracks"
@@ -7458,4 +7671,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
@@ -7684,13 +7898,18 @@
 msgstr "Rysuj duże punkty GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+msgid "Draw a circle form HDOP value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Prędkość (czerwony = wolno, zielony = szybko)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Dokładność pozycji (czerwony = duża, zielony = niska, jeśli dostępne)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -7698,6 +7917,6 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1374
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:1377
 msgid "Car"
 msgstr "Samochód"
@@ -7718,14 +7937,14 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:324 build/trans_presets.java:650
-#: build/trans_presets.java:857 build/trans_presets.java:876
-#: build/trans_presets.java:890 build/trans_presets.java:912
-#: build/trans_presets.java:949 build/trans_presets.java:962
-#: build/trans_presets.java:974 build/trans_presets.java:986
-#: build/trans_presets.java:998 build/trans_presets.java:1010
-#: build/trans_presets.java:1020 build/trans_presets.java:1029
-#: build/trans_presets.java:1038 build/trans_presets.java:1437
-#: build/trans_presets.java:1510
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:325 build/trans_presets.java:651
+#: build/trans_presets.java:858 build/trans_presets.java:877
+#: build/trans_presets.java:891 build/trans_presets.java:913
+#: build/trans_presets.java:950 build/trans_presets.java:963
+#: build/trans_presets.java:975 build/trans_presets.java:987
+#: build/trans_presets.java:999 build/trans_presets.java:1011
+#: build/trans_presets.java:1021 build/trans_presets.java:1030
+#: build/trans_presets.java:1039 build/trans_presets.java:1440
+#: build/trans_presets.java:1513
 msgid "Bicycle"
 msgstr "Rowery"
@@ -7758,62 +7977,62 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:325 build/trans_presets.java:649
-#: build/trans_presets.java:856 build/trans_presets.java:875
-#: build/trans_presets.java:889 build/trans_presets.java:911
-#: build/trans_presets.java:948 build/trans_presets.java:961
-#: build/trans_presets.java:973 build/trans_presets.java:985
-#: build/trans_presets.java:997 build/trans_presets.java:1009
-#: build/trans_presets.java:1019 build/trans_presets.java:1028
-#: build/trans_presets.java:1037
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:326 build/trans_presets.java:650
+#: build/trans_presets.java:857 build/trans_presets.java:876
+#: build/trans_presets.java:890 build/trans_presets.java:912
+#: build/trans_presets.java:949 build/trans_presets.java:962
+#: build/trans_presets.java:974 build/trans_presets.java:986
+#: build/trans_presets.java:998 build/trans_presets.java:1010
+#: build/trans_presets.java:1020 build/trans_presets.java:1029
+#: build/trans_presets.java:1038
 msgid "Foot"
 msgstr "Ruch pieszy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Rysuj strzałki kierunkowe"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Szybsze rysowanie (wygląda gorzej)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "tylko jeżeli mają znaczenie (np.: dla drogi jednokierunkowej)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Only on the head of a way."
 msgstr "Tylko na początku drogi."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Numeruj kolejne segmenty dróg."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Rysuj granicę obszaru pobranych danych"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Rysuj węzły wirtualne podczas pracy w trybie zaznaczania"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Zaznaczaj nieaktywne warstwy innym kolorem"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Wygładzaj rysowaną mapę (antyaliasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:82
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -7821,9 +8040,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
@@ -7832,10 +8051,10 @@
 "rysować linie."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length (meters)"
 msgstr "Maksymalna długość (w metrach)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -7844,10 +8063,10 @@
 "liniach."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:129
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Oznaczaj kierunek wszystkich odcinków, łączących punkty GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:135
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -7856,5 +8075,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:141
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -7862,13 +8081,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:144
 msgid "Minimum distance (pixels)"
 msgstr "Minimalna odległość (w pikselach)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Draw larger dots for the GPS points."
 msgstr "Rysuj większe kropki dla punktów GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -7876,9 +8095,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -7886,47 +8105,47 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 "Pozwana na dostrojenie kolorowania ścieżek dla różnych prędkości średnich."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202
 msgid "GPS Points"
 msgstr "Punkty GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:237
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Rysuje granice obszaru danych pobranych z serwera."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257
 msgid "Draw the inactive data layers in a different color."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "OSM Data"
 msgstr "Dane OSM"
@@ -8006,45 +8225,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Configure available plugins."
 msgstr "Konfiguracja dostępnych wtyczek."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50
+#. buttons at the bottom
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
 msgid "Download List"
 msgstr "Pobierz listę"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:100
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 msgid "Update"
 msgstr "Aktualizuj"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Configure Sites..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:125
 msgid "Add JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:126
 msgid "Enter URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:162
 msgid "Please select an entry."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:147
 msgid "Edit JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:148
 msgid "JOSM Plugin description URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:175
 msgid "Configure Plugin Sites"
 msgstr ""
@@ -8373,6 +8593,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:369
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341
 #, java-format
 msgid "Remove old keys from up to {0} object"
@@ -8381,9 +8601,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135
 msgid "Add a new tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160
 msgid "Delete the selection in the tag table"
 msgstr ""
@@ -8418,7 +8638,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:68
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:75
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -8463,4 +8683,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24
+#, fuzzy, java-format
+msgid "Preset group ''{0}'' of group ''{1}''"
+msgstr "Używa szablon \"{0}\" z grupy \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
 #, java-format
 msgid "Preset group ''{0}''"
@@ -8481,4 +8706,10 @@
 msgstr "Pobieranie punktów od {0} do {1}..."
 
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, fuzzy, java-format
+msgid "parameter ''{0}'' > 0 expected. Got {1}"
+msgstr "parameter ''{0}'' nie może być pusty (null)"
+
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8588,5 +8819,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "Błąd parsowania: błędna struktura dokumentu gpx"
@@ -8706,10 +8937,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -8717,75 +8949,79 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315
 msgid "Creating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
 #, java-format
 msgid "Successfully opened changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#, java-format
+msgid "id of changeset > 0 required. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
-#, java-format
-msgid "Changeset {0} is unchanged. Skipping update."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
 #, java-format
 msgid "Updating changeset {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
-msgid ""
-"Failed to update changeset. Either there is no current changeset or the id "
-"of the current changeset is 0"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
 msgid "Closing changeset..."
 msgstr "Zamykanie zestawu zmian..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
-#, java-format
-msgid "Closing changeset {0}..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
-#, java-format
-msgid "Leaving changeset {0} open..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
 msgid "No changeset present for diff upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414
 msgid "Preparing..."
 msgstr "Przygotowywanie..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419
 msgid "Uploading..."
 msgstr "Wysyłanie..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438
 msgid "Waiting 10 seconds ... "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449
 msgid "OK - trying again."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:485
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517
 #, java-format
 msgid "Starting retry {0} of {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
+msgid "current changeset is null. Can't upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
+#, java-format
+msgid "id of current changeset > required. Current id is {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
+#, java-format
+msgid "Open changeset expected. Got closed changeset with id {0}"
 msgstr ""
 
@@ -8811,50 +9047,109 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
+#, java-format
+msgid "missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:128
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:134
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
+#, java-format
+msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
+#, java-format
+msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
+#, java-format
+msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#, java-format
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#, java-format
+msgid "Unsupported version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:176
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Aborting."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#, java-format
+msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
+#, fuzzy
+msgid "Parsing list of changesets..."
+msgstr "Zamykanie zestawu zmian..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
 msgid "Incorrect password or username."
 msgstr "Nieprawidłowe hasło lub nazwa użytkownika."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:168
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Uwaga: Hasło nie jest szyfrowane podczas transmisji."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Save user and password (unencrypted)"
 msgstr "Zapisz nazwę użytkownika i hasło (nieszyfrowane)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
 msgid "Enter Password"
 msgstr "Wprowadź hasło"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 msgid "Login"
 msgstr "Logowanie"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:242
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Adres URL serwera OSM (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr "Hasło konta OSM. Pozostaw puste aby nie zapamiętywać hasła."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
 msgid "Base Server URL"
 msgstr "Adres URL serwera"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
 msgid "OSM password"
 msgstr "Hasło OSM"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -8863,5 +9158,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:51
+#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #, java-format
 msgid "(at line {0}, column {1})"
@@ -8951,20 +9246,5 @@
 msgstr "Błąd parsowania danych"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124
-#, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
-#, fuzzy, java-format
-msgid "Missing mandatory attribute ''{0}''"
-msgstr "Brak wymaganego atrybutu \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
-#, fuzzy, java-format
-msgid "Unsupported version: {0}"
-msgstr "Przekonwertowany z: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:155
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -8973,38 +9253,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
 msgid "found XML element <nd> element not as direct child of element <way>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
 msgid "Found XML element <member> not as direct child of element <relation>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
 #, java-format
 msgid ""
@@ -9012,24 +9292,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Niekompletny opis <member> z ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
-#, java-format
-msgid "Warning: Undefined element ''{0}'' found in input stream. Skipping."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
-#, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Skipping."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
 msgid "Illegal object with id=0"
 msgstr "Niedozwolony obiekt z id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #, java-format
 msgid ""
@@ -9037,5 +9312,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:303
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
 #, java-format
 msgid ""
@@ -9044,5 +9319,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
 #, java-format
 msgid ""
@@ -9051,5 +9326,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
@@ -9059,25 +9334,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:316
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with id {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#, java-format
 msgid "Missing required attribute ''{0}''."
-msgstr "Brak wymaganego atrybutu \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
 #, java-format
 msgid ""
@@ -9085,5 +9360,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
 #, java-format
 msgid ""
@@ -9092,5 +9367,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
 #, java-format
 msgid ""
@@ -9098,5 +9373,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
 #, java-format
 msgid ""
@@ -9105,17 +9380,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
 msgid "Prepare OSM data..."
 msgstr "Przygotowywanie danych OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 msgid "Parsing OSM data..."
-msgstr "Przygotowywanie danych OSM..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
 msgid "Preparing data set..."
-msgstr "Przygotowywanie danych..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
@@ -9136,4 +9409,24 @@
 msgid "Downloading referring relations ..."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51
+#, fuzzy
+msgid "Reading changesets..."
+msgstr "Zamykanie zestawu zmian..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
+#, fuzzy
+msgid "Downloading changesets ..."
+msgstr "Zamykanie zestawu zmian..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85
+#, fuzzy, java-format
+msgid "Reading changeset {0} ..."
+msgstr "Wczytywanie {0}..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91
+#, fuzzy, java-format
+msgid "Downloading changeset {0} ..."
+msgstr "Zamykanie zestawu zmian..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
@@ -9150,10 +9443,14 @@
 msgstr "Łączenie z serwerem..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
 msgid "Failed to open connection to API {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
+msgid "Error: failed to add authentication credentials to the connection."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -9162,33 +9459,52 @@
 "Internetem."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+msgid "XML tag <user> is missing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
+#, fuzzy, java-format
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgstr "Używa szablon \"{0}\" z grupy \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
+#, java-format
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
 msgid "Starting to upload with one request per primitive ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
 msgid "Starting to upload in one request ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:171
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135
 msgid "Uploading data ..."
-msgstr "Wysyłanie..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:178
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
 msgid ""
 "WARNING: no API version defined for data to upload. Falling back to version "
@@ -9196,5 +9512,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147
 #, java-format
 msgid ""
@@ -9204,10 +9520,10 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
 msgid "Update Plugins"
 msgstr "Aktualizuj wtyczki"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 msgid "Download Plugins"
 msgstr "Pobierz wtyczki"
@@ -9367,5 +9683,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -9375,18 +9691,18 @@
 msgstr[2] "Pobrano informacje o wtyczkach z {0} serwerów"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
 msgid "No plugin information found."
 msgstr "Nie znaleziono informacji o wtyczce."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:93
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
 msgid "All installed plugins are up to date."
 msgstr "Wszystkie zainstalowane wtyczki są aktualne."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
 #, java-format
 msgid ""
@@ -9399,9 +9715,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
 msgid "Download missing plugins"
 msgstr "Pobierz brakujące wtyczki"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
 #, java-format
 msgid ""
@@ -9416,43 +9732,43 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
 msgid "unknown"
 msgstr "nieznany"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Wersja {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 msgid "Plugin bundled with JOSM"
 msgstr "Wtyczka dostarczana wraz z JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:357
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -9770,10 +10086,4 @@
 msgid "(What does that mean?)"
 msgstr ""
-
-#. item "Relations/Route" text "Symbol description"
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3148
-msgid "Description"
-msgstr "Opis"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
@@ -10529,6 +10839,7 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
-msgid "Set "
-msgstr ""
+#, fuzzy, java-format
+msgid "Set {0} Lambert coordinates"
+msgstr "Zerowe współrzędne: "
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -11147,6 +11458,6 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 #: build/trans_style.java:990 build/trans_style.java:1007
-#: build/trans_style.java:1023 build/trans_style.java:3392
-#: build/trans_style.java:3400
+#: build/trans_style.java:1023 build/trans_style.java:3400
+#: build/trans_style.java:3408
 msgid "water"
 msgstr "woda"
@@ -11431,4 +11742,57 @@
 msgstr ""
 
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Michigan Left"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Adds no left turn for sets of 4 or 5 ways."
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45
+#, fuzzy
+msgid "Please select 4 or 5 ways to assign no left turns."
+msgstr ""
+"Wybierz przynajmniej jedną lub więcej zamkniętych dróg o co najmniej "
+"czterech węzłach."
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61
+#, fuzzy, java-format
+msgid "{0} extrem nodes."
+msgstr "{0} węzeł"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69
+#, java-format
+msgid "Via node {0}, {1}"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75
+#, fuzzy, java-format
+msgid "{0} via nodes."
+msgstr "{0} węzeł"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78
+msgid "Unable to find via nodes. Please check your selection"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98
+#, fuzzy, java-format
+msgid "MIddle way: {0}"
+msgstr "Tryb: {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121
+msgid "Create Michigan left turn restriction"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129
+#, fuzzy, java-format
+msgid "Processing {0}"
+msgstr "Wersja {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142
+#, java-format
+msgid "Relation: from {0} to {1} via {2}"
+msgstr ""
+
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
 msgid "OpenLayers"
@@ -11580,7 +11944,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
-#, fuzzy
 msgid "create new objects"
-msgstr "Utwórz nowy węzeł."
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
@@ -11900,5 +12263,5 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:158
 msgid "JOSM Tag Editor Plugin"
 msgstr ""
@@ -11908,5 +12271,5 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:370
 #, java-format
 msgid "Updating properties of up to {0} object"
@@ -11915,18 +12278,4 @@
 msgstr[1] ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44
-msgid "INFO: entering compatibilty mode for JOSM with Main.ds"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47
-msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49
-msgid ""
-"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-"found."
-msgstr ""
-
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
 msgid "Group"
@@ -11935,9 +12284,4 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
 msgid "Item"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-msgid "Filter"
 msgstr ""
 
@@ -12024,5 +12368,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2272
 msgid "Street name"
 msgstr "Nazwa ulicy"
@@ -12183,8 +12527,4 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88
 msgid "Zoom (in metres)"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
-msgid "URL"
 msgstr ""
 
@@ -12390,7 +12730,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501
-#, fuzzy
 msgid "Updating map ..."
-msgstr "Odświeżanie danych"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69
@@ -12875,7 +13214,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
-#: build/trans_style.java:4179
+#: build/trans_style.java:4159 build/trans_style.java:4166
+#: build/trans_style.java:4173 build/trans_style.java:4180
+#: build/trans_style.java:4187
 msgid "building"
 msgstr "budynek"
@@ -12889,5 +13228,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4186
+#: build/trans_style.java:4194
 msgid "area"
 msgstr "obszar"
@@ -13014,10 +13353,10 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:148
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:155
 msgid "Reached a junction"
 msgstr ""
@@ -13307,7 +13646,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
-#, fuzzy
 msgid "Overlap tiles"
-msgstr "Nakładające się obszary"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
@@ -13316,7 +13654,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
-#, fuzzy
 msgid "% of north:"
-msgstr "północ"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -13461,6 +13798,11 @@
 msgstr ""
 
+#. Plugin michigan_left
+#: build/trans_plugins.java:35
+msgid "Adds no left turn for sets of 4 or 5 ways"
+msgstr ""
+
 #. Plugin nearclick
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid ""
 "Simulates a click when you do a small and short drag. This is usefull for "
@@ -13470,15 +13812,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13486,5 +13828,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13492,5 +13834,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13499,15 +13841,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13516,10 +13858,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13528,15 +13870,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -13546,10 +13888,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin usertools
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -13558,5 +13900,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -13565,5 +13907,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -13572,5 +13914,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -13581,10 +13923,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -13640,4 +13982,10 @@
 #. <annotations>
 #: build/trans_presets.java:57
+#, fuzzy
+msgid "Highways"
+msgstr "droga"
+
+#. group "Highways"
+#: build/trans_presets.java:58
 msgid "Streets"
 msgstr "Sieć drogowa"
@@ -13648,5 +13996,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:58 build/trans_surveyor.java:72
+#: build/trans_presets.java:59 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "autostrada"
@@ -13655,5 +14003,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:61
+#: build/trans_presets.java:62
 msgid "Edit Motorway"
 msgstr "Edycja autostrady"
@@ -13680,8 +14028,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:120 build/trans_presets.java:140
-#: build/trans_presets.java:177 build/trans_presets.java:197
-#: build/trans_presets.java:1557 build/trans_presets.java:3146
+#: build/trans_presets.java:65 build/trans_presets.java:101
+#: build/trans_presets.java:121 build/trans_presets.java:141
+#: build/trans_presets.java:178 build/trans_presets.java:198
+#: build/trans_presets.java:1560 build/trans_presets.java:3158
 msgid "Reference"
 msgstr "Numer"
@@ -13695,8 +14043,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:358
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:359
 msgid "Lanes"
 msgstr "Liczba pasów ruchu"
@@ -13713,15 +14061,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:224 build/trans_presets.java:280
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:373 build/trans_presets.java:388
-#: build/trans_presets.java:412 build/trans_presets.java:431
-#: build/trans_presets.java:452 build/trans_presets.java:472
-#: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1307
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:225 build/trans_presets.java:281
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:374 build/trans_presets.java:389
+#: build/trans_presets.java:413 build/trans_presets.java:432
+#: build/trans_presets.java:453 build/trans_presets.java:473
+#: build/trans_presets.java:511 build/trans_presets.java:667
+#: build/trans_presets.java:1310
 msgid "Max. speed (km/h)"
 msgstr "Max. prędkość (km/h)"
@@ -13758,16 +14106,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:293 build/trans_presets.java:306
-#: build/trans_presets.java:320 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:464
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:659 build/trans_presets.java:1300
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:294 build/trans_presets.java:307
+#: build/trans_presets.java:321 build/trans_presets.java:353
+#: build/trans_presets.java:405 build/trans_presets.java:425
+#: build/trans_presets.java:445 build/trans_presets.java:465
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:660 build/trans_presets.java:1303
 msgid "Oneway"
 msgstr "jednokierunkowa"
@@ -13809,19 +14157,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:353
-#: build/trans_presets.java:362 build/trans_presets.java:405
-#: build/trans_presets.java:425 build/trans_presets.java:445
-#: build/trans_presets.java:465 build/trans_presets.java:485
-#: build/trans_presets.java:504 build/trans_presets.java:523
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:586 build/trans_presets.java:607
-#: build/trans_presets.java:628 build/trans_presets.java:660
-#: build/trans_presets.java:1301 build/trans_surveyor.java:12
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:354
+#: build/trans_presets.java:363 build/trans_presets.java:406
+#: build/trans_presets.java:426 build/trans_presets.java:446
+#: build/trans_presets.java:466 build/trans_presets.java:486
+#: build/trans_presets.java:505 build/trans_presets.java:524
+#: build/trans_presets.java:545 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629 build/trans_presets.java:661
+#: build/trans_presets.java:1304 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "most"
@@ -13857,19 +14205,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:354
-#: build/trans_presets.java:378 build/trans_presets.java:406
-#: build/trans_presets.java:426 build/trans_presets.java:446
-#: build/trans_presets.java:466 build/trans_presets.java:486
-#: build/trans_presets.java:505 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629 build/trans_presets.java:661
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:355
+#: build/trans_presets.java:379 build/trans_presets.java:407
+#: build/trans_presets.java:427 build/trans_presets.java:447
+#: build/trans_presets.java:467 build/trans_presets.java:487
+#: build/trans_presets.java:506 build/trans_presets.java:525
+#: build/trans_presets.java:546 build/trans_presets.java:567
+#: build/trans_presets.java:588 build/trans_presets.java:609
+#: build/trans_presets.java:630 build/trans_presets.java:662
+#: build/trans_presets.java:1305
 msgid "Tunnel"
 msgstr "tunel"
@@ -13903,18 +14251,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:73 build/trans_presets.java:90
-#: build/trans_presets.java:110 build/trans_presets.java:129
-#: build/trans_presets.java:150 build/trans_presets.java:166
-#: build/trans_presets.java:186 build/trans_presets.java:205
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:355
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:467
-#: build/trans_presets.java:487 build/trans_presets.java:506
-#: build/trans_presets.java:525 build/trans_presets.java:546
-#: build/trans_presets.java:567 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:630
-#: build/trans_presets.java:662 build/trans_presets.java:1303
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:356
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:468
+#: build/trans_presets.java:488 build/trans_presets.java:507
+#: build/trans_presets.java:526 build/trans_presets.java:547
+#: build/trans_presets.java:568 build/trans_presets.java:589
+#: build/trans_presets.java:610 build/trans_presets.java:631
+#: build/trans_presets.java:663 build/trans_presets.java:1306
 msgid "Cutting"
 msgstr "wykop"
@@ -13948,18 +14296,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:74 build/trans_presets.java:91
-#: build/trans_presets.java:111 build/trans_presets.java:130
-#: build/trans_presets.java:151 build/trans_presets.java:167
-#: build/trans_presets.java:187 build/trans_presets.java:206
-#: build/trans_presets.java:222 build/trans_presets.java:240
-#: build/trans_presets.java:258 build/trans_presets.java:277
-#: build/trans_presets.java:310 build/trans_presets.java:356
-#: build/trans_presets.java:408 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:468
-#: build/trans_presets.java:488 build/trans_presets.java:507
-#: build/trans_presets.java:526 build/trans_presets.java:547
-#: build/trans_presets.java:568 build/trans_presets.java:589
-#: build/trans_presets.java:610 build/trans_presets.java:631
-#: build/trans_presets.java:663 build/trans_presets.java:1304
+#: build/trans_presets.java:75 build/trans_presets.java:92
+#: build/trans_presets.java:112 build/trans_presets.java:131
+#: build/trans_presets.java:152 build/trans_presets.java:168
+#: build/trans_presets.java:188 build/trans_presets.java:207
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:357
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:469
+#: build/trans_presets.java:489 build/trans_presets.java:508
+#: build/trans_presets.java:527 build/trans_presets.java:548
+#: build/trans_presets.java:569 build/trans_presets.java:590
+#: build/trans_presets.java:611 build/trans_presets.java:632
+#: build/trans_presets.java:664 build/trans_presets.java:1307
 msgid "Embankment"
 msgstr "nasyp"
@@ -13967,5 +14315,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Motorway Link"
 msgstr "autostrada - dojazd"
@@ -13974,5 +14322,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:80
+#: build/trans_presets.java:81
 msgid "Edit Motorway Link"
 msgstr "Edycja dojazdu do autostrady"
@@ -13980,5 +14328,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:94
+#: build/trans_presets.java:95
 msgid "Trunk"
 msgstr "droga ekspresowa"
@@ -13987,5 +14335,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:97
+#: build/trans_presets.java:98
 msgid "Edit Trunk"
 msgstr "Edycja drogi ekspresowej"
@@ -13995,6 +14343,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
 msgid "Motorroad"
 msgstr ""
@@ -14002,5 +14350,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:114
+#: build/trans_presets.java:115
 msgid "Trunk Link"
 msgstr "droga ekspresowa - dojazd"
@@ -14009,5 +14357,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:117
+#: build/trans_presets.java:118
 msgid "Edit Trunk Link"
 msgstr "Edycja dojazdu do drogi ekspresowej"
@@ -14020,5 +14368,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:134 build/trans_surveyor.java:76
+#: build/trans_presets.java:135 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "droga krajowa"
@@ -14027,5 +14375,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:137
+#: build/trans_presets.java:138
 msgid "Edit Primary Road"
 msgstr "Edycja drogi krajowej"
@@ -14033,10 +14381,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:154
+#: build/trans_presets.java:155
 msgid "Primary Link"
 msgstr "droga krajowa - dojazd"
 
 #. item
-#: build/trans_presets.java:155
+#: build/trans_presets.java:156
 msgid "Edit Primary Link"
 msgstr "Edycja dojazdu do drogi krajowej"
@@ -14048,5 +14396,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:170 build/trans_surveyor.java:80
+#: build/trans_presets.java:171 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "droga wojewódzka"
@@ -14056,5 +14404,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:174
+#: build/trans_presets.java:175
 msgid "Edit Secondary Road"
 msgstr "Edycja drogi wojewódzkiej"
@@ -14062,5 +14410,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:190
+#: build/trans_presets.java:191
 msgid "Tertiary"
 msgstr "droga powiatowa"
@@ -14070,5 +14418,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:194
+#: build/trans_presets.java:195
 msgid "Edit Tertiary Road"
 msgstr "Edycja drogi powiatowej"
@@ -14080,5 +14428,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:209 build/trans_surveyor.java:84
+#: build/trans_presets.java:210 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "droga gminna"
@@ -14088,5 +14436,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:213
+#: build/trans_presets.java:214
 msgid "Edit Unclassified Road"
 msgstr "Edycja drogi gminnej lub innej drogi publicznej"
@@ -14113,19 +14461,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:225 build/trans_presets.java:243
-#: build/trans_presets.java:261 build/trans_presets.java:281
-#: build/trans_presets.java:314 build/trans_presets.java:359
-#: build/trans_presets.java:375 build/trans_presets.java:389
-#: build/trans_presets.java:413 build/trans_presets.java:432
-#: build/trans_presets.java:453 build/trans_presets.java:473
-#: build/trans_presets.java:491 build/trans_presets.java:511
-#: build/trans_presets.java:532 build/trans_presets.java:553
-#: build/trans_presets.java:574 build/trans_presets.java:595
-#: build/trans_presets.java:616 build/trans_presets.java:637
-#: build/trans_presets.java:667 build/trans_presets.java:680
-#: build/trans_presets.java:693 build/trans_presets.java:706
-#: build/trans_presets.java:719 build/trans_presets.java:732
-#: build/trans_presets.java:745 build/trans_presets.java:1308
-#: build/trans_presets.java:1498 build/trans_presets.java:1540
+#: build/trans_presets.java:226 build/trans_presets.java:244
+#: build/trans_presets.java:262 build/trans_presets.java:282
+#: build/trans_presets.java:315 build/trans_presets.java:360
+#: build/trans_presets.java:376 build/trans_presets.java:390
+#: build/trans_presets.java:414 build/trans_presets.java:433
+#: build/trans_presets.java:454 build/trans_presets.java:474
+#: build/trans_presets.java:492 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:554
+#: build/trans_presets.java:575 build/trans_presets.java:596
+#: build/trans_presets.java:617 build/trans_presets.java:638
+#: build/trans_presets.java:668 build/trans_presets.java:681
+#: build/trans_presets.java:694 build/trans_presets.java:707
+#: build/trans_presets.java:720 build/trans_presets.java:733
+#: build/trans_presets.java:746 build/trans_presets.java:1311
+#: build/trans_presets.java:1501 build/trans_presets.java:1543
 msgid "Width (meters)"
 msgstr "Szerokość (w metrach)"
@@ -14137,5 +14485,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:228 build/trans_surveyor.java:88
+#: build/trans_presets.java:229 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "droga lokalna"
@@ -14144,5 +14492,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:231
+#: build/trans_presets.java:232
 msgid "Edit Residential Street"
 msgstr "Edycja drogi lokalnej / ulicy"
@@ -14167,14 +14515,14 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:611
-#: build/trans_presets.java:632 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "Surface"
 msgstr "Nawierzchnia"
@@ -14195,53 +14543,53 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paved"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "unpaved"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
 msgid "metal"
 msgstr ""
@@ -14255,22 +14603,22 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
-#: build/trans_style.java:3367
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
+#: build/trans_style.java:3375
 msgid "wood"
 msgstr "Las naturalny"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paving_stones"
 msgstr ""
@@ -14278,77 +14626,77 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "cobblestone"
 msgstr "bruk"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "gravel"
 msgstr "żwir"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "grass"
 msgstr "trawa"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "sand"
 msgstr "piach"
@@ -14356,13 +14704,13 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "ground"
 msgstr "grunt"
@@ -14370,5 +14718,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:246
+#: build/trans_presets.java:247
 msgid "Living Street"
 msgstr "strefa zamieszkania"
@@ -14377,5 +14725,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:249
+#: build/trans_presets.java:250
 msgid "Edit Living Street"
 msgstr "Edycja strefy zamieszkania"
@@ -14383,5 +14731,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:264
+#: build/trans_presets.java:265
 msgid "Service"
 msgstr "droga serwisowa"
@@ -14390,5 +14738,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:267
+#: build/trans_presets.java:268
 msgid "Edit Serviceway"
 msgstr "Edycja drogi serwisowej"
@@ -14398,18 +14746,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "alley"
 msgstr "Alejka"
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "driveway"
 msgstr "podjazd"
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "parking_aisle"
 msgstr "wysepka parkignowa"
@@ -14417,5 +14765,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:284
+#: build/trans_presets.java:285
 msgid "Parking Aisle"
 msgstr "uliczka parkingowa"
@@ -14425,5 +14773,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:288
+#: build/trans_presets.java:289
 msgid "Edit Parking Aisle"
 msgstr "Edycja uliczki parkingowej"
@@ -14431,5 +14779,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:298
+#: build/trans_presets.java:299
 msgid "Road (Unknown Type)"
 msgstr "droga (nieokreślona)"
@@ -14438,5 +14786,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Edit Road of unknown type"
 msgstr "Edycja drogi nieokreślonego rodzaju"
@@ -14445,20 +14793,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:318
+#: build/trans_presets.java:319
 msgid "Road Restrictions"
 msgstr "ograniczenia na drodze"
 
 #. item
-#: build/trans_presets.java:319
+#: build/trans_presets.java:320
 msgid "Edit Road Restrictions"
 msgstr "Edycja ograniczeń na drodze"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:321
+#: build/trans_presets.java:322
 msgid "Toll"
 msgstr "bramka (opłata)"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:322
+#: build/trans_presets.java:323
 msgid "No exit (cul-de-sac)"
 msgstr "ślepa ulica"
@@ -14471,8 +14819,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:323 build/trans_presets.java:529
-#: build/trans_presets.java:550 build/trans_presets.java:571
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:634
+#: build/trans_presets.java:324 build/trans_presets.java:530
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:593 build/trans_presets.java:614
+#: build/trans_presets.java:635
 msgid "Access"
 msgstr "Dostęp do drogi"
@@ -14526,29 +14874,29 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1397
-#: build/trans_presets.java:1398 build/trans_presets.java:1399
-#: build/trans_presets.java:1763 build/trans_presets.java:1773
-#: build/trans_presets.java:2397 build/trans_presets.java:2433
-#: build/trans_presets.java:2442 build/trans_presets.java:2443
-#: build/trans_presets.java:2444 build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:1396
+#: build/trans_presets.java:1397 build/trans_presets.java:1400
+#: build/trans_presets.java:1401 build/trans_presets.java:1402
+#: build/trans_presets.java:1767 build/trans_presets.java:1777
+#: build/trans_presets.java:2408 build/trans_presets.java:2444
+#: build/trans_presets.java:2453 build/trans_presets.java:2454
+#: build/trans_presets.java:2455 build/trans_presets.java:2725
 msgid "yes"
 msgstr "tak"
@@ -14561,40 +14909,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:212
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:212
 msgid "private"
 msgstr "droga prywatna"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655
 msgid "designated"
 msgstr "dla wyznaczonych pojazdów"
@@ -14607,19 +14955,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:219
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:219
 msgid "destination"
 msgstr "dojazd do posesji"
@@ -14642,71 +14990,71 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:205
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:205
 msgid "permissive"
 msgstr "dopuszczalny"
 
-#: build/trans_presets.java:323 build/trans_presets.java:327
-#: build/trans_presets.java:330 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636
+#: build/trans_presets.java:324 build/trans_presets.java:328
+#: build/trans_presets.java:331 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637
 msgid "agricultural"
 msgstr "dla rolnictwa"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
-#: build/trans_presets.java:2433 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1396 build/trans_presets.java:1397
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
+#: build/trans_presets.java:2444 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
+#: build/trans_presets.java:2725
 msgid "no"
 msgstr "nie"
 
-#: build/trans_presets.java:326
+#: build/trans_presets.java:327
 msgid "Goods"
 msgstr "Zaopatrzenie"
 
-#: build/trans_presets.java:327
+#: build/trans_presets.java:328
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Samochody dostawcze"
@@ -14721,10 +15069,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:328 build/trans_presets.java:651
-#: build/trans_presets.java:858 build/trans_presets.java:891
-#: build/trans_presets.java:913 build/trans_presets.java:950
-#: build/trans_presets.java:963 build/trans_presets.java:975
-#: build/trans_presets.java:987 build/trans_presets.java:999
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:329 build/trans_presets.java:652
+#: build/trans_presets.java:859 build/trans_presets.java:892
+#: build/trans_presets.java:914 build/trans_presets.java:951
+#: build/trans_presets.java:964 build/trans_presets.java:976
+#: build/trans_presets.java:988 build/trans_presets.java:1000
+#: build/trans_presets.java:1040
 msgid "Horse"
 msgstr "Konie"
@@ -14740,13 +15088,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:329 build/trans_presets.java:530
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:635 build/trans_presets.java:859
-#: build/trans_presets.java:877 build/trans_presets.java:892
-#: build/trans_presets.java:914 build/trans_presets.java:951
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:330 build/trans_presets.java:531
+#: build/trans_presets.java:552 build/trans_presets.java:573
+#: build/trans_presets.java:594 build/trans_presets.java:615
+#: build/trans_presets.java:636 build/trans_presets.java:860
+#: build/trans_presets.java:878 build/trans_presets.java:893
+#: build/trans_presets.java:915 build/trans_presets.java:952
+#: build/trans_presets.java:965 build/trans_presets.java:977
+#: build/trans_presets.java:989 build/trans_presets.java:1001
+#: build/trans_presets.java:1041
 msgid "Motorcycle"
 msgstr "Motocykle"
@@ -14761,30 +15109,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:330 build/trans_presets.java:531
-#: build/trans_presets.java:552 build/trans_presets.java:573
-#: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:636 build/trans_presets.java:654
-#: build/trans_presets.java:878 build/trans_presets.java:893
-#: build/trans_presets.java:915 build/trans_presets.java:952
-#: build/trans_presets.java:965 build/trans_presets.java:977
-#: build/trans_presets.java:989 build/trans_presets.java:1001
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:331 build/trans_presets.java:532
+#: build/trans_presets.java:553 build/trans_presets.java:574
+#: build/trans_presets.java:595 build/trans_presets.java:616
+#: build/trans_presets.java:637 build/trans_presets.java:655
+#: build/trans_presets.java:879 build/trans_presets.java:894
+#: build/trans_presets.java:916 build/trans_presets.java:953
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1042
 msgid "Motorcar"
 msgstr "Samochody"
 
-#: build/trans_presets.java:331
+#: build/trans_presets.java:332
 msgid "Public Service Vehicles (psv)"
 msgstr "Transport publiczny"
 
-#: build/trans_presets.java:332
+#: build/trans_presets.java:333
 msgid "Motorboat"
 msgstr "Motorówka"
 
-#: build/trans_presets.java:333
+#: build/trans_presets.java:334
 msgid "Boat"
 msgstr "Łódka"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:336
 msgid "Min. speed (km/h)"
 msgstr "Min. prędkość (km/h)"
@@ -14792,25 +15140,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:336 build/trans_presets.java:374
+#: build/trans_presets.java:337 build/trans_presets.java:375
 msgid "Max. weight (tonnes)"
 msgstr "Max. ciężar (w tonach)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:337
+#: build/trans_presets.java:338
 msgid "Max. Height (meters)"
 msgstr "Maks. wysokość (w metrach)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Max. Width (meters)"
 msgstr "Maks. szerokość (w metrach)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:339
+#: build/trans_presets.java:340
 msgid "Max. Length (meters)"
 msgstr "Maks. długość (w metrach)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:341
+#: build/trans_presets.java:342
 msgid "Roundabout"
 msgstr "rondo"
@@ -14821,5 +15169,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:346
+#: build/trans_presets.java:347
 msgid "Edit Junction"
 msgstr "Edycja skrzyżowania"
@@ -14841,9 +15189,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:349 build/trans_presets.java:648
-#: build/trans_presets.java:788 build/trans_presets.java:1135
-#: build/trans_presets.java:1392 build/trans_presets.java:2353
-#: build/trans_presets.java:2901 build/trans_presets.java:2911
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:350 build/trans_presets.java:649
+#: build/trans_presets.java:789 build/trans_presets.java:1137
+#: build/trans_presets.java:1395 build/trans_presets.java:2364
+#: build/trans_presets.java:2913 build/trans_presets.java:2923
+#: build/trans_presets.java:2932
 msgid "Type"
 msgstr "Rodzaj"
@@ -14863,10 +15211,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:547
+#: build/trans_presets.java:350 build/trans_style.java:547
 #: build/trans_style.java:555
 msgid "motorway"
 msgstr "autostrada"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "motorway_link"
 msgstr "ciąg pieszy"
@@ -14888,10 +15236,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:563
+#: build/trans_presets.java:350 build/trans_style.java:563
 #: build/trans_style.java:571
 msgid "trunk"
 msgstr "droga ekspresowa"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "trunk_link"
 msgstr "droga ekspresowa - dojazd"
@@ -14913,10 +15261,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:579
+#: build/trans_presets.java:350 build/trans_style.java:579
 #: build/trans_style.java:587
 msgid "primary"
 msgstr "droga krajowa"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "primary_link"
 msgstr "droga krajowa - dojazd"
@@ -14938,5 +15286,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:595
+#: build/trans_presets.java:350 build/trans_style.java:595
 #: build/trans_style.java:603
 msgid "secondary"
@@ -14951,9 +15299,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:349 build/trans_style.java:611
+#: build/trans_presets.java:350 build/trans_style.java:611
 msgid "tertiary"
 msgstr "droga powiatowa"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "unclassified"
 msgstr "droga gminna"
@@ -14967,9 +15315,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:349 build/trans_style.java:3143
+#: build/trans_presets.java:350 build/trans_style.java:3151
 msgid "residential"
 msgstr "droga lokalna"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "living_street"
 msgstr "strefa zamieszkania"
@@ -14999,10 +15347,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:349 build/trans_style.java:667
-#: build/trans_style.java:4244
+#: build/trans_presets.java:350 build/trans_style.java:667
+#: build/trans_style.java:4252
 msgid "service"
 msgstr "droga serwisowa"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "bus_guideway"
 msgstr "wydzielony pas autobusowy"
@@ -15032,6 +15380,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:349 build/trans_style.java:877
-#: build/trans_style.java:3208 build/trans_style.java:3209
+#: build/trans_presets.java:350 build/trans_style.java:877
+#: build/trans_style.java:3216 build/trans_style.java:3217
 msgid "construction"
 msgstr "w budowie"
@@ -15042,10 +15390,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Edit Bridge"
 msgstr "Edycja mostu"
 
 #. item
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "Edit Tunnel"
 msgstr "Edycja tunelu"
@@ -15053,19 +15401,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:393
+#: build/trans_presets.java:394
 msgid "Ways"
 msgstr "Drogi"
 
 #. group "Ways"
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Construction"
 msgstr "w budowie"
 
 #. item
-#: build/trans_presets.java:395
+#: build/trans_presets.java:396
 msgid "Edit Highway Under Construction"
 msgstr "Edycja drogi w budowie"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "Junction"
 msgstr "Skrzyżowanie"
@@ -15081,5 +15429,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:411 build/trans_style.java:895
+#: build/trans_presets.java:412 build/trans_style.java:895
 msgid "roundabout"
 msgstr "rondo"
@@ -15088,5 +15436,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:417
+#: build/trans_presets.java:418
 msgid "Bridleway"
 msgstr "ścieżka do jazdy konnej"
@@ -15094,5 +15442,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:419
+#: build/trans_presets.java:420
 msgid "Edit Bridleway"
 msgstr "Edycja ścieżki do jazdy konnej"
@@ -15100,5 +15448,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:435
+#: build/trans_presets.java:436
 msgid "Cycleway"
 msgstr "ścieżka rowerowa"
@@ -15108,10 +15456,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:439
+#: build/trans_presets.java:440
 msgid "Edit Cycleway"
 msgstr "Edycja ścieżki rowerowej"
 
 #. item "Ways/Cycleway" check "Embankment"
-#: build/trans_presets.java:449
+#: build/trans_presets.java:450
 msgid "Pedestrians"
 msgstr ""
@@ -15119,5 +15467,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Footway"
 msgstr "droga dla pieszych"
@@ -15126,10 +15474,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Footway"
 msgstr "Edycja drogi dla pieszych"
 
 #. item "Ways/Footway" check "Embankment"
-#: build/trans_presets.java:469
+#: build/trans_presets.java:470
 msgid "Bikes"
 msgstr ""
@@ -15137,5 +15485,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:476
+#: build/trans_presets.java:477
 msgid "Pedestrian"
 msgstr "ciąg pieszy"
@@ -15144,5 +15492,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Edit Pedestrian Street"
 msgstr "Edycja ciągu pieszego"
@@ -15150,5 +15498,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:494
+#: build/trans_presets.java:495
 msgid "Steps"
 msgstr "schody"
@@ -15158,5 +15506,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:498
+#: build/trans_presets.java:499
 msgid "Edit Flight of Steps"
 msgstr "Edycja schodów"
@@ -15165,5 +15513,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:515
+#: build/trans_presets.java:516
 msgid "Track"
 msgstr "droga gruntowa"
@@ -15172,5 +15520,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:518
+#: build/trans_presets.java:519
 msgid "Edit Track"
 msgstr "Edycja drogi gruntowej"
@@ -15178,5 +15526,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:535
+#: build/trans_presets.java:536
 msgid "Track Grade 1"
 msgstr "droga gruntowa klasy 1"
@@ -15185,5 +15533,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:538
+#: build/trans_presets.java:539
 msgid "Edit Track of grade 1"
 msgstr "Edycja drogi gruntowej klasy 1"
@@ -15191,5 +15539,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:556
+#: build/trans_presets.java:557
 msgid "Track Grade 2"
 msgstr "droga gruntowa klasy 2"
@@ -15198,5 +15546,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:559
+#: build/trans_presets.java:560
 msgid "Edit Track of grade 2"
 msgstr "Edycja drogi gruntowej klasy 2"
@@ -15204,5 +15552,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:577
+#: build/trans_presets.java:578
 msgid "Track Grade 3"
 msgstr "droga gruntowa klasy 3"
@@ -15211,5 +15559,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:580
+#: build/trans_presets.java:581
 msgid "Edit Track of grade 3"
 msgstr "Edycja drogi gruntowej klasy 3"
@@ -15217,5 +15565,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:598
+#: build/trans_presets.java:599
 msgid "Track Grade 4"
 msgstr "droga gruntowa klasy 4"
@@ -15224,5 +15572,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:601
+#: build/trans_presets.java:602
 msgid "Edit Track of grade 4"
 msgstr "Edycja drogi gruntowej klasy 4"
@@ -15230,5 +15578,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:619
+#: build/trans_presets.java:620
 msgid "Track Grade 5"
 msgstr "droga gruntowa klasy 5"
@@ -15237,5 +15585,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:622
+#: build/trans_presets.java:623
 msgid "Edit Track of grade 5"
 msgstr "Edycja drogi gruntowej klasy 5"
@@ -15244,5 +15592,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:641
+#: build/trans_presets.java:642
 msgid "Path"
 msgstr "ścieżka"
@@ -15251,13 +15599,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:644
+#: build/trans_presets.java:645
 msgid "Edit Path"
 msgstr "Edycja ścieżki"
 
-#: build/trans_presets.java:652
+#: build/trans_presets.java:653
 msgid "Ski"
 msgstr "Narty"
 
-#: build/trans_presets.java:653
+#: build/trans_presets.java:654
 msgid "Snowmobile"
 msgstr "Skuter śnieżny"
@@ -15267,6 +15615,6 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:670 build/trans_presets.java:1725
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:671 build/trans_presets.java:1729
+#: build/trans_presets.java:1752
 msgid "Hiking"
 msgstr "szlak"
@@ -15276,5 +15624,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:674
+#: build/trans_presets.java:675
 msgid "Edit Hiking"
 msgstr "Edycja szlaku"
@@ -15282,5 +15630,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:683
+#: build/trans_presets.java:684
 msgid "Mountain Hiking"
 msgstr "szlak górski"
@@ -15290,5 +15638,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:687
+#: build/trans_presets.java:688
 msgid "Edit Mountain Hiking"
 msgstr "Edycja szlaku górskiego"
@@ -15296,5 +15644,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:696
+#: build/trans_presets.java:697
 msgid "Demanding Mountain Hiking"
 msgstr "stromy szlak górski"
@@ -15304,5 +15652,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:700
+#: build/trans_presets.java:701
 msgid "Edit Demanding Mountain Hiking"
 msgstr "miejsce do zawracania"
@@ -15310,5 +15658,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:709
+#: build/trans_presets.java:710
 msgid "Alpine Hiking"
 msgstr "szlak alpejski"
@@ -15318,5 +15666,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:713
+#: build/trans_presets.java:714
 msgid "Edit Alpine Hiking"
 msgstr "Edycja szlaku alpejskiego"
@@ -15324,5 +15672,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:723
 msgid "Demanding Alpine Hiking"
 msgstr "stromy szlak alpejski"
@@ -15332,5 +15680,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:726
+#: build/trans_presets.java:727
 msgid "Edit Demanding Alpine Hiking"
 msgstr "Edycja stromego szlaku alpejskiego"
@@ -15338,5 +15686,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:735
+#: build/trans_presets.java:736
 msgid "Difficult Alpine Hiking"
 msgstr "trudny szlak alpejski"
@@ -15346,5 +15694,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:739
+#: build/trans_presets.java:740
 msgid "Edit Difficult Alpine Hiking"
 msgstr "Edycja trudnego szlaku alpejskiego"
@@ -15352,10 +15700,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:749
+#: build/trans_presets.java:750
 msgid "Waypoints"
 msgstr "Punkty drogowe"
 
 #. group "Waypoints"
-#: build/trans_presets.java:750
+#: build/trans_presets.java:751
 msgid "Motorway Junction"
 msgstr "skrzyżowanie autostrad"
@@ -15363,15 +15711,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:752
+#: build/trans_presets.java:753
 msgid "Edit Motorway Junction"
 msgstr "Edycja skrzyżowania autostrad"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:757
 msgid "Number"
 msgstr "Numer"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:759
 msgid "Services"
 msgstr "miejsce obsługi podróżnych"
@@ -15379,5 +15727,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:761
 msgid "Edit Service Station"
 msgstr "Edycja miejsca obsługi podróżnych"
@@ -15415,15 +15763,15 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:765 build/trans_presets.java:902
-#: build/trans_presets.java:1382 build/trans_presets.java:1406
-#: build/trans_presets.java:1413 build/trans_presets.java:1419
-#: build/trans_presets.java:1427 build/trans_presets.java:1434
-#: build/trans_presets.java:1761 build/trans_presets.java:1771
-#: build/trans_presets.java:2361 build/trans_presets.java:2368
-#: build/trans_presets.java:2384 build/trans_presets.java:2395
-#: build/trans_presets.java:2403 build/trans_presets.java:2410
-#: build/trans_presets.java:2464 build/trans_presets.java:2512
-#: build/trans_presets.java:2678 build/trans_presets.java:2693
-#: build/trans_presets.java:2732 build/trans_presets.java:3151
+#: build/trans_presets.java:766 build/trans_presets.java:903
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
+#: build/trans_presets.java:1416 build/trans_presets.java:1422
+#: build/trans_presets.java:1430 build/trans_presets.java:1437
+#: build/trans_presets.java:1765 build/trans_presets.java:1775
+#: build/trans_presets.java:2372 build/trans_presets.java:2379
+#: build/trans_presets.java:2395 build/trans_presets.java:2406
+#: build/trans_presets.java:2414 build/trans_presets.java:2421
+#: build/trans_presets.java:2475 build/trans_presets.java:2523
+#: build/trans_presets.java:2689 build/trans_presets.java:2704
+#: build/trans_presets.java:2743 build/trans_presets.java:3163
 msgid "Operator"
 msgstr "Operator"
@@ -15432,5 +15780,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:769
+#: build/trans_presets.java:770
 msgid "Traffic Signal"
 msgstr "sygnalizacja świetlna"
@@ -15440,5 +15788,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:774
 msgid "Pedestrian crossing type"
 msgstr "Typ przejścia dla pieszych"
@@ -15447,27 +15795,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "traffic_signals"
 msgstr "sygnalizacja świetlna"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "island"
 msgstr "wysepka"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "unmarked"
 msgstr "nieoznakowane"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:774 build/trans_presets.java:790
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:775 build/trans_presets.java:791
+#: build/trans_presets.java:1334
 msgid "Cross on horseback"
 msgstr ""
@@ -15475,6 +15823,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:775 build/trans_presets.java:789
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:776 build/trans_presets.java:790
+#: build/trans_presets.java:1335
 msgid "Cross by bicycle"
 msgstr ""
@@ -15483,11 +15831,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:776 build/trans_presets.java:791
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:1336
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:778
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -15495,30 +15843,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:780
+#: build/trans_presets.java:781
 msgid "Stop"
 msgstr "znak stop"
@@ -15526,5 +15874,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:783
+#: build/trans_presets.java:784
 msgid "Pedestrian Crossing"
 msgstr ""
@@ -15533,14 +15881,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:786
+#: build/trans_presets.java:787
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:793
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:795
 msgid "Mini-roundabout"
 msgstr "Miniaturowe rondo"
@@ -15551,14 +15899,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "Direction"
 msgstr "Kierunek"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "clockwise"
 msgstr "zgodnie z ruchem wskazówek zegara"
 
-#: build/trans_presets.java:801
+#: build/trans_presets.java:802
 msgid "Turning Circle"
 msgstr "miejsce do zawracania"
@@ -15568,20 +15916,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:806
+#: build/trans_presets.java:807
 msgid "City Limit"
 msgstr "granica miasta"
 
 #. item
-#: build/trans_presets.java:807
+#: build/trans_presets.java:808
 msgid "Edit City Limit Sign"
 msgstr "Edycja tablicy oznaczającej granicę miasta"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:812
+#: build/trans_presets.java:813
 msgid "Second Name"
 msgstr "Druga nazwa"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:814
+#: build/trans_presets.java:815
 msgid "Speed Camera"
 msgstr "fotoradar"
@@ -15589,5 +15937,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:817
+#: build/trans_presets.java:818
 msgid "Emergency Phone"
 msgstr "Telefon alarmowy"
@@ -15595,5 +15943,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:820
+#: build/trans_presets.java:821
 msgid "Incline"
 msgstr ""
@@ -15601,5 +15949,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:823
+#: build/trans_presets.java:824
 msgid "Incline Steep"
 msgstr ""
@@ -15608,10 +15956,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:827
+#: build/trans_presets.java:828
 msgid "Ford"
 msgstr "bród"
 
 #. item
-#: build/trans_presets.java:828
+#: build/trans_presets.java:829
 msgid "Edit Ford"
 msgstr "Edycja brodu"
@@ -15619,5 +15967,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:835
+#: build/trans_presets.java:836
 msgid "Mountain Pass"
 msgstr "przełęcz"
@@ -15625,5 +15973,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:837
+#: build/trans_presets.java:838
 msgid "Edit Mountain Pass"
 msgstr "Edycja przełęczy"
@@ -15635,7 +15983,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:842 build/trans_presets.java:1600
-#: build/trans_presets.java:1745 build/trans_presets.java:2845
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:843 build/trans_presets.java:1604
+#: build/trans_presets.java:1749 build/trans_presets.java:2857
+#: build/trans_presets.java:2864 build/trans_presets.java:2871
 msgid "Elevation"
 msgstr "Wysokość"
@@ -15643,5 +15991,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:846
+#: build/trans_presets.java:847
 msgid "Barriers"
 msgstr "Przeszkody"
@@ -15649,5 +15997,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:849
+#: build/trans_presets.java:850
 msgid "Bollard"
 msgstr "słupek drogowy"
@@ -15655,5 +16003,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:852
 msgid "Edit Bollard"
 msgstr "Edycja słupka drogowego"
@@ -15698,16 +16046,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:854 build/trans_presets.java:873
-#: build/trans_presets.java:887 build/trans_presets.java:909
-#: build/trans_presets.java:946 build/trans_presets.java:959
-#: build/trans_presets.java:971 build/trans_presets.java:983
-#: build/trans_presets.java:995 build/trans_presets.java:1007
-#: build/trans_presets.java:1017 build/trans_presets.java:1026
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:855 build/trans_presets.java:874
+#: build/trans_presets.java:888 build/trans_presets.java:910
+#: build/trans_presets.java:947 build/trans_presets.java:960
+#: build/trans_presets.java:972 build/trans_presets.java:984
+#: build/trans_presets.java:996 build/trans_presets.java:1008
+#: build/trans_presets.java:1018 build/trans_presets.java:1027
+#: build/trans_presets.java:1036
 msgid "Allowed traffic:"
 msgstr ""
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:861
+#: build/trans_presets.java:862
 msgid "Cycle Barrier"
 msgstr ""
@@ -15716,5 +16064,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:865
+#: build/trans_presets.java:866
 msgid "Block"
 msgstr ""
@@ -15722,5 +16070,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:868
+#: build/trans_presets.java:869
 msgid "Cattle Grid"
 msgstr "przeszkoda dla bydła"
@@ -15728,10 +16076,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:870
+#: build/trans_presets.java:871
 msgid "Edit Cattle Grid"
 msgstr "Edycja przeszkody dla bydła"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:880
+#: build/trans_presets.java:881
 msgid "Bus Trap"
 msgstr ""
@@ -15739,15 +16087,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:883
+#: build/trans_presets.java:884
 msgid "Spikes"
 msgstr "Kolczatka"
 
 #. item
-#: build/trans_presets.java:884
+#: build/trans_presets.java:885
 msgid "Edit Spikes"
 msgstr "Edycja kolczatki"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:896
 msgid "Toll Booth"
 msgstr "punkt poboru opłat"
@@ -15755,5 +16103,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:897
+#: build/trans_presets.java:898
 msgid "Edit Toll Booth"
 msgstr "Edycja punktu poboru opłat"
@@ -15761,10 +16109,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:905
+#: build/trans_presets.java:906
 msgid "Border Control"
 msgstr "przejście graniczne"
 
 #. item
-#: build/trans_presets.java:906
+#: build/trans_presets.java:907
 msgid "Edit Border Control"
 msgstr "Edycja przejścia granicznego"
@@ -15774,5 +16122,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:920
+#: build/trans_presets.java:921
 msgid "Hedge"
 msgstr "żywopłot"
@@ -15781,5 +16129,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:925
 msgid "Fence"
 msgstr "ogrodzenie"
@@ -15788,5 +16136,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:929
 msgid "Wall"
 msgstr "mur"
@@ -15794,5 +16142,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:931
+#: build/trans_presets.java:932
 msgid "City Wall"
 msgstr "mury miejskie"
@@ -15801,5 +16149,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:935
+#: build/trans_presets.java:936
 msgid "Retaining Wall"
 msgstr "mur oporowy"
@@ -15811,15 +16159,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:942
+#: build/trans_presets.java:943
 msgid "Entrance"
 msgstr "Wejście"
 
 #. item
-#: build/trans_presets.java:943
+#: build/trans_presets.java:944
 msgid "Edit Entrance"
 msgstr "Edycja wejścia"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:954
+#: build/trans_presets.java:955
 msgid "Gate"
 msgstr "brama"
@@ -15827,50 +16175,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:956
+#: build/trans_presets.java:957
 msgid "Edit Gate"
 msgstr "Edycja bramy"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:967
+#: build/trans_presets.java:968
 msgid "Lift Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:968
+#: build/trans_presets.java:969
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:979
+#: build/trans_presets.java:980
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:980
+#: build/trans_presets.java:981
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:991
+#: build/trans_presets.java:992
 msgid "Bump Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:992
+#: build/trans_presets.java:993
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:1003
+#: build/trans_presets.java:1004
 msgid "Kissing Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1004
+#: build/trans_presets.java:1005
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1013
 msgid "Stile"
 msgstr "przełaz"
@@ -15878,25 +16226,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1014
+#: build/trans_presets.java:1015
 msgid "Edit Stile"
 msgstr "Edycja przełazu"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1023
 msgid "Turnstile"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1024
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1032
 msgid "Sally Port"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1033
 msgid "Edit Sally Port"
 msgstr ""
@@ -15904,13 +16252,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #.
-#. <separator/>
+#. group "Water"
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1046 build/trans_presets.java:1089
+#: build/trans_presets.java:1047 build/trans_presets.java:1048
+#: build/trans_presets.java:1091
 msgid "Water"
 msgstr "zbiornik wodny"
 
 #. group "Water"
-#: build/trans_presets.java:1047
+#: build/trans_presets.java:1049
 msgid "Spring"
 msgstr "źródło"
@@ -15918,5 +16267,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1049
+#: build/trans_presets.java:1051
 msgid "Edit Spring"
 msgstr "plaża"
@@ -15924,5 +16273,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1056
 msgid "Drain"
 msgstr "odpływ"
@@ -15930,10 +16279,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1058
 msgid "Edit Drain"
 msgstr "Edycja odpływu"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1064
 msgid "Stream"
 msgstr "strumień"
@@ -15941,10 +16290,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1066
 msgid "Edit Stream"
 msgstr "Edycja strumienia"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1072
 msgid "Canal"
 msgstr "kanał"
@@ -15952,10 +16301,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1074
 msgid "Edit Canal"
 msgstr "Edycja kanału"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1080
 msgid "River"
 msgstr "rzeka"
@@ -15965,5 +16314,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1084
 msgid "Edit River"
 msgstr "Edycja rzeki"
@@ -15971,15 +16320,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1093
 msgid "Edit Water"
 msgstr "Edycja zbiornika wodnego"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1097
 msgid "Land"
 msgstr "ląd"
 
 #. item
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1098
 msgid "Edit Land"
 msgstr "Edycja lądu"
@@ -15987,15 +16336,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1103
 msgid "Basin"
 msgstr "zbiornik wodny"
 
 #. item
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1104
 msgid "Edit Basin Landuse"
 msgstr "Edycja zbiornika wodnego"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1109
 msgid "Reservoir"
 msgstr "sztuczne jezioro"
@@ -16003,15 +16352,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1109
+#: build/trans_presets.java:1111
 msgid "Edit Reservoir Landuse"
 msgstr "Edycja sztucznego jeziora"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1116
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1117
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -16019,5 +16368,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1120
+#: build/trans_presets.java:1122
 msgid "Riverbank"
 msgstr ""
@@ -16026,10 +16375,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1125
 msgid "Edit Riverbank"
 msgstr ""
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1127
+#: build/trans_presets.java:1129
 msgid "Wetland"
 msgstr "mokradło"
@@ -16040,14 +16389,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1134
 msgid "Edit Wetland"
 msgstr "Edycja mokradła"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "swamp"
 msgstr "bagno"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "bog"
 msgstr "torfowisko"
@@ -16061,35 +16410,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1135 build/trans_style.java:3384
+#: build/trans_presets.java:1137 build/trans_style.java:3392
 msgid "marsh"
 msgstr "marsze"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "reedbed"
 msgstr "szuwary"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "tidalflat"
 msgstr "tereny zalewowe"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "mangrove"
 msgstr "namorzyny"
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1139
 msgid "Mud"
 msgstr "błota"
 
 #. item
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1140
 msgid "Edit Mud"
 msgstr "Edycja błot"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1144
 msgid "Beach"
 msgstr "plaża"
@@ -16097,20 +16446,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1144
+#: build/trans_presets.java:1146
 msgid "Edit Beach"
 msgstr "Edycja plaży"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1150
 msgid "Bay"
 msgstr "zatoka"
 
 #. item
-#: build/trans_presets.java:1149
+#: build/trans_presets.java:1151
 msgid "Edit Bay"
 msgstr "Edycja zatoki"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1155
 msgid "Cliff"
 msgstr "klif"
@@ -16118,10 +16467,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1157
 msgid "Edit Cliff"
 msgstr "Edycja klifu"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1159
+#: build/trans_presets.java:1161
 msgid "Coastline"
 msgstr "wybrzeże"
@@ -16129,5 +16478,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1163
 msgid "Edit Coastline"
 msgstr "Edycja zbiornika gazu"
@@ -16135,5 +16484,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1168
 msgid "Ferry Route"
 msgstr "trasa promu"
@@ -16141,5 +16490,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1170
 msgid "Edit Ferry"
 msgstr "Edycja trasy promu"
@@ -16148,5 +16497,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1176
+#: build/trans_presets.java:1178
 msgid "Boatyard"
 msgstr "stocznia"
@@ -16154,10 +16503,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:1180
 msgid "Edit Boatyard"
 msgstr "Edycja stoczni"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1185
 msgid "Dock"
 msgstr "dok"
@@ -16165,5 +16514,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1187
 msgid "Edit Dock"
 msgstr "Edycja doku"
@@ -16171,5 +16520,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1193
 msgid "Dam"
 msgstr "Tama"
@@ -16177,15 +16526,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1195
 msgid "Edit Dam"
 msgstr "Edycja tamy"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1199
+#: build/trans_presets.java:1201
 msgid "Waterway Point"
 msgstr "Punkty drogi wodnej"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1202
 msgid "Lock Gate"
 msgstr "wrota śluzy"
@@ -16194,5 +16543,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1206
 msgid "Weir"
 msgstr "jaz"
@@ -16200,20 +16549,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1208
 msgid "Edit Weir"
 msgstr "Edycja jazu"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1213
 msgid "Waterfall"
 msgstr "wodospad"
 
 #. item
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1214
 msgid "Edit Waterfall"
 msgstr "Edycja wodospadu"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1219
 msgid "Turning Point"
 msgstr ""
@@ -16222,15 +16571,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1221
+#: build/trans_presets.java:1223
 msgid "Marina"
 msgstr "marina"
 
 #. item
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1224
 msgid "Edit Marina"
 msgstr "Edycja mariny"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1228
 msgid "Pier"
 msgstr "molo"
@@ -16238,10 +16587,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1230
 msgid "Edit Pier"
 msgstr "Edycja molo"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1234
 msgid "Ferry Terminal"
 msgstr "terminal promowy"
@@ -16249,10 +16598,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1236
 msgid "Edit Ferry Terminal"
 msgstr "Edycja terminalu promowego"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1240
 msgid "Slipway"
 msgstr "pochylnia"
@@ -16262,16 +16611,21 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1244
 msgid "Edit Slipway"
 msgstr "Edycja pochylni"
 
 #. item "Waterway Point/Slipway" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1250
+#, fuzzy
+msgid "Transport"
+msgstr "Transport publiczny"
+
+#. group "Transport"
+#: build/trans_presets.java:1251
 msgid "Railway"
 msgstr "Kolej"
 
 #. group "Railway"
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1252
 msgid "Rail"
 msgstr "tor"
@@ -16279,5 +16633,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:1254
 msgid "Edit Rail"
 msgstr "Edycja toru"
@@ -16307,8 +16661,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "Optional Types"
 msgstr "Rodzaj (opcjonalne)"
@@ -16322,35 +16676,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "yard"
 msgstr "dworzec przetokowy"
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "siding"
 msgstr "bocznica"
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "spur"
 msgstr "odnoga"
 
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1259
 msgid "Narrow Gauge Rail"
 msgstr "kolej wąskotorowa"
 
 #. item
-#: build/trans_presets.java:1257
+#: build/trans_presets.java:1260
 msgid "Edit Narrow Gauge Rail"
 msgstr "Edycja toru kolei wąskotorowej"
 
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1265
 msgid "Monorail"
 msgstr "tor jednoszynowy"
@@ -16358,45 +16712,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1267
 msgid "Edit Monorail"
 msgstr "Edycja toru jednoszynowego"
 
-#: build/trans_presets.java:1269
+#: build/trans_presets.java:1272
 msgid "Preserved"
 msgstr "kolej retro"
 
 #. item
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1273
 msgid "Edit Preserved Railway"
 msgstr "Edycja kolei retro"
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1278
 msgid "Light Rail"
 msgstr "trasa szybkiego tramwaju"
 
 #. item
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1279
 msgid "Edit Light Rail"
 msgstr "Edycja trasy szybkiego tramwaju"
 
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1284
 msgid "Subway"
 msgstr "metro"
 
 #. item
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1285
 msgid "Edit Subway"
 msgstr "Edycja toru metra"
 
-#: build/trans_presets.java:1287
+#: build/trans_presets.java:1290
 msgid "Tram"
 msgstr "tramwaj"
 
 #. item
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1291
 msgid "Edit Tram"
 msgstr "Edycja torów tramwajowych"
 
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1296
 msgid "Bus Guideway"
 msgstr ""
@@ -16404,5 +16758,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1295
+#: build/trans_presets.java:1298
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -16411,14 +16765,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1315
 msgid "Disused Rail"
 msgstr "nieużywany tor"
 
 #. item
-#: build/trans_presets.java:1313
+#: build/trans_presets.java:1316
 msgid "Edit Disused Railway"
 msgstr "Edycja opuszczonych torów"
 
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1321
 msgid "Abandoned Rail"
 msgstr "nieczynny tor"
@@ -16427,5 +16781,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1325
 msgid "Level Crossing"
 msgstr "przejazd kolejowy"
@@ -16434,5 +16788,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1329
 msgid "Crossing"
 msgstr "przejazd przez tory"
@@ -16442,5 +16796,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1333
 msgid "Crossing type"
 msgstr "Rodzaj przejazdu"
@@ -16448,5 +16802,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1339
 msgid "Turntable"
 msgstr "obrotnica"
@@ -16455,10 +16809,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1344
 msgid "Aerialway"
 msgstr "Koleje linowe"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1345
 msgid "Chair Lift"
 msgstr "wyciąg krzesełkowy"
@@ -16466,10 +16820,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1347
 msgid "Edit Chair Lift"
 msgstr "Edycja wyciągu krzesełkowego"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1351
 msgid "Drag Lift"
 msgstr "wyciąg orczykowy"
@@ -16477,10 +16831,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1353
 msgid "Edit Drag Lift"
 msgstr "Edycja wyciągu orczykowego"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1357
 msgid "Cable Car"
 msgstr "kolej linowa"
@@ -16488,10 +16842,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1359
 msgid "Edit Cable Car"
 msgstr "Edycja kolei linowej"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1360
+#: build/trans_presets.java:1363
 msgid "Gondola"
 msgstr ""
@@ -16499,5 +16853,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1365
 msgid "Edit Gondola"
 msgstr ""
@@ -16505,5 +16859,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1366 build/trans_presets.java:1461
+#: build/trans_presets.java:1369 build/trans_presets.java:1464
 msgid "Station"
 msgstr "stacja"
@@ -16514,10 +16868,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1368 build/trans_presets.java:1464
+#: build/trans_presets.java:1371 build/trans_presets.java:1467
 msgid "Edit Station"
 msgstr "Edycja stacji"
 
 #. group "Car"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1378
 msgid "Fuel"
 msgstr "stacja benzynowa"
@@ -16527,5 +16881,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1382
 msgid "Edit Fuel"
 msgstr "Edycja stacji benzynowej"
@@ -16583,32 +16937,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1671 build/trans_presets.java:1678
-#: build/trans_presets.java:1686 build/trans_presets.java:1699
-#: build/trans_presets.java:1713 build/trans_presets.java:1810
-#: build/trans_presets.java:1818 build/trans_presets.java:1909
-#: build/trans_presets.java:1915 build/trans_presets.java:2226
-#: build/trans_presets.java:2250 build/trans_presets.java:2465
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1703
+#: build/trans_presets.java:1717 build/trans_presets.java:1814
+#: build/trans_presets.java:1822 build/trans_presets.java:1919
+#: build/trans_presets.java:1925 build/trans_presets.java:2237
+#: build/trans_presets.java:2261 build/trans_presets.java:2476
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Opening Hours"
 msgstr "godziny otwarcia"
@@ -16667,91 +17021,91 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -16766,5 +17120,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1385 build/trans_presets.java:1438
+#: build/trans_presets.java:1388 build/trans_presets.java:1441
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -16774,5 +17128,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1391
 msgid "Edit Parking"
 msgstr "Edycja parkingu"
@@ -16783,24 +17137,24 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1391 build/trans_presets.java:1762
-#: build/trans_presets.java:1772 build/trans_presets.java:2396
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:1394 build/trans_presets.java:1766
+#: build/trans_presets.java:1776 build/trans_presets.java:2407
+#: build/trans_presets.java:2524
 msgid "Reference number"
 msgstr "Numer referencyjny"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "multi-storey"
 msgstr "wielopoziomowy"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "surface"
 msgstr "powierzchnia"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "underground"
 msgstr "podziemny"
 
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1396
 msgid "Park and Ride"
 msgstr ""
@@ -16809,38 +17163,38 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1394 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
+#: build/trans_presets.java:1397 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
 msgid "Fee"
 msgstr "Opłata"
 
 #. <space />
-#: build/trans_presets.java:1396
+#: build/trans_presets.java:1399
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1400
 msgid "Spaces for Disabled"
 msgstr "Miejsca dla niepełnosprawnych"
 
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1401
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1402
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1403
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1405
 msgid "Wash"
 msgstr "Myjnia samochodowa"
 
 #. item
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1406
 msgid "Edit Car Wash"
 msgstr "Edycja myjni samochodowej"
@@ -16848,5 +17202,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1408 build/trans_presets.java:1452
+#: build/trans_presets.java:1411 build/trans_presets.java:1455
 msgid "Shop"
 msgstr "warsztat"
@@ -16854,15 +17208,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1413
 msgid "Edit Car Shop"
 msgstr "Edycja warsztatu samochodowego"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1418
 msgid "Repair"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1419
 msgid "Edit Car Repair"
 msgstr ""
@@ -16870,5 +17224,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1421 build/trans_presets.java:1445
+#: build/trans_presets.java:1424 build/trans_presets.java:1448
 msgid "Rental"
 msgstr "wypożyczalnia"
@@ -16877,10 +17231,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1427
 msgid "Edit Car Rental"
 msgstr "Edycja wypożyczalni samochodów"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1432
 msgid "Sharing"
 msgstr ""
@@ -16888,5 +17242,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1434
 msgid "Edit Car Sharing"
 msgstr ""
@@ -16894,10 +17248,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Parking"
 msgstr "Edycja parkingu dla rowerów"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1446
 msgid "Capacity"
 msgstr "Pojemność"
@@ -16906,5 +17260,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1448
+#: build/trans_presets.java:1451
 msgid "Edit Bicycle Rental"
 msgstr "Edycja wypożyczalni rowerów"
@@ -16913,15 +17267,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1458
 msgid "Edit Bicycle Shop"
 msgstr "Edycja warsztatu rowerowego"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1463
 msgid "Public Transport"
 msgstr "Transport publiczny"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:1472
 msgid "UIC-Reference"
 msgstr ""
@@ -16929,5 +17283,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1475
 msgid "Railway Halt"
 msgstr "przystanek kolejowy"
@@ -16935,5 +17289,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1477
 msgid "Edit Halt"
 msgstr "Edycja przystanku kolejowego"
@@ -16941,5 +17295,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1484
 msgid "Tram Stop"
 msgstr "przystanek tramwajowy"
@@ -16948,5 +17302,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1484
+#: build/trans_presets.java:1487
 msgid "Edit Tram Stop"
 msgstr "Edycja przystanku tramwajowego"
@@ -16954,5 +17308,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1494
 msgid "Railway Platform"
 msgstr "Platforma kolejowa"
@@ -16961,5 +17315,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1497
 msgid "Edit Railway Platform"
 msgstr "Edytuj platformę kolejową"
@@ -16971,5 +17325,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1497 build/trans_presets.java:1539
+#: build/trans_presets.java:1500 build/trans_presets.java:1542
 msgid "Reference (track number)"
 msgstr "Oznaczenie (numer toru)"
@@ -16977,10 +17331,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1499 build/trans_presets.java:1541
+#: build/trans_presets.java:1502 build/trans_presets.java:1544
 msgid "Area"
 msgstr "obszar"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1504
 msgid "Subway Entrance"
 msgstr "wejście do metra"
@@ -16989,10 +17343,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1507
 msgid "Edit Subway Entrance"
 msgstr "Edycja wejścia do metra"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1512
 msgid "Wheelchair"
 msgstr "dla niepełnosprawnych"
@@ -17001,5 +17355,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1517
 msgid "Bus Station"
 msgstr "dworzec autobusowy"
@@ -17008,5 +17362,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1520
 msgid "Edit Bus Station"
 msgstr "Edycja dworca autobusowego"
@@ -17014,5 +17368,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1526
 msgid "Bus Stop"
 msgstr "Przystanek autobusowy"
@@ -17022,5 +17376,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1530
 msgid "Edit Bus Stop"
 msgstr "Edycja przystanku autobusowego"
@@ -17029,6 +17383,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1532 build/trans_presets.java:1785
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:1535 build/trans_presets.java:1789
+#: build/trans_presets.java:2453
 msgid "Shelter"
 msgstr "schronienie"
@@ -17036,10 +17390,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1538
 msgid "Bus Platform"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1539
 msgid "Edit Bus Platform"
 msgstr ""
@@ -17047,5 +17401,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1547
 msgid "Taxi"
 msgstr "taksówki"
@@ -17053,5 +17407,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1549
 msgid "Edit Taxi station"
 msgstr "Edycja postoju taksówek"
@@ -17059,5 +17413,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1554
 msgid "Airport"
 msgstr "lotnisko"
@@ -17065,15 +17419,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1556
 msgid "Edit Airport"
 msgstr "Edycja lotniska"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1561
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1559
+#: build/trans_presets.java:1562
 msgid "ICAO"
 msgstr "ICAO"
@@ -17081,6 +17435,11 @@
 #. item "Public Transport/Airport" text "ICAO"
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1567
+#, fuzzy
+msgid "Travel"
+msgstr "żwir"
+
+#. group "Travel"
+#: build/trans_presets.java:1568
 msgid "Accomodation"
 msgstr "Zakwaterowanie"
@@ -17092,5 +17451,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1565 build/trans_surveyor.java:43
+#: build/trans_presets.java:1569 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "hotel"
@@ -17099,15 +17458,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:1568
+#: build/trans_presets.java:1572
 msgid "Edit Hotel"
 msgstr "Edycja hotelu"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1575
 msgid "Stars"
 msgstr "Gwiazdki"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1577
 msgid "Motel"
 msgstr "motel"
@@ -17115,20 +17474,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1579
 msgid "Edit Motel"
 msgstr "Edycja motelu"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1583
 msgid "Guest House"
 msgstr "kwatera"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1584
 msgid "Edit Guest House"
 msgstr "Edycja kwatery turystycznej"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1588
 msgid "Chalet"
 msgstr "chata górska"
@@ -17136,10 +17495,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1590
 msgid "Edit Chalet"
 msgstr "Edycja chaty górskiej"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1594
 msgid "Hostel"
 msgstr "hostel"
@@ -17147,30 +17506,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1592
+#: build/trans_presets.java:1596
 msgid "Edit Hostel"
 msgstr "Edycja hostelu"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1600
 msgid "Alpine Hut"
 msgstr "chata alpejska"
 
 #. item
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1601
 msgid "Edit Alpine Hut"
 msgstr "Edycja chaty alpejskiej"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1606
 msgid "Caravan Site"
 msgstr "kemping"
 
 #. item
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1607
 msgid "Edit Caravan Site"
 msgstr "Edycja kempingu"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1611
 msgid "Camping Site"
 msgstr "pole namiotowe"
@@ -17178,10 +17537,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1613
 msgid "Edit Camping Site"
 msgstr "Edycja pola namiotowego"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1618
 msgid "Food+Drinks"
 msgstr "Wyżywienie"
@@ -17192,5 +17551,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1615 build/trans_surveyor.java:47
+#: build/trans_presets.java:1619 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "restauracja"
@@ -17198,5 +17557,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1621
 msgid "Edit Restaurant"
 msgstr "Edycja restauracji"
@@ -17204,5 +17563,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "Cuisine"
 msgstr "Kuchnia"
@@ -17210,61 +17569,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "italian"
 msgstr "włoska"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "chinese"
 msgstr "chińska"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "burger"
 msgstr "hamburgery"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "greek"
 msgstr "grecka"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "german"
 msgstr "niemiecka"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "indian"
 msgstr "indyjska"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "regional"
 msgstr "regionalna"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "turkish"
 msgstr "turecka"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "asian"
 msgstr "azjatycka"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "thai"
 msgstr "tajska"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "mexican"
 msgstr "meksykańska"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "japanese"
 msgstr "japońska"
 
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1627
 msgid "Fast Food"
 msgstr "fast food"
@@ -17272,9 +17631,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1629
 msgid "Edit Fast Food Restaurant"
 msgstr "Edycja restauracji fast-food"
 
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1635
 msgid "Cafe"
 msgstr "kawiarnia"
@@ -17282,9 +17641,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1633
+#: build/trans_presets.java:1637
 msgid "Edit Cafe"
 msgstr "Edycja kawiarni"
 
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1642
 msgid "Pub"
 msgstr "pub"
@@ -17292,18 +17651,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1644
 msgid "Edit Pub"
 msgstr "Edycja pubu"
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1649
 msgid "Biergarten"
 msgstr "ogródek piwny"
 
 #. item
-#: build/trans_presets.java:1646
+#: build/trans_presets.java:1650
 msgid "Edit Biergarten"
 msgstr "Edycja ogródka piwnego"
 
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1655
 msgid "Bar"
 msgstr "bar"
@@ -17311,9 +17670,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1657
 msgid "Edit Bar"
 msgstr "Edycja baru"
 
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1662
 msgid "Nightclub"
 msgstr "klub nocny"
@@ -17321,24 +17680,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1664
 msgid "Edit Nightclub"
 msgstr "Edycja klubu nocnego"
 
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1670
 msgid "Tourism"
 msgstr "Turystyka"
 
 #. group "Tourism"
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1671
 msgid "Attraction"
 msgstr "atrakcja"
 
 #. item
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1672
 msgid "Edit Attraction"
 msgstr "Edycja atrakcji turystycznej"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1677
 msgid "Museum"
 msgstr "muzeum"
@@ -17346,9 +17705,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1679
 msgid "Edit Museum"
 msgstr "Edycja muzeum"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1684
 msgid "Zoo"
 msgstr "zoo"
@@ -17357,9 +17716,9 @@
 #. <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:1683
+#: build/trans_presets.java:1687
 msgid "Edit Zoo"
 msgstr "Edycja zoo"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1692
 msgid "Viewpoint"
 msgstr "punkt widokowy"
@@ -17367,24 +17726,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1694
 msgid "Edit Viewpoint"
 msgstr "Edycja punktu widokowego"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1697
 msgid "Look-Out Tower"
 msgstr "wieża widokowa"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1699
 msgid "Theme Park"
 msgstr "park rozrywki"
 
 #. item
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1700
 msgid "Edit Theme Park"
 msgstr "Edycja parku rozrywki"
 
-#: build/trans_presets.java:1701
+#: build/trans_presets.java:1705
 msgid "Artwork"
 msgstr "sztuka"
@@ -17392,5 +17751,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1707
 msgid "Edit Artwork"
 msgstr "Edycja obiektu sztuki"
@@ -17398,19 +17757,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1712
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1719
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "topo"
 msgstr ""
@@ -17448,5 +17807,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1720 build/trans_style.java:619
+#: build/trans_presets.java:1724 build/trans_style.java:619
 #: build/trans_style.java:635 build/trans_style.java:651
 #: build/trans_style.java:659
@@ -17454,28 +17813,28 @@
 msgstr "ulica"
 
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1722 build/trans_presets.java:1738
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1726 build/trans_presets.java:1742
+#: build/trans_presets.java:1786
 msgid "Closer Description"
 msgstr ""
@@ -17485,5 +17844,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1724 build/trans_presets.java:1747
+#: build/trans_presets.java:1728 build/trans_presets.java:1751
 msgid "Routes shown for:"
 msgstr ""
@@ -17491,6 +17850,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1726 build/trans_presets.java:1749
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1965
 msgid "Cycling"
 msgstr "kolarstwo"
@@ -17498,5 +17857,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1727 build/trans_presets.java:1750
+#: build/trans_presets.java:1731 build/trans_presets.java:1754
 msgid "Mountainbiking"
 msgstr ""
@@ -17504,6 +17863,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1728 build/trans_presets.java:1751
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:1732 build/trans_presets.java:1755
+#: build/trans_presets.java:2019
 msgid "Skiing"
 msgstr "narciarstwo"
@@ -17511,5 +17870,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1729 build/trans_presets.java:1752
+#: build/trans_presets.java:1733 build/trans_presets.java:1756
 msgid "Riding"
 msgstr ""
@@ -17517,46 +17876,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1734 build/trans_presets.java:1757
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1736
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "history"
 msgstr "tablica historyczna"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "nature"
 msgstr "tablica przyrodnicza"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "wildlife"
 msgstr "tablica o zwierzętach"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1744
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1759
 msgid "Information Terminal"
 msgstr ""
@@ -17564,29 +17923,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1760 build/trans_presets.java:1770
+#: build/trans_presets.java:1764 build/trans_presets.java:1774
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1769
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1779
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1780
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1778
+#: build/trans_presets.java:1782
 msgid "Other Information Points"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1790
 msgid "Edit Shelter"
 msgstr "Edycja schronienia"
@@ -17594,25 +17953,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1789 build/trans_presets.java:1795
+#: build/trans_presets.java:1793 build/trans_presets.java:1799
 msgid "Fireplace"
 msgstr "miejsce na ognisko"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1791
+#: build/trans_presets.java:1795
 msgid "Picnic Site"
 msgstr "miejsce na piknik"
 
 #. item
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1796
 msgid "Edit Picnic Site"
 msgstr "Edycja miejsca na piknik"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1802
 msgid "Historic Places"
 msgstr "Miejsca historyczne"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1799
+#: build/trans_presets.java:1803
 msgid "Castle"
 msgstr "zamek"
@@ -17621,19 +17980,19 @@
 #. <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:1802
+#: build/trans_presets.java:1806
 msgid "Edit Castle"
 msgstr "Edycja zamku"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1810
 msgid "Ruins"
 msgstr "ruiny"
 
 #. item
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1811
 msgid "Edit Ruins"
 msgstr "Edycja ruin"
 
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1816
 msgid "Archaeological Site"
 msgstr "Wykopaliska archeologiczne"
@@ -17642,9 +18001,9 @@
 #. <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:1815
+#: build/trans_presets.java:1819
 msgid "Edit Archaeological Site"
 msgstr "Edycja wykopalisk archeologicznych"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1824
 msgid "Battlefield"
 msgstr "pole bitwy"
@@ -17652,5 +18011,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1826
 msgid "Edit Battlefield"
 msgstr "Edycja pola bitwy"
@@ -17658,15 +18017,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1831
 msgid "Monument"
 msgstr "pomnik"
 
 #. item
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1832
 msgid "Edit Monument"
 msgstr "Edycja pomnika"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1836
 msgid "Memorial"
 msgstr "miejsce pamięci"
@@ -17674,45 +18033,57 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1838
 msgid "Edit Memorial"
 msgstr "Edycja miejsca pamięci"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1842
 msgid "Wayside Cross"
 msgstr "krzyż przydrożny"
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1843
 msgid "Edit Wayside Cross"
 msgstr "Edycja krzyża przydrożnego"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1847
 msgid "Wayside Shrine"
 msgstr "kapliczka"
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1848
 msgid "Edit Wayside Shrine"
 msgstr "Edycja kapliczki"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1852
+#, fuzzy
+msgid "Boundary Stone"
+msgstr "Granice"
+
+#. item
+#: build/trans_presets.java:1853
+#, fuzzy
+msgid "Edit Boundary Stone"
+msgstr "Edycja przystanku autobusowego"
+
+#. item "Historic Places/Boundary Stone" text "Name"
+#: build/trans_presets.java:1858
 msgid "Leisure"
 msgstr "Rozrywka"
 
 #. group "Leisure"
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1859
 msgid "Water Park"
 msgstr "park wodny"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1860
 msgid "Edit Water Park"
 msgstr "Edycja parku wodnego"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1864
 msgid "Playground"
 msgstr "plac zabaw"
@@ -17720,31 +18091,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1866
 msgid "Edit Playground"
 msgstr "Edycja placu zabaw"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1870
 msgid "Fishing"
 msgstr "miejsce do wędkowania"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1871
 msgid "Edit Fishing"
 msgstr "Edycja miejsca do wędkowania"
 
 #. item "Leisure/Fishing" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1877 build/trans_presets.java:2669
+msgid "Sports"
+msgstr ""
+
+#. group "Sports"
+#: build/trans_presets.java:1878
 msgid "Sport Facilities"
 msgstr "obiekty sportowe"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1879
 msgid "Stadium"
 msgstr "stadion"
 
 #. item
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1880
 msgid "Edit Stadium"
 msgstr "Edycja stadionu"
@@ -17758,6 +18133,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1874 build/trans_presets.java:1883
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1902 build/trans_presets.java:1911
 msgid "select sport:"
 msgstr "wybierz sport:"
@@ -18149,30 +18524,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884 build/trans_style.java:3892
-#: build/trans_style.java:3900 build/trans_style.java:3908
-#: build/trans_style.java:3916 build/trans_style.java:3924
-#: build/trans_style.java:3932
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_style.java:3572 build/trans_style.java:3580
+#: build/trans_style.java:3588 build/trans_style.java:3596
+#: build/trans_style.java:3604 build/trans_style.java:3612
+#: build/trans_style.java:3620 build/trans_style.java:3628
+#: build/trans_style.java:3636 build/trans_style.java:3644
+#: build/trans_style.java:3652 build/trans_style.java:3660
+#: build/trans_style.java:3668 build/trans_style.java:3676
+#: build/trans_style.java:3684 build/trans_style.java:3692
+#: build/trans_style.java:3700 build/trans_style.java:3708
+#: build/trans_style.java:3716 build/trans_style.java:3724
+#: build/trans_style.java:3732 build/trans_style.java:3740
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3764 build/trans_style.java:3772
+#: build/trans_style.java:3780 build/trans_style.java:3788
+#: build/trans_style.java:3796 build/trans_style.java:3804
+#: build/trans_style.java:3812 build/trans_style.java:3820
+#: build/trans_style.java:3828 build/trans_style.java:3836
+#: build/trans_style.java:3844 build/trans_style.java:3852
+#: build/trans_style.java:3860 build/trans_style.java:3868
+#: build/trans_style.java:3876 build/trans_style.java:3884
+#: build/trans_style.java:3892 build/trans_style.java:3900
+#: build/trans_style.java:3908 build/trans_style.java:3916
+#: build/trans_style.java:3924 build/trans_style.java:3932
+#: build/trans_style.java:3940
 msgid "sport"
 msgstr "sport"
@@ -18182,225 +18557,225 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "multi"
 msgstr "różne sporty"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "archery"
 msgstr "łucznictwo"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "athletics"
 msgstr "lekkoatletyka"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "basketball"
 msgstr "siatkówka"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "boules"
 msgstr "bule"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "bowls"
 msgstr "gra w kule"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "canoe"
 msgstr "kajakarstwo"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "climbing"
 msgstr "wspinaczka"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket"
 msgstr "krykiet"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "croquet"
 msgstr "krokiet"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cycling"
 msgstr "kolarstwo"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "dog_racing"
 msgstr "wyścigi psów"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "equestrian"
 msgstr "jazda konna"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "football"
 msgstr "football"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "gymnastics"
 msgstr "gimnastyka"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "horse_racing"
 msgstr "wyścigi konne"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "motor"
 msgstr "sporty motorowe"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "shooting"
 msgstr "strzelectwo"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skateboard"
 msgstr "jazda na deskorolce"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skating"
 msgstr "łyżwiarstwo"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skiing"
 msgstr "narciarstwo"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "soccer"
 msgstr "piłka nożna"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "swimming"
 msgstr "pływanie"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "table_tennis"
 msgstr "tenis stołowy"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1888
 msgid "Sports Centre"
 msgstr "centrum sportowe"
 
 #. item
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1889
 msgid "Edit Sports Centre"
 msgstr "Edycja centrum sportowego"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1897
 msgid "Pitch"
 msgstr "boisko"
 
 #. item
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1898
 msgid "Edit Pitch"
 msgstr "Edycja boiska"
 
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1906
 msgid "Racetrack"
 msgstr "tor wyścigowy"
 
 #. item
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1907
 msgid "Edit Racetrack"
 msgstr "Edycja toru wyścigowego"
 
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1915
 msgid "Golf Course"
 msgstr "pole golfowe"
 
 #. item
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1916
 msgid "Edit Golf Course"
 msgstr "Edycja pola golfowego"
 
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1921
 msgid "Miniature Golf"
 msgstr "miniaturowy golf"
 
 #. item
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1922
 msgid "Edit Miniature Golf"
 msgstr "Edycja miniaturowego golfa"
 
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1928
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1929
 msgid "Multi"
 msgstr "różne sporty"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1930
 msgid "Edit Multi"
 msgstr ""
@@ -18439,183 +18814,183 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "pitch"
 msgstr "boisko"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "sports_centre"
 msgstr "centrum sportowe"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1935
 msgid "10pin"
 msgstr "kręgle"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1936
 msgid "Edit 10pin"
 msgstr "Edycja kręgli"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1941
 msgid "Athletics"
 msgstr "lekkoatletyka"
 
 #. item
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1942
 msgid "Edit Athletics"
 msgstr "Edycja"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1947
 msgid "Archery"
 msgstr "łucznictwo"
 
 #. item
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1948
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1953
 msgid "Climbing"
 msgstr "wspinaczka"
 
 #. item
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:1954
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1959
 msgid "Canoeing"
 msgstr "kajakarstwo"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1960
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1966
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1971
 msgid "Dog Racing"
 msgstr "wyścigi psów"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1972
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1977
 msgid "Equestrian"
 msgstr "jeździectwo"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1978
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1983
 msgid "Horse Racing"
 msgstr "wyścigi konne"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1984
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1989
 msgid "Gymnastics"
 msgstr "gimnastyka"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1990
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1995
 msgid "Motor Sports"
 msgstr "sporty motorowe"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1996
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2001
 msgid "Skating"
 msgstr "łyżwiarstwo"
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2002
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2007
 msgid "Skateboard"
 msgstr "jazda na deskorolce"
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2008
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2013
 msgid "Swimming"
 msgstr "pływanie"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2014
 msgid "Edit Swimming"
 msgstr ""
@@ -18623,56 +18998,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2021
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "Piste type"
 msgstr "Rodzaj trasy"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "Difficulty"
 msgstr "Poziom trudności"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "novice"
 msgstr "dla początkujących"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "easy"
 msgstr "łatwa"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "expert"
 msgstr "dla ekspertów"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2028
 msgid "Shooting"
 msgstr "strzelectwo"
@@ -18680,178 +19055,183 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2030
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2036
 msgid "Sport (Ball)"
 msgstr "Sporty z piłką"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2037
 msgid "Soccer"
 msgstr "piłka nożna"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2038
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2043
 msgid "Football"
 msgstr "football"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2044
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2049
 msgid "Australian Football"
 msgstr "australijski football"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2050
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2055
 msgid "Baseball"
 msgstr "baseball"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2056
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2061
 msgid "Basketball"
 msgstr "koszykówka"
 
 #. item
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2062
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2067
 msgid "Golf"
 msgstr "golf"
 
 #. item
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2068
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2071
 msgid "golf_course"
 msgstr "pole golfowe"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2073
 msgid "Boule"
 msgstr "bule"
 
 #. item
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2074
 msgid "Edit Boule"
 msgstr "Edycja boiska do gry w boule"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2079
 msgid "Bowls"
 msgstr "gra w kule"
 
 #. item
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2080
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2085
 msgid "Cricket"
 msgstr "krykiet"
 
 #. item
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2086
 msgid "Edit Cricket"
 msgstr "Edycja boiska do gry w krykieta"
 
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2091
 msgid "Cricket Nets"
 msgstr "krykiet - siatki"
 
 #. item
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2092
 msgid "Edit Cricket Nets"
 msgstr "Edycja siatek do treningu gry w krykieta"
 
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2097
 msgid "Croquet"
 msgstr "krokiet"
 
 #. item
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2098
 msgid "Edit Croquet"
 msgstr "Edycja miejsca do gry w krokieta"
 
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2103
 msgid "Hockey"
 msgstr "hokej"
 
 #. item
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2104
 msgid "Edit Hockey"
 msgstr "Edycja miejsca do gry w hokeja"
 
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2109
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2110
 msgid "Edit Pelota"
 msgstr "Edycja miejsca do gry w pelotę"
 
-#: build/trans_presets.java:2105
+#: build/trans_presets.java:2115
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2116
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2121
 msgid "Rugby"
 msgstr "rugby"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2122
 msgid "Edit Rugby"
 msgstr "Edycja miejsca do gry w rugby"
 
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2127
 msgid "Table Tennis"
 msgstr "tenis stołowy"
 
 #. item
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2128
 msgid "Edit Table Tennis"
 msgstr "Edycja miejsca do gry w tenis stołowy"
 
-#: build/trans_presets.java:2123
+#: build/trans_presets.java:2133
 msgid "Tennis"
 msgstr "tenis"
 
 #. item
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2134
 msgid "Edit Tennis"
 msgstr "Edycja miejsca do gry w tenisa"
 
-#. <separator/>
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2141
+#, fuzzy
+msgid "Man-Made"
+msgstr "Obiekty sztuczne"
+
+#. group "Man-Made"
+#: build/trans_presets.java:2142
 msgid "Buildings"
 msgstr "Budynki"
 
 #. group "Buildings"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2143
 msgid "Building"
 msgstr "budynek"
@@ -18859,5 +19239,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Public Building"
 msgstr "budynek użyteczności publicznej"
@@ -18865,10 +19245,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2148
 msgid "Edit Public Building"
 msgstr "Edycja budynku użyteczności publicznej"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2152
 msgid "Town hall"
 msgstr "ratusz"
@@ -18876,10 +19256,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2154
 msgid "Edit Town hall"
 msgstr "Edycja ratusza"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:2158
 msgid "Embassy"
 msgstr "ambasada"
@@ -18887,10 +19267,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Edit Embassy"
 msgstr "Edycja ambasady"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2164
 msgid "Courthouse"
 msgstr "sąd"
@@ -18899,10 +19279,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:2156
+#: build/trans_presets.java:2167
 msgid "Edit Courthouse"
 msgstr "Edycja siedziby sądu"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2171
 msgid "Prison"
 msgstr "więzienie"
@@ -18911,10 +19291,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:2163
+#: build/trans_presets.java:2174
 msgid "Edit Prison"
 msgstr "Edycja więzienia"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2178
 msgid "Police"
 msgstr "posterunek policji"
@@ -18924,10 +19304,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:2171
+#: build/trans_presets.java:2182
 msgid "Edit Police"
 msgstr "Edycja posterunku policji"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2186
 msgid "Fire Station"
 msgstr "straż pożarna"
@@ -18936,10 +19316,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:2178
+#: build/trans_presets.java:2189
 msgid "Edit Fire Station"
 msgstr "Edycja posterunku straży pożarnej"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "Post Office"
 msgstr "poczta"
@@ -18947,5 +19327,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Edit Post Office"
 msgstr "Edycja urzędu pocztowego"
@@ -18953,15 +19333,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2200
 msgid "Kindergarten"
 msgstr "przedszkole"
 
 #. item
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Kindergarten"
 msgstr "Edycja przedszkola"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2205
 msgid "School"
 msgstr "szkoła"
@@ -18969,10 +19349,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Edit School"
 msgstr "Edycja szkoły"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2211
 msgid "University"
 msgstr "uniwersytet"
@@ -18980,10 +19360,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit University"
 msgstr "Edycja uniwersytetu"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "College"
 msgstr "college"
@@ -18991,5 +19371,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2219
 msgid "Edit College"
 msgstr "Edycja college'u"
@@ -18997,5 +19377,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2224
 msgid "Cinema"
 msgstr "kino"
@@ -19004,10 +19384,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:2216
+#: build/trans_presets.java:2227
 msgid "Edit Cinema"
 msgstr "Edycja kina"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2231
 msgid "Library"
 msgstr "biblioteka"
@@ -19016,9 +19396,9 @@
 #. <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:2223
+#: build/trans_presets.java:2234
 msgid "Edit Library"
 msgstr "Edycja biblioteki"
 
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Arts Centre"
 msgstr "centrum kulturalne"
@@ -19026,10 +19406,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Arts Centre"
 msgstr "Edycja centrum kulturalnego"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Theatre"
 msgstr "teatr"
@@ -19038,10 +19418,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:2237
+#: build/trans_presets.java:2248
 msgid "Edit Theatre"
 msgstr "Edycja teatru"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2252
 msgid "Place of Worship"
 msgstr "miejsce kultu religijnego"
@@ -19051,5 +19431,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:2245
+#: build/trans_presets.java:2256
 msgid "Edit Place of Worship"
 msgstr "Edycja miejsca kultu religijnego"
@@ -19058,6 +19438,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "Religion"
 msgstr "Religia"
@@ -19066,66 +19446,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "bahai"
 msgstr "bahaizm"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "buddhist"
 msgstr "buddyzm"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "christian"
 msgstr "chrześcijaństwo"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "hindu"
 msgstr "hinduizm"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jain"
 msgstr "dżinizm"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jewish"
 msgstr "judaizm"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "muslim"
 msgstr "islam"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "sikh"
 msgstr "sikhizm"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "spiritualist"
 msgstr "spirytualizm"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "taoist"
 msgstr "taoizm"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "zoroastrian"
 msgstr "zaratusztrianizm"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "Denomination"
 msgstr "Wyznanie"
@@ -19134,81 +19514,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "anglican"
 msgstr "kościół anglikański"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "baptist"
 msgstr "baptyści"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "catholic"
 msgstr "kościół katolicki"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "evangelical"
 msgstr "ewangelikalizm"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "jehovahs_witness"
 msgstr "świadkowie Jehowy"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "lutheran"
 msgstr "luteranie"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "methodist"
 msgstr "metodyści"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "mormon"
 msgstr "mormoni"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "orthodox"
 msgstr "kościół prawosławny"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "pentecostal"
 msgstr "zielonoświątkowcy"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "presbyterian"
 msgstr "prezbiterianie"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "protestant"
 msgstr "protestanci"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "quaker"
 msgstr "kwakrzy"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "shia"
 msgstr "szyici"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "sunni"
 msgstr "sunnici"
 
 #. <separator/>
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2264
 msgid "Addresses"
 msgstr "Adresy"
@@ -19217,5 +19597,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:2256
+#: build/trans_presets.java:2267
 msgid "Edit Address Information"
 msgstr "Edycja informacji o adresach"
@@ -19223,5 +19603,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2269
 msgid "House number"
 msgstr "Numer domu"
@@ -19229,20 +19609,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "House name"
 msgstr "Nazwa domu"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "City name"
 msgstr "Nazwa miejscowości"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2274
 msgid "Post code"
 msgstr "Kod pocztowy"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2275
 msgid "Country code"
 msgstr "Kod kraju"
@@ -19250,5 +19630,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Address Interpolation"
 msgstr "Interpolacja adresów"
@@ -19257,5 +19637,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:2270
+#: build/trans_presets.java:2281
 msgid "Edit Address Interpolation"
 msgstr "Edycja interpolacji adresów"
@@ -19263,67 +19643,67 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "Numbering scheme"
 msgstr "Sposób numeracji domów"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "odd"
 msgstr "nieparzyste"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "even"
 msgstr "parzyste"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2286
 msgid "Man Made"
 msgstr "Obiekty sztuczne"
 
 #. group "Man Made"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Works"
 msgstr "zakład produkcyjny"
 
 #. item
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2288
 msgid "Edit Works"
 msgstr "Edycja zakładu produkcyjnego"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2292
 msgid "Tower"
 msgstr "wieża"
 
 #. item
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2293
 msgid "Edit Tower"
 msgstr "Edycja wieży"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Water Tower"
 msgstr "wieża ciśnień"
 
 #. item
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2298
 msgid "Edit Water Tower"
 msgstr "Edycja wieży ciśnień"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Gasometer"
 msgstr "zbiornik gazu"
 
 #. item
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2303
 msgid "Edit Gasometer"
 msgstr "Edycja zbiornika gazu"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Lighthouse"
 msgstr "latarnia morska"
@@ -19331,10 +19711,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2309
 msgid "Edit Lighthouse"
 msgstr "Edycja latarni morskiej"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Windmill"
 msgstr "wiatrak"
@@ -19342,10 +19722,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2315
 msgid "Edit Windmill"
 msgstr "Edycja wiatraka"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2319
 msgid "Pipeline"
 msgstr "rurociąg"
@@ -19353,10 +19733,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Edit Pipeline"
 msgstr "Edycja rurociągu"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2325
 msgid "Wastewater Plant"
 msgstr "oczyszczalnia ścieków"
@@ -19366,10 +19746,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:2318
+#: build/trans_presets.java:2329
 msgid "Edit Wastewater Plant"
 msgstr "Edycja oczyszczalni ścieków"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2333
 msgid "Crane"
 msgstr "dźwig"
@@ -19377,10 +19757,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2335
 msgid "Edit Crane"
 msgstr "Edycja dźwigu"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Beacon"
 msgstr "radiolatarnia"
@@ -19388,10 +19768,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2341
 msgid "Edit Beacon"
 msgstr "Edycja radiolatarni"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2345
 msgid "Survey Point"
 msgstr "punkt geodezyjny"
@@ -19399,10 +19779,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Edit Survey Point"
 msgstr "Edycja punktu geodezyjnego"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2351
 msgid "Surveillance"
 msgstr "monitoring"
@@ -19410,5 +19790,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2353
 msgid "Edit Surveillance Camera"
 msgstr "Edycja kamery do monitoringu"
@@ -19416,5 +19796,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Power Generator"
 msgstr "źródło energii elektrycznej"
@@ -19424,39 +19804,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:2351
+#: build/trans_presets.java:2362
 msgid "Edit Power Generator"
 msgstr "Edycja źródła energii elektrycznej"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "wind"
 msgstr "wiatrowa"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "hydro"
 msgstr "wodna"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "fossil"
 msgstr "cieplna"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "nuclear"
 msgstr "jądrowa"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "coal"
 msgstr "węglowa"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "photovoltaic"
 msgstr "fotowoltaiczna"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "gas"
 msgstr "gazowa"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2367
 msgid "Power Station"
 msgstr "elektrownia"
@@ -19465,10 +19845,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:2359
+#: build/trans_presets.java:2370
 msgid "Edit Power Station"
 msgstr "Edycja elektrowni"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2374
 msgid "Power Sub Station"
 msgstr "rozdzielnia elektryczna"
@@ -19477,5 +19857,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:2366
+#: build/trans_presets.java:2377
 msgid "Edit Power Sub Station"
 msgstr "Edycja rozdzielni elektrycznej"
@@ -19483,10 +19863,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2369 build/trans_presets.java:2385
+#: build/trans_presets.java:2380 build/trans_presets.java:2396
 msgid "Line reference"
 msgstr "oznaczenie linii"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2382
 msgid "Power Tower"
 msgstr "słup elektryczny"
@@ -19497,5 +19877,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:2376
+#: build/trans_presets.java:2387
 msgid "Edit Power Tower"
 msgstr "Edycja słupa linii wysokiego napięcia"
@@ -19503,5 +19883,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2390
 msgid "Power Line"
 msgstr "linia wysokiego napięcia"
@@ -19510,40 +19890,40 @@
 #. <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:2382
+#: build/trans_presets.java:2393
 msgid "Edit Power Line"
 msgstr "Edycja linii wysokiego napięcia"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Voltage"
 msgstr "Napięcie"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2398
 msgid "Amount of Wires"
 msgstr "Ilość przewodów"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2402
 msgid "Toilets"
 msgstr "toalety"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2398 build/trans_presets.java:2514
+#: build/trans_presets.java:2409 build/trans_presets.java:2525
 msgid "Note"
 msgstr "Uwagi"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2411
 msgid "Post Box"
 msgstr "skrzynka pocztowa"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2416
 msgid "Telephone"
 msgstr "telefon"
@@ -19552,5 +19932,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:2408
+#: build/trans_presets.java:2419
 msgid "Edit Telephone"
 msgstr "Edycja telefonu"
@@ -19558,5 +19938,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2411 build/trans_presets.java:2515
+#: build/trans_presets.java:2422 build/trans_presets.java:2526
 msgid "Coins"
 msgstr "na monety"
@@ -19564,5 +19944,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2412 build/trans_presets.java:2516
+#: build/trans_presets.java:2423 build/trans_presets.java:2527
 msgid "Notes"
 msgstr "na banknoty"
@@ -19570,5 +19950,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2413 build/trans_presets.java:2517
+#: build/trans_presets.java:2424 build/trans_presets.java:2528
 msgid "Electronic purses and Charge cards"
 msgstr "na karty chipowe"
@@ -19576,5 +19956,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2414 build/trans_presets.java:2518
+#: build/trans_presets.java:2425 build/trans_presets.java:2529
 msgid "Debit cards"
 msgstr "na karty debetowe"
@@ -19582,15 +19962,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2415 build/trans_presets.java:2519
+#: build/trans_presets.java:2426 build/trans_presets.java:2530
 msgid "Credit cards"
 msgstr "na karty kredytowe"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2427
 msgid "Telephone cards"
 msgstr "na karty telefoniczne"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2429
 msgid "Recycling"
 msgstr "zbiórka odpadów"
@@ -19599,5 +19979,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:2421
+#: build/trans_presets.java:2432
 msgid "Edit Recycling station"
 msgstr "Edycja punktu zbiórki odpadów"
@@ -19605,35 +19985,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Batteries"
 msgstr "baterie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2435
 msgid "Cans"
 msgstr "puszki"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Clothes"
 msgstr "odzież"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2437
 msgid "Glass"
 msgstr "szkło"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2438
 msgid "Paper"
 msgstr "papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2439
 msgid "Scrap Metal"
 msgstr "złom"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2441
 msgid "Bench"
 msgstr "ławka"
@@ -19642,40 +20022,33 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2433
-#, fuzzy
+#: build/trans_presets.java:2444
 msgid "Backrest"
-msgstr "Wstecz"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "Material"
-msgstr "miejsce pamięci"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2434
-#, fuzzy
+#: build/trans_presets.java:2445
 msgid "stone"
-msgstr "żadne"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "plastic"
-msgstr "Miejsce"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "Colour"
-msgstr "Kolor"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "black"
-msgstr "Wstecz"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "brown"
-msgstr "na dół"
+msgstr ""
 
 #. color historic
@@ -19744,39 +20117,35 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2435 build/trans_style.java:3055
-#: build/trans_style.java:3063 build/trans_style.java:3071
-#: build/trans_style.java:3079 build/trans_style.java:3127
-#: build/trans_style.java:3135 build/trans_style.java:3233
-#: build/trans_style.java:3241
+#: build/trans_presets.java:2446 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3135
+#: build/trans_style.java:3143 build/trans_style.java:3241
+#: build/trans_style.java:3249
 msgid "green"
 msgstr "zielony"
 
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "red"
-msgstr "koniec"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "blue"
-msgstr "Wartość"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "white"
-msgstr "woda"
-
-#: build/trans_presets.java:2436
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2447
 msgid "Amount of Seats"
-msgstr "Ilość przewodów"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2449
 msgid "Hunting Stand"
 msgstr "Ambona myśliwska"
 
 #. item
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2450
 msgid "Edit Hunting Stand"
 msgstr "Edycja ambony strzelniczej"
@@ -19785,30 +20154,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2441 build/trans_presets.java:2902
+#: build/trans_presets.java:2452 build/trans_presets.java:2914
 msgid "Height"
 msgstr "Wysokość"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2454
 msgid "Hide"
 msgstr "Ukryj"
 
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2455
 msgid "Lock"
 msgstr "Zablokuj"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Fountain"
 msgstr "fontanna"
@@ -19817,10 +20186,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:2449
+#: build/trans_presets.java:2460
 msgid "Edit Fountain"
 msgstr "Edycja fontanny"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2464
 msgid "Drinking Water"
 msgstr "woda do picia"
@@ -19829,10 +20198,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:2456
+#: build/trans_presets.java:2467
 msgid "Edit Drinking Water"
 msgstr "Edycja punktu z wodą pitną"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2471
 msgid "Baby Hatch"
 msgstr ""
@@ -19840,33 +20209,33 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2479
 msgid "Shops"
 msgstr "Sklepy"
 
 #. group "Shops"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2480
 msgid "Supermarket"
 msgstr "supermarket"
 
 #. item
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2481
 msgid "Edit Supermarket"
 msgstr "Edycja supermarketu"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2486
 msgid "Chemist"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2487
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2492
 msgid "Convenience Store"
 msgstr "sklepik"
@@ -19874,9 +20243,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Edit Convenience Store"
 msgstr "Edycja sklepiku"
 
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2499
 msgid "Kiosk"
 msgstr "kiosk"
@@ -19884,27 +20253,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Kiosk"
 msgstr "Edycja kiosku"
 
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Book Store"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2507
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2512
 msgid "Travel Agency"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2513
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2518
 msgid "Vending machine"
 msgstr "automat sprzedający"
@@ -19912,5 +20281,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Edit Vending machine"
 msgstr "Edycja automatu sprzedającego"
@@ -19918,88 +20287,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "Vending products"
 msgstr "Sprzedawane produkty"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_tickets"
 msgstr "bilety komunikacji miejskiej"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_plans"
 msgstr "mapy komunikacji miejskiej"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "parking_tickets"
 msgstr "bilety parkingowe"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "food"
 msgstr "jedzenie"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "drinks"
 msgstr "napoje"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "sweets"
 msgstr "słodycze"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "cigarettes"
 msgstr "papierosy"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "photos"
 msgstr "zdjęcia"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "animal_food"
 msgstr "jedzenie dla zwierząt"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "news_papers"
 msgstr "gazety"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "toys"
 msgstr "zabawki"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "stamps"
 msgstr "znaczki"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "SIM-cards"
 msgstr "karty SIM"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "vouchers"
 msgstr "vouchery"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "condoms"
 msgstr "prezerwatywy"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "tampons"
 msgstr "tampony"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "excrement_bags"
 msgstr "torby na odchody"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Butcher"
 msgstr "rzeźnik"
@@ -20007,9 +20376,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2535
 msgid "Edit Butcher"
 msgstr "Edycja sklepu mięsnego"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2540
 msgid "Baker"
 msgstr "piekarnia"
@@ -20017,9 +20386,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2542
 msgid "Edit Baker"
 msgstr "Edycja piekarni"
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2547
 msgid "Florist"
 msgstr "florysta"
@@ -20027,18 +20396,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Florist"
 msgstr "Edycja kwiaciarni"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2554
 msgid "Organic"
 msgstr "naturalna żywność"
 
 #. item
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Edit Organic Shop"
 msgstr "Edycja sklepu z naturalną żywnością"
 
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2560
 msgid "Alcohol"
 msgstr "monopolowy"
@@ -20046,54 +20415,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2562
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2567
 msgid "Beverages"
 msgstr "napoje"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2568
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2573
 msgid "Computer"
 msgstr "komputery"
 
 #. item
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2574
 msgid "Edit Computer Shop"
 msgstr "Edycja sklepu komputerowego"
 
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Electronics"
 msgstr "elektronika"
 
 #. item
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2580
 msgid "Edit Electronics Shop"
 msgstr "Edycja sklepu z elektroniką"
 
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2585
 msgid "Hifi"
 msgstr "sprzęt hifi"
 
 #. item
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2586
 msgid "Edit Hifi Shop"
 msgstr "Edycja sklepu ze sprzętem hi-fi"
 
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2591
 msgid "Furniture"
 msgstr "meble"
 
 #. item
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Edit Furniture Shop"
 msgstr "Edycja sklepu meblowego"
 
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Garden Centre"
 msgstr "centrum ogrodnicze"
@@ -20101,9 +20470,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2599
 msgid "Edit Garden Centre"
 msgstr "Edycja centrum ogrodniczego"
 
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Hardware"
 msgstr ""
@@ -20111,9 +20480,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2606
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "Do-it-yourself-store"
 msgstr "sklep DIY"
@@ -20121,54 +20490,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2613
 msgid "Edit Do-it-yourself-store"
 msgstr "Edycja sklepu DIY (zrób to sam)"
 
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2618
 msgid "Stationery"
 msgstr "artykuły biurowe"
 
 #. item
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2619
 msgid "Edit Stationery Shop"
 msgstr "Edycja sklepu z artykułami biurowymi"
 
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Hairdresser"
 msgstr "fryzjer"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Hairdresser"
 msgstr "Edycja salonu fryzjerskiego"
 
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Shoes"
 msgstr "obuwie"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Shoe Shop"
 msgstr "Edycja sklepu obuwniczego"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2636
 msgid "Toys"
 msgstr "zabawki"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit Toy Shop"
 msgstr "Edycja sklepu z zabawkami"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "Dry Cleaning"
 msgstr "pralnia chemiczna"
@@ -20176,9 +20545,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2650
 msgid "Edit Dry Cleaning"
 msgstr "Edycja palni chemicznej"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "Laundry"
 msgstr "pralnia samoobsługowa"
@@ -20186,9 +20555,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2657
 msgid "Edit Laundry"
 msgstr "wyspa"
 
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2662
 msgid "Outdoor"
 msgstr "sklep turystyczny"
@@ -20196,32 +20565,28 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2664
 msgid "Edit Outdoor Shop"
 msgstr "Edycja sklepu ze sprzętem turystycznym"
 
-#: build/trans_presets.java:2658
-msgid "Sports"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2659
+#. item
+#: build/trans_presets.java:2670
 msgid "Edit Sports Shop"
 msgstr "Edycja sklepu sportowego"
 
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Optician"
 msgstr "Edycja optyka"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2683
 msgid "Cash"
 msgstr "Gotówka"
 
 #. group "Cash"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2684
 msgid "Bank"
 msgstr "bank"
@@ -20229,14 +20594,14 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2686
 msgid "Edit Bank"
 msgstr "Edycja banku"
 
-#: build/trans_presets.java:2680 build/trans_presets.java:2689
+#: build/trans_presets.java:2691 build/trans_presets.java:2700
 msgid "Automated Teller Machine"
 msgstr "bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2693
 msgid "Money Exchange"
 msgstr "kantor"
@@ -20244,5 +20609,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Edit Money Exchange"
 msgstr "Edycja kantoru"
@@ -20250,15 +20615,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2691
+#: build/trans_presets.java:2702
 msgid "Edit Automated Teller Machine"
 msgstr "Edycja bankomatu"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2707
 msgid "Health"
 msgstr "Zdrowie"
 
 #. group "Health"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2708
 msgid "Doctors"
 msgstr "lekarz"
@@ -20266,18 +20631,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2710
 msgid "Edit Doctors"
 msgstr "Edycja lekarza"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2715
 msgid "Dentist"
 msgstr "dentysta"
 
 #. item
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Edit Dentist"
 msgstr "Edycja dentysty"
 
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2721
 msgid "Pharmacy"
 msgstr "apteka"
@@ -20285,5 +20650,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Edit Pharmacy"
 msgstr "Edycja apteki"
@@ -20291,9 +20656,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Dispensing"
 msgstr "realizacja recept"
 
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2729
 msgid "Hospital"
 msgstr "szpital"
@@ -20301,10 +20666,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Edit Hospital"
 msgstr "Edycja szpitala"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2735
 msgid "Emergency Access Point"
 msgstr ""
@@ -20313,5 +20678,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:2727
+#: build/trans_presets.java:2738
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -20320,20 +20685,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2741
 msgid "Point Number"
 msgstr "Numer punktu"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2742
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Phone Number"
 msgstr "Numer telefonu"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Podaj razem z kodem kraju, np.: +12-345-67890)"
@@ -20341,5 +20706,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2748
 msgid "Veterinary"
 msgstr "weterynarz"
@@ -20348,55 +20713,59 @@
 #. <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:2740
+#: build/trans_presets.java:2751
 msgid "Edit Veterinary"
 msgstr "Edycja lecznicy weterynaryjnej"
 
+#: build/trans_presets.java:2758
+msgid "Geography"
+msgstr ""
+
 #. group "Places"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2760
 msgid "Continent"
 msgstr "kontynent"
 
 #. item
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2761
 msgid "Edit Continent"
 msgstr "Edycja kontynentu"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2766
 msgid "Country"
 msgstr "kraj"
 
 #. item
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2767
 msgid "Edit Country"
 msgstr "Edycja kraju"
 
 #. item "Places/Country" text "Name"
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2772
 msgid "State"
 msgstr "stan"
 
 #. item
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2773
 msgid "Edit State"
 msgstr "Edycja stanu"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2778
 msgid "Region"
 msgstr "region"
 
 #. item
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2779
 msgid "Edit Region"
 msgstr "Edycja regionu"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2784
 msgid "County"
 msgstr "okręg"
 
 #. item
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2785
 msgid "Edit County"
 msgstr "Edycja okręgu / hrabstwa"
@@ -20404,15 +20773,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2791
 msgid "City"
 msgstr "miasto"
 
 #. item
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2792
 msgid "Edit City"
 msgstr "Edycja miasta"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2797
 msgid "Town"
 msgstr "miejscowość"
@@ -20420,10 +20789,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2799
 msgid "Edit Town"
 msgstr "Edycja miejscowości"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2804
 msgid "Suburb"
 msgstr "dzielnica"
@@ -20431,25 +20800,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2806
 msgid "Edit Suburb"
 msgstr "Edycja dzielnicy"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2811
 msgid "Village"
 msgstr "wieś"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2812
 msgid "Edit Village"
 msgstr "Edycja wsi"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2817
 msgid "Hamlet"
 msgstr "wólka"
 
 #. item
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2818
 msgid "Edit Hamlet"
 msgstr "Edycja wólki"
@@ -20457,5 +20826,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2824
 msgid "Locality"
 msgstr "okolica"
@@ -20463,10 +20832,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2826
 msgid "Edit Locality"
 msgstr "Edycja okolicy"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2831
 msgid "Island"
 msgstr "wyspa"
@@ -20474,10 +20843,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2833
 msgid "Edit Island"
 msgstr "Edycja wyspy"
 
 #. item "Places/Island" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2838
 msgid "Islet"
 msgstr ""
@@ -20485,5 +20854,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2840
 msgid "Edit Islet"
 msgstr ""
@@ -20491,5 +20860,5 @@
 #. item "Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2846
 msgid "Cave Entrance"
 msgstr "wejście do jaskini"
@@ -20497,10 +20866,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2848
 msgid "Edit Cave Entrance"
 msgstr "Edycja wejścia do jaskini"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2852
 msgid "Peak"
 msgstr "wzgórze"
@@ -20508,10 +20877,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2854
 msgid "Edit Peak"
 msgstr "Edycja wzgórza"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2859
 msgid "Glacier"
 msgstr "lodowiec"
@@ -20519,10 +20888,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2861
 msgid "Edit Glacier"
 msgstr "Edycja lodowca"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2854
+#: build/trans_presets.java:2866
 msgid "Volcano"
 msgstr "wulkan"
@@ -20530,70 +20899,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2868
 msgid "Edit Volcano"
 msgstr "Edycja wulkanu"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2874
 msgid "Boundaries"
 msgstr "Granice"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2875
 msgid "National"
 msgstr "narodowa"
 
 #. item
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2876
 msgid "Edit National Boundary"
 msgstr "Edycja granicy narodowej"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2881
 msgid "Administrative"
 msgstr "administracyjna"
 
 #. item
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2882
 msgid "Edit Administrative Boundary"
 msgstr "Edycja granicy administracyjnej"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:2887
 msgid "Civil"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2888
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2893
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2894
 msgid "Edit Political Boundary"
 msgstr "Edycja granicy politycznej"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2899
 msgid "National park"
 msgstr "park narodowy"
 
 #. item
-#: build/trans_presets.java:2888
+#: build/trans_presets.java:2900
 msgid "Edit National Park Boundary"
 msgstr "Edycja granicy parku narodowego"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2906
 msgid "Land use"
 msgstr "Zagospodarowanie terenu"
 
 #. group "Land use"
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2907
 msgid "Tree"
 msgstr "drzewo"
@@ -20602,15 +20971,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:2898
+#: build/trans_presets.java:2910
 msgid "Edit Tree"
 msgstr "Edycja drzewa"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2915
 msgid "Botanical Name"
 msgstr "Nazwa systematyczna"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2917
 msgid "Wood"
 msgstr "las"
@@ -20619,5 +20988,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:2908
+#: build/trans_presets.java:2920
 msgid "Edit Wood"
 msgstr "Edycja lasu"
@@ -20625,17 +20994,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "coniferous"
 msgstr "iglasty"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "deciduous"
 msgstr "liściasty"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "mixed"
 msgstr "mieszany"
 
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2925
 msgid "Forest"
 msgstr "las"
@@ -20644,14 +21013,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:2916
+#: build/trans_presets.java:2928
 msgid "Edit Forest Landuse"
 msgstr "Edycja lasu"
 
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2934
 msgid "Nature Reserve"
 msgstr "rezerwat przyrody"
 
 #. item
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2935
 msgid "Edit Nature Reserve"
 msgstr "Edycja rezerwatu przyrody"
@@ -20659,25 +21028,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2940
 msgid "Scree"
 msgstr "rumowisko"
 
 #. item
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2941
 msgid "Edit Scree"
 msgstr "Edycja rumowiska"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2945
 msgid "Scrub"
 msgstr "busz"
 
 #. item
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2946
 msgid "Edit Scrub"
 msgstr "Edycja buszu"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2950
 msgid "Fell"
 msgstr "turnia"
@@ -20685,10 +21054,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2952
 msgid "Edit Fell"
 msgstr "Edycja turni"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2956
 msgid "Heath"
 msgstr "wrzosowisko"
@@ -20696,5 +21065,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2958
 msgid "Edit Heath"
 msgstr "Edycja wrzosowiska"
@@ -20702,5 +21071,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2963
 msgid "Farmyard"
 msgstr "zagroda"
@@ -20709,45 +21078,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:2954
+#: build/trans_presets.java:2966
 msgid "Edit Farmyard Landuse"
 msgstr "Edycja zagrody"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2971
 msgid "Farmland"
 msgstr "grunty rolne"
 
 #. item
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2972
 msgid "Edit Farmland Landuse"
 msgstr "Edycja gruntów rolnych"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2977
 msgid "Meadow"
 msgstr "łąka"
 
 #. item
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2978
 msgid "Edit Meadow Landuse"
 msgstr "Edycja łąki"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2983
 msgid "Vineyard"
 msgstr "winnica"
 
 #. item
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2984
 msgid "Edit Vineyard Landuse"
 msgstr "Edycja winnicy"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:2989
 msgid "Allotments"
 msgstr "ogródki działkowe"
 
 #. item
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2990
 msgid "Edit Allotments Landuse"
 msgstr "Edycja ogródków działkowych"
@@ -20755,25 +21124,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2996
 msgid "Garden"
 msgstr "ogród"
 
 #. item
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2997
 msgid "Edit Garden"
 msgstr "Edycja ogrodu"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3001
 msgid "Grass"
 msgstr "Trawa"
 
 #. item
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3002
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3007
 msgid "Village Green"
 msgstr ""
@@ -20781,10 +21150,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3009
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3014
 msgid "Common"
 msgstr "miejsce publiczne"
@@ -20792,20 +21161,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3004
+#: build/trans_presets.java:3016
 msgid "Edit Common"
 msgstr "Edycja miejsca publicznego"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3020
 msgid "Park"
 msgstr "park"
 
 #. item
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3021
 msgid "Edit Park"
 msgstr "Edycja parku"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3025
 msgid "Recreation Ground"
 msgstr "Teren rekreacyjny"
@@ -20813,5 +21182,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3027
 msgid "Edit Recreation Ground Landuse"
 msgstr "Edycja terenu rekreacyjnego"
@@ -20819,15 +21188,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3033
 msgid "Residential area"
 msgstr "zabudowa mieszkaniowa"
 
 #. item
-#: build/trans_presets.java:3022
+#: build/trans_presets.java:3034
 msgid "Edit Residential Landuse"
 msgstr "Edycja zabudowy mieszkaniowej"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3039
 msgid "Graveyard"
 msgstr "cmentarz"
@@ -20835,9 +21204,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3029
+#: build/trans_presets.java:3041
 msgid "Edit Graveyard"
 msgstr "Edycja cmentarza"
 
-#: build/trans_presets.java:3035
+#: build/trans_presets.java:3047
 msgid "Cemetery"
 msgstr "cmentarz"
@@ -20845,39 +21214,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3049
 msgid "Edit Cemetery Landuse"
 msgstr "Edycja cmentarza"
 
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3056
 msgid "Retail"
 msgstr "handel"
 
 #. item
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3057
 msgid "Edit Retail Landuse"
 msgstr "Edycja obszaru handlowego"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3062
 msgid "Commercial"
 msgstr "biura i usługi"
 
 #. item
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3063
 msgid "Edit Commercial Landuse"
 msgstr "Edycja obszaru biur i usług"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3056
+#: build/trans_presets.java:3068
 msgid "Industrial"
 msgstr "teren przemysłowy"
 
 #. item
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3069
 msgid "Edit Industrial Landuse"
 msgstr "Edycja terenu przemysłowego"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3074
 msgid "Railway land"
 msgstr "teren kolejowy"
@@ -20885,15 +21254,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3076
 msgid "Edit Railway Landuse"
 msgstr "Edycja terenu kolejowego"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3081
 msgid "Military"
 msgstr "obszar wojskowy"
 
 #. item
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3082
 msgid "Edit Military Landuse"
 msgstr "Edycja obszaru wojskowego"
@@ -20901,55 +21270,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3088
 msgid "Construction area"
 msgstr "budowa"
 
 #. item
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3089
 msgid "Edit Construction Landuse"
 msgstr "Edycja terenu budowy"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3094
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3095
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3100
 msgid "Greenfield"
 msgstr "teren pod zabudowę"
 
 #. item
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3101
 msgid "Edit Greenfield Landuse"
 msgstr "Edycja terenu pod zabudowę"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3106
 msgid "Landfill"
 msgstr "wysypisko"
 
 #. item
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3107
 msgid "Edit Landfill Landuse"
 msgstr "Edycja wysypiska śmieci"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3112
 msgid "Quarry"
 msgstr "kamieniołom"
 
 #. item
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3113
 msgid "Edit Quarry Landuse"
 msgstr "Edycja komieniołomu"
 
 #. group "Relations"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3122
 msgid "Multipolygon"
 msgstr ""
@@ -20959,5 +21328,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:3114
+#: build/trans_presets.java:3126
 msgid "Edit Multipolygon"
 msgstr ""
@@ -20966,10 +21335,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3132
 msgid "outer segment"
 msgstr "zewnętrzny segment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3133
 msgid "inner segment"
 msgstr "wewnętrzny segment"
@@ -20977,5 +21346,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3136
 msgid "Turn restriction"
 msgstr "ograniczenia skrętu"
@@ -20984,5 +21353,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3139
 msgid "Edit Turn Restriction"
 msgstr "Edycja ograniczenia skrętu"
@@ -20990,34 +21359,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "Restriction"
 msgstr "Ograniczenie"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_left_turn"
 msgstr "brak skrętu w lewo"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_right_turn"
 msgstr "brak skrętu w prawo"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_straight_on"
 msgstr "zakaz jazdy prosto"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_u_turn"
 msgstr "zakaz zawracania"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_right_turn"
 msgstr "nakaz skrętu w prawo"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_left_turn"
 msgstr "nakaz skrętu w lewo"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_straight_on"
 msgstr "nakaz jazdy prosto"
@@ -21026,15 +21395,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3146
 msgid "from way"
 msgstr "z drogi"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3147
 msgid "via node or way"
 msgstr "przez węzeł lub drogę"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3148
 msgid "to way"
 msgstr "do drogi"
@@ -21042,5 +21411,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3151
 msgid "Route"
 msgstr "Trasa"
@@ -21049,5 +21418,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3154
 msgid "Edit Route"
 msgstr "Edytuj trasę"
@@ -21055,5 +21424,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "Route type"
 msgstr "Typ trasy"
@@ -21125,5 +21494,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3144 build/trans_style.java:233
+#: build/trans_presets.java:3156 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -21132,17 +21501,17 @@
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "road"
 msgstr "droga"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ferry"
 msgstr "prom"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ski"
 msgstr ""
@@ -21195,5 +21564,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3144 build/trans_style.java:247
+#: build/trans_presets.java:3156 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -21202,13 +21571,13 @@
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "tram"
 msgstr "tramway"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "detour"
 msgstr "objazd"
@@ -21222,10 +21591,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3144 build/trans_style.java:1206
+#: build/trans_presets.java:3156 build/trans_style.java:1206
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3159
 msgid "Symbol description"
 msgstr "Opis symboli"
@@ -21233,31 +21602,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3162
 msgid "Network"
 msgstr "Sieć"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "proposed"
 msgstr "proponowany"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "alternate"
 msgstr "alternatywny"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "temporary"
 msgstr "tymczasowy"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "connection"
 msgstr "połaczenie"
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "Color (hex)"
 msgstr "Kolor (hex)"
@@ -21266,30 +21635,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3168
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3169
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3170
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3171
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3172
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3173
 msgid "backward halt point"
 msgstr ""
@@ -21727,11 +22096,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3375 build/trans_style.java:3376
-#: build/trans_style.java:3946 build/trans_style.java:4254
-#: build/trans_style.java:4263 build/trans_style.java:4272
-#: build/trans_style.java:4281 build/trans_style.java:4290
-#: build/trans_style.java:4299 build/trans_style.java:4308
-#: build/trans_style.java:4309 build/trans_style.java:4318
-#: build/trans_style.java:4327
+#: build/trans_style.java:3383 build/trans_style.java:3384
+#: build/trans_style.java:3954 build/trans_style.java:4262
+#: build/trans_style.java:4271 build/trans_style.java:4280
+#: build/trans_style.java:4289 build/trans_style.java:4298
+#: build/trans_style.java:4307 build/trans_style.java:4316
+#: build/trans_style.java:4317 build/trans_style.java:4326
+#: build/trans_style.java:4335
 msgid "deprecated"
 msgstr "przestarzały"
@@ -23755,5 +24124,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3294
+#: build/trans_style.java:3302
 msgid "light_water"
 msgstr ""
@@ -24435,8 +24804,17 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="boundary_stone"/>
+#. <icon annotate="true" src="historic/boundary_stone.png"/>
 #: build/trans_style.java:2990 build/trans_style.java:2998
 #: build/trans_style.java:3006 build/trans_style.java:3014
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
+#: build/trans_style.java:3054
 msgid "historic"
 msgstr "historia"
@@ -24450,5 +24828,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3095
 msgid "quarry"
 msgstr "kamieniołom"
@@ -24462,5 +24840,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "landfill"
 msgstr "Wysypisko smieci"
@@ -24482,5 +24860,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3103 build/trans_style.java:3111
+#: build/trans_style.java:3111 build/trans_style.java:3119
 msgid "basin"
 msgstr "Basen"
@@ -24494,5 +24872,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3127
 msgid "forest"
 msgstr "las"
@@ -24506,5 +24884,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3159
 msgid "farmyard"
 msgstr ""
@@ -24527,5 +24905,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3160 build/trans_style.java:3168
+#: build/trans_style.java:3168 build/trans_style.java:3176
 msgid "retail"
 msgstr ""
@@ -24539,5 +24917,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3176
+#: build/trans_style.java:3184
 msgid "industrial"
 msgstr "Teren przemysłowy"
@@ -24551,5 +24929,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "brownfield"
 msgstr ""
@@ -24563,5 +24941,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "greenfield"
 msgstr ""
@@ -24575,5 +24953,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "railland"
 msgstr "Teren kolejowy"
@@ -24630,7 +25008,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3217 build/trans_style.java:3252
-#: build/trans_style.java:3260 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3225 build/trans_style.java:3260
+#: build/trans_style.java:3268 build/trans_style.java:3276
+#: build/trans_style.java:3284 build/trans_style.java:3292
 msgid "military"
 msgstr "Teren wojskowy"
@@ -24644,5 +25022,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3225
+#: build/trans_style.java:3233
 msgid "cemetery"
 msgstr "cmentarz"
@@ -24655,5 +25033,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3301
+#: build/trans_style.java:3309
 msgid "peak"
 msgstr "szczyt"
@@ -24668,5 +25046,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3310
+#: build/trans_style.java:3318
 msgid "glacier"
 msgstr "lodowiec"
@@ -24680,5 +25058,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "volcano"
 msgstr "wulkan"
@@ -24733,8 +25111,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3326 build/trans_style.java:3327
-#: build/trans_style.java:3335 build/trans_style.java:3351
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440
+#: build/trans_style.java:3334 build/trans_style.java:3335
+#: build/trans_style.java:3343 build/trans_style.java:3359
+#: build/trans_style.java:3432 build/trans_style.java:3440
+#: build/trans_style.java:3448
 msgid "natural"
 msgstr ""
@@ -24748,5 +25126,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3343
+#: build/trans_style.java:3351
 msgid "scrub"
 msgstr ""
@@ -24760,5 +25138,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3359
+#: build/trans_style.java:3367
 msgid "heath"
 msgstr "zdrowie"
@@ -24772,5 +25150,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3408
+#: build/trans_style.java:3416
 msgid "mud"
 msgstr "błoto"
@@ -24784,5 +25162,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "beach"
 msgstr "plaża"
@@ -24860,8 +25238,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
-#: build/trans_style.java:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496 build/trans_style.java:3504
+#: build/trans_style.java:3512 build/trans_style.java:3520
 msgid "route"
 msgstr "droga"
@@ -24909,7 +25287,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3522 build/trans_style.java:3530
-#: build/trans_style.java:3538 build/trans_style.java:3546
-#: build/trans_style.java:3554
+#: build/trans_style.java:3530 build/trans_style.java:3538
+#: build/trans_style.java:3546 build/trans_style.java:3554
+#: build/trans_style.java:3562
 msgid "boundary"
 msgstr "granica"
@@ -25059,11 +25437,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090
+#: build/trans_style.java:4002 build/trans_style.java:4010
+#: build/trans_style.java:4018 build/trans_style.java:4026
+#: build/trans_style.java:4034 build/trans_style.java:4042
+#: build/trans_style.java:4050 build/trans_style.java:4058
+#: build/trans_style.java:4066 build/trans_style.java:4074
+#: build/trans_style.java:4082 build/trans_style.java:4090
+#: build/trans_style.java:4098
 msgid "place"
 msgstr "Miejsce"
@@ -25111,6 +25489,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4207 build/trans_style.java:4214
-#: build/trans_style.java:4221 build/trans_style.java:4228
+#: build/trans_style.java:4215 build/trans_style.java:4222
+#: build/trans_style.java:4229 build/trans_style.java:4236
 msgid "address"
 msgstr "adres"
@@ -25418,45 +25796,24 @@
 msgstr ""
 
-#~ msgid "All the ways were empty"
-#~ msgstr "Wszystkie trasy są puste"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Czy scalić węzły z różnych relacji?"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Scal mimo tego"
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr ""
-#~ "Wybrane węzły są częścią różnych relacji. Czy nadal chcesz je scalić."
+#~ msgid "- running version is {0}"
+#~ msgstr "- używasz wersji {0}"
+
+#~ msgid "Move"
+#~ msgstr "Przenieś"
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr "Żaden dokument nie jest otwarty więc nie ma nic do zapisania."
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Nieznane rozszerzenie pliku."
+
+#~ msgid "Email"
+#~ msgstr "E-mail"
+
+#~ msgid "Object"
+#~ msgstr "Obiekt"
 
 #~ msgid "Unknown version"
 #~ msgstr "Nieznana wersja"
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> nie posiada referencji"
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Znaleziono tag <member> w"
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Zły format identyfikatora węzła"
-
-#~ msgid "Move"
-#~ msgstr "Przenieś"
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Żaden dokument nie jest otwarty więc nie ma nic do zapisania."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Nieznane rozszerzenie pliku."
-
-#~ msgid "Email"
-#~ msgstr "E-mail"
-
-#~ msgid "Object"
-#~ msgstr "Obiekt"
 
 #~ msgid "true"
@@ -25536,9 +25893,12 @@
 #~ msgstr "Plugin wymaga aktualizacji JOSM: {0}."
 
+#~ msgid "<nd> has zero ref"
+#~ msgstr "<nd> nie posiada referencji"
+
 #~ msgid "Tags (empty value deletes tag)"
 #~ msgstr "Etykiety (ustawienie wartości na pustą usuwa etykietę)"
 
-#~ msgid "Add Selected"
-#~ msgstr "Dodaj zaznaczone"
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "Znaleziono tag <member> w"
 
 #~ msgid ""
@@ -25559,6 +25919,6 @@
 #~ "po chwili."
 
-#~ msgid "Server does not support changesets"
-#~ msgstr "Serwer nie wspiera wersjonowania"
+#~ msgid "Ill-formed node id"
+#~ msgstr "Zły format identyfikatora węzła"
 
 #~ msgid "Error parsing server response."
@@ -25640,9 +26000,15 @@
 #~ "{0}"
 
-#~ msgid "Commit comment"
-#~ msgstr "Komentarz zmiany"
-
 #~ msgid "different"
 #~ msgstr "różne"
+
+#~ msgid ""
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
+#~ msgstr ""
+#~ "Wybrane węzły są częścią różnych relacji. Czy nadal chcesz je scalić."
+
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "Czy scalić węzły z różnych relacji?"
 
 #~ msgid "Some of the nodes are (almost) in the line"
@@ -25695,7 +26061,4 @@
 #~ msgid "Basic"
 #~ msgstr "Podstawowe"
-
-#~ msgid "Delete Layer"
-#~ msgstr "Usuń warstwę"
 
 #~ msgid "sports"
@@ -25739,4 +26102,7 @@
 #~ msgstr "Edycja brony"
 
+#~ msgid "All the ways were empty"
+#~ msgstr "Wszystkie trasy są puste"
+
 #~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">english</A>."
 #~ msgstr ""
@@ -25757,4 +26123,7 @@
 #~ "przesłane elementy posiadają historię."
 
+#~ msgid "Merge Anyway"
+#~ msgstr "Scal mimo tego"
+
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
Index: applications/editors/josm/i18n/po/pt_BR.po
===================================================================
--- applications/editors/josm/i18n/po/pt_BR.po	(revision 17655)
+++ applications/editors/josm/i18n/po/pt_BR.po	(revision 17697)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-12 18:11+0200\n"
-"PO-Revision-Date: 2009-09-10 02:03+0000\n"
-"Last-Translator: Skippern <Unknown>\n"
+"POT-Creation-Date: 2009-09-19 13:00+0200\n"
+"PO-Revision-Date: 2009-09-15 03:52+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@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-09-12 16:06+0000\n"
+"X-Launchpad-Export-Date: 2009-09-19 10:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -42,10 +42,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:543
 #: ../core/src/org/openstreetmap/josm/Main.java:551
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -70,5 +70,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -86,6 +86,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:358
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
@@ -101,6 +101,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
@@ -124,10 +124,10 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
 msgid "Save and Exit"
 msgstr "Salvar e Sair"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
 msgid "Discard and Exit"
 msgstr "Descartar e Sair"
@@ -138,4 +138,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
@@ -143,27 +144,28 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:296
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:258
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:613
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
@@ -171,5 +173,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -189,6 +191,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
@@ -205,17 +207,17 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:654
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1528
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -226,6 +228,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
@@ -278,9 +280,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:607
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:609
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -340,5 +342,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
 msgid "Plugins"
@@ -390,5 +392,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Combinar"
@@ -478,5 +480,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -489,4 +491,5 @@
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -522,6 +525,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
@@ -530,6 +533,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:346
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
@@ -644,4 +647,45 @@
 msgstr "Não há conflitos para se aproximar"
 
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#, fuzzy
+msgid "Close open changesets"
+msgstr "Fechando conjunto de mudanças..."
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#, fuzzy
+msgid "Closes open changesets"
+msgstr "Fechando conjunto de mudanças..."
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
+#: ../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:114
+#, java-format
+msgid "File: {0}"
+msgstr "Arquivo: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
+msgid "There are no open changesets"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
+#, fuzzy
+msgid "No open changesets"
+msgstr "conjunto de mudanças"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
+#, fuzzy
+msgid "Downloading open changesets ..."
+msgstr "Fechando conjunto de mudanças..."
+
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
@@ -741,10 +785,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:123
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
@@ -787,31 +832,30 @@
 msgstr "Distribuir nós selecionados equidistantemente sobre uma linha."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
 msgid "Download from OSM..."
 msgstr "Baixar do OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
 msgid "Download map data from the OSM server."
 msgstr "Baixar mapa do servidor OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
-#, java-format
-msgid "File: {0}"
-msgstr "Arquivo: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
 msgid "Download"
 msgstr "Baixar"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "Aceitar"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
 msgid "Please select at least one task to download"
 msgstr "Por favor selecione no mínimo uma tarefa para baixar"
@@ -833,5 +877,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1527
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307
@@ -851,6 +895,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:376
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1415
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
 msgid "Duplicate"
 msgstr "Duplicar"
@@ -922,10 +966,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
@@ -1012,25 +1057,26 @@
 msgstr "Combinar camada atual em outra camada"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 msgid "Merge Nodes"
 msgstr "Unir Nós"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
 msgid "Merge nodes into the oldest one."
 msgstr "Unir nós no mais antigo"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
 msgid "Please select at least two nodes to merge."
 msgstr "Por favor selecione no mínimo dois nós para unir."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:394
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
@@ -1046,8 +1092,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -1073,6 +1119,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
@@ -1081,10 +1131,10 @@
 msgstr "parâmetro ''{0}'' não pode ser nulo"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
 "Não é possivel unir nós: Será necessário deletar o caminho que ainda é usado."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283
 #, java-format
 msgid "Merge {0} nodes"
@@ -1156,5 +1206,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "New"
 msgstr "Novo"
@@ -1435,14 +1485,15 @@
 msgstr "Ajuda: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
 msgid "Status Report"
 msgstr "Relatório Atual"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 msgid "Copy to clipboard and close"
 msgstr "Copiar para área de transferência e fechar"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
@@ -1524,25 +1575,4 @@
 msgstr "Dividir caminho {0} em {1} partes"
 
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24
-msgid "Close current changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-msgid "Close the current changeset ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41
-msgid "There is currently no changeset open."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42
-msgid "No open changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60
-msgid "Closing changeset"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
@@ -1710,41 +1740,39 @@
 msgstr "Seleção vazia"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Enviar para o OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 msgid "Upload all changes to the OSM server."
 msgstr "Enviar todas as modificações ao servidor OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#, java-format
 msgid ""
 "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
 "resolve them first.</html>"
 msgstr ""
-"<html>Não há camadas em que a camada<br>''{0}''<br>possa ser combinada.</"
-"html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
 msgid "Nothing to upload. Get some data first."
 msgstr "Não há nada a enviar. Baixe dados primeiro."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 msgid "No changes to upload."
 msgstr "Não há modificações a enviar."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Sincronizar {0} {1} apenas"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
 msgid "Synchronize entire dataset"
 msgstr "Synchronizar todo o conjunto de dados"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
 #, java-format
 msgid ""
@@ -1765,17 +1793,17 @@
 "</strong> para abortar e continuar editando.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
 msgid "Conflict detected"
 msgstr "Detectado conflito"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr "valor não esperado de retorno. Veio {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:267
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
 #, java-format
 msgid ""
@@ -1790,5 +1818,17 @@
 "<br>Clique <strong>{1}</strong> para abortar e continuar editando.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
+msgid ""
+"<html>Uploading <strong>failed</strong> because you've been "
+"using<br>changeset {0} which was already closed at {1}.<br>Please upload "
+"again with a new or an existing open changeset."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+#, fuzzy
+msgid "Changeset closed"
+msgstr "conjunto de mudanças"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
@@ -1796,23 +1836,23 @@
 "Aviso: cabeçalho de erro \"{0}\" não se encaixa no padrão esperado \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr "Cabeçalho de erro \"{0}\" não se encaixa no padrão \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr "<html>Envio <strong>falhou</strong>.<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
 msgid "Upload to OSM API failed"
 msgstr "Envio para API OSM falhou"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
 msgid "Updating primitive"
 msgstr "Atualizando primitiva"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -2037,14 +2077,14 @@
 msgstr "Adicionar nó em um caminho e conectar"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:930
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:932
 msgid "Create new node."
 msgstr "Criar novo nó."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
 msgid "Select node under cursor."
 msgstr "Selecionar nó sob o cursor."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939
 #, java-format
 msgid "Insert new node into way."
@@ -2053,14 +2093,14 @@
 msgstr[1] "Inserir novo nó em {0} caminhos."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
 msgid "Start new way from last node."
 msgstr "Começar novo caminho a partir do último nó."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951
 msgid "Continue way from last node."
 msgstr "Continuar caminho a partir do último nó."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:972
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:974
 msgid "Finish drawing."
 msgstr "Finalizar desenho."
@@ -2182,60 +2222,70 @@
 "Abaixo, Direita; mova ampliação com o botão direito"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Pesquisar..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Busca por objetos."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
 msgid "Can't search because there is no loaded data."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
+#, fuzzy
+msgid "Please enter a filter string."
+msgstr "Por favor, entre com uma string de busca."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
 msgid "Please enter a search string."
 msgstr "Por favor, entre com uma string de busca."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
 msgid "replace selection"
 msgstr "susbtitui a seleção"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72
 msgid "add to selection"
 msgstr "adiciona à seleção"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73
 msgid "remove from selection"
 msgstr "remove da seleção"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
+#, fuzzy
+msgid "find in selection"
+msgstr "adiciona à seleção"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81
 msgid "case sensitive"
 msgstr "sensível à caixa alta"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82
 msgid "regular expression"
 msgstr "expressão regular"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
 msgstr "<b>Rua Augusta</b> - 'Rua' and 'Augusta em qualquer chave ou valor."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
 msgstr "<b>\"Baker Street\"</b> - 'Baker Street' em qualquer chave ou nome."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
 msgstr "<b>name:May</b> - 'Bak' em qualquer parte do nome."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
 msgstr "<b>type=route</b> - chave 'type' com valor exato 'route'."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid ""
 "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
@@ -2245,17 +2295,17 @@
 "b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
 msgstr "<b>-name:Bak</b> - 'Bak' não existe no nome."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - qualquer valor presente na chave=foot"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
 msgid "<u>Special targets:</u>"
 msgstr "<u>Destinos especiais:<u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
@@ -2263,33 +2313,33 @@
 "<b>type:</b> - tipo de objeto (<b>nó</b>, <b>caminho</b>, <b>relação</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - todos os objetos modificados por determinado usuário"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 msgid "<b>nodes:</b>... - object with given number of nodes"
 msgstr "<b>nós:</b>... - objeto com um determinado número de nós"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modificado</b> - todos os objetos modificados"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selecionados</b> - todos os objetos selecionados"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incompletos</b> - todos os objetos incompletos"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>não tagueados</b> - todos objetos não tagueados"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2297,5 +2347,5 @@
 "<b>child <i>expr</i></b> - todos objetos filhos que coincidem com a expressão"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2304,54 +2354,71 @@
 "expressão"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Use <b>|</b> ou <b>OR</b> para combinar com \"ou\" lógico"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr "Usar <b>\"</b> para operadores de aspas (se a chave contém :)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Usar <b>(</b> and <b>)</b> para agrupar expressões"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
+msgid "Filter"
+msgstr "Filtro"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Buscar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
+msgid "Submit filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "Start Search"
 msgstr "Iniciar Pesquisa"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Não há valores coincidentes para ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Nada adicionado à seleção pela busca por \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Nada foi removido da seleção quando buscado por \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#, fuzzy, java-format
+msgid "Nothing find in selection by searching for ''{0}''"
+msgstr "Nada adicionado à seleção pela busca por \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262
 #, java-format
 msgid "Found {0} matches"
 msgstr "Encontrados {0} resultados"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283
 msgid "RX"
 msgstr "RX"
@@ -2543,5 +2610,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
 msgid "Double conflict"
 msgstr "Conflito duplo"
@@ -2790,4 +2857,5 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:134
 msgid "Old value"
 msgstr "Valor antigo"
@@ -2951,27 +3019,59 @@
 
 #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
 msgid "E"
 msgstr "L"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:59
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:203
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
 msgid "Changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:323
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
 msgstr "parametro {0} > 0 necessário. Obtido {1}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:325
-#, fuzzy, java-format
-msgid "paramete''{0}'' must not be null"
-msgstr "parâmetro ''{0}'' não pode ser nulo"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331
-#, fuzzy, java-format
-msgid "unsupported value ''{0}'' or parameter ''{1}''"
-msgstr "Regra não aplicável ''{0}'' para Way ''{1}''."
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "H"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "Text"
+msgstr "texto"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "C"
+msgstr "CS"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "I"
+msgstr "CI"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "M"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#, fuzzy
+msgid "R"
+msgstr "RX"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+msgid "A"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+msgid "D"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+msgid "F"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
@@ -2985,29 +3085,29 @@
 msgstr "Aviso: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
+#, java-format
 msgid "expected id >= 0. Got {0}"
-msgstr "indice inesperado na coluna. Obtido {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:257
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
 msgid "a primitive with id=0 can't be invisible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:293
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
+#, java-format
 msgid "id > 0 expected. Got {0}"
-msgstr "Credencial de autenticação inesperada: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
+#, java-format
 msgid "version > 0 expected. Got {0}"
-msgstr "Credencial de autenticação inesperada: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
 msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
 msgstr "parametro ''{0}'' não é um tipo válido para nome, obtido ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
 msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
@@ -3078,9 +3178,9 @@
 msgstr "parâmetro ''{0}'' fora do intervalo de 0..{1}, obtido {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:247
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:249
 msgid "Area style way is not closed."
 msgstr "Caminho para Estilo de Área não está fechado."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:478
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:482
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
@@ -3089,118 +3189,118 @@
 #. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
 #. TODO Remove useless nullcheck when RelationMember.member is encalupsed
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:851
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855
 msgid "Empty member in relation."
 msgstr "Membro vazio na relação."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:853
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Apagado membro ''{0}'' na relação."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:864
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Way ''{0}'' com menos de dois pontos."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "More than one \"from\" way found."
 msgstr "Mais de um caminho \"de\" encontrado."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "More than one \"to\" way found."
 msgstr "Mais de um caminho \"para\" encontrado."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "More than one \"via\" found."
 msgstr "Encontrado mais de um parâmetro \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Regra desconhecida \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Tipo de membro desconhecido para \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"from\" way found."
 msgstr "Nenhum caminho \"de\" encontrado."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"to\" way found."
 msgstr "Nenhuma caminho \"para\" encontrado."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652
 msgid "No \"via\" node or way found."
 msgstr "Não encontrei nenum nó ou caminho com o parâmetro \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "O caminho \"de\" não começa ou termina em um nó \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "O trecho \"to\" não começa ou termina no nó \"via\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "O trecho \"from\" não começa ou termina no caminho \"via\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "O trecho \"to\" não começa ou termina em um nó \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Estilo para restrição {0} não encontrado."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Regra não aplicável ''{0}'' para Way ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:885
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "\"{0}\" não é um caminho no multipolígono."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:943
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Não há via externa no multipolígono \"{0}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1032
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Interseção entre as vias \"{0}\" e \"{1}\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1044
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Via interna \"{0}\" está fora."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1097
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Estilo para caminho interno \"{0}\" é multipolígono."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1123
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Estilo para via externa \"{0}\" contém erros."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1327
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331
 msgid "untagged"
 msgstr "não tagueado"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1328
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332
 msgid "text"
 msgstr "texto"
@@ -3224,5 +3324,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
@@ -3243,5 +3343,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
@@ -3295,5 +3395,5 @@
 msgstr "Zona Lambert (França)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
 msgid "Lambert Zone (Estonia)"
 msgstr "Zona Lambert (Estônia)"
@@ -3335,9 +3435,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:38
 msgid "Do not show again"
 msgstr "Não mostrar novamente"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
 #, java-format
@@ -3345,31 +3445,31 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:91
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:116
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154
 msgid "incomplete"
 msgstr "incompleto"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
 msgid "highway"
 msgstr "rodovia"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
-#: build/trans_presets.java:3144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: build/trans_presets.java:3156
 msgid "railway"
 msgstr "ferrovia"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
 msgid "waterway"
 msgstr "água"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "landuse"
 msgstr "uso da terra"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:474
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
@@ -3379,5 +3479,5 @@
 msgstr[1] "{0} nós"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
 #, java-format
 msgid "{0} member"
@@ -3422,10 +3522,5 @@
 msgstr "Mensagem do dia não disponível"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67
-#, java-format
-msgid "- running version is {0}"
-msgstr "- versão em execução é {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:95
 msgid "Downloading \"Message of the day\""
 msgstr "Baixando \"Mensagem do Dia\""
@@ -3497,10 +3592,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:162
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
 msgid "Username"
 msgstr "Nome do Usuário"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
 msgid "Password"
 msgstr "Senha"
@@ -3624,5 +3719,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226
 msgid "Presets"
 msgstr "Predefinições"
@@ -3696,38 +3791,49 @@
 msgstr "escala"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
 msgid "The geographic longitude at the mouse pointer."
 msgstr "A lontigute geográfica na posição do ponteiro do mouse."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The name of the object at the mouse pointer."
 msgstr "O nome do objeto na posição do ponteiro do mouse."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The geographic latitude at the mouse pointer."
 msgstr "A latitude geográfica na posição do ponteiro do mouse."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The angle between the previous and the current way segment."
 msgstr "O ângulo entre o segmento anterior e o atual."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "A direção (bússola) do segmento de linha que está sendo desenhado."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The length of the new way segment being drawn."
 msgstr "O comprimento do novo caminho que está sendo desenhado."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199
+msgid ""
+"Middle click again to cycle through.<br>Hold CTRL to select directly from "
+"this list with the mouse.<hr>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290
 msgid "(no object)"
 msgstr "(nenhum objeto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:301
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418
+#, fuzzy
+msgid "User:"
+msgstr "Usuário"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
 msgid "layer not in list."
 msgstr "camada não está na lista."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:488
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3799,7 +3905,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:224
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Tags"
 msgstr "Etiquetas"
@@ -3814,5 +3920,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
@@ -4014,4 +4120,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
 msgid "Up"
 msgstr "Acima"
@@ -4022,4 +4129,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Down"
 msgstr "Abaixo"
@@ -4032,5 +4140,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
@@ -4474,23 +4582,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:236
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239
 msgid "No conflicts to resolve"
-msgstr "Nenhum conflito de tags pendentes a ser resolvido"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:295
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254
 msgid "Cancel conflict resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:310
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269
 msgid "Apply resolved conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Apply"
 msgstr "Aplicar"
@@ -4502,5 +4609,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "all"
 msgstr "todos os números"
@@ -4544,7 +4651,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
-msgid "not yet decided"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:213
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
@@ -4571,7 +4675,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
@@ -4581,7 +4685,7 @@
 msgstr[1] "{0} vias"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:152
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
@@ -4591,20 +4695,20 @@
 msgstr[1] "{0} relações"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "Paste ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "From ..."
 msgstr "De ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:372
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "To ..."
 msgstr "Para ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:428
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
 #, java-format
 msgid "{0} tag"
@@ -4620,13 +4724,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
-#, fuzzy
 msgid "Remove this relation member from the relation"
-msgstr "Remover da relação o membro na linha atual"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-#, fuzzy
 msgid "Replace"
-msgstr "lugar"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
@@ -4637,11 +4739,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
-#, fuzzy
 msgid "Undecided"
-msgstr "Pendente"
+msgstr ""
 
 #. --- role editing
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:56
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510
 msgid "Role:"
 msgstr "Regra:"
@@ -4657,7 +4758,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70
-#, fuzzy
 msgid "Value:"
-msgstr "Valor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86
@@ -4670,12 +4770,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51
-#, fuzzy
 msgid "Orig. Way"
-msgstr "Mão única"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
-#, fuzzy
 msgid "Decision"
-msgstr "Revisão"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -4691,6 +4789,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
@@ -4781,169 +4880,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-msgid "History"
-msgstr "Histórico"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-msgid "Display the history of all selected items."
-msgstr "Mostrar histórico de todos itens selecionados."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
-#, java-format
-msgid "index out of bounds Got {0}"
-msgstr "índice fora dos limites. Obtido {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr "Nó {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr "Caminho {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
-msgid "History item"
-msgstr "Historia do iten"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Recarregar todos objetos selecionados e atualizar a lista."
-
-#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
-msgid "Show"
-msgstr "Mostrar"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
-msgstr "Mostrar histórico da primitiva selecionada"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
-msgid "Dialog not created yet. Invoke createInstance() first"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
-msgid "Layers"
-msgstr "Camadas"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-msgid "Open a list of all loaded layers."
-msgstr "Abrir uma lista com camadas carregadas."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:297
-msgid "Delete the selected layer."
-msgstr "Excluir camada selecionada."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:367
-msgid "Show/Hide"
-msgstr "Mostrar/Ocultar"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:378
-msgid "Toggle visible state of the selected layer."
-msgstr "Mudar estado de visibilidade do layer selecionado."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414
-msgid "Activate"
-msgstr "Ativar"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:420
-msgid "Activate the selected layer"
-msgstr "Ativar camada selecionada"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:475
-msgid "Merge this layer into another layer"
-msgstr "Combinar esta camada em outra camada"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:581
-msgid "Move the selected layer one row up."
-msgstr "Mover a camada selecionada uma linha acima."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:600
-msgid "Move the selected layer one row down."
-msgstr "Mover camada selecionada uma linha abaixo."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
-msgid "Information about layer"
-msgstr "Informação sobre camada"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
-#, java-format
-msgid "This will change up to {0} object."
-msgid_plural "This will change up to {0} objects."
-msgstr[0] "Isto modificará {0} objeto."
-msgstr[1] "Isto modificará {0} objetos."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
-msgid "An empty value deletes the key."
-msgstr "Um valor vazio apaga a chave."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
-msgid "<different>"
-msgstr "<diferente>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
-msgid "Change values?"
-msgstr "Modificar valores?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
-#, java-format
-msgid "Change properties of up to {0} object"
-msgid_plural "Change properties of up to {0} objects"
-msgstr[0] "Modificar propriedades de até {0} objeto"
-msgstr[1] "Modificar propriedades de até {0} objetos"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
-msgid "Please select a key"
-msgstr "Por favor, selecione uma chave"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
-msgid "Please select a value"
-msgstr "Por favor, selecione um valor"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
-msgid "Please select the objects you want to change properties for."
-msgstr "Por favor, selecione os objetos que deseja modificar propriedades."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
-msgid "Properties/Memberships"
-msgstr "Propriedades/Associações"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-msgid "Properties for selected objects."
-msgstr "Propriedades dos objetos selecionados."
-
-#. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-msgid "Member Of"
-msgstr "Membro de"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
-msgid "Add Properties"
-msgstr "Adicionar Propriedades"
-
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+msgid "Filter objects and hide/disable them."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
@@ -4957,4 +4900,212 @@
 msgstr "Adicionar"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#, fuzzy
+msgid "Add filter."
+msgstr "Adicionar Selecionado"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
+#, fuzzy
+msgid "Edit filter."
+msgstr "Editar Abrigo"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#, fuzzy
+msgid "Delete filter."
+msgstr "Excluir Camada"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
+#, fuzzy
+msgid "Move filter up."
+msgstr "Mover para cima"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
+#, fuzzy
+msgid "Move filter down."
+msgstr "Mover para baixo"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128
+msgid "Enable filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
+#, fuzzy
+msgid "Hide elements"
+msgstr "Mover elementos"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
+msgid "Apply also for children"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
+msgid "Inverse filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
+#, fuzzy
+msgid "Filter mode"
+msgstr "Filtro"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
+msgid "History"
+msgstr "Histórico"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+msgid "Display the history of all selected items."
+msgstr "Mostrar histórico de todos itens selecionados."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr "índice fora dos limites. Obtido {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr "Nó {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr "Caminho {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
+msgid "History item"
+msgstr "Historia do iten"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
+msgid "Reload all currently selected objects and refresh the list."
+msgstr "Recarregar todos objetos selecionados e atualizar a lista."
+
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
+msgid "Show"
+msgstr "Mostrar"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
+msgid "Display the history of the selected primitive"
+msgstr "Mostrar histórico da primitiva selecionada"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84
+msgid "Dialog not created yet. Invoke createInstance() first"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
+msgid "Layers"
+msgstr "Camadas"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+msgid "Open a list of all loaded layers."
+msgstr "Abrir uma lista com camadas carregadas."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294
+msgid "Delete the selected layer."
+msgstr "Excluir camada selecionada."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364
+msgid "Show/Hide"
+msgstr "Mostrar/Ocultar"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375
+msgid "Toggle visible state of the selected layer."
+msgstr "Mudar estado de visibilidade do layer selecionado."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgid "Activate"
+msgstr "Ativar"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417
+msgid "Activate the selected layer"
+msgstr "Ativar camada selecionada"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472
+msgid "Merge this layer into another layer"
+msgstr "Combinar esta camada em outra camada"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578
+msgid "Move the selected layer one row up."
+msgstr "Mover a camada selecionada uma linha acima."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597
+msgid "Move the selected layer one row down."
+msgstr "Mover camada selecionada uma linha abaixo."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+msgid "Information about layer"
+msgstr "Informação sobre camada"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+#, java-format
+msgid "This will change up to {0} object."
+msgid_plural "This will change up to {0} objects."
+msgstr[0] "Isto modificará {0} objeto."
+msgstr[1] "Isto modificará {0} objetos."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+msgid "An empty value deletes the key."
+msgstr "Um valor vazio apaga a chave."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+msgid "<different>"
+msgstr "<diferente>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+msgid "Change values?"
+msgstr "Modificar valores?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#, java-format
+msgid "Change properties of up to {0} object"
+msgid_plural "Change properties of up to {0} objects"
+msgstr[0] "Modificar propriedades de até {0} objeto"
+msgstr[1] "Modificar propriedades de até {0} objetos"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+msgid "Please select a key"
+msgstr "Por favor, selecione uma chave"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+msgid "Please select a value"
+msgstr "Por favor, selecione um valor"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
+msgid "Please select the objects you want to change properties for."
+msgstr "Por favor, selecione os objetos que deseja modificar propriedades."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
+msgid "Properties/Memberships"
+msgstr "Propriedades/Associações"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+msgid "Properties for selected objects."
+msgstr "Propriedades dos objetos selecionados."
+
+#. setting up the membership table
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+msgid "Member Of"
+msgstr "Membro de"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
+msgid "Add Properties"
+msgstr "Adicionar Propriedades"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574
 msgid "Add a new key/value pair to all objects"
@@ -4996,10 +5147,9 @@
 
 #. item "Land use/Quarry" text "Name"
-#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
-#: build/trans_presets.java:3109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168
+#: build/trans_presets.java:3121
 msgid "Relations"
 msgstr "Relações"
@@ -5009,23 +5159,23 @@
 msgstr "Abrir uma lista de de todas as relações."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relações: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276
 msgid "Open an editor for the selected relation"
 msgstr "Abrir um editor para a relação selecionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
 msgid "Delete the selected relation"
 msgstr "Excluir a relação selecionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349
 msgid "Create a new relation"
 msgstr "Criar uma nova relação"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:373
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1412
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "Criar uma cópia desta relação e abri-la em outra janela de edição"
@@ -5058,5 +5208,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5068,9 +5218,9 @@
 msgstr "Seleção: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441
 msgid "Undock the panel"
 msgstr "Desacoplar painel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5078,5 +5228,5 @@
 "Fechar este painel. Você pode reabri-lo com os botões da barra da esquerda."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:457
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Clique para minimizar/maximizar o conteúdo do painel"
@@ -5137,5 +5287,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr "Editar relação referente à relação selecionada atualmente"
@@ -5159,5 +5309,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1502
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1370
 msgid "Download relation members"
 msgstr "Baixar membros do relaçoe"
@@ -5187,5 +5337,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -5193,18 +5343,18 @@
 msgstr "Aviso: ignorando exceção porque tarefa foi cancelada. Exceção: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
 msgid "Tags and Members"
 msgstr "Tags e Membros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:167
 msgid "Parent Relations"
 msgstr "Relações de parentesco"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5213,14 +5363,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
 msgid "Remove them, clean up relation"
 msgstr "Apagá-los, limpar relação"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
 msgid "Ignore them, leave relation as is"
 msgstr "Ignorá-los, deixar relação como está"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613
 #, java-format
 msgid ""
@@ -5230,9 +5380,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
 msgid "Multiple members referring to same primitive"
 msgstr "Múltiplos membros referenciando a mesma primitiva"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid ""
@@ -5242,5 +5392,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
@@ -5249,5 +5399,5 @@
 "membro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
@@ -5256,5 +5406,5 @@
 "membro"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5264,5 +5414,5 @@
 "membro selecionado"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5272,20 +5422,20 @@
 "membro selecionado"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
 msgid "Relation Editor: Remove Selected"
 msgstr "Editor de Relações: Remover Selecionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849
 #, java-format
 msgid ""
@@ -5294,57 +5444,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:961
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
 msgid "Sort the relation members"
 msgstr "Classificar a relação de membros"
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897
 msgid "Relation Editor: Sort"
 msgstr "Editor de Relações: Classificar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909
 msgid "Move the currently selected members up"
 msgstr "Mover os membros selecionados para cima"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:979
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:912
 msgid "Relation Editor: Move Up"
 msgstr "Editor de Relações: Mover para cima"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928
 msgid "Move the currently selected members down"
 msgstr "Mover membros selecionados para baixo"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:998
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:931
 msgid "Relation Editor: Move Down"
 msgstr "Editor de Relações: Mover para Baixo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
 msgid "Relation Editor: Remove"
 msgstr "Editor de Relações: Remover"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5353,9 +5503,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1058
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
 #, java-format
 msgid ""
@@ -5364,56 +5514,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090
 msgid "Apply the current updates"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123
 msgid "Apply the updates and close the dialog"
 msgstr "Aplicar atualizações e fechar aviso"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "Aceitar"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Cancel the updates and close the dialog"
 msgstr "Cancelar atualizações e fechar janela"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 msgid "Add an empty tag"
 msgstr "Adicionar uma tag vazia"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
-msgid "Delete the currently selected tags"
-msgstr "Apagar tags selecionadas atuais"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Baixar todas vias imcompletas e nós desta relação"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 msgid "Download Members"
 msgstr "Baixar membros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Relation Editor: Download Members"
 msgstr "Editor de Relações: Baixar Membros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1208
 msgid "Sets a role for the selected members"
 msgstr "Definir uma papel para membros selecionados"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1211
 msgid "Apply Role"
 msgstr "Aplicar papel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1356
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 #, java-format
 msgid ""
@@ -5423,13 +5558,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1229
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1367
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
 msgid "Confirm empty role"
 msgstr ""
@@ -5516,37 +5651,37 @@
 msgstr "Favoritos"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:82
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
 msgid "Please enter the desired coordinates first."
 msgstr "Por favor, entre com as coordenadas desejadas primeiro."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
 msgid "Please enter a name for the location."
 msgstr "Por favor, entre com um nome para a location."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:107
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
 msgid "Select a bookmark first."
 msgstr "Selecione um favorito primeiro"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
 msgid "min lat"
 msgstr "lat mín"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
 msgid "min lon"
 msgstr "lon mín"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid "max lat"
 msgstr "lat máx"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
 msgid "max lon"
 msgstr "lon máx"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5556,22 +5691,22 @@
 "área)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
 msgid "Bounding Box"
 msgstr "Retângulo Limite"
 
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
 msgid "Data Sources and Types"
 msgstr "Fontes e tipos de dados"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
 msgid "Download as new layer"
 msgstr "Baixar como nova camada"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
 msgid "Download Area"
 msgstr "Baixar Área"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
 msgid "Download area too large; will probably be rejected by server"
 msgstr ""
@@ -5579,5 +5714,5 @@
 "servidor"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
 msgid "Download area ok, size probably acceptable to server"
 msgstr "Área para baixar ok, possívelmente será aceito pelo servidor"
@@ -5602,7 +5737,7 @@
 msgstr "Forneça o nome de um lugar a procurar:"
 
-#. <separator/>
+#. group "Geography"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2759
 msgid "Places"
 msgstr "Lugares"
@@ -5649,21 +5784,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "type"
 msgstr "tipo"
@@ -5680,5 +5815,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-#, fuzzy
 msgid ""
 "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
@@ -5686,7 +5820,4 @@
 "Hold left mousebutton and draw a frame."
 msgstr ""
-"<b>Zoom:</b> Roda do mouse, duplo clique ou Ctrl + flecha para Cima / Baixo "
-"<b> Mover mapa: </b> Segure botão direito do mouse e mova o cursor ou use as "
-"teclas. <b>Selecione:</b> Clique."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
@@ -6152,4 +6283,6 @@
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
 #. <key key="historic" value="wayside_shrine" />
+#. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
+#. <key key="historic" value="boundary_stone" />
 #. item "Leisure/Water Park" label "Edit Water Park"
 #. <key key="leisure" value="water_park" />
@@ -6521,153 +6654,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/trans_presets.java:66 build/trans_presets.java:102
-#: build/trans_presets.java:142 build/trans_presets.java:179
-#: build/trans_presets.java:199 build/trans_presets.java:217
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:272 build/trans_presets.java:305
-#: build/trans_presets.java:351 build/trans_presets.java:371
-#: build/trans_presets.java:386 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:463 build/trans_presets.java:482
-#: build/trans_presets.java:502 build/trans_presets.java:522
-#: build/trans_presets.java:543 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627 build/trans_presets.java:658
-#: build/trans_presets.java:679 build/trans_presets.java:692
-#: build/trans_presets.java:705 build/trans_presets.java:718
-#: build/trans_presets.java:731 build/trans_presets.java:744
-#: build/trans_presets.java:755 build/trans_presets.java:764
-#: build/trans_presets.java:811 build/trans_presets.java:832
-#: build/trans_presets.java:841 build/trans_presets.java:901
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1067 build/trans_presets.java:1075
-#: build/trans_presets.java:1085 build/trans_presets.java:1093
-#: build/trans_presets.java:1098 build/trans_presets.java:1105
-#: build/trans_presets.java:1112 build/trans_presets.java:1117
-#: build/trans_presets.java:1125 build/trans_presets.java:1134
-#: build/trans_presets.java:1140 build/trans_presets.java:1146
-#: build/trans_presets.java:1151 build/trans_presets.java:1157
-#: build/trans_presets.java:1163 build/trans_presets.java:1172
-#: build/trans_presets.java:1181 build/trans_presets.java:1188
-#: build/trans_presets.java:1196 build/trans_presets.java:1209
-#: build/trans_presets.java:1215 build/trans_presets.java:1224
-#: build/trans_presets.java:1230 build/trans_presets.java:1236
-#: build/trans_presets.java:1244 build/trans_presets.java:1299
-#: build/trans_presets.java:1346 build/trans_presets.java:1352
-#: build/trans_presets.java:1358 build/trans_presets.java:1364
-#: build/trans_presets.java:1370 build/trans_presets.java:1381
-#: build/trans_presets.java:1390 build/trans_presets.java:1405
-#: build/trans_presets.java:1412 build/trans_presets.java:1418
-#: build/trans_presets.java:1426 build/trans_presets.java:1433
-#: build/trans_presets.java:1442 build/trans_presets.java:1450
-#: build/trans_presets.java:1457 build/trans_presets.java:1468
-#: build/trans_presets.java:1478 build/trans_presets.java:1488
-#: build/trans_presets.java:1508 build/trans_presets.java:1520
-#: build/trans_presets.java:1531 build/trans_presets.java:1548
-#: build/trans_presets.java:1555 build/trans_presets.java:1570
-#: build/trans_presets.java:1577 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1594
-#: build/trans_presets.java:1599 build/trans_presets.java:1605
-#: build/trans_presets.java:1611 build/trans_presets.java:1619
-#: build/trans_presets.java:1627 build/trans_presets.java:1635
-#: build/trans_presets.java:1642 build/trans_presets.java:1648
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1670 build/trans_presets.java:1677
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1712 build/trans_presets.java:1719
-#: build/trans_presets.java:1736 build/trans_presets.java:1744
-#: build/trans_presets.java:1759 build/trans_presets.java:1769
-#: build/trans_presets.java:1781 build/trans_presets.java:1788
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:1809 build/trans_presets.java:1817
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1841
-#: build/trans_presets.java:1846 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1864
-#: build/trans_presets.java:1872 build/trans_presets.java:1881
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1908 build/trans_presets.java:1914
-#: build/trans_presets.java:1922 build/trans_presets.java:1928
-#: build/trans_presets.java:1934 build/trans_presets.java:1940
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2013
-#: build/trans_presets.java:2022 build/trans_presets.java:2030
-#: build/trans_presets.java:2036 build/trans_presets.java:2042
-#: build/trans_presets.java:2048 build/trans_presets.java:2054
-#: build/trans_presets.java:2060 build/trans_presets.java:2066
-#: build/trans_presets.java:2072 build/trans_presets.java:2078
-#: build/trans_presets.java:2084 build/trans_presets.java:2090
-#: build/trans_presets.java:2096 build/trans_presets.java:2102
-#: build/trans_presets.java:2108 build/trans_presets.java:2114
-#: build/trans_presets.java:2120 build/trans_presets.java:2126
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2158
-#: build/trans_presets.java:2165 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2186
-#: build/trans_presets.java:2192 build/trans_presets.java:2198
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2218 build/trans_presets.java:2225
-#: build/trans_presets.java:2232 build/trans_presets.java:2239
-#: build/trans_presets.java:2247 build/trans_presets.java:2279
-#: build/trans_presets.java:2284 build/trans_presets.java:2289
-#: build/trans_presets.java:2294 build/trans_presets.java:2300
-#: build/trans_presets.java:2306 build/trans_presets.java:2312
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2354
-#: build/trans_presets.java:2451 build/trans_presets.java:2458
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2485 build/trans_presets.java:2492
-#: build/trans_presets.java:2498 build/trans_presets.java:2504
-#: build/trans_presets.java:2526 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2553 build/trans_presets.java:2559
-#: build/trans_presets.java:2565 build/trans_presets.java:2571
-#: build/trans_presets.java:2577 build/trans_presets.java:2583
-#: build/trans_presets.java:2590 build/trans_presets.java:2597
-#: build/trans_presets.java:2604 build/trans_presets.java:2610
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2661
-#: build/trans_presets.java:2667 build/trans_presets.java:2677
-#: build/trans_presets.java:2686 build/trans_presets.java:2701
-#: build/trans_presets.java:2707 build/trans_presets.java:2715
-#: build/trans_presets.java:2722 build/trans_presets.java:2742
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2783
-#: build/trans_presets.java:2790 build/trans_presets.java:2797
-#: build/trans_presets.java:2803 build/trans_presets.java:2809
-#: build/trans_presets.java:2817 build/trans_presets.java:2824
-#: build/trans_presets.java:2831 build/trans_presets.java:2838
-#: build/trans_presets.java:2844 build/trans_presets.java:2851
-#: build/trans_presets.java:2858 build/trans_presets.java:2867
-#: build/trans_presets.java:2873 build/trans_presets.java:2879
-#: build/trans_presets.java:2885 build/trans_presets.java:2891
-#: build/trans_presets.java:2900 build/trans_presets.java:2910
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2948
-#: build/trans_presets.java:2957 build/trans_presets.java:2963
-#: build/trans_presets.java:2969 build/trans_presets.java:2975
-#: build/trans_presets.java:2981 build/trans_presets.java:2987
-#: build/trans_presets.java:2993 build/trans_presets.java:3000
-#: build/trans_presets.java:3006 build/trans_presets.java:3011
-#: build/trans_presets.java:3018 build/trans_presets.java:3025
-#: build/trans_presets.java:3031 build/trans_presets.java:3040
-#: build/trans_presets.java:3048 build/trans_presets.java:3054
-#: build/trans_presets.java:3060 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3080
-#: build/trans_presets.java:3086 build/trans_presets.java:3092
-#: build/trans_presets.java:3098 build/trans_presets.java:3104
-#: build/trans_presets.java:3117 build/trans_presets.java:3131
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:67 build/trans_presets.java:103
+#: build/trans_presets.java:143 build/trans_presets.java:180
+#: build/trans_presets.java:200 build/trans_presets.java:218
+#: build/trans_presets.java:235 build/trans_presets.java:253
+#: build/trans_presets.java:273 build/trans_presets.java:306
+#: build/trans_presets.java:352 build/trans_presets.java:372
+#: build/trans_presets.java:387 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:503 build/trans_presets.java:523
+#: build/trans_presets.java:544 build/trans_presets.java:565
+#: build/trans_presets.java:586 build/trans_presets.java:607
+#: build/trans_presets.java:628 build/trans_presets.java:659
+#: build/trans_presets.java:680 build/trans_presets.java:693
+#: build/trans_presets.java:706 build/trans_presets.java:719
+#: build/trans_presets.java:732 build/trans_presets.java:745
+#: build/trans_presets.java:756 build/trans_presets.java:765
+#: build/trans_presets.java:812 build/trans_presets.java:833
+#: build/trans_presets.java:842 build/trans_presets.java:902
+#: build/trans_presets.java:1053 build/trans_presets.java:1061
+#: build/trans_presets.java:1069 build/trans_presets.java:1077
+#: build/trans_presets.java:1087 build/trans_presets.java:1095
+#: build/trans_presets.java:1100 build/trans_presets.java:1107
+#: build/trans_presets.java:1114 build/trans_presets.java:1119
+#: build/trans_presets.java:1127 build/trans_presets.java:1136
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1153 build/trans_presets.java:1159
+#: build/trans_presets.java:1165 build/trans_presets.java:1174
+#: build/trans_presets.java:1183 build/trans_presets.java:1190
+#: build/trans_presets.java:1198 build/trans_presets.java:1211
+#: build/trans_presets.java:1217 build/trans_presets.java:1226
+#: build/trans_presets.java:1232 build/trans_presets.java:1238
+#: build/trans_presets.java:1246 build/trans_presets.java:1302
+#: build/trans_presets.java:1349 build/trans_presets.java:1355
+#: build/trans_presets.java:1361 build/trans_presets.java:1367
+#: build/trans_presets.java:1373 build/trans_presets.java:1384
+#: build/trans_presets.java:1393 build/trans_presets.java:1408
+#: build/trans_presets.java:1415 build/trans_presets.java:1421
+#: build/trans_presets.java:1429 build/trans_presets.java:1436
+#: build/trans_presets.java:1445 build/trans_presets.java:1453
+#: build/trans_presets.java:1460 build/trans_presets.java:1471
+#: build/trans_presets.java:1481 build/trans_presets.java:1491
+#: build/trans_presets.java:1511 build/trans_presets.java:1523
+#: build/trans_presets.java:1534 build/trans_presets.java:1551
+#: build/trans_presets.java:1558 build/trans_presets.java:1574
+#: build/trans_presets.java:1581 build/trans_presets.java:1586
+#: build/trans_presets.java:1592 build/trans_presets.java:1598
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1646 build/trans_presets.java:1652
+#: build/trans_presets.java:1659 build/trans_presets.java:1666
+#: build/trans_presets.java:1674 build/trans_presets.java:1681
+#: build/trans_presets.java:1689 build/trans_presets.java:1696
+#: build/trans_presets.java:1702 build/trans_presets.java:1709
+#: build/trans_presets.java:1716 build/trans_presets.java:1723
+#: build/trans_presets.java:1740 build/trans_presets.java:1748
+#: build/trans_presets.java:1763 build/trans_presets.java:1773
+#: build/trans_presets.java:1785 build/trans_presets.java:1792
+#: build/trans_presets.java:1798 build/trans_presets.java:1808
+#: build/trans_presets.java:1813 build/trans_presets.java:1821
+#: build/trans_presets.java:1828 build/trans_presets.java:1834
+#: build/trans_presets.java:1840 build/trans_presets.java:1845
+#: build/trans_presets.java:1850 build/trans_presets.java:1855
+#: build/trans_presets.java:1862 build/trans_presets.java:1868
+#: build/trans_presets.java:1873 build/trans_presets.java:1882
+#: build/trans_presets.java:1891 build/trans_presets.java:1900
+#: build/trans_presets.java:1909 build/trans_presets.java:1918
+#: build/trans_presets.java:1924 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 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:2023 build/trans_presets.java:2032
+#: build/trans_presets.java:2040 build/trans_presets.java:2046
+#: build/trans_presets.java:2052 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 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:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2150
+#: build/trans_presets.java:2156 build/trans_presets.java:2162
+#: build/trans_presets.java:2169 build/trans_presets.java:2176
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2197 build/trans_presets.java:2203
+#: build/trans_presets.java:2209 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2229
+#: build/trans_presets.java:2236 build/trans_presets.java:2243
+#: build/trans_presets.java:2250 build/trans_presets.java:2258
+#: build/trans_presets.java:2290 build/trans_presets.java:2295
+#: build/trans_presets.java:2300 build/trans_presets.java:2305
+#: build/trans_presets.java:2311 build/trans_presets.java:2317
+#: build/trans_presets.java:2323 build/trans_presets.java:2331
+#: build/trans_presets.java:2337 build/trans_presets.java:2343
+#: build/trans_presets.java:2349 build/trans_presets.java:2355
+#: build/trans_presets.java:2365 build/trans_presets.java:2462
+#: build/trans_presets.java:2469 build/trans_presets.java:2483
+#: build/trans_presets.java:2489 build/trans_presets.java:2496
+#: build/trans_presets.java:2503 build/trans_presets.java:2509
+#: build/trans_presets.java:2515 build/trans_presets.java:2537
+#: build/trans_presets.java:2544 build/trans_presets.java:2551
+#: build/trans_presets.java:2557 build/trans_presets.java:2564
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2594 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2615
+#: build/trans_presets.java:2621 build/trans_presets.java:2627
+#: build/trans_presets.java:2633 build/trans_presets.java:2639
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2672 build/trans_presets.java:2678
+#: build/trans_presets.java:2688 build/trans_presets.java:2697
+#: build/trans_presets.java:2712 build/trans_presets.java:2718
+#: build/trans_presets.java:2726 build/trans_presets.java:2733
+#: build/trans_presets.java:2753 build/trans_presets.java:2764
+#: build/trans_presets.java:2770 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2788
+#: build/trans_presets.java:2795 build/trans_presets.java:2802
+#: build/trans_presets.java:2809 build/trans_presets.java:2815
+#: build/trans_presets.java:2821 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2912
+#: build/trans_presets.java:2922 build/trans_presets.java:2931
+#: build/trans_presets.java:2937 build/trans_presets.java:2943
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 build/trans_presets.java:2981
+#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:2999 build/trans_presets.java:3005
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3023 build/trans_presets.java:3030
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3066 build/trans_presets.java:3072
+#: build/trans_presets.java:3079 build/trans_presets.java:3085
+#: build/trans_presets.java:3092 build/trans_presets.java:3098
+#: build/trans_presets.java:3104 build/trans_presets.java:3110
+#: build/trans_presets.java:3116 build/trans_presets.java:3129
+#: build/trans_presets.java:3143 build/trans_presets.java:3157
 msgid "Name"
 msgstr "Nome"
@@ -6701,4 +6835,58 @@
 msgid "Version"
 msgstr "Versão"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
+#, fuzzy
+msgid "Changeset id:"
+msgstr "conjunto de mudanças"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
+#, fuzzy
+msgid "Created at:"
+msgstr "Criar áreas"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
+#, fuzzy
+msgid "Changeset comment:"
+msgstr "Modificar relação"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
+msgid "No open changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48
+#, fuzzy
+msgid "<html>Please select the changesets you want to close</html>"
+msgstr "Por favor, selecione quais alterações de propriedades quer aplicar."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
+#, fuzzy
+msgid "Open changesets"
+msgstr "conjunto de mudanças"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101
+#, fuzzy
+msgid "Close changesets"
+msgstr "Fechando conjunto de mudanças..."
+
+#. putValue(SMALL_ICON, ImageProvider.get("cancel"));
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
+#, fuzzy
+msgid "Close the selected open changesets"
+msgstr "Excluir os objetos selecionados."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126
+#, fuzzy
+msgid "Cancel closeing of changesets"
+msgstr "Fechando conjunto de mudanças..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37
+msgid "Closing changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77
+#, fuzzy, java-format
+msgid "Closing changeset {0}"
+msgstr "Fechando conjunto de mudanças..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
@@ -6727,5 +6915,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be uploaded"
+msgid "Layer ''{0}'' has no modifications to be uploaded."
 msgstr ""
 
@@ -6733,5 +6921,5 @@
 #, java-format
 msgid ""
-"Layer ''{0}'' has modifications which should be saved to its assoicated file "
+"Layer ''{0}'' has modifications which should be saved to its associated file "
 "''{1}''."
 msgstr ""
@@ -6739,5 +6927,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be saved"
+msgid "Layer ''{0}'' has no modifications to be saved."
 msgstr ""
 
@@ -6771,17 +6959,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113
 msgid "Unsaved changes - Save/Upload before exiting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194
 #, java-format
 msgid ""
@@ -6794,10 +6982,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205
 msgid "Unsaved data and conflicts"
-msgstr "Resolver conflitos"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212
 #, java-format
 msgid ""
@@ -6811,9 +6998,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223
 msgid "Unsaved data and missing associated file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230
 #, java-format
 msgid ""
@@ -6828,42 +7015,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243
 msgid "Unsaved data non-writable files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
 msgid "Close this dialog and resume editing in JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322
+msgid "Discard and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
-msgid "Discard and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354
+msgid "Save and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
-msgid "Save and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
 msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402
 #, java-format
 msgid "Preparing layer ''{0}'' for upload ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
@@ -6871,5 +7058,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491
 msgid "Incomplete upload and/or save"
 msgstr ""
@@ -6909,21 +7096,21 @@
 #. item "Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:200
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:278
-#: build/trans_presets.java:311 build/trans_presets.java:357
-#: build/trans_presets.java:372 build/trans_presets.java:387
-#: build/trans_presets.java:409 build/trans_presets.java:429
-#: build/trans_presets.java:450 build/trans_presets.java:470
-#: build/trans_presets.java:489 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:549
-#: build/trans_presets.java:570 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:633
-#: build/trans_presets.java:664 build/trans_presets.java:1060
-#: build/trans_presets.java:1068 build/trans_presets.java:1076
-#: build/trans_presets.java:1086 build/trans_presets.java:1305
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:242
+#: build/trans_presets.java:260 build/trans_presets.java:279
+#: build/trans_presets.java:312 build/trans_presets.java:358
+#: build/trans_presets.java:373 build/trans_presets.java:388
+#: build/trans_presets.java:410 build/trans_presets.java:430
+#: build/trans_presets.java:451 build/trans_presets.java:471
+#: build/trans_presets.java:490 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:665 build/trans_presets.java:1062
+#: build/trans_presets.java:1070 build/trans_presets.java:1078
+#: build/trans_presets.java:1088 build/trans_presets.java:1308
 msgid "Layer"
 msgstr "Layer"
@@ -6942,69 +7129,32 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:200
 msgid "Upload"
 msgstr "Enviar"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-msgid "Use a new changeset and close it"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
-msgid ""
-"Select to upload the data using a new changeset and to close the changeset "
-"after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
-msgid "Use a new changeset and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
-msgid ""
-"Select to upload the data using a new changeset and to leave the changeset "
-"open after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
-msgid "Upload to a new or to an existing changeset?"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
-msgid "upload all changes in one request"
-msgstr "enviar todas modificações em um pedido"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
-msgid ""
-"Enable to upload all changes in one request, disable to use one request per "
-"changed primitive"
-msgstr ""
-"Habilitar para envio de todas modificações em uma chamada, desabilitar para "
-"usar uma chamada por primitiva"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "Faça um comentário breve sobre as mudanças que está enviando:"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:216
 msgid "Settings"
 msgstr "Configurações"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908
 msgid "Tags of new changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:221
 msgid "Objects to add:"
 msgstr "Objetos a adicionar:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:227
 msgid "Objects to modify:"
 msgstr "Objetos a modificar:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:233
 msgid "Objects to delete:"
 msgstr "Objetos a excluir:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
 #, java-format
 msgid "{0} object to add:"
@@ -7013,5 +7163,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:277
 #, java-format
 msgid "{0} object to modifiy:"
@@ -7020,5 +7170,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:286
 #, java-format
 msgid "{0} object to delete:"
@@ -7027,55 +7177,90 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422
-#, java-format
-msgid "Use the existing changeset {0} and close it after upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:423
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to close the changeset "
-"after this upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426
-#, java-format
-msgid "Use the existing changeset {0} and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:427
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to leave the changeset "
-"open for further uploads"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
-#, java-format
-msgid "Tags of changeset {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:470
 msgid "Upload Changes"
 msgstr "Enviar Modificações"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472
+msgid "Upload the changed primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
+msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:479
+msgid "Illegal upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
+msgid "Cancel the upload and resume editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606
 #, fuzzy
-msgid "Upload the changed primitives"
-msgstr "Enviar estas modificações?"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592
+msgid "Upload all changes in one request"
+msgstr "enviar todas modificações em um pedido"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607
+msgid ""
+"Enable to upload all changes in one request, disable to use one request per "
+"changed primitive"
+msgstr ""
+"Habilitar para envio de todas modificações em uma chamada, desabilitar para "
+"usar uma chamada por primitiva"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:617
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "Faça um comentário breve sobre as mudanças que está enviando:"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672
 #, fuzzy
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "Por favor, entre com um nome para a location."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:593
-msgid "Illegal upload comment"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
+msgid "Open a new changeset"
+msgstr "conjunto de mudanças"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
+msgid "Open a new changeset and use it in the next upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
 #, fuzzy
-msgid "Cancel the upload and resume editing"
-msgstr "Cancelar atualizações e fechar janela"
+msgid "Use an open changeset"
+msgstr "Alterações Não Salvas"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
+msgid "Upload data to an already opened changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
+#, fuzzy
+msgid "Close changeset after upload"
+msgstr "Não há modificações a enviar."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
+msgid "Select to close the changeset after the next upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922
+#, java-format
+msgid "Tags of changeset {0}"
+msgstr ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
+#, fuzzy
+msgid "Load the list of your open changesets from the server"
+msgstr "Enviar as preferências atuais para o servidor"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
+#, fuzzy
+msgid "Close the currently selected open changeset"
+msgstr "Apagar tags selecionadas atuais"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
+#, fuzzy, java-format
+msgid "changeset id > 0 expected. Got {1}"
+msgstr "esperava-se que o parâmetro ''{0}'' > 0, valor atual ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63
@@ -7153,5 +7338,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
@@ -7189,5 +7374,5 @@
 msgstr "O tempo informado não pode ser analisado."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
@@ -7195,30 +7380,30 @@
 msgstr "ponto GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
 msgid "Customize line drawing"
 msgstr "Personalizar linha"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
 msgid "Use global settings."
 msgstr "Usar preferências globais."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Draw lines between points for this layer."
 msgstr "Desenhar linhas entre pontos para esta camada."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Do not draw lines between points for this layer."
 msgstr "Não desenhar linhas entre pontos para esta camada."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 msgid "Select line drawing options"
 msgstr "Selecionar opções de linha"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7226,5 +7411,5 @@
 msgstr "Personalizar cores"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7233,5 +7418,5 @@
 msgstr "Padrão"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7240,38 +7425,75 @@
 msgstr "Selecionar uma cor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
 msgid "Markers From Named Points"
 msgstr "Marcadores de Pontos Nomeados"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
 msgid "Import Audio"
 msgstr "Importar Áudio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
 msgid "Wave Audio files (*.wav)"
 msgstr "Árquivos de Áudio WAV (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Marcadores de audio de {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
 msgid "Import images"
 msgstr "Importar imagens"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#, java-format
+msgid "Name: {0}"
+msgstr "Nome: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#, java-format
+msgid "Description: {0}"
+msgstr "Descrição: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#, fuzzy, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
 msgstr[0] "{0} trilha, "
 msgstr[1] "{0} trilhas, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
+#: build/trans_presets.java:3160
+msgid "Description"
+msgstr "Descrição"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#, fuzzy
+msgid "Timespan"
+msgstr "Intervalo de Tempo: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#, fuzzy
+msgid "Length"
+msgstr "Comprimento: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
+msgid "URL"
+msgstr "URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+msgid "Length: "
+msgstr "Comprimento: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
 #, java-format
 msgid "{0} route, "
@@ -7280,5 +7502,5 @@
 msgstr[1] "{0} rotas, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 #, java-format
 msgid "{0} waypoint"
@@ -7287,29 +7509,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
-#, java-format
-msgid "Name: {0}"
-msgstr "Nome: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
-#, java-format
-msgid "Description: {0}"
-msgstr "Descrição: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
-msgid "Timespan: "
-msgstr "Intervalo de Tempo: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
-msgid "Length: "
-msgstr "Comprimento: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Converter para camada de dados"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7319,10 +7522,10 @@
 "arriscado.<br> Se quiser enviar dados, consulte aqui:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces (EN)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -7333,29 +7536,29 @@
 msgstr "Convertido de: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
 msgid "Download from OSM along this track"
 msgstr "Descarregar do OSM ao largo desta via"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
 msgid "Download everything within:"
 msgstr "Descargar tudo entre:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metros"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 msgid "Maximum area per request:"
 msgstr "Área máxima por pedio:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
 #, java-format
 msgid ""
@@ -7366,13 +7569,13 @@
 "Você deseja </br> continuar? </html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
 msgid "Download data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Não há trilha GPX disponível na camada para associar áudio."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7380,5 +7583,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7429,30 +7632,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
-#, fuzzy
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
 "<br>If you want to upload traces, look here:</html>"
 msgstr ""
-"<html>O envio de dados não processados de GPS como mapa é considerado "
-"arriscado.<br> Se quiser enviar dados, consulte aqui:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "track"
 msgid_plural "tracks"
@@ -7585,4 +7785,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
@@ -7821,13 +8022,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+msgid "Draw a circle form HDOP value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Velocidade (vermelho = lento, verde = rápido)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Diluição da posição (vermelho = alta, verde = baixo, se disponível)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Cor única (pode ser personalizado para camadas nomeadas)"
@@ -7835,6 +8041,6 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1374
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:1377
 msgid "Car"
 msgstr "Carro"
@@ -7855,14 +8061,14 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:324 build/trans_presets.java:650
-#: build/trans_presets.java:857 build/trans_presets.java:876
-#: build/trans_presets.java:890 build/trans_presets.java:912
-#: build/trans_presets.java:949 build/trans_presets.java:962
-#: build/trans_presets.java:974 build/trans_presets.java:986
-#: build/trans_presets.java:998 build/trans_presets.java:1010
-#: build/trans_presets.java:1020 build/trans_presets.java:1029
-#: build/trans_presets.java:1038 build/trans_presets.java:1437
-#: build/trans_presets.java:1510
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:325 build/trans_presets.java:651
+#: build/trans_presets.java:858 build/trans_presets.java:877
+#: build/trans_presets.java:891 build/trans_presets.java:913
+#: build/trans_presets.java:950 build/trans_presets.java:963
+#: build/trans_presets.java:975 build/trans_presets.java:987
+#: build/trans_presets.java:999 build/trans_presets.java:1011
+#: build/trans_presets.java:1021 build/trans_presets.java:1030
+#: build/trans_presets.java:1039 build/trans_presets.java:1440
+#: build/trans_presets.java:1513
 msgid "Bicycle"
 msgstr "Bicicleta"
@@ -7895,62 +8101,62 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:325 build/trans_presets.java:649
-#: build/trans_presets.java:856 build/trans_presets.java:875
-#: build/trans_presets.java:889 build/trans_presets.java:911
-#: build/trans_presets.java:948 build/trans_presets.java:961
-#: build/trans_presets.java:973 build/trans_presets.java:985
-#: build/trans_presets.java:997 build/trans_presets.java:1009
-#: build/trans_presets.java:1019 build/trans_presets.java:1028
-#: build/trans_presets.java:1037
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:326 build/trans_presets.java:650
+#: build/trans_presets.java:857 build/trans_presets.java:876
+#: build/trans_presets.java:890 build/trans_presets.java:912
+#: build/trans_presets.java:949 build/trans_presets.java:962
+#: build/trans_presets.java:974 build/trans_presets.java:986
+#: build/trans_presets.java:998 build/trans_presets.java:1010
+#: build/trans_presets.java:1020 build/trans_presets.java:1029
+#: build/trans_presets.java:1038
 msgid "Foot"
 msgstr "A Pé"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Desenhar setas de direção"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr ""
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Somente sugestões de sentido interessantes (ex. tag de mão única)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Only on the head of a way."
 msgstr "Somente no sentido da via."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Desenhar número de sequência dos segmentos"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Desenhar nós virtuais no modo escollhido"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Desenhar camadas inativas em cor diferente"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:82
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -7958,34 +8164,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length (meters)"
 msgstr ""
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:129
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:135
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:141
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -7993,13 +8199,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:144
 msgid "Minimum distance (pixels)"
 msgstr "Distância mínima (pixels)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Draw larger dots for the GPS points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -8009,9 +8215,9 @@
 "personalizado no Gerenciador de Camadas."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -8019,46 +8225,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202
 msgid "GPS Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:237
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257
 msgid "Draw the inactive data layers in a different color."
 msgstr "Desenhar as camadas de dados inativas em uma cor diferente."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "OSM Data"
 msgstr ""
@@ -8137,45 +8343,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Configure available plugins."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50
+#. buttons at the bottom
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
 msgid "Download List"
 msgstr "Lista de Download"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:100
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 msgid "Update"
 msgstr "Atualizar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Configure Sites..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:125
 msgid "Add JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:126
 msgid "Enter URL"
 msgstr "Inserir URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:162
 msgid "Please select an entry."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:147
 msgid "Edit JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:148
 msgid "JOSM Plugin description URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:175
 msgid "Configure Plugin Sites"
 msgstr ""
@@ -8503,6 +8710,6 @@
 msgstr "<múltiplo>"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:369
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341
 #, java-format
 msgid "Remove old keys from up to {0} object"
@@ -8511,9 +8718,9 @@
 msgstr[1] "Remover chaves antigas de até {0} objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135
 msgid "Add a new tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160
 msgid "Delete the selection in the tag table"
 msgstr ""
@@ -8548,7 +8755,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:68
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:75
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -8592,4 +8799,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24
+#, fuzzy, java-format
+msgid "Preset group ''{0}'' of group ''{1}''"
+msgstr "Usar preferência ''{0}'' do grupo ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
 #, java-format
 msgid "Preset group ''{0}''"
@@ -8610,4 +8822,10 @@
 msgstr "Baixando pontos {0} a {1}..."
 
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, fuzzy, java-format
+msgid "parameter ''{0}'' > 0 expected. Got {1}"
+msgstr "esperava-se que o parâmetro ''{0}'' > 0, valor atual ''{1}''"
+
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8716,5 +8934,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "Erro de interpretação: estrutura inválida para documento gpx"
@@ -8834,10 +9052,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -8845,75 +9064,79 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315
 msgid "Creating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
 #, java-format
 msgid "Successfully opened changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#, fuzzy, java-format
+msgid "id of changeset > 0 required. Got {0}"
+msgstr "parametro {0} > 0 necessário. Obtido {1}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
-#, java-format
-msgid "Changeset {0} is unchanged. Skipping update."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
 #, java-format
 msgid "Updating changeset {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
-msgid ""
-"Failed to update changeset. Either there is no current changeset or the id "
-"of the current changeset is 0"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
 msgid "Closing changeset..."
 msgstr "Fechando conjunto de mudanças..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
-#, java-format
-msgid "Closing changeset {0}..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
-#, java-format
-msgid "Leaving changeset {0} open..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
 msgid "No changeset present for diff upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414
 msgid "Preparing..."
 msgstr "Preparando..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419
 msgid "Uploading..."
 msgstr "Enviando..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438
 msgid "Waiting 10 seconds ... "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449
 msgid "OK - trying again."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:485
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517
 #, java-format
 msgid "Starting retry {0} of {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
+msgid "current changeset is null. Can't upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
+#, java-format
+msgid "id of current changeset > required. Current id is {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
+#, java-format
+msgid "Open changeset expected. Got closed changeset with id {0}"
 msgstr ""
 
@@ -8939,50 +9162,109 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
+#, java-format
+msgid "missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:128
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:134
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
+#, java-format
+msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
+#, java-format
+msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
+#, java-format
+msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#, java-format
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#, java-format
+msgid "Unsupported version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:176
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Aborting."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#, java-format
+msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
+#, fuzzy
+msgid "Parsing list of changesets..."
+msgstr "Fechando conjunto de mudanças..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
 msgid "Incorrect password or username."
 msgstr "Senha ou usuário incorreto."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:168
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Atenção: A senha é enviada sem encriptação."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Save user and password (unencrypted)"
 msgstr "Salvar usuário e senha (sem encriptação)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
 msgid "Enter Password"
 msgstr "Digite a Senha"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 msgid "Login"
 msgstr "Login"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:242
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
 msgid "The base URL for the OSM server (REST API)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
 msgid "Base Server URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
 msgid "OSM password"
 msgstr "OSM senha"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -8991,5 +9273,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:51
+#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #, java-format
 msgid "(at line {0}, column {1})"
@@ -9079,20 +9361,5 @@
 msgstr "Erro durante interpretação."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124
-#, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
-#, fuzzy, java-format
-msgid "Missing mandatory attribute ''{0}''"
-msgstr "Faltando atributo obrigatório \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
-#, fuzzy, java-format
-msgid "Unsupported version: {0}"
-msgstr "Versão desconhecida: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:155
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -9101,38 +9368,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
 msgid "found XML element <nd> element not as direct child of element <way>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
 msgid "Found XML element <member> not as direct child of element <relation>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
 #, java-format
 msgid ""
@@ -9140,24 +9407,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Especificação de <member> incompleta com ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
-#, java-format
-msgid "Warning: Undefined element ''{0}'' found in input stream. Skipping."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
-#, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Skipping."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
 msgid "Illegal object with id=0"
 msgstr "Objeto ilegal com id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #, java-format
 msgid ""
@@ -9165,5 +9427,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:303
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
 #, java-format
 msgid ""
@@ -9172,5 +9434,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
 #, java-format
 msgid ""
@@ -9179,5 +9441,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
@@ -9187,25 +9449,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:316
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#, java-format
 msgid "Unknown or unsupported API version. Got {0}"
-msgstr "Versão desconhecida: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with id {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#, java-format
 msgid "Missing required attribute ''{0}''."
-msgstr "Faltando atributo obrigatório \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
 #, java-format
 msgid ""
@@ -9213,5 +9475,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
 #, java-format
 msgid ""
@@ -9220,5 +9482,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
 #, java-format
 msgid ""
@@ -9226,26 +9488,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#, java-format
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
 "id ''{1}''"
 msgstr ""
-"não é possível comparar um primitivo com id ''{0}'' com um primitivo com id "
-"''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
 msgid "Prepare OSM data..."
 msgstr "Preparando dados OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 msgid "Parsing OSM data..."
-msgstr "Preparando dados OSM..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
 msgid "Preparing data set..."
-msgstr "Preparando dados..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
@@ -9266,4 +9524,24 @@
 msgid "Downloading referring relations ..."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51
+#, fuzzy
+msgid "Reading changesets..."
+msgstr "Fechando conjunto de mudanças..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
+#, fuzzy
+msgid "Downloading changesets ..."
+msgstr "Fechando conjunto de mudanças..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85
+#, fuzzy, java-format
+msgid "Reading changeset {0} ..."
+msgstr "Lendo {0}..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91
+#, fuzzy, java-format
+msgid "Downloading changeset {0} ..."
+msgstr "Fechando conjunto de mudanças..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
@@ -9280,10 +9558,14 @@
 msgstr "Acessando Servidor..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
 msgid "Failed to open connection to API {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
+msgid "Error: failed to add authentication credentials to the connection."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -9292,33 +9574,52 @@
 "conexão de internet."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+msgid "XML tag <user> is missing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
+#, fuzzy, java-format
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgstr "Usar preferência ''{0}'' do grupo ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
+#, java-format
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
 msgid "Starting to upload with one request per primitive ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
 msgid "Starting to upload in one request ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:171
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135
 msgid "Uploading data ..."
-msgstr "Enviando..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:178
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
 msgid ""
 "WARNING: no API version defined for data to upload. Falling back to version "
@@ -9326,5 +9627,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147
 #, java-format
 msgid ""
@@ -9334,10 +9635,10 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
 msgid "Update Plugins"
 msgstr "Atualizar Plugins"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 msgid "Download Plugins"
 msgstr ""
@@ -9496,5 +9797,5 @@
 msgstr "Mais detalhes"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -9503,18 +9804,18 @@
 msgstr[1] "Informações de plugin baixadas de {0} sites"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
 msgid "No plugin information found."
 msgstr "Não foi possível encontrar informações de plugin."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:93
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
 msgid "All installed plugins are up to date."
 msgstr "Todos os plugins estão atualizados."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
 #, java-format
 msgid ""
@@ -9527,9 +9828,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
 msgid "Download missing plugins"
 msgstr "Baixando plugins que faltam"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
 #, java-format
 msgid ""
@@ -9544,43 +9845,43 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
 msgid "unknown"
 msgstr "Desconhecido"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Versão {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 msgid "Plugin bundled with JOSM"
 msgstr "Plugin que vem junto com o JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:357
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -9902,10 +10203,4 @@
 msgid "(What does that mean?)"
 msgstr ""
-
-#. item "Relations/Route" text "Symbol description"
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3148
-msgid "Description"
-msgstr "Descrição"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
@@ -10659,6 +10954,7 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
-msgid "Set "
-msgstr ""
+#, fuzzy, java-format
+msgid "Set {0} Lambert coordinates"
+msgstr "Mantenha suas coordenadas"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -11276,6 +11572,6 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 #: build/trans_style.java:990 build/trans_style.java:1007
-#: build/trans_style.java:1023 build/trans_style.java:3392
-#: build/trans_style.java:3400
+#: build/trans_style.java:1023 build/trans_style.java:3400
+#: build/trans_style.java:3408
 msgid "water"
 msgstr "água"
@@ -11560,4 +11856,56 @@
 msgstr "Medições"
 
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Michigan Left"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Adds no left turn for sets of 4 or 5 ways."
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45
+#, fuzzy
+msgid "Please select 4 or 5 ways to assign no left turns."
+msgstr ""
+"Por favor selecione um ou mais caminhos fechados de no mínimo quatro nós."
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61
+#, fuzzy, java-format
+msgid "{0} extrem nodes."
+msgstr "{0} nó"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69
+#, java-format
+msgid "Via node {0}, {1}"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75
+#, fuzzy, java-format
+msgid "{0} via nodes."
+msgstr "{0} nó"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78
+msgid "Unable to find via nodes. Please check your selection"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98
+#, fuzzy, java-format
+msgid "MIddle way: {0}"
+msgstr "Modo: {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121
+msgid "Create Michigan left turn restriction"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129
+#, fuzzy, java-format
+msgid "Processing {0}"
+msgstr "Versão {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142
+#, fuzzy, java-format
+msgid "Relation: from {0} to {1} via {2}"
+msgstr "Verção {0} creado do {2} no {1}"
+
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
 msgid "OpenLayers"
@@ -11703,7 +12051,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
-#, fuzzy
 msgid "create new objects"
-msgstr "Criar novo nó."
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
@@ -12023,5 +12370,5 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:158
 msgid "JOSM Tag Editor Plugin"
 msgstr ""
@@ -12031,5 +12378,5 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:370
 #, java-format
 msgid "Updating properties of up to {0} object"
@@ -12038,18 +12385,4 @@
 msgstr[1] "Atualizando propriedades de {0} objetos"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44
-msgid "INFO: entering compatibilty mode for JOSM with Main.ds"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47
-msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49
-msgid ""
-"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-"found."
-msgstr ""
-
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
 msgid "Group"
@@ -12059,9 +12392,4 @@
 msgid "Item"
 msgstr "Ítem"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-msgid "Filter"
-msgstr "Filtro"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63
@@ -12147,5 +12475,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2272
 msgid "Street name"
 msgstr "Nome do rua"
@@ -12307,8 +12635,4 @@
 msgid "Zoom (in metres)"
 msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
-msgid "URL"
-msgstr "URL"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -12511,7 +12835,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501
-#, fuzzy
 msgid "Updating map ..."
-msgstr "Enviando dados"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69
@@ -12995,7 +13318,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
-#: build/trans_style.java:4179
+#: build/trans_style.java:4159 build/trans_style.java:4166
+#: build/trans_style.java:4173 build/trans_style.java:4180
+#: build/trans_style.java:4187
 msgid "building"
 msgstr ""
@@ -13009,5 +13332,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4186
+#: build/trans_style.java:4194
 msgid "area"
 msgstr ""
@@ -13134,10 +13457,10 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:148
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:155
 msgid "Reached a junction"
 msgstr ""
@@ -13425,7 +13748,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
-#, fuzzy
 msgid "Overlap tiles"
-msgstr "Arquivos do servidor OSM"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
@@ -13434,7 +13756,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
-#, fuzzy
 msgid "% of north:"
-msgstr "norte"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -13579,6 +13900,11 @@
 msgstr ""
 
+#. Plugin michigan_left
+#: build/trans_plugins.java:35
+msgid "Adds no left turn for sets of 4 or 5 ways"
+msgstr ""
+
 #. Plugin nearclick
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid ""
 "Simulates a click when you do a small and short drag. This is usefull for "
@@ -13588,15 +13914,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13604,5 +13930,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13610,5 +13936,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13617,15 +13943,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13634,10 +13960,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13646,15 +13972,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -13664,10 +13990,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin usertools
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -13676,5 +14002,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -13683,5 +14009,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -13690,5 +14016,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -13697,10 +14023,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -13756,4 +14082,10 @@
 #. <annotations>
 #: build/trans_presets.java:57
+#, fuzzy
+msgid "Highways"
+msgstr "rodovia"
+
+#. group "Highways"
+#: build/trans_presets.java:58
 msgid "Streets"
 msgstr "Ruas"
@@ -13764,5 +14096,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:58 build/trans_surveyor.java:72
+#: build/trans_presets.java:59 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Auto-estrada"
@@ -13771,5 +14103,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:61
+#: build/trans_presets.java:62
 msgid "Edit Motorway"
 msgstr "Editar Auto-estrada"
@@ -13796,8 +14128,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:120 build/trans_presets.java:140
-#: build/trans_presets.java:177 build/trans_presets.java:197
-#: build/trans_presets.java:1557 build/trans_presets.java:3146
+#: build/trans_presets.java:65 build/trans_presets.java:101
+#: build/trans_presets.java:121 build/trans_presets.java:141
+#: build/trans_presets.java:178 build/trans_presets.java:198
+#: build/trans_presets.java:1560 build/trans_presets.java:3158
 msgid "Reference"
 msgstr "Referência"
@@ -13811,8 +14143,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:358
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:359
 msgid "Lanes"
 msgstr "Faixas"
@@ -13829,15 +14161,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:224 build/trans_presets.java:280
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:373 build/trans_presets.java:388
-#: build/trans_presets.java:412 build/trans_presets.java:431
-#: build/trans_presets.java:452 build/trans_presets.java:472
-#: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1307
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:225 build/trans_presets.java:281
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:374 build/trans_presets.java:389
+#: build/trans_presets.java:413 build/trans_presets.java:432
+#: build/trans_presets.java:453 build/trans_presets.java:473
+#: build/trans_presets.java:511 build/trans_presets.java:667
+#: build/trans_presets.java:1310
 msgid "Max. speed (km/h)"
 msgstr "Velocidade máxima (km/h)"
@@ -13874,16 +14206,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:293 build/trans_presets.java:306
-#: build/trans_presets.java:320 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:464
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:659 build/trans_presets.java:1300
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:294 build/trans_presets.java:307
+#: build/trans_presets.java:321 build/trans_presets.java:353
+#: build/trans_presets.java:405 build/trans_presets.java:425
+#: build/trans_presets.java:445 build/trans_presets.java:465
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:660 build/trans_presets.java:1303
 msgid "Oneway"
 msgstr "Mão Única"
@@ -13925,19 +14257,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:353
-#: build/trans_presets.java:362 build/trans_presets.java:405
-#: build/trans_presets.java:425 build/trans_presets.java:445
-#: build/trans_presets.java:465 build/trans_presets.java:485
-#: build/trans_presets.java:504 build/trans_presets.java:523
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:586 build/trans_presets.java:607
-#: build/trans_presets.java:628 build/trans_presets.java:660
-#: build/trans_presets.java:1301 build/trans_surveyor.java:12
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:354
+#: build/trans_presets.java:363 build/trans_presets.java:406
+#: build/trans_presets.java:426 build/trans_presets.java:446
+#: build/trans_presets.java:466 build/trans_presets.java:486
+#: build/trans_presets.java:505 build/trans_presets.java:524
+#: build/trans_presets.java:545 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629 build/trans_presets.java:661
+#: build/trans_presets.java:1304 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Ponte"
@@ -13973,19 +14305,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:354
-#: build/trans_presets.java:378 build/trans_presets.java:406
-#: build/trans_presets.java:426 build/trans_presets.java:446
-#: build/trans_presets.java:466 build/trans_presets.java:486
-#: build/trans_presets.java:505 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629 build/trans_presets.java:661
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:355
+#: build/trans_presets.java:379 build/trans_presets.java:407
+#: build/trans_presets.java:427 build/trans_presets.java:447
+#: build/trans_presets.java:467 build/trans_presets.java:487
+#: build/trans_presets.java:506 build/trans_presets.java:525
+#: build/trans_presets.java:546 build/trans_presets.java:567
+#: build/trans_presets.java:588 build/trans_presets.java:609
+#: build/trans_presets.java:630 build/trans_presets.java:662
+#: build/trans_presets.java:1305
 msgid "Tunnel"
 msgstr "Túnel"
@@ -14019,18 +14351,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:73 build/trans_presets.java:90
-#: build/trans_presets.java:110 build/trans_presets.java:129
-#: build/trans_presets.java:150 build/trans_presets.java:166
-#: build/trans_presets.java:186 build/trans_presets.java:205
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:355
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:467
-#: build/trans_presets.java:487 build/trans_presets.java:506
-#: build/trans_presets.java:525 build/trans_presets.java:546
-#: build/trans_presets.java:567 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:630
-#: build/trans_presets.java:662 build/trans_presets.java:1303
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:356
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:468
+#: build/trans_presets.java:488 build/trans_presets.java:507
+#: build/trans_presets.java:526 build/trans_presets.java:547
+#: build/trans_presets.java:568 build/trans_presets.java:589
+#: build/trans_presets.java:610 build/trans_presets.java:631
+#: build/trans_presets.java:663 build/trans_presets.java:1306
 msgid "Cutting"
 msgstr "Corte"
@@ -14064,18 +14396,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:74 build/trans_presets.java:91
-#: build/trans_presets.java:111 build/trans_presets.java:130
-#: build/trans_presets.java:151 build/trans_presets.java:167
-#: build/trans_presets.java:187 build/trans_presets.java:206
-#: build/trans_presets.java:222 build/trans_presets.java:240
-#: build/trans_presets.java:258 build/trans_presets.java:277
-#: build/trans_presets.java:310 build/trans_presets.java:356
-#: build/trans_presets.java:408 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:468
-#: build/trans_presets.java:488 build/trans_presets.java:507
-#: build/trans_presets.java:526 build/trans_presets.java:547
-#: build/trans_presets.java:568 build/trans_presets.java:589
-#: build/trans_presets.java:610 build/trans_presets.java:631
-#: build/trans_presets.java:663 build/trans_presets.java:1304
+#: build/trans_presets.java:75 build/trans_presets.java:92
+#: build/trans_presets.java:112 build/trans_presets.java:131
+#: build/trans_presets.java:152 build/trans_presets.java:168
+#: build/trans_presets.java:188 build/trans_presets.java:207
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:357
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:469
+#: build/trans_presets.java:489 build/trans_presets.java:508
+#: build/trans_presets.java:527 build/trans_presets.java:548
+#: build/trans_presets.java:569 build/trans_presets.java:590
+#: build/trans_presets.java:611 build/trans_presets.java:632
+#: build/trans_presets.java:664 build/trans_presets.java:1307
 msgid "Embankment"
 msgstr ""
@@ -14083,5 +14415,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Motorway Link"
 msgstr ""
@@ -14090,5 +14422,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:80
+#: build/trans_presets.java:81
 msgid "Edit Motorway Link"
 msgstr ""
@@ -14096,5 +14428,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:94
+#: build/trans_presets.java:95
 msgid "Trunk"
 msgstr ""
@@ -14103,5 +14435,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:97
+#: build/trans_presets.java:98
 msgid "Edit Trunk"
 msgstr ""
@@ -14111,6 +14443,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
 msgid "Motorroad"
 msgstr ""
@@ -14118,5 +14450,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:114
+#: build/trans_presets.java:115
 msgid "Trunk Link"
 msgstr ""
@@ -14125,5 +14457,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:117
+#: build/trans_presets.java:118
 msgid "Edit Trunk Link"
 msgstr ""
@@ -14136,5 +14468,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:134 build/trans_surveyor.java:76
+#: build/trans_presets.java:135 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr ""
@@ -14143,5 +14475,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:137
+#: build/trans_presets.java:138
 msgid "Edit Primary Road"
 msgstr ""
@@ -14149,10 +14481,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:154
+#: build/trans_presets.java:155
 msgid "Primary Link"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:155
+#: build/trans_presets.java:156
 msgid "Edit Primary Link"
 msgstr ""
@@ -14164,5 +14496,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:170 build/trans_surveyor.java:80
+#: build/trans_presets.java:171 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr ""
@@ -14172,5 +14504,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:174
+#: build/trans_presets.java:175
 msgid "Edit Secondary Road"
 msgstr ""
@@ -14178,5 +14510,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:190
+#: build/trans_presets.java:191
 msgid "Tertiary"
 msgstr ""
@@ -14186,5 +14518,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:194
+#: build/trans_presets.java:195
 msgid "Edit Tertiary Road"
 msgstr ""
@@ -14196,5 +14528,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:209 build/trans_surveyor.java:84
+#: build/trans_presets.java:210 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr ""
@@ -14204,5 +14536,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:213
+#: build/trans_presets.java:214
 msgid "Edit Unclassified Road"
 msgstr ""
@@ -14229,19 +14561,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:225 build/trans_presets.java:243
-#: build/trans_presets.java:261 build/trans_presets.java:281
-#: build/trans_presets.java:314 build/trans_presets.java:359
-#: build/trans_presets.java:375 build/trans_presets.java:389
-#: build/trans_presets.java:413 build/trans_presets.java:432
-#: build/trans_presets.java:453 build/trans_presets.java:473
-#: build/trans_presets.java:491 build/trans_presets.java:511
-#: build/trans_presets.java:532 build/trans_presets.java:553
-#: build/trans_presets.java:574 build/trans_presets.java:595
-#: build/trans_presets.java:616 build/trans_presets.java:637
-#: build/trans_presets.java:667 build/trans_presets.java:680
-#: build/trans_presets.java:693 build/trans_presets.java:706
-#: build/trans_presets.java:719 build/trans_presets.java:732
-#: build/trans_presets.java:745 build/trans_presets.java:1308
-#: build/trans_presets.java:1498 build/trans_presets.java:1540
+#: build/trans_presets.java:226 build/trans_presets.java:244
+#: build/trans_presets.java:262 build/trans_presets.java:282
+#: build/trans_presets.java:315 build/trans_presets.java:360
+#: build/trans_presets.java:376 build/trans_presets.java:390
+#: build/trans_presets.java:414 build/trans_presets.java:433
+#: build/trans_presets.java:454 build/trans_presets.java:474
+#: build/trans_presets.java:492 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:554
+#: build/trans_presets.java:575 build/trans_presets.java:596
+#: build/trans_presets.java:617 build/trans_presets.java:638
+#: build/trans_presets.java:668 build/trans_presets.java:681
+#: build/trans_presets.java:694 build/trans_presets.java:707
+#: build/trans_presets.java:720 build/trans_presets.java:733
+#: build/trans_presets.java:746 build/trans_presets.java:1311
+#: build/trans_presets.java:1501 build/trans_presets.java:1543
 msgid "Width (meters)"
 msgstr "Largura (metros)"
@@ -14253,5 +14585,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:228 build/trans_surveyor.java:88
+#: build/trans_presets.java:229 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Residencial"
@@ -14260,5 +14592,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:231
+#: build/trans_presets.java:232
 msgid "Edit Residential Street"
 msgstr "Editar Rua Residencial"
@@ -14283,14 +14615,14 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:611
-#: build/trans_presets.java:632 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "Surface"
 msgstr "Superfície"
@@ -14311,53 +14643,53 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paved"
 msgstr "pavimentada"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "unpaved"
 msgstr "não pavimentada"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "concrete"
 msgstr "concreto"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
 msgid "metal"
 msgstr ""
@@ -14371,22 +14703,22 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
-#: build/trans_style.java:3367
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
+#: build/trans_style.java:3375
 msgid "wood"
 msgstr "madeira"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paving_stones"
 msgstr ""
@@ -14394,77 +14726,77 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "cobblestone"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "gravel"
 msgstr "pedras"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "grass"
 msgstr "grama"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "sand"
 msgstr "areia"
@@ -14472,13 +14804,13 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "ground"
 msgstr "terra"
@@ -14486,5 +14818,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:246
+#: build/trans_presets.java:247
 msgid "Living Street"
 msgstr ""
@@ -14493,5 +14825,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:249
+#: build/trans_presets.java:250
 msgid "Edit Living Street"
 msgstr ""
@@ -14499,5 +14831,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:264
+#: build/trans_presets.java:265
 msgid "Service"
 msgstr "Serviço"
@@ -14506,5 +14838,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:267
+#: build/trans_presets.java:268
 msgid "Edit Serviceway"
 msgstr "Editar Rua de Serviço"
@@ -14514,18 +14846,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "Serviceway type"
 msgstr "Tipo de Rua de Serviço"
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "parking_aisle"
 msgstr ""
@@ -14533,5 +14865,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:284
+#: build/trans_presets.java:285
 msgid "Parking Aisle"
 msgstr ""
@@ -14541,5 +14873,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:288
+#: build/trans_presets.java:289
 msgid "Edit Parking Aisle"
 msgstr ""
@@ -14547,5 +14879,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:298
+#: build/trans_presets.java:299
 msgid "Road (Unknown Type)"
 msgstr ""
@@ -14554,5 +14886,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Edit Road of unknown type"
 msgstr ""
@@ -14561,20 +14893,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:318
+#: build/trans_presets.java:319
 msgid "Road Restrictions"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:319
+#: build/trans_presets.java:320
 msgid "Edit Road Restrictions"
 msgstr ""
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:321
+#: build/trans_presets.java:322
 msgid "Toll"
 msgstr "Pedágio"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:322
+#: build/trans_presets.java:323
 msgid "No exit (cul-de-sac)"
 msgstr "Sem saída"
@@ -14587,8 +14919,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:323 build/trans_presets.java:529
-#: build/trans_presets.java:550 build/trans_presets.java:571
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:634
+#: build/trans_presets.java:324 build/trans_presets.java:530
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:593 build/trans_presets.java:614
+#: build/trans_presets.java:635
 msgid "Access"
 msgstr "Acesso"
@@ -14642,29 +14974,29 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1397
-#: build/trans_presets.java:1398 build/trans_presets.java:1399
-#: build/trans_presets.java:1763 build/trans_presets.java:1773
-#: build/trans_presets.java:2397 build/trans_presets.java:2433
-#: build/trans_presets.java:2442 build/trans_presets.java:2443
-#: build/trans_presets.java:2444 build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:1396
+#: build/trans_presets.java:1397 build/trans_presets.java:1400
+#: build/trans_presets.java:1401 build/trans_presets.java:1402
+#: build/trans_presets.java:1767 build/trans_presets.java:1777
+#: build/trans_presets.java:2408 build/trans_presets.java:2444
+#: build/trans_presets.java:2453 build/trans_presets.java:2454
+#: build/trans_presets.java:2455 build/trans_presets.java:2725
 msgid "yes"
 msgstr "sim"
@@ -14677,40 +15009,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:212
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:212
 msgid "private"
 msgstr "privado"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655
 msgid "designated"
 msgstr ""
@@ -14723,19 +15055,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:219
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:219
 msgid "destination"
 msgstr ""
@@ -14758,71 +15090,71 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:205
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:205
 msgid "permissive"
 msgstr "permitido"
 
-#: build/trans_presets.java:323 build/trans_presets.java:327
-#: build/trans_presets.java:330 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636
+#: build/trans_presets.java:324 build/trans_presets.java:328
+#: build/trans_presets.java:331 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637
 msgid "agricultural"
 msgstr ""
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
-#: build/trans_presets.java:2433 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1396 build/trans_presets.java:1397
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
+#: build/trans_presets.java:2444 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
+#: build/trans_presets.java:2725
 msgid "no"
 msgstr "não"
 
-#: build/trans_presets.java:326
+#: build/trans_presets.java:327
 msgid "Goods"
 msgstr "Carga"
 
-#: build/trans_presets.java:327
+#: build/trans_presets.java:328
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Veículos de Carga Pesados"
@@ -14837,10 +15169,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:328 build/trans_presets.java:651
-#: build/trans_presets.java:858 build/trans_presets.java:891
-#: build/trans_presets.java:913 build/trans_presets.java:950
-#: build/trans_presets.java:963 build/trans_presets.java:975
-#: build/trans_presets.java:987 build/trans_presets.java:999
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:329 build/trans_presets.java:652
+#: build/trans_presets.java:859 build/trans_presets.java:892
+#: build/trans_presets.java:914 build/trans_presets.java:951
+#: build/trans_presets.java:964 build/trans_presets.java:976
+#: build/trans_presets.java:988 build/trans_presets.java:1000
+#: build/trans_presets.java:1040
 msgid "Horse"
 msgstr "Cavalo"
@@ -14856,13 +15188,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:329 build/trans_presets.java:530
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:635 build/trans_presets.java:859
-#: build/trans_presets.java:877 build/trans_presets.java:892
-#: build/trans_presets.java:914 build/trans_presets.java:951
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:330 build/trans_presets.java:531
+#: build/trans_presets.java:552 build/trans_presets.java:573
+#: build/trans_presets.java:594 build/trans_presets.java:615
+#: build/trans_presets.java:636 build/trans_presets.java:860
+#: build/trans_presets.java:878 build/trans_presets.java:893
+#: build/trans_presets.java:915 build/trans_presets.java:952
+#: build/trans_presets.java:965 build/trans_presets.java:977
+#: build/trans_presets.java:989 build/trans_presets.java:1001
+#: build/trans_presets.java:1041
 msgid "Motorcycle"
 msgstr "Motocicleta"
@@ -14877,30 +15209,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:330 build/trans_presets.java:531
-#: build/trans_presets.java:552 build/trans_presets.java:573
-#: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:636 build/trans_presets.java:654
-#: build/trans_presets.java:878 build/trans_presets.java:893
-#: build/trans_presets.java:915 build/trans_presets.java:952
-#: build/trans_presets.java:965 build/trans_presets.java:977
-#: build/trans_presets.java:989 build/trans_presets.java:1001
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:331 build/trans_presets.java:532
+#: build/trans_presets.java:553 build/trans_presets.java:574
+#: build/trans_presets.java:595 build/trans_presets.java:616
+#: build/trans_presets.java:637 build/trans_presets.java:655
+#: build/trans_presets.java:879 build/trans_presets.java:894
+#: build/trans_presets.java:916 build/trans_presets.java:953
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1042
 msgid "Motorcar"
 msgstr "Automóvel"
 
-#: build/trans_presets.java:331
+#: build/trans_presets.java:332
 msgid "Public Service Vehicles (psv)"
 msgstr "Veículos de Serviço Público"
 
-#: build/trans_presets.java:332
+#: build/trans_presets.java:333
 msgid "Motorboat"
 msgstr "Barco motorizado"
 
-#: build/trans_presets.java:333
+#: build/trans_presets.java:334
 msgid "Boat"
 msgstr "Barco"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:336
 msgid "Min. speed (km/h)"
 msgstr "Velocidade mínima (km/h)"
@@ -14908,25 +15240,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:336 build/trans_presets.java:374
+#: build/trans_presets.java:337 build/trans_presets.java:375
 msgid "Max. weight (tonnes)"
 msgstr "Peso máximo (toneladas)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:337
+#: build/trans_presets.java:338
 msgid "Max. Height (meters)"
 msgstr "Altura máxima (metros)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Max. Width (meters)"
 msgstr "Largura máx. (metros)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:339
+#: build/trans_presets.java:340
 msgid "Max. Length (meters)"
 msgstr "Comprimento Máx. (metros)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:341
+#: build/trans_presets.java:342
 msgid "Roundabout"
 msgstr "Rotatória"
@@ -14937,5 +15269,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:346
+#: build/trans_presets.java:347
 msgid "Edit Junction"
 msgstr "Editar Junção"
@@ -14957,9 +15289,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:349 build/trans_presets.java:648
-#: build/trans_presets.java:788 build/trans_presets.java:1135
-#: build/trans_presets.java:1392 build/trans_presets.java:2353
-#: build/trans_presets.java:2901 build/trans_presets.java:2911
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:350 build/trans_presets.java:649
+#: build/trans_presets.java:789 build/trans_presets.java:1137
+#: build/trans_presets.java:1395 build/trans_presets.java:2364
+#: build/trans_presets.java:2913 build/trans_presets.java:2923
+#: build/trans_presets.java:2932
 msgid "Type"
 msgstr "Tipo"
@@ -14979,10 +15311,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:547
+#: build/trans_presets.java:350 build/trans_style.java:547
 #: build/trans_style.java:555
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "motorway_link"
 msgstr ""
@@ -15004,10 +15336,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:563
+#: build/trans_presets.java:350 build/trans_style.java:563
 #: build/trans_style.java:571
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "trunk_link"
 msgstr ""
@@ -15029,10 +15361,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:579
+#: build/trans_presets.java:350 build/trans_style.java:579
 #: build/trans_style.java:587
 msgid "primary"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "primary_link"
 msgstr ""
@@ -15054,5 +15386,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:595
+#: build/trans_presets.java:350 build/trans_style.java:595
 #: build/trans_style.java:603
 msgid "secondary"
@@ -15067,9 +15399,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:349 build/trans_style.java:611
+#: build/trans_presets.java:350 build/trans_style.java:611
 msgid "tertiary"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "unclassified"
 msgstr ""
@@ -15083,9 +15415,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:349 build/trans_style.java:3143
+#: build/trans_presets.java:350 build/trans_style.java:3151
 msgid "residential"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "living_street"
 msgstr ""
@@ -15115,10 +15447,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:349 build/trans_style.java:667
-#: build/trans_style.java:4244
+#: build/trans_presets.java:350 build/trans_style.java:667
+#: build/trans_style.java:4252
 msgid "service"
 msgstr "serviço"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "bus_guideway"
 msgstr ""
@@ -15148,6 +15480,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:349 build/trans_style.java:877
-#: build/trans_style.java:3208 build/trans_style.java:3209
+#: build/trans_presets.java:350 build/trans_style.java:877
+#: build/trans_style.java:3216 build/trans_style.java:3217
 msgid "construction"
 msgstr "construção"
@@ -15158,10 +15490,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Edit Bridge"
 msgstr "Editar Ponte"
 
 #. item
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "Edit Tunnel"
 msgstr "Editar Túnel"
@@ -15169,19 +15501,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:393
+#: build/trans_presets.java:394
 msgid "Ways"
 msgstr "Vias"
 
 #. group "Ways"
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Construction"
 msgstr "Construção"
 
 #. item
-#: build/trans_presets.java:395
+#: build/trans_presets.java:396
 msgid "Edit Highway Under Construction"
 msgstr "Editar Rodovia em Construção"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "Junction"
 msgstr "Junção"
@@ -15197,5 +15529,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:411 build/trans_style.java:895
+#: build/trans_presets.java:412 build/trans_style.java:895
 msgid "roundabout"
 msgstr "rotatória"
@@ -15204,5 +15536,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:417
+#: build/trans_presets.java:418
 msgid "Bridleway"
 msgstr ""
@@ -15210,5 +15542,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:419
+#: build/trans_presets.java:420
 msgid "Edit Bridleway"
 msgstr ""
@@ -15216,5 +15548,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:435
+#: build/trans_presets.java:436
 msgid "Cycleway"
 msgstr "Ciclovia"
@@ -15224,10 +15556,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:439
+#: build/trans_presets.java:440
 msgid "Edit Cycleway"
 msgstr "Editar Ciclovia"
 
 #. item "Ways/Cycleway" check "Embankment"
-#: build/trans_presets.java:449
+#: build/trans_presets.java:450
 msgid "Pedestrians"
 msgstr ""
@@ -15235,5 +15567,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Footway"
 msgstr "Calçada"
@@ -15242,10 +15574,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Footway"
 msgstr "Editar Calçada"
 
 #. item "Ways/Footway" check "Embankment"
-#: build/trans_presets.java:469
+#: build/trans_presets.java:470
 msgid "Bikes"
 msgstr ""
@@ -15253,5 +15585,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:476
+#: build/trans_presets.java:477
 msgid "Pedestrian"
 msgstr ""
@@ -15260,5 +15592,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Edit Pedestrian Street"
 msgstr "Editar Calçadão"
@@ -15266,5 +15598,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:494
+#: build/trans_presets.java:495
 msgid "Steps"
 msgstr "Escada"
@@ -15274,5 +15606,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:498
+#: build/trans_presets.java:499
 msgid "Edit Flight of Steps"
 msgstr "Editar Escadaria"
@@ -15281,5 +15613,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:515
+#: build/trans_presets.java:516
 msgid "Track"
 msgstr "Trilha"
@@ -15288,5 +15620,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:518
+#: build/trans_presets.java:519
 msgid "Edit Track"
 msgstr "Editar Trilha"
@@ -15294,5 +15626,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:535
+#: build/trans_presets.java:536
 msgid "Track Grade 1"
 msgstr ""
@@ -15301,5 +15633,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:538
+#: build/trans_presets.java:539
 msgid "Edit Track of grade 1"
 msgstr ""
@@ -15307,5 +15639,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:556
+#: build/trans_presets.java:557
 msgid "Track Grade 2"
 msgstr ""
@@ -15314,5 +15646,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:559
+#: build/trans_presets.java:560
 msgid "Edit Track of grade 2"
 msgstr ""
@@ -15320,5 +15652,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:577
+#: build/trans_presets.java:578
 msgid "Track Grade 3"
 msgstr ""
@@ -15327,5 +15659,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:580
+#: build/trans_presets.java:581
 msgid "Edit Track of grade 3"
 msgstr ""
@@ -15333,5 +15665,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:598
+#: build/trans_presets.java:599
 msgid "Track Grade 4"
 msgstr ""
@@ -15340,5 +15672,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:601
+#: build/trans_presets.java:602
 msgid "Edit Track of grade 4"
 msgstr ""
@@ -15346,5 +15678,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:619
+#: build/trans_presets.java:620
 msgid "Track Grade 5"
 msgstr ""
@@ -15353,5 +15685,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:622
+#: build/trans_presets.java:623
 msgid "Edit Track of grade 5"
 msgstr ""
@@ -15360,5 +15692,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:641
+#: build/trans_presets.java:642
 msgid "Path"
 msgstr "Caminho"
@@ -15367,13 +15699,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:644
+#: build/trans_presets.java:645
 msgid "Edit Path"
 msgstr "Edicar Caminho"
 
-#: build/trans_presets.java:652
+#: build/trans_presets.java:653
 msgid "Ski"
 msgstr "Ski"
 
-#: build/trans_presets.java:653
+#: build/trans_presets.java:654
 msgid "Snowmobile"
 msgstr ""
@@ -15383,6 +15715,6 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:670 build/trans_presets.java:1725
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:671 build/trans_presets.java:1729
+#: build/trans_presets.java:1752
 msgid "Hiking"
 msgstr ""
@@ -15392,5 +15724,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:674
+#: build/trans_presets.java:675
 msgid "Edit Hiking"
 msgstr ""
@@ -15398,5 +15730,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:683
+#: build/trans_presets.java:684
 msgid "Mountain Hiking"
 msgstr ""
@@ -15406,5 +15738,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:687
+#: build/trans_presets.java:688
 msgid "Edit Mountain Hiking"
 msgstr ""
@@ -15412,5 +15744,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:696
+#: build/trans_presets.java:697
 msgid "Demanding Mountain Hiking"
 msgstr ""
@@ -15420,5 +15752,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:700
+#: build/trans_presets.java:701
 msgid "Edit Demanding Mountain Hiking"
 msgstr ""
@@ -15426,5 +15758,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:709
+#: build/trans_presets.java:710
 msgid "Alpine Hiking"
 msgstr ""
@@ -15434,5 +15766,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:713
+#: build/trans_presets.java:714
 msgid "Edit Alpine Hiking"
 msgstr ""
@@ -15440,5 +15772,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:723
 msgid "Demanding Alpine Hiking"
 msgstr ""
@@ -15448,5 +15780,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:726
+#: build/trans_presets.java:727
 msgid "Edit Demanding Alpine Hiking"
 msgstr ""
@@ -15454,5 +15786,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:735
+#: build/trans_presets.java:736
 msgid "Difficult Alpine Hiking"
 msgstr ""
@@ -15462,5 +15794,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:739
+#: build/trans_presets.java:740
 msgid "Edit Difficult Alpine Hiking"
 msgstr ""
@@ -15468,10 +15800,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:749
+#: build/trans_presets.java:750
 msgid "Waypoints"
 msgstr ""
 
 #. group "Waypoints"
-#: build/trans_presets.java:750
+#: build/trans_presets.java:751
 msgid "Motorway Junction"
 msgstr ""
@@ -15479,15 +15811,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:752
+#: build/trans_presets.java:753
 msgid "Edit Motorway Junction"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:757
 msgid "Number"
 msgstr "Número"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:759
 msgid "Services"
 msgstr "Serviços"
@@ -15495,5 +15827,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:761
 msgid "Edit Service Station"
 msgstr ""
@@ -15531,15 +15863,15 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:765 build/trans_presets.java:902
-#: build/trans_presets.java:1382 build/trans_presets.java:1406
-#: build/trans_presets.java:1413 build/trans_presets.java:1419
-#: build/trans_presets.java:1427 build/trans_presets.java:1434
-#: build/trans_presets.java:1761 build/trans_presets.java:1771
-#: build/trans_presets.java:2361 build/trans_presets.java:2368
-#: build/trans_presets.java:2384 build/trans_presets.java:2395
-#: build/trans_presets.java:2403 build/trans_presets.java:2410
-#: build/trans_presets.java:2464 build/trans_presets.java:2512
-#: build/trans_presets.java:2678 build/trans_presets.java:2693
-#: build/trans_presets.java:2732 build/trans_presets.java:3151
+#: build/trans_presets.java:766 build/trans_presets.java:903
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
+#: build/trans_presets.java:1416 build/trans_presets.java:1422
+#: build/trans_presets.java:1430 build/trans_presets.java:1437
+#: build/trans_presets.java:1765 build/trans_presets.java:1775
+#: build/trans_presets.java:2372 build/trans_presets.java:2379
+#: build/trans_presets.java:2395 build/trans_presets.java:2406
+#: build/trans_presets.java:2414 build/trans_presets.java:2421
+#: build/trans_presets.java:2475 build/trans_presets.java:2523
+#: build/trans_presets.java:2689 build/trans_presets.java:2704
+#: build/trans_presets.java:2743 build/trans_presets.java:3163
 msgid "Operator"
 msgstr "Operador"
@@ -15548,5 +15880,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:769
+#: build/trans_presets.java:770
 msgid "Traffic Signal"
 msgstr "Sinal de Trânsito"
@@ -15556,5 +15888,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:774
 msgid "Pedestrian crossing type"
 msgstr "Tipo de cruzamento de pedestres"
@@ -15563,27 +15895,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "uncontrolled"
 msgstr "faixa de pedestre (sem sinal)"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "traffic_signals"
 msgstr "sinal de trânsito"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "island"
 msgstr "ilha"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "unmarked"
 msgstr "sem faixa"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:774 build/trans_presets.java:790
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:775 build/trans_presets.java:791
+#: build/trans_presets.java:1334
 msgid "Cross on horseback"
 msgstr "Travessia à cavalo"
@@ -15591,6 +15923,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:775 build/trans_presets.java:789
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:776 build/trans_presets.java:790
+#: build/trans_presets.java:1335
 msgid "Cross by bicycle"
 msgstr "Travessia de bicicleta"
@@ -15599,11 +15931,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:776 build/trans_presets.java:791
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:1336
 msgid "Crossing attendant"
 msgstr "Guarda de trânsito"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:778
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -15611,30 +15943,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:780
+#: build/trans_presets.java:781
 msgid "Stop"
 msgstr "Pare"
@@ -15642,5 +15974,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:783
+#: build/trans_presets.java:784
 msgid "Pedestrian Crossing"
 msgstr "Faixa de Pedestres"
@@ -15649,14 +15981,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:786
+#: build/trans_presets.java:787
 msgid "Edit Crossing"
 msgstr "Editar Faixa de Pedestres"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:793
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:795
 msgid "Mini-roundabout"
 msgstr "Mini-rotatória"
@@ -15667,14 +15999,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "Direction"
 msgstr "Direção"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "clockwise"
 msgstr "sentido horário"
 
-#: build/trans_presets.java:801
+#: build/trans_presets.java:802
 msgid "Turning Circle"
 msgstr ""
@@ -15684,20 +16016,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:806
+#: build/trans_presets.java:807
 msgid "City Limit"
 msgstr "Limite da Cidade"
 
 #. item
-#: build/trans_presets.java:807
+#: build/trans_presets.java:808
 msgid "Edit City Limit Sign"
 msgstr "Editar Placa de Limite da Cidade"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:812
+#: build/trans_presets.java:813
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:814
+#: build/trans_presets.java:815
 msgid "Speed Camera"
 msgstr "Radar de Velocidade"
@@ -15705,5 +16037,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:817
+#: build/trans_presets.java:818
 msgid "Emergency Phone"
 msgstr "Telefone de Emergência"
@@ -15711,5 +16043,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:820
+#: build/trans_presets.java:821
 msgid "Incline"
 msgstr "Aclive"
@@ -15717,5 +16049,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:823
+#: build/trans_presets.java:824
 msgid "Incline Steep"
 msgstr ""
@@ -15724,10 +16056,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:827
+#: build/trans_presets.java:828
 msgid "Ford"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:828
+#: build/trans_presets.java:829
 msgid "Edit Ford"
 msgstr ""
@@ -15735,5 +16067,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:835
+#: build/trans_presets.java:836
 msgid "Mountain Pass"
 msgstr ""
@@ -15741,5 +16073,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:837
+#: build/trans_presets.java:838
 msgid "Edit Mountain Pass"
 msgstr ""
@@ -15751,7 +16083,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:842 build/trans_presets.java:1600
-#: build/trans_presets.java:1745 build/trans_presets.java:2845
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:843 build/trans_presets.java:1604
+#: build/trans_presets.java:1749 build/trans_presets.java:2857
+#: build/trans_presets.java:2864 build/trans_presets.java:2871
 msgid "Elevation"
 msgstr "Altitude"
@@ -15759,5 +16091,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:846
+#: build/trans_presets.java:847
 msgid "Barriers"
 msgstr "Barreiras"
@@ -15765,5 +16097,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:849
+#: build/trans_presets.java:850
 msgid "Bollard"
 msgstr ""
@@ -15771,5 +16103,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:852
 msgid "Edit Bollard"
 msgstr ""
@@ -15814,16 +16146,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:854 build/trans_presets.java:873
-#: build/trans_presets.java:887 build/trans_presets.java:909
-#: build/trans_presets.java:946 build/trans_presets.java:959
-#: build/trans_presets.java:971 build/trans_presets.java:983
-#: build/trans_presets.java:995 build/trans_presets.java:1007
-#: build/trans_presets.java:1017 build/trans_presets.java:1026
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:855 build/trans_presets.java:874
+#: build/trans_presets.java:888 build/trans_presets.java:910
+#: build/trans_presets.java:947 build/trans_presets.java:960
+#: build/trans_presets.java:972 build/trans_presets.java:984
+#: build/trans_presets.java:996 build/trans_presets.java:1008
+#: build/trans_presets.java:1018 build/trans_presets.java:1027
+#: build/trans_presets.java:1036
 msgid "Allowed traffic:"
 msgstr ""
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:861
+#: build/trans_presets.java:862
 msgid "Cycle Barrier"
 msgstr ""
@@ -15832,5 +16164,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:865
+#: build/trans_presets.java:866
 msgid "Block"
 msgstr ""
@@ -15838,5 +16170,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:868
+#: build/trans_presets.java:869
 msgid "Cattle Grid"
 msgstr ""
@@ -15844,10 +16176,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:870
+#: build/trans_presets.java:871
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:880
+#: build/trans_presets.java:881
 msgid "Bus Trap"
 msgstr ""
@@ -15855,15 +16187,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:883
+#: build/trans_presets.java:884
 msgid "Spikes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:884
+#: build/trans_presets.java:885
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:896
 msgid "Toll Booth"
 msgstr ""
@@ -15871,5 +16203,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:897
+#: build/trans_presets.java:898
 msgid "Edit Toll Booth"
 msgstr ""
@@ -15877,10 +16209,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:905
+#: build/trans_presets.java:906
 msgid "Border Control"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:906
+#: build/trans_presets.java:907
 msgid "Edit Border Control"
 msgstr ""
@@ -15890,5 +16222,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:920
+#: build/trans_presets.java:921
 msgid "Hedge"
 msgstr ""
@@ -15897,5 +16229,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:925
 msgid "Fence"
 msgstr ""
@@ -15904,5 +16236,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:929
 msgid "Wall"
 msgstr ""
@@ -15910,5 +16242,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:931
+#: build/trans_presets.java:932
 msgid "City Wall"
 msgstr ""
@@ -15917,5 +16249,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:935
+#: build/trans_presets.java:936
 msgid "Retaining Wall"
 msgstr ""
@@ -15927,15 +16259,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:942
+#: build/trans_presets.java:943
 msgid "Entrance"
 msgstr "Entrada"
 
 #. item
-#: build/trans_presets.java:943
+#: build/trans_presets.java:944
 msgid "Edit Entrance"
 msgstr "Editar Entrada"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:954
+#: build/trans_presets.java:955
 msgid "Gate"
 msgstr ""
@@ -15943,50 +16275,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:956
+#: build/trans_presets.java:957
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:967
+#: build/trans_presets.java:968
 msgid "Lift Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:968
+#: build/trans_presets.java:969
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:979
+#: build/trans_presets.java:980
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:980
+#: build/trans_presets.java:981
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:991
+#: build/trans_presets.java:992
 msgid "Bump Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:992
+#: build/trans_presets.java:993
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:1003
+#: build/trans_presets.java:1004
 msgid "Kissing Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1004
+#: build/trans_presets.java:1005
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1013
 msgid "Stile"
 msgstr ""
@@ -15994,25 +16326,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1014
+#: build/trans_presets.java:1015
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1023
 msgid "Turnstile"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1024
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1032
 msgid "Sally Port"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1033
 msgid "Edit Sally Port"
 msgstr ""
@@ -16020,13 +16352,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #.
-#. <separator/>
+#. group "Water"
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1046 build/trans_presets.java:1089
+#: build/trans_presets.java:1047 build/trans_presets.java:1048
+#: build/trans_presets.java:1091
 msgid "Water"
 msgstr ""
 
 #. group "Water"
-#: build/trans_presets.java:1047
+#: build/trans_presets.java:1049
 msgid "Spring"
 msgstr ""
@@ -16034,5 +16367,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1049
+#: build/trans_presets.java:1051
 msgid "Edit Spring"
 msgstr ""
@@ -16040,5 +16373,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1056
 msgid "Drain"
 msgstr ""
@@ -16046,10 +16379,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1058
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1064
 msgid "Stream"
 msgstr ""
@@ -16057,10 +16390,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1066
 msgid "Edit Stream"
 msgstr ""
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1072
 msgid "Canal"
 msgstr ""
@@ -16068,10 +16401,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1074
 msgid "Edit Canal"
 msgstr ""
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1080
 msgid "River"
 msgstr ""
@@ -16081,5 +16414,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1084
 msgid "Edit River"
 msgstr ""
@@ -16087,15 +16420,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1093
 msgid "Edit Water"
 msgstr ""
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1097
 msgid "Land"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1098
 msgid "Edit Land"
 msgstr ""
@@ -16103,15 +16436,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1103
 msgid "Basin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1104
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1109
 msgid "Reservoir"
 msgstr ""
@@ -16119,15 +16452,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1109
+#: build/trans_presets.java:1111
 msgid "Edit Reservoir Landuse"
 msgstr ""
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1116
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1117
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -16135,5 +16468,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1120
+#: build/trans_presets.java:1122
 msgid "Riverbank"
 msgstr ""
@@ -16142,10 +16475,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1125
 msgid "Edit Riverbank"
 msgstr ""
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1127
+#: build/trans_presets.java:1129
 msgid "Wetland"
 msgstr ""
@@ -16156,14 +16489,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1134
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "swamp"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "bog"
 msgstr ""
@@ -16177,35 +16510,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1135 build/trans_style.java:3384
+#: build/trans_presets.java:1137 build/trans_style.java:3392
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1139
 msgid "Mud"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1140
 msgid "Edit Mud"
 msgstr ""
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1144
 msgid "Beach"
 msgstr ""
@@ -16213,20 +16546,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1144
+#: build/trans_presets.java:1146
 msgid "Edit Beach"
 msgstr ""
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1150
 msgid "Bay"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1149
+#: build/trans_presets.java:1151
 msgid "Edit Bay"
 msgstr ""
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1155
 msgid "Cliff"
 msgstr ""
@@ -16234,10 +16567,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1157
 msgid "Edit Cliff"
 msgstr ""
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1159
+#: build/trans_presets.java:1161
 msgid "Coastline"
 msgstr ""
@@ -16245,5 +16578,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1163
 msgid "Edit Coastline"
 msgstr ""
@@ -16251,5 +16584,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1168
 msgid "Ferry Route"
 msgstr ""
@@ -16257,5 +16590,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1170
 msgid "Edit Ferry"
 msgstr ""
@@ -16264,5 +16597,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1176
+#: build/trans_presets.java:1178
 msgid "Boatyard"
 msgstr ""
@@ -16270,10 +16603,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:1180
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1185
 msgid "Dock"
 msgstr ""
@@ -16281,5 +16614,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1187
 msgid "Edit Dock"
 msgstr ""
@@ -16287,5 +16620,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1193
 msgid "Dam"
 msgstr ""
@@ -16293,15 +16626,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1195
 msgid "Edit Dam"
 msgstr ""
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1199
+#: build/trans_presets.java:1201
 msgid "Waterway Point"
 msgstr ""
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1202
 msgid "Lock Gate"
 msgstr ""
@@ -16310,5 +16643,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1206
 msgid "Weir"
 msgstr ""
@@ -16316,20 +16649,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1208
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1213
 msgid "Waterfall"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1214
 msgid "Edit Waterfall"
 msgstr ""
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1219
 msgid "Turning Point"
 msgstr ""
@@ -16338,15 +16671,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1221
+#: build/trans_presets.java:1223
 msgid "Marina"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1224
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1228
 msgid "Pier"
 msgstr ""
@@ -16354,10 +16687,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1230
 msgid "Edit Pier"
 msgstr ""
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1234
 msgid "Ferry Terminal"
 msgstr ""
@@ -16365,10 +16698,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1236
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1240
 msgid "Slipway"
 msgstr ""
@@ -16378,16 +16711,21 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1244
 msgid "Edit Slipway"
 msgstr ""
 
 #. item "Waterway Point/Slipway" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1250
+#, fuzzy
+msgid "Transport"
+msgstr "Transporte Público"
+
+#. group "Transport"
+#: build/trans_presets.java:1251
 msgid "Railway"
 msgstr ""
 
 #. group "Railway"
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1252
 msgid "Rail"
 msgstr ""
@@ -16395,5 +16733,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:1254
 msgid "Edit Rail"
 msgstr ""
@@ -16423,8 +16761,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "Optional Types"
 msgstr ""
@@ -16438,35 +16776,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1259
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1257
+#: build/trans_presets.java:1260
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1265
 msgid "Monorail"
 msgstr ""
@@ -16474,45 +16812,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1267
 msgid "Edit Monorail"
 msgstr ""
 
-#: build/trans_presets.java:1269
+#: build/trans_presets.java:1272
 msgid "Preserved"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1273
 msgid "Edit Preserved Railway"
 msgstr ""
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1278
 msgid "Light Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1279
 msgid "Edit Light Rail"
 msgstr ""
 
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1284
 msgid "Subway"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1285
 msgid "Edit Subway"
 msgstr ""
 
-#: build/trans_presets.java:1287
+#: build/trans_presets.java:1290
 msgid "Tram"
 msgstr "Bonde/VLT"
 
 #. item
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1291
 msgid "Edit Tram"
 msgstr "Editar Bonde/VLT"
 
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1296
 msgid "Bus Guideway"
 msgstr ""
@@ -16520,5 +16858,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1295
+#: build/trans_presets.java:1298
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -16527,14 +16865,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1315
 msgid "Disused Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1313
+#: build/trans_presets.java:1316
 msgid "Edit Disused Railway"
 msgstr ""
 
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1321
 msgid "Abandoned Rail"
 msgstr ""
@@ -16543,5 +16881,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1325
 msgid "Level Crossing"
 msgstr ""
@@ -16550,5 +16888,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1329
 msgid "Crossing"
 msgstr ""
@@ -16558,5 +16896,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1333
 msgid "Crossing type"
 msgstr ""
@@ -16564,5 +16902,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1339
 msgid "Turntable"
 msgstr ""
@@ -16571,10 +16909,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1344
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1345
 msgid "Chair Lift"
 msgstr ""
@@ -16582,10 +16920,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1347
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1351
 msgid "Drag Lift"
 msgstr ""
@@ -16593,10 +16931,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1353
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1357
 msgid "Cable Car"
 msgstr ""
@@ -16604,10 +16942,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1359
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1360
+#: build/trans_presets.java:1363
 msgid "Gondola"
 msgstr ""
@@ -16615,5 +16953,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1365
 msgid "Edit Gondola"
 msgstr ""
@@ -16621,5 +16959,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1366 build/trans_presets.java:1461
+#: build/trans_presets.java:1369 build/trans_presets.java:1464
 msgid "Station"
 msgstr "Estação"
@@ -16630,10 +16968,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1368 build/trans_presets.java:1464
+#: build/trans_presets.java:1371 build/trans_presets.java:1467
 msgid "Edit Station"
 msgstr "Editar Estação"
 
 #. group "Car"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1378
 msgid "Fuel"
 msgstr "Posto de Gasolina"
@@ -16643,5 +16981,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1382
 msgid "Edit Fuel"
 msgstr "Editar Posto de Gasolina"
@@ -16699,32 +17037,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1671 build/trans_presets.java:1678
-#: build/trans_presets.java:1686 build/trans_presets.java:1699
-#: build/trans_presets.java:1713 build/trans_presets.java:1810
-#: build/trans_presets.java:1818 build/trans_presets.java:1909
-#: build/trans_presets.java:1915 build/trans_presets.java:2226
-#: build/trans_presets.java:2250 build/trans_presets.java:2465
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1703
+#: build/trans_presets.java:1717 build/trans_presets.java:1814
+#: build/trans_presets.java:1822 build/trans_presets.java:1919
+#: build/trans_presets.java:1925 build/trans_presets.java:2237
+#: build/trans_presets.java:2261 build/trans_presets.java:2476
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Opening Hours"
 msgstr "Horário de Funcionamento"
@@ -16783,91 +17121,91 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -16882,5 +17220,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1385 build/trans_presets.java:1438
+#: build/trans_presets.java:1388 build/trans_presets.java:1441
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -16890,5 +17228,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1391
 msgid "Edit Parking"
 msgstr "Editar Estacionamento"
@@ -16899,24 +17237,24 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1391 build/trans_presets.java:1762
-#: build/trans_presets.java:1772 build/trans_presets.java:2396
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:1394 build/trans_presets.java:1766
+#: build/trans_presets.java:1776 build/trans_presets.java:2407
+#: build/trans_presets.java:2524
 msgid "Reference number"
 msgstr "Número de Referência"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "surface"
 msgstr ""
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1396
 msgid "Park and Ride"
 msgstr ""
@@ -16925,38 +17263,38 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1394 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
+#: build/trans_presets.java:1397 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
 msgid "Fee"
 msgstr "Taxa"
 
 #. <space />
-#: build/trans_presets.java:1396
+#: build/trans_presets.java:1399
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1400
 msgid "Spaces for Disabled"
 msgstr ""
 
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1401
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1402
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1403
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1405
 msgid "Wash"
 msgstr "Lava Jato"
 
 #. item
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1406
 msgid "Edit Car Wash"
 msgstr "Editar Lava Jato"
@@ -16964,5 +17302,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1408 build/trans_presets.java:1452
+#: build/trans_presets.java:1411 build/trans_presets.java:1455
 msgid "Shop"
 msgstr "Loja"
@@ -16970,15 +17308,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1413
 msgid "Edit Car Shop"
 msgstr "Editar Loja de Carros"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1418
 msgid "Repair"
 msgstr "Oficina"
 
 #. item
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1419
 msgid "Edit Car Repair"
 msgstr "Editar Oficina"
@@ -16986,5 +17324,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1421 build/trans_presets.java:1445
+#: build/trans_presets.java:1424 build/trans_presets.java:1448
 msgid "Rental"
 msgstr "Aluguel"
@@ -16993,10 +17331,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1427
 msgid "Edit Car Rental"
 msgstr "Editar Aluguel de Carros"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1432
 msgid "Sharing"
 msgstr "Compartilhamento"
@@ -17004,5 +17342,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1434
 msgid "Edit Car Sharing"
 msgstr "Editar Compartilhamento de Carro"
@@ -17010,10 +17348,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Parking"
 msgstr "Editar Bicicletário"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1446
 msgid "Capacity"
 msgstr ""
@@ -17022,5 +17360,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1448
+#: build/trans_presets.java:1451
 msgid "Edit Bicycle Rental"
 msgstr "Editar Aluguel de Bicicletas"
@@ -17029,15 +17367,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1458
 msgid "Edit Bicycle Shop"
 msgstr "Editar Loja de Bicicletas"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1463
 msgid "Public Transport"
 msgstr "Transporte Público"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:1472
 msgid "UIC-Reference"
 msgstr ""
@@ -17045,5 +17383,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1475
 msgid "Railway Halt"
 msgstr ""
@@ -17051,5 +17389,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1477
 msgid "Edit Halt"
 msgstr ""
@@ -17057,5 +17395,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1484
 msgid "Tram Stop"
 msgstr "Parada do Bonde/VLT"
@@ -17064,5 +17402,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1484
+#: build/trans_presets.java:1487
 msgid "Edit Tram Stop"
 msgstr "Editar Parada do Bonde/VLT"
@@ -17070,5 +17408,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1494
 msgid "Railway Platform"
 msgstr "Plataforma de Trens"
@@ -17077,5 +17415,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1497
 msgid "Edit Railway Platform"
 msgstr "Editar Plataforma de Trens"
@@ -17087,5 +17425,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1497 build/trans_presets.java:1539
+#: build/trans_presets.java:1500 build/trans_presets.java:1542
 msgid "Reference (track number)"
 msgstr ""
@@ -17093,10 +17431,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1499 build/trans_presets.java:1541
+#: build/trans_presets.java:1502 build/trans_presets.java:1544
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1504
 msgid "Subway Entrance"
 msgstr "Entrada do Metrô"
@@ -17105,10 +17443,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1507
 msgid "Edit Subway Entrance"
 msgstr "Editar Entrada do Metrô"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1512
 msgid "Wheelchair"
 msgstr ""
@@ -17117,5 +17455,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1517
 msgid "Bus Station"
 msgstr "Terminal de Ônibus"
@@ -17124,5 +17462,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1520
 msgid "Edit Bus Station"
 msgstr "Editar Terminal de Ônibus"
@@ -17130,5 +17468,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1526
 msgid "Bus Stop"
 msgstr "Ponto de Ônibus"
@@ -17138,5 +17476,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1530
 msgid "Edit Bus Stop"
 msgstr "Editar Ponto de Ônibus"
@@ -17145,6 +17483,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1532 build/trans_presets.java:1785
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:1535 build/trans_presets.java:1789
+#: build/trans_presets.java:2453
 msgid "Shelter"
 msgstr "Abrigo"
@@ -17152,10 +17490,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1538
 msgid "Bus Platform"
 msgstr "Plataforma de Ônibus"
 
 #. item
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1539
 msgid "Edit Bus Platform"
 msgstr "Editar Plataforma de Ônibus"
@@ -17163,5 +17501,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1547
 msgid "Taxi"
 msgstr "Táxi"
@@ -17169,5 +17507,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1549
 msgid "Edit Taxi station"
 msgstr "Editar Ponto de Táxi"
@@ -17175,5 +17513,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1554
 msgid "Airport"
 msgstr "Aeroporto"
@@ -17181,15 +17519,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1556
 msgid "Edit Airport"
 msgstr "Editar Aeroporto"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1561
 msgid "IATA"
 msgstr ""
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1559
+#: build/trans_presets.java:1562
 msgid "ICAO"
 msgstr ""
@@ -17197,6 +17535,11 @@
 #. item "Public Transport/Airport" text "ICAO"
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1567
+#, fuzzy
+msgid "Travel"
+msgstr "pedras"
+
+#. group "Travel"
+#: build/trans_presets.java:1568
 msgid "Accomodation"
 msgstr "Acomodação"
@@ -17208,5 +17551,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1565 build/trans_surveyor.java:43
+#: build/trans_presets.java:1569 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr ""
@@ -17215,15 +17558,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:1568
+#: build/trans_presets.java:1572
 msgid "Edit Hotel"
 msgstr ""
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1575
 msgid "Stars"
 msgstr ""
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1577
 msgid "Motel"
 msgstr ""
@@ -17231,20 +17574,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1579
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1583
 msgid "Guest House"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1584
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1588
 msgid "Chalet"
 msgstr "Chalé"
@@ -17252,10 +17595,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1590
 msgid "Edit Chalet"
 msgstr "Editar Chalé"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1594
 msgid "Hostel"
 msgstr "Albergue"
@@ -17263,30 +17606,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1592
+#: build/trans_presets.java:1596
 msgid "Edit Hostel"
 msgstr "Editar Albergue"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1600
 msgid "Alpine Hut"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1601
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1606
 msgid "Caravan Site"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1607
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1611
 msgid "Camping Site"
 msgstr ""
@@ -17294,10 +17637,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1613
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1618
 msgid "Food+Drinks"
 msgstr "Comida e Bebida"
@@ -17308,5 +17651,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1615 build/trans_surveyor.java:47
+#: build/trans_presets.java:1619 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurante"
@@ -17314,5 +17657,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1621
 msgid "Edit Restaurant"
 msgstr "Editar Restaurante"
@@ -17320,5 +17663,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "Cuisine"
 msgstr "Cozinha"
@@ -17326,61 +17669,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "italian"
 msgstr "italiana"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "chinese"
 msgstr "chinessa"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "burger"
 msgstr "hambúrguer"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "greek"
 msgstr "grega"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "german"
 msgstr "alemã"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "indian"
 msgstr "indiana"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "turkish"
 msgstr "turca"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "asian"
 msgstr "asiática"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "thai"
 msgstr "tailandesa"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "mexican"
 msgstr "mexicana"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "japanese"
 msgstr "japonesa"
 
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1627
 msgid "Fast Food"
 msgstr "Lanchonete"
@@ -17388,9 +17731,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1629
 msgid "Edit Fast Food Restaurant"
 msgstr "Editar Lanchonete Fast-Food"
 
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1635
 msgid "Cafe"
 msgstr "Café"
@@ -17398,9 +17741,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1633
+#: build/trans_presets.java:1637
 msgid "Edit Cafe"
 msgstr "Editar Café"
 
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1642
 msgid "Pub"
 msgstr "Bar/Pub"
@@ -17408,18 +17751,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1644
 msgid "Edit Pub"
 msgstr "Editar Bar/Pub"
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1649
 msgid "Biergarten"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1646
+#: build/trans_presets.java:1650
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1655
 msgid "Bar"
 msgstr ""
@@ -17427,9 +17770,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1657
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1662
 msgid "Nightclub"
 msgstr "Boate"
@@ -17437,24 +17780,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1664
 msgid "Edit Nightclub"
 msgstr "Editar Boate"
 
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1670
 msgid "Tourism"
 msgstr "Turismo"
 
 #. group "Tourism"
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1671
 msgid "Attraction"
 msgstr "Atração"
 
 #. item
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1672
 msgid "Edit Attraction"
 msgstr "Editar Atração Turística"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1677
 msgid "Museum"
 msgstr "Museu"
@@ -17462,9 +17805,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1679
 msgid "Edit Museum"
 msgstr "Editar Museu"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1684
 msgid "Zoo"
 msgstr "Zoológico"
@@ -17473,9 +17816,9 @@
 #. <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:1683
+#: build/trans_presets.java:1687
 msgid "Edit Zoo"
 msgstr "Editar Zoológico"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1692
 msgid "Viewpoint"
 msgstr "Mirante"
@@ -17483,24 +17826,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1694
 msgid "Edit Viewpoint"
 msgstr "Editar Mirante"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1697
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1699
 msgid "Theme Park"
 msgstr "Parque Temático"
 
 #. item
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1700
 msgid "Edit Theme Park"
 msgstr "Editar Parque Temático"
 
-#: build/trans_presets.java:1701
+#: build/trans_presets.java:1705
 msgid "Artwork"
 msgstr "Arte"
@@ -17508,5 +17851,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1707
 msgid "Edit Artwork"
 msgstr "Editar Arte"
@@ -17514,19 +17857,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1712
 msgid "Information Office"
 msgstr "Centro de Informações Turísticas"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1719
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "topo"
 msgstr ""
@@ -17564,5 +17907,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1720 build/trans_style.java:619
+#: build/trans_presets.java:1724 build/trans_style.java:619
 #: build/trans_style.java:635 build/trans_style.java:651
 #: build/trans_style.java:659
@@ -17570,28 +17913,28 @@
 msgstr "estrada"
 
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1722 build/trans_presets.java:1738
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1726 build/trans_presets.java:1742
+#: build/trans_presets.java:1786
 msgid "Closer Description"
 msgstr ""
@@ -17601,5 +17944,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1724 build/trans_presets.java:1747
+#: build/trans_presets.java:1728 build/trans_presets.java:1751
 msgid "Routes shown for:"
 msgstr ""
@@ -17607,6 +17950,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1726 build/trans_presets.java:1749
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1965
 msgid "Cycling"
 msgstr ""
@@ -17614,5 +17957,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1727 build/trans_presets.java:1750
+#: build/trans_presets.java:1731 build/trans_presets.java:1754
 msgid "Mountainbiking"
 msgstr ""
@@ -17620,6 +17963,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1728 build/trans_presets.java:1751
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:1732 build/trans_presets.java:1755
+#: build/trans_presets.java:2019
 msgid "Skiing"
 msgstr ""
@@ -17627,5 +17970,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1729 build/trans_presets.java:1752
+#: build/trans_presets.java:1733 build/trans_presets.java:1756
 msgid "Riding"
 msgstr ""
@@ -17633,46 +17976,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1734 build/trans_presets.java:1757
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1736
 msgid "Information Board"
 msgstr "Quadro de Informações"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "history"
 msgstr "história"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "nature"
 msgstr "natureza"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "wildlife"
 msgstr "vida selvagem"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1744
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1759
 msgid "Information Terminal"
 msgstr ""
@@ -17680,29 +18023,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1760 build/trans_presets.java:1770
+#: build/trans_presets.java:1764 build/trans_presets.java:1774
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1769
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1779
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1780
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1778
+#: build/trans_presets.java:1782
 msgid "Other Information Points"
 msgstr "Outros Pontos de Informação"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1790
 msgid "Edit Shelter"
 msgstr "Editar Abrigo"
@@ -17710,25 +18053,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1789 build/trans_presets.java:1795
+#: build/trans_presets.java:1793 build/trans_presets.java:1799
 msgid "Fireplace"
 msgstr "Lareira"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1791
+#: build/trans_presets.java:1795
 msgid "Picnic Site"
 msgstr "Campo de Picnic"
 
 #. item
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1796
 msgid "Edit Picnic Site"
 msgstr "Editar Campo de Picnic"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1802
 msgid "Historic Places"
 msgstr "Lugares Históricos"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1799
+#: build/trans_presets.java:1803
 msgid "Castle"
 msgstr "Castelo"
@@ -17737,19 +18080,19 @@
 #. <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:1802
+#: build/trans_presets.java:1806
 msgid "Edit Castle"
 msgstr "Editar Castelo"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1810
 msgid "Ruins"
 msgstr "Ruínas"
 
 #. item
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1811
 msgid "Edit Ruins"
 msgstr "Editar Ruínas"
 
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1816
 msgid "Archaeological Site"
 msgstr "Sítio Arqueológico"
@@ -17758,9 +18101,9 @@
 #. <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:1815
+#: build/trans_presets.java:1819
 msgid "Edit Archaeological Site"
 msgstr "Editar Sítio Arqueológico"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1824
 msgid "Battlefield"
 msgstr "Campo de Batalha"
@@ -17768,5 +18111,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1826
 msgid "Edit Battlefield"
 msgstr "Editar Campo de Batalha"
@@ -17774,15 +18117,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1831
 msgid "Monument"
 msgstr "Monumento"
 
 #. item
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1832
 msgid "Edit Monument"
 msgstr "Editar Monumento"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1836
 msgid "Memorial"
 msgstr "Memorial"
@@ -17790,45 +18133,57 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1838
 msgid "Edit Memorial"
 msgstr "Editar Memorial"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1842
 msgid "Wayside Cross"
 msgstr "Cruz de beira de estrada"
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1843
 msgid "Edit Wayside Cross"
 msgstr "Editar Cruz de beira de estrada"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1847
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1848
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1852
+#, fuzzy
+msgid "Boundary Stone"
+msgstr "Fronteiras"
+
+#. item
+#: build/trans_presets.java:1853
+#, fuzzy
+msgid "Edit Boundary Stone"
+msgstr "Editar Ponto de Ônibus"
+
+#. item "Historic Places/Boundary Stone" text "Name"
+#: build/trans_presets.java:1858
 msgid "Leisure"
 msgstr "Lazer"
 
 #. group "Leisure"
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1859
 msgid "Water Park"
 msgstr "Parque Aquático"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1860
 msgid "Edit Water Park"
 msgstr "Editar Parque Aquático"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1864
 msgid "Playground"
 msgstr "Parquinho"
@@ -17836,31 +18191,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1866
 msgid "Edit Playground"
 msgstr "Editar Parquinho"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1870
 msgid "Fishing"
 msgstr "Pescaria"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1871
 msgid "Edit Fishing"
 msgstr "Editar Pescaria"
 
 #. item "Leisure/Fishing" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1877 build/trans_presets.java:2669
+msgid "Sports"
+msgstr "Esportes"
+
+#. group "Sports"
+#: build/trans_presets.java:1878
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1879
 msgid "Stadium"
 msgstr "Estádio"
 
 #. item
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1880
 msgid "Edit Stadium"
 msgstr "Editar Estádio"
@@ -17874,6 +18233,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1874 build/trans_presets.java:1883
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1902 build/trans_presets.java:1911
 msgid "select sport:"
 msgstr "selecionar esporte:"
@@ -18265,30 +18624,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884 build/trans_style.java:3892
-#: build/trans_style.java:3900 build/trans_style.java:3908
-#: build/trans_style.java:3916 build/trans_style.java:3924
-#: build/trans_style.java:3932
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_style.java:3572 build/trans_style.java:3580
+#: build/trans_style.java:3588 build/trans_style.java:3596
+#: build/trans_style.java:3604 build/trans_style.java:3612
+#: build/trans_style.java:3620 build/trans_style.java:3628
+#: build/trans_style.java:3636 build/trans_style.java:3644
+#: build/trans_style.java:3652 build/trans_style.java:3660
+#: build/trans_style.java:3668 build/trans_style.java:3676
+#: build/trans_style.java:3684 build/trans_style.java:3692
+#: build/trans_style.java:3700 build/trans_style.java:3708
+#: build/trans_style.java:3716 build/trans_style.java:3724
+#: build/trans_style.java:3732 build/trans_style.java:3740
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3764 build/trans_style.java:3772
+#: build/trans_style.java:3780 build/trans_style.java:3788
+#: build/trans_style.java:3796 build/trans_style.java:3804
+#: build/trans_style.java:3812 build/trans_style.java:3820
+#: build/trans_style.java:3828 build/trans_style.java:3836
+#: build/trans_style.java:3844 build/trans_style.java:3852
+#: build/trans_style.java:3860 build/trans_style.java:3868
+#: build/trans_style.java:3876 build/trans_style.java:3884
+#: build/trans_style.java:3892 build/trans_style.java:3900
+#: build/trans_style.java:3908 build/trans_style.java:3916
+#: build/trans_style.java:3924 build/trans_style.java:3932
+#: build/trans_style.java:3940
 msgid "sport"
 msgstr "esporte"
@@ -18298,225 +18657,225 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "archery"
 msgstr "arco e flecha"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "athletics"
 msgstr "atletismo"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "australian_football"
 msgstr "futebol australiano"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "basketball"
 msgstr "basquete"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "bowls"
 msgstr "boliche"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "canoe"
 msgstr "canoagem"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "climbing"
 msgstr "escalada"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket"
 msgstr "críquete"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cycling"
 msgstr "ciclismo"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "dog_racing"
 msgstr "corrida de cachorros"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "football"
 msgstr "futebol americano"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "golf"
 msgstr "golfe"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "gymnastics"
 msgstr "ginástica olímpica"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "hockey"
 msgstr "hóquei"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "horse_racing"
 msgstr "corrida de cavalos"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "motor"
 msgstr "automobilismo"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "rugby"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "shooting"
 msgstr "tiro"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skiing"
 msgstr "esqui"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "soccer"
 msgstr "futebol"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "swimming"
 msgstr "natação"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "table_tennis"
 msgstr "ping-pong"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "tennis"
 msgstr "tênis"
 
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1888
 msgid "Sports Centre"
 msgstr "Centro de Esportes"
 
 #. item
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1889
 msgid "Edit Sports Centre"
 msgstr "Editar Centro de Esportes"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1897
 msgid "Pitch"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1898
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1906
 msgid "Racetrack"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1907
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1915
 msgid "Golf Course"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1916
 msgid "Edit Golf Course"
 msgstr ""
 
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1921
 msgid "Miniature Golf"
 msgstr "Mini-Golf"
 
 #. item
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1922
 msgid "Edit Miniature Golf"
 msgstr "Editar Mini-Golf"
 
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1928
 msgid "Sport"
 msgstr ""
 
 #. group "Sport"
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1929
 msgid "Multi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1930
 msgid "Edit Multi"
 msgstr ""
@@ -18555,183 +18914,183 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "stadium"
 msgstr "estádio"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1935
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1936
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1941
 msgid "Athletics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1942
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1947
 msgid "Archery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1948
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1953
 msgid "Climbing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:1954
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1959
 msgid "Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1960
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1966
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1971
 msgid "Dog Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1972
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1977
 msgid "Equestrian"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1978
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1983
 msgid "Horse Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1984
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1989
 msgid "Gymnastics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1990
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1995
 msgid "Motor Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1996
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2001
 msgid "Skating"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2002
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2007
 msgid "Skateboard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2008
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2013
 msgid "Swimming"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2014
 msgid "Edit Swimming"
 msgstr ""
@@ -18739,56 +19098,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2021
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2028
 msgid "Shooting"
 msgstr ""
@@ -18796,178 +19155,182 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2030
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2036
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2037
 msgid "Soccer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2038
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2043
 msgid "Football"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2044
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2049
 msgid "Australian Football"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2050
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2055
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2056
 msgid "Edit Baseball"
 msgstr "Editar Campo de Baseball"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2061
 msgid "Basketball"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2062
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2067
 msgid "Golf"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2068
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2071
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2073
 msgid "Boule"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2074
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2079
 msgid "Bowls"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2080
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2085
 msgid "Cricket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2086
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2091
 msgid "Cricket Nets"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2092
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2097
 msgid "Croquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2098
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2103
 msgid "Hockey"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2104
 msgid "Edit Hockey"
 msgstr ""
 
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2109
 msgid "Pelota"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2110
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2105
+#: build/trans_presets.java:2115
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2116
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2121
 msgid "Rugby"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2122
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2127
 msgid "Table Tennis"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2128
 msgid "Edit Table Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2123
+#: build/trans_presets.java:2133
 msgid "Tennis"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2134
 msgid "Edit Tennis"
 msgstr ""
 
-#. <separator/>
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2141
+msgid "Man-Made"
+msgstr ""
+
+#. group "Man-Made"
+#: build/trans_presets.java:2142
 msgid "Buildings"
 msgstr "Construções"
 
 #. group "Buildings"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2143
 msgid "Building"
 msgstr ""
@@ -18975,5 +19338,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Public Building"
 msgstr "Prédio Público"
@@ -18981,10 +19344,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2148
 msgid "Edit Public Building"
 msgstr "Editar Prédio Público"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2152
 msgid "Town hall"
 msgstr "Prefeitura"
@@ -18992,10 +19355,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2154
 msgid "Edit Town hall"
 msgstr "Editar Prefeitura"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:2158
 msgid "Embassy"
 msgstr "Embaixada"
@@ -19003,10 +19366,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Edit Embassy"
 msgstr "Editar Embaixada"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2164
 msgid "Courthouse"
 msgstr "Fórum"
@@ -19015,10 +19378,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:2156
+#: build/trans_presets.java:2167
 msgid "Edit Courthouse"
 msgstr "Editar Fórum"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2171
 msgid "Prison"
 msgstr "Presídio"
@@ -19027,10 +19390,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:2163
+#: build/trans_presets.java:2174
 msgid "Edit Prison"
 msgstr "Editar Presídio"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2178
 msgid "Police"
 msgstr "Polícia"
@@ -19040,10 +19403,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:2171
+#: build/trans_presets.java:2182
 msgid "Edit Police"
 msgstr "Editar Polícia"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2186
 msgid "Fire Station"
 msgstr "Bombeiros"
@@ -19052,10 +19415,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:2178
+#: build/trans_presets.java:2189
 msgid "Edit Fire Station"
 msgstr "Editar Bombeiros"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "Post Office"
 msgstr "Correios"
@@ -19063,5 +19426,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Edit Post Office"
 msgstr "Editar Correios"
@@ -19069,15 +19432,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2200
 msgid "Kindergarten"
 msgstr "Creche"
 
 #. item
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Kindergarten"
 msgstr "Editar Creche"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2205
 msgid "School"
 msgstr "Escola"
@@ -19085,10 +19448,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Edit School"
 msgstr "Editar Escola"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2211
 msgid "University"
 msgstr "Universidade"
@@ -19096,10 +19459,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit University"
 msgstr "Editar Universidade"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "College"
 msgstr "Faculdade"
@@ -19107,5 +19470,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2219
 msgid "Edit College"
 msgstr "Editar Faculdade"
@@ -19113,5 +19476,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2224
 msgid "Cinema"
 msgstr "Cinema"
@@ -19120,10 +19483,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:2216
+#: build/trans_presets.java:2227
 msgid "Edit Cinema"
 msgstr "Editar Cinema"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2231
 msgid "Library"
 msgstr "Biblioteca"
@@ -19132,9 +19495,9 @@
 #. <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:2223
+#: build/trans_presets.java:2234
 msgid "Edit Library"
 msgstr "Editar Biblioteca"
 
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Arts Centre"
 msgstr "Centro de Artes"
@@ -19142,10 +19505,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Arts Centre"
 msgstr "Editar Centro de Artes"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Theatre"
 msgstr "Teatro"
@@ -19154,10 +19517,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:2237
+#: build/trans_presets.java:2248
 msgid "Edit Theatre"
 msgstr "Editar Teatro"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2252
 msgid "Place of Worship"
 msgstr "Lugar de Adoração"
@@ -19167,5 +19530,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:2245
+#: build/trans_presets.java:2256
 msgid "Edit Place of Worship"
 msgstr "Editar Lugar de Adoração"
@@ -19174,6 +19537,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "Religion"
 msgstr ""
@@ -19182,66 +19545,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "buddhist"
 msgstr "budismo"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "christian"
 msgstr "cristianismo"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "hindu"
 msgstr "hinduísmo"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jain"
 msgstr "jainismo"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jewish"
 msgstr "judaísmo"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "muslim"
 msgstr "muçulmano"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "sikh"
 msgstr "sikhismo"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "spiritualist"
 msgstr "espiritismo"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "taoist"
 msgstr "taoísmo"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "unitarian"
 msgstr "unitarianismo"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "zoroastrian"
 msgstr "zoroastrianismo"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "Denomination"
 msgstr "Denominação"
@@ -19250,81 +19613,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "anglican"
 msgstr "anglicana"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "baptist"
 msgstr "batista"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "catholic"
 msgstr "católica"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "evangelical"
 msgstr "evangélica"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "jehovahs_witness"
 msgstr "testemunha de jeová"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "lutheran"
 msgstr "luterana"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "methodist"
 msgstr "metodista"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "mormon"
 msgstr "mórmon"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "orthodox"
 msgstr "ortodoxa"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "presbyterian"
 msgstr "presbiteriana"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "protestant"
 msgstr "protestante"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "shia"
 msgstr "xiismo"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "sunni"
 msgstr "sunismo"
 
 #. <separator/>
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2264
 msgid "Addresses"
 msgstr "Endereços"
@@ -19333,5 +19696,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:2256
+#: build/trans_presets.java:2267
 msgid "Edit Address Information"
 msgstr "Editar Informações de Endereço"
@@ -19339,5 +19702,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2269
 msgid "House number"
 msgstr "Número da casa"
@@ -19345,20 +19708,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "House name"
 msgstr "Nome da casa"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "City name"
 msgstr "Cidade"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2274
 msgid "Post code"
 msgstr "CEP"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2275
 msgid "Country code"
 msgstr "Código do país"
@@ -19366,5 +19729,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Address Interpolation"
 msgstr "Interpolação de Endereços"
@@ -19373,5 +19736,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:2270
+#: build/trans_presets.java:2281
 msgid "Edit Address Interpolation"
 msgstr "Editar Interpolação de Endereços"
@@ -19379,67 +19742,67 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "Numbering scheme"
 msgstr "Esquema de numeração"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "odd"
 msgstr "números ímpares"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "even"
 msgstr "números pares"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "alphabetic"
 msgstr "alfabético"
 
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2286
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Works"
 msgstr "Fábrica"
 
 #. item
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2288
 msgid "Edit Works"
 msgstr "Editar Fábrica"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2292
 msgid "Tower"
 msgstr "Torre"
 
 #. item
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2293
 msgid "Edit Tower"
 msgstr "Editar Torre"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Water Tower"
 msgstr "Torre de Água"
 
 #. item
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2298
 msgid "Edit Water Tower"
 msgstr "Editar Torre de Água"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Gasometer"
 msgstr "Gasômetro"
 
 #. item
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2303
 msgid "Edit Gasometer"
 msgstr "Editar Gasômetro"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Lighthouse"
 msgstr "Farol"
@@ -19447,10 +19810,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2309
 msgid "Edit Lighthouse"
 msgstr "Editar Farol"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Windmill"
 msgstr "Moinho de Vento"
@@ -19458,10 +19821,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2315
 msgid "Edit Windmill"
 msgstr "Editar Moinho de Vento"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2319
 msgid "Pipeline"
 msgstr "Cano"
@@ -19469,10 +19832,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Edit Pipeline"
 msgstr "Editar Cano"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2325
 msgid "Wastewater Plant"
 msgstr "Estação de Tratamento de Esgoto"
@@ -19482,10 +19845,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:2318
+#: build/trans_presets.java:2329
 msgid "Edit Wastewater Plant"
 msgstr "Editar Estação de Tratamento de Esgoto"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2333
 msgid "Crane"
 msgstr "Guindaste"
@@ -19493,10 +19856,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2335
 msgid "Edit Crane"
 msgstr "Editar Guindaste"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Beacon"
 msgstr ""
@@ -19504,10 +19867,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2341
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2345
 msgid "Survey Point"
 msgstr "Vértice Geodésico"
@@ -19515,10 +19878,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Edit Survey Point"
 msgstr "Editar Vértice Geodésico"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2351
 msgid "Surveillance"
 msgstr "Câmera de Vigilância"
@@ -19526,5 +19889,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2353
 msgid "Edit Surveillance Camera"
 msgstr "Editar Câmera de Vigilância"
@@ -19532,5 +19895,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Power Generator"
 msgstr "Gerador de Energia"
@@ -19540,39 +19903,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:2351
+#: build/trans_presets.java:2362
 msgid "Edit Power Generator"
 msgstr "Editar Gerador de Energia"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "wind"
 msgstr "eólica"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "hydro"
 msgstr "hidrelétrica"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "fossil"
 msgstr "fóssil"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "photovoltaic"
 msgstr "carvão"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "gas"
 msgstr "gás"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2367
 msgid "Power Station"
 msgstr "Estação de Energia"
@@ -19581,10 +19944,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:2359
+#: build/trans_presets.java:2370
 msgid "Edit Power Station"
 msgstr "Editar Estação de Energia"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2374
 msgid "Power Sub Station"
 msgstr "Subestação de Energia"
@@ -19593,5 +19956,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:2366
+#: build/trans_presets.java:2377
 msgid "Edit Power Sub Station"
 msgstr "Editar Subestação de Energia"
@@ -19599,10 +19962,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2369 build/trans_presets.java:2385
+#: build/trans_presets.java:2380 build/trans_presets.java:2396
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2382
 msgid "Power Tower"
 msgstr "Torre de Energia"
@@ -19613,5 +19976,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:2376
+#: build/trans_presets.java:2387
 msgid "Edit Power Tower"
 msgstr "Editar Torre de Energia"
@@ -19619,5 +19982,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2390
 msgid "Power Line"
 msgstr "Linha de transmissão"
@@ -19626,40 +19989,40 @@
 #. <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:2382
+#: build/trans_presets.java:2393
 msgid "Edit Power Line"
 msgstr "Editar Linha de Transmissão"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Voltage"
 msgstr "Voltagem"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2398
 msgid "Amount of Wires"
 msgstr "Quantidade de Cabos"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Amenities"
 msgstr "Comodidades"
 
 #. group "Amenities"
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2402
 msgid "Toilets"
 msgstr "Banheiros"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2398 build/trans_presets.java:2514
+#: build/trans_presets.java:2409 build/trans_presets.java:2525
 msgid "Note"
 msgstr "Nota"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2411
 msgid "Post Box"
 msgstr "Caixa de Correio"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2416
 msgid "Telephone"
 msgstr "Telefone"
@@ -19668,5 +20031,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:2408
+#: build/trans_presets.java:2419
 msgid "Edit Telephone"
 msgstr "Editar Telefone"
@@ -19674,5 +20037,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2411 build/trans_presets.java:2515
+#: build/trans_presets.java:2422 build/trans_presets.java:2526
 msgid "Coins"
 msgstr "Moedas"
@@ -19680,5 +20043,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2412 build/trans_presets.java:2516
+#: build/trans_presets.java:2423 build/trans_presets.java:2527
 msgid "Notes"
 msgstr "Notas"
@@ -19686,5 +20049,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2413 build/trans_presets.java:2517
+#: build/trans_presets.java:2424 build/trans_presets.java:2528
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -19692,5 +20055,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2414 build/trans_presets.java:2518
+#: build/trans_presets.java:2425 build/trans_presets.java:2529
 msgid "Debit cards"
 msgstr ""
@@ -19698,15 +20061,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2415 build/trans_presets.java:2519
+#: build/trans_presets.java:2426 build/trans_presets.java:2530
 msgid "Credit cards"
 msgstr "Cartão de Crédito"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2427
 msgid "Telephone cards"
 msgstr "Cartão Telefônico"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2429
 msgid "Recycling"
 msgstr "Reciclagem"
@@ -19715,5 +20078,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:2421
+#: build/trans_presets.java:2432
 msgid "Edit Recycling station"
 msgstr ""
@@ -19721,35 +20084,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Batteries"
 msgstr "Baterias"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2435
 msgid "Cans"
 msgstr "Latas"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Clothes"
 msgstr "Roupas"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2437
 msgid "Glass"
 msgstr "Vidro"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2438
 msgid "Paper"
 msgstr "Papel"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2439
 msgid "Scrap Metal"
 msgstr "Ferro Velho"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2441
 msgid "Bench"
 msgstr "Banco"
@@ -19758,40 +20121,33 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2433
-#, fuzzy
+#: build/trans_presets.java:2444
 msgid "Backrest"
-msgstr "Voltar"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "Material"
-msgstr "Memorial"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2434
-#, fuzzy
+#: build/trans_presets.java:2445
 msgid "stone"
-msgstr "nenhum"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "plastic"
-msgstr "lugar"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "Colour"
-msgstr "Cor"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "black"
-msgstr "Voltar"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "brown"
-msgstr "abaixo"
+msgstr ""
 
 #. color historic
@@ -19860,39 +20216,35 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2435 build/trans_style.java:3055
-#: build/trans_style.java:3063 build/trans_style.java:3071
-#: build/trans_style.java:3079 build/trans_style.java:3127
-#: build/trans_style.java:3135 build/trans_style.java:3233
-#: build/trans_style.java:3241
+#: build/trans_presets.java:2446 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3135
+#: build/trans_style.java:3143 build/trans_style.java:3241
+#: build/trans_style.java:3249
 msgid "green"
 msgstr ""
 
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "red"
-msgstr "terminar"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "blue"
-msgstr "Valor"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "white"
-msgstr "água"
-
-#: build/trans_presets.java:2436
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2447
 msgid "Amount of Seats"
-msgstr "Quantidade de Cabos"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2449
 msgid "Hunting Stand"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2450
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -19901,30 +20253,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2441 build/trans_presets.java:2902
+#: build/trans_presets.java:2452 build/trans_presets.java:2914
 msgid "Height"
 msgstr "Altura"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "low"
 msgstr "baixa"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2454
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2455
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Fountain"
 msgstr "Chafariz"
@@ -19933,10 +20285,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:2449
+#: build/trans_presets.java:2460
 msgid "Edit Fountain"
 msgstr "Editar Chafariz"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2464
 msgid "Drinking Water"
 msgstr "Bebedouro"
@@ -19945,10 +20297,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:2456
+#: build/trans_presets.java:2467
 msgid "Edit Drinking Water"
 msgstr "Editar Bebedouro"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2471
 msgid "Baby Hatch"
 msgstr ""
@@ -19956,33 +20308,33 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2479
 msgid "Shops"
 msgstr "Lojas"
 
 #. group "Shops"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2480
 msgid "Supermarket"
 msgstr "Supermercado"
 
 #. item
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2481
 msgid "Edit Supermarket"
 msgstr "Editar Supermercado"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2486
 msgid "Chemist"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2487
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2492
 msgid "Convenience Store"
 msgstr "Loja de Conveniência"
@@ -19990,9 +20342,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Edit Convenience Store"
 msgstr "Editar Loja de Conveniência"
 
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2499
 msgid "Kiosk"
 msgstr "Quiosque"
@@ -20000,27 +20352,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Kiosk"
 msgstr "Editar Quiosque"
 
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Book Store"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2507
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2512
 msgid "Travel Agency"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2513
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2518
 msgid "Vending machine"
 msgstr ""
@@ -20028,5 +20380,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Edit Vending machine"
 msgstr "Editar Máquina de Vendas"
@@ -20034,88 +20386,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "Vending products"
 msgstr "Produtos à venda"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_tickets"
 msgstr "tíquetes de transporte público"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_plans"
 msgstr "mapas de transporte público"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "parking_tickets"
 msgstr "tíquetes de estacionamento"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "food"
 msgstr "comida"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "drinks"
 msgstr "bebidas"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "sweets"
 msgstr "doces"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "cigarettes"
 msgstr "cigarros"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "photos"
 msgstr "fotos"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "animal_food"
 msgstr "ração animal"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "news_papers"
 msgstr "jornais"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "toys"
 msgstr "brinquedos"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "stamps"
 msgstr "selos"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "SIM-cards"
 msgstr "Cartões SIM"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "condoms"
 msgstr "preservativos"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "tampons"
 msgstr "absorventes"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "excrement_bags"
 msgstr "sacos para fezes"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Account or loyalty cards"
 msgstr "Cartões de fidelidade"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Butcher"
 msgstr "Açougue"
@@ -20123,9 +20475,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2535
 msgid "Edit Butcher"
 msgstr "Editar Açougue"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2540
 msgid "Baker"
 msgstr "Padaria"
@@ -20133,9 +20485,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2542
 msgid "Edit Baker"
 msgstr "Editar Padaria"
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2547
 msgid "Florist"
 msgstr "Floricultura"
@@ -20143,18 +20495,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Florist"
 msgstr "Editar Floricultura"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2554
 msgid "Organic"
 msgstr "Orgânicos"
 
 #. item
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Edit Organic Shop"
 msgstr "Editar Loja de Orgânicos"
 
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2560
 msgid "Alcohol"
 msgstr "Álcool"
@@ -20162,54 +20514,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2562
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2567
 msgid "Beverages"
 msgstr "Bebidas"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2568
 msgid "Edit Beverages Shop"
 msgstr "Editar Loja de Bebidas"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2573
 msgid "Computer"
 msgstr "Computador"
 
 #. item
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2574
 msgid "Edit Computer Shop"
 msgstr "Editar Loja de Computador"
 
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Electronics"
 msgstr "Eletrônicos"
 
 #. item
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2580
 msgid "Edit Electronics Shop"
 msgstr "Editar Loja de Eletrônicos"
 
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2585
 msgid "Hifi"
 msgstr "Equipamentos de Áudio"
 
 #. item
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2586
 msgid "Edit Hifi Shop"
 msgstr "Editar Loja de Equipamentos de Áudio"
 
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2591
 msgid "Furniture"
 msgstr "Móveis"
 
 #. item
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Edit Furniture Shop"
 msgstr "Editar Loja de Móveis"
 
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Garden Centre"
 msgstr "Loja de Plantas"
@@ -20217,9 +20569,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2599
 msgid "Edit Garden Centre"
 msgstr "Editar Loja de Plantas"
 
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Hardware"
 msgstr ""
@@ -20227,9 +20579,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2606
 msgid "Edit Hardware Store"
 msgstr "Editar Loja de Utilidades Domésticas"
 
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -20237,54 +20589,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2613
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2618
 msgid "Stationery"
 msgstr "Papelaria"
 
 #. item
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2619
 msgid "Edit Stationery Shop"
 msgstr "Editar Papelaria"
 
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Hairdresser"
 msgstr "Cabelereiro"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Hairdresser"
 msgstr "Editar Cabelereiro"
 
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Shoes"
 msgstr "Sapatos"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Shoe Shop"
 msgstr "Editar Loja de Sapatos"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2636
 msgid "Toys"
 msgstr "Brinquedos"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit Toy Shop"
 msgstr "Editar Loja de Brinquedos"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Video"
 msgstr "Locadora de Vídeo"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Video Shop"
 msgstr "Editar Locadora de Vídeo"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "Dry Cleaning"
 msgstr "Lavanderia à Seco"
@@ -20292,9 +20644,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2650
 msgid "Edit Dry Cleaning"
 msgstr "Editar Lavanderia à Seco"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "Laundry"
 msgstr "Lavanderia"
@@ -20302,9 +20654,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2657
 msgid "Edit Laundry"
 msgstr "Editar Lavanderia"
 
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2662
 msgid "Outdoor"
 msgstr ""
@@ -20312,32 +20664,28 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2664
 msgid "Edit Outdoor Shop"
 msgstr ""
 
-#: build/trans_presets.java:2658
-msgid "Sports"
-msgstr "Esportes"
-
-#. item
-#: build/trans_presets.java:2659
+#. item
+#: build/trans_presets.java:2670
 msgid "Edit Sports Shop"
 msgstr "Editar Loja de Esportes"
 
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Optician"
 msgstr "Óculos"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Optician"
 msgstr "Editar Loja de Óculos"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2683
 msgid "Cash"
 msgstr "Dinheiro"
 
 #. group "Cash"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2684
 msgid "Bank"
 msgstr "Banco"
@@ -20345,14 +20693,14 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2686
 msgid "Edit Bank"
 msgstr "Editar Banco"
 
-#: build/trans_presets.java:2680 build/trans_presets.java:2689
+#: build/trans_presets.java:2691 build/trans_presets.java:2700
 msgid "Automated Teller Machine"
 msgstr "Caixa Eletrônico"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2693
 msgid "Money Exchange"
 msgstr "Loja de Câmbio"
@@ -20360,5 +20708,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Edit Money Exchange"
 msgstr "Editar Loja de Câmbio"
@@ -20366,15 +20714,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2691
+#: build/trans_presets.java:2702
 msgid "Edit Automated Teller Machine"
 msgstr "Editar Caixa Eletrônico"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2707
 msgid "Health"
 msgstr "Saúde"
 
 #. group "Health"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2708
 msgid "Doctors"
 msgstr "Médicos"
@@ -20382,18 +20730,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2710
 msgid "Edit Doctors"
 msgstr "Editar Médicos"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2715
 msgid "Dentist"
 msgstr "Dentistas"
 
 #. item
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Edit Dentist"
 msgstr "Editar Dentistas"
 
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2721
 msgid "Pharmacy"
 msgstr "Farmácia"
@@ -20401,5 +20749,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Edit Pharmacy"
 msgstr "Editar Farmácia"
@@ -20407,9 +20755,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2729
 msgid "Hospital"
 msgstr "Hospital"
@@ -20417,10 +20765,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Edit Hospital"
 msgstr "Editar Hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2735
 msgid "Emergency Access Point"
 msgstr "Entrada de Emergência"
@@ -20429,5 +20777,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:2727
+#: build/trans_presets.java:2738
 msgid "Edit Emergency Access Point"
 msgstr "Editar Entrada de Emergência"
@@ -20436,20 +20784,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2741
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2742
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Phone Number"
 msgstr "Número de telefone"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Use código internacional, como +12-345-67890)"
@@ -20457,5 +20805,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2748
 msgid "Veterinary"
 msgstr "Veterinária"
@@ -20464,55 +20812,60 @@
 #. <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:2740
+#: build/trans_presets.java:2751
 msgid "Edit Veterinary"
 msgstr "Editar Veterinária"
 
+#: build/trans_presets.java:2758
+#, fuzzy
+msgid "Geography"
+msgstr "Geografia WGS84"
+
 #. group "Places"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2760
 msgid "Continent"
 msgstr "Continente"
 
 #. item
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2761
 msgid "Edit Continent"
 msgstr "Editar Continente"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2766
 msgid "Country"
 msgstr "País"
 
 #. item
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2767
 msgid "Edit Country"
 msgstr "Editar País"
 
 #. item "Places/Country" text "Name"
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2772
 msgid "State"
 msgstr "Estado"
 
 #. item
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2773
 msgid "Edit State"
 msgstr "Editar Estado"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2778
 msgid "Region"
 msgstr "Região"
 
 #. item
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2779
 msgid "Edit Region"
 msgstr "Editar Região"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2784
 msgid "County"
 msgstr "Condado"
 
 #. item
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2785
 msgid "Edit County"
 msgstr "Editar Condado"
@@ -20520,15 +20873,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2791
 msgid "City"
 msgstr "Cidade"
 
 #. item
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2792
 msgid "Edit City"
 msgstr "Editar Cidade (mais que 100 mil habitantes)"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2797
 msgid "Town"
 msgstr "Cidade (menos que 100 mil habitantes)"
@@ -20536,10 +20889,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2799
 msgid "Edit Town"
 msgstr "Editar Cidade (menos que 100 mil habitantes)"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2804
 msgid "Suburb"
 msgstr "Bairro"
@@ -20547,25 +20900,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2806
 msgid "Edit Suburb"
 msgstr "Editar Bairro"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2811
 msgid "Village"
 msgstr "Vilarejo"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2812
 msgid "Edit Village"
 msgstr "Editar Vilarejo"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2817
 msgid "Hamlet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2818
 msgid "Edit Hamlet"
 msgstr ""
@@ -20573,5 +20926,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2824
 msgid "Locality"
 msgstr ""
@@ -20579,10 +20932,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2826
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2831
 msgid "Island"
 msgstr "Ilha"
@@ -20590,10 +20943,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2833
 msgid "Edit Island"
 msgstr "Editar Ilha"
 
 #. item "Places/Island" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2838
 msgid "Islet"
 msgstr ""
@@ -20601,5 +20954,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2840
 msgid "Edit Islet"
 msgstr ""
@@ -20607,5 +20960,5 @@
 #. item "Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2846
 msgid "Cave Entrance"
 msgstr "Entrada de Caverna"
@@ -20613,10 +20966,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2848
 msgid "Edit Cave Entrance"
 msgstr "Editar Entrada de Caverna"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2852
 msgid "Peak"
 msgstr "Pico"
@@ -20624,10 +20977,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2854
 msgid "Edit Peak"
 msgstr "Editar Pico"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2859
 msgid "Glacier"
 msgstr "Geleira"
@@ -20635,10 +20988,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2861
 msgid "Edit Glacier"
 msgstr "Editar Geleira"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2854
+#: build/trans_presets.java:2866
 msgid "Volcano"
 msgstr "Vulcão"
@@ -20646,70 +20999,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2868
 msgid "Edit Volcano"
 msgstr "Editar Vulcão"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2874
 msgid "Boundaries"
 msgstr "Fronteiras"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2875
 msgid "National"
 msgstr "Nacional"
 
 #. item
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2876
 msgid "Edit National Boundary"
 msgstr "Editar Fronteiras Nacionais"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2881
 msgid "Administrative"
 msgstr "Administrativo"
 
 #. item
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2882
 msgid "Edit Administrative Boundary"
 msgstr "Editar Fronteiras Administrativas"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:2887
 msgid "Civil"
 msgstr "Civil"
 
 #. item
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2888
 msgid "Edit Civil Boundary"
 msgstr "Editar Fronteiras Civis"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2893
 msgid "Political"
 msgstr "Político"
 
 #. item
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2894
 msgid "Edit Political Boundary"
 msgstr "Editar Fronteiras Políticas"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2899
 msgid "National park"
 msgstr "Parque nacional"
 
 #. item
-#: build/trans_presets.java:2888
+#: build/trans_presets.java:2900
 msgid "Edit National Park Boundary"
 msgstr "Editar Fronteira de Parque Nacional"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2906
 msgid "Land use"
 msgstr "Uso da terra"
 
 #. group "Land use"
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2907
 msgid "Tree"
 msgstr "Árvore"
@@ -20718,15 +21071,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:2898
+#: build/trans_presets.java:2910
 msgid "Edit Tree"
 msgstr "Editar Árvore"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2915
 msgid "Botanical Name"
 msgstr "Nome Botânico"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2917
 msgid "Wood"
 msgstr "Floresta"
@@ -20735,5 +21088,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:2908
+#: build/trans_presets.java:2920
 msgid "Edit Wood"
 msgstr "Editar Floresta"
@@ -20741,17 +21094,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "coniferous"
 msgstr "conífera"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "deciduous"
 msgstr "decídua"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "mixed"
 msgstr "misturado"
 
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2925
 msgid "Forest"
 msgstr "Floresta"
@@ -20760,14 +21113,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:2916
+#: build/trans_presets.java:2928
 msgid "Edit Forest Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2934
 msgid "Nature Reserve"
 msgstr "Reserva Natural"
 
 #. item
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2935
 msgid "Edit Nature Reserve"
 msgstr "Editar Reserva Natural"
@@ -20775,25 +21128,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2940
 msgid "Scree"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2941
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2945
 msgid "Scrub"
 msgstr "Arbusto"
 
 #. item
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2946
 msgid "Edit Scrub"
 msgstr "Editar arbusto"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2950
 msgid "Fell"
 msgstr ""
@@ -20801,10 +21154,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2952
 msgid "Edit Fell"
 msgstr "Editar rocha"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2956
 msgid "Heath"
 msgstr "Matagal"
@@ -20812,5 +21165,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2958
 msgid "Edit Heath"
 msgstr "Editar matagal"
@@ -20818,5 +21171,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2963
 msgid "Farmyard"
 msgstr ""
@@ -20825,45 +21178,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:2954
+#: build/trans_presets.java:2966
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2971
 msgid "Farmland"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2972
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2977
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2978
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2983
 msgid "Vineyard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2984
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:2989
 msgid "Allotments"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2990
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -20871,25 +21224,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2996
 msgid "Garden"
 msgstr "Jardim"
 
 #. item
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2997
 msgid "Edit Garden"
 msgstr "Editar Jardim"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3001
 msgid "Grass"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3002
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3007
 msgid "Village Green"
 msgstr ""
@@ -20897,10 +21250,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3009
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3014
 msgid "Common"
 msgstr ""
@@ -20908,20 +21261,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3004
+#: build/trans_presets.java:3016
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3020
 msgid "Park"
 msgstr "Parque"
 
 #. item
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3021
 msgid "Edit Park"
 msgstr "Editar Parque"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3025
 msgid "Recreation Ground"
 msgstr "área de recreação"
@@ -20929,5 +21282,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3027
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -20935,15 +21288,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3033
 msgid "Residential area"
 msgstr "Área residencial"
 
 #. item
-#: build/trans_presets.java:3022
+#: build/trans_presets.java:3034
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3039
 msgid "Graveyard"
 msgstr "Cemitério"
@@ -20951,9 +21304,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3029
+#: build/trans_presets.java:3041
 msgid "Edit Graveyard"
 msgstr "Editar Cemitério"
 
-#: build/trans_presets.java:3035
+#: build/trans_presets.java:3047
 msgid "Cemetery"
 msgstr "Cemitério"
@@ -20961,39 +21314,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3049
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3056
 msgid "Retail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3057
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3062
 msgid "Commercial"
 msgstr "Comercial"
 
 #. item
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3063
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3056
+#: build/trans_presets.java:3068
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3069
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3074
 msgid "Railway land"
 msgstr ""
@@ -21001,15 +21354,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3076
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3081
 msgid "Military"
 msgstr "Militar"
 
 #. item
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3082
 msgid "Edit Military Landuse"
 msgstr ""
@@ -21017,55 +21370,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3088
 msgid "Construction area"
 msgstr "Área de construção"
 
 #. item
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3089
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3094
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3095
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3100
 msgid "Greenfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3101
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3106
 msgid "Landfill"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3107
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3112
 msgid "Quarry"
 msgstr "Pedreira"
 
 #. item
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3113
 msgid "Edit Quarry Landuse"
 msgstr ""
 
 #. group "Relations"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3122
 msgid "Multipolygon"
 msgstr "Multipolígono"
@@ -21075,5 +21428,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:3114
+#: build/trans_presets.java:3126
 msgid "Edit Multipolygon"
 msgstr "Editar Multipolígono"
@@ -21082,10 +21435,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3132
 msgid "outer segment"
 msgstr "segmento externo"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3133
 msgid "inner segment"
 msgstr "segmento interno"
@@ -21093,5 +21446,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3136
 msgid "Turn restriction"
 msgstr "Restrição de manobra"
@@ -21100,5 +21453,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3139
 msgid "Edit Turn Restriction"
 msgstr "Editar restrição de manobras"
@@ -21106,34 +21459,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "Restriction"
 msgstr "Restrição"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_left_turn"
 msgstr "proibida_conversão_esquerda"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_right_turn"
 msgstr "proibida_conversão_direita"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_straight_on"
 msgstr "proibido_em_frente"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_u_turn"
 msgstr "proibido_retornar"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_right_turn"
 msgstr "somente_a_direita"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_left_turn"
 msgstr "somente_a_esuqerda"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_straight_on"
 msgstr "somente_em_frente"
@@ -21142,15 +21495,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3146
 msgid "from way"
 msgstr "do caminho"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3147
 msgid "via node or way"
 msgstr "nó de via ou caminho"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3148
 msgid "to way"
 msgstr "para caminho"
@@ -21158,5 +21511,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3151
 msgid "Route"
 msgstr ""
@@ -21165,5 +21518,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3154
 msgid "Edit Route"
 msgstr ""
@@ -21171,5 +21524,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "Route type"
 msgstr "Tipo de rota"
@@ -21241,5 +21594,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3144 build/trans_style.java:233
+#: build/trans_presets.java:3156 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -21248,17 +21601,17 @@
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "bus"
 msgstr "ônibus"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "road"
 msgstr "estrada"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ferry"
 msgstr "Ferry"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ski"
 msgstr "Esqui"
@@ -21311,5 +21664,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3144 build/trans_style.java:247
+#: build/trans_presets.java:3156 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -21318,13 +21671,13 @@
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "hiking"
 msgstr "caminhada"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "tram"
 msgstr "bonde/VLT"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "detour"
 msgstr "desvio"
@@ -21338,10 +21691,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3144 build/trans_style.java:1206
+#: build/trans_presets.java:3156 build/trans_style.java:1206
 msgid "subway"
 msgstr "Metrô"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3159
 msgid "Symbol description"
 msgstr "Descrição de símbolo"
@@ -21349,31 +21702,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3162
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "proposed"
 msgstr "Proposto"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "alternate"
 msgstr "alternativa"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "temporary"
 msgstr "temporário"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "Color (hex)"
 msgstr "Cor (hex)"
@@ -21382,30 +21735,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3168
 msgid "route segment"
 msgstr "segmento de rota"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3169
 msgid "forward segment"
 msgstr "segmento em frente"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3170
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3171
 msgid "halt point"
 msgstr "Ponto de parada"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3172
 msgid "forward halt point"
 msgstr "ponto de parada em frente"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3173
 msgid "backward halt point"
 msgstr "ponto de parada atrás"
@@ -21843,11 +22196,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3375 build/trans_style.java:3376
-#: build/trans_style.java:3946 build/trans_style.java:4254
-#: build/trans_style.java:4263 build/trans_style.java:4272
-#: build/trans_style.java:4281 build/trans_style.java:4290
-#: build/trans_style.java:4299 build/trans_style.java:4308
-#: build/trans_style.java:4309 build/trans_style.java:4318
-#: build/trans_style.java:4327
+#: build/trans_style.java:3383 build/trans_style.java:3384
+#: build/trans_style.java:3954 build/trans_style.java:4262
+#: build/trans_style.java:4271 build/trans_style.java:4280
+#: build/trans_style.java:4289 build/trans_style.java:4298
+#: build/trans_style.java:4307 build/trans_style.java:4316
+#: build/trans_style.java:4317 build/trans_style.java:4326
+#: build/trans_style.java:4335
 msgid "deprecated"
 msgstr "depreciado"
@@ -23871,5 +24224,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3294
+#: build/trans_style.java:3302
 msgid "light_water"
 msgstr ""
@@ -24551,8 +24904,17 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="boundary_stone"/>
+#. <icon annotate="true" src="historic/boundary_stone.png"/>
 #: build/trans_style.java:2990 build/trans_style.java:2998
 #: build/trans_style.java:3006 build/trans_style.java:3014
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
+#: build/trans_style.java:3054
 msgid "historic"
 msgstr "histórico"
@@ -24566,5 +24928,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3095
 msgid "quarry"
 msgstr ""
@@ -24578,5 +24940,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "landfill"
 msgstr "aterro"
@@ -24598,5 +24960,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3103 build/trans_style.java:3111
+#: build/trans_style.java:3111 build/trans_style.java:3119
 msgid "basin"
 msgstr ""
@@ -24610,5 +24972,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3127
 msgid "forest"
 msgstr "floresta"
@@ -24622,5 +24984,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3159
 msgid "farmyard"
 msgstr "fazenda"
@@ -24643,5 +25005,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3160 build/trans_style.java:3168
+#: build/trans_style.java:3168 build/trans_style.java:3176
 msgid "retail"
 msgstr "venda"
@@ -24655,5 +25017,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3176
+#: build/trans_style.java:3184
 msgid "industrial"
 msgstr "industrial"
@@ -24667,5 +25029,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "brownfield"
 msgstr "Área contaminada"
@@ -24679,5 +25041,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "greenfield"
 msgstr "campo"
@@ -24691,5 +25053,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "railland"
 msgstr ""
@@ -24746,7 +25108,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3217 build/trans_style.java:3252
-#: build/trans_style.java:3260 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3225 build/trans_style.java:3260
+#: build/trans_style.java:3268 build/trans_style.java:3276
+#: build/trans_style.java:3284 build/trans_style.java:3292
 msgid "military"
 msgstr "exército"
@@ -24760,5 +25122,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3225
+#: build/trans_style.java:3233
 msgid "cemetery"
 msgstr "Cemitério"
@@ -24771,5 +25133,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3301
+#: build/trans_style.java:3309
 msgid "peak"
 msgstr "cume"
@@ -24784,5 +25146,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3310
+#: build/trans_style.java:3318
 msgid "glacier"
 msgstr "geleira"
@@ -24796,5 +25158,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "volcano"
 msgstr "vulcão"
@@ -24849,8 +25211,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3326 build/trans_style.java:3327
-#: build/trans_style.java:3335 build/trans_style.java:3351
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440
+#: build/trans_style.java:3334 build/trans_style.java:3335
+#: build/trans_style.java:3343 build/trans_style.java:3359
+#: build/trans_style.java:3432 build/trans_style.java:3440
+#: build/trans_style.java:3448
 msgid "natural"
 msgstr ""
@@ -24864,5 +25226,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3343
+#: build/trans_style.java:3351
 msgid "scrub"
 msgstr "arbusto"
@@ -24876,5 +25238,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3359
+#: build/trans_style.java:3367
 msgid "heath"
 msgstr ""
@@ -24888,5 +25250,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3408
+#: build/trans_style.java:3416
 msgid "mud"
 msgstr "lama"
@@ -24900,5 +25262,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "beach"
 msgstr "praia"
@@ -24976,8 +25338,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
-#: build/trans_style.java:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496 build/trans_style.java:3504
+#: build/trans_style.java:3512 build/trans_style.java:3520
 msgid "route"
 msgstr "rota"
@@ -25025,7 +25387,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3522 build/trans_style.java:3530
-#: build/trans_style.java:3538 build/trans_style.java:3546
-#: build/trans_style.java:3554
+#: build/trans_style.java:3530 build/trans_style.java:3538
+#: build/trans_style.java:3546 build/trans_style.java:3554
+#: build/trans_style.java:3562
 msgid "boundary"
 msgstr "limite"
@@ -25175,11 +25537,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090
+#: build/trans_style.java:4002 build/trans_style.java:4010
+#: build/trans_style.java:4018 build/trans_style.java:4026
+#: build/trans_style.java:4034 build/trans_style.java:4042
+#: build/trans_style.java:4050 build/trans_style.java:4058
+#: build/trans_style.java:4066 build/trans_style.java:4074
+#: build/trans_style.java:4082 build/trans_style.java:4090
+#: build/trans_style.java:4098
 msgid "place"
 msgstr "lugar"
@@ -25227,6 +25589,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4207 build/trans_style.java:4214
-#: build/trans_style.java:4221 build/trans_style.java:4228
+#: build/trans_style.java:4215 build/trans_style.java:4222
+#: build/trans_style.java:4229 build/trans_style.java:4236
 msgid "address"
 msgstr "endereço"
@@ -25534,49 +25896,27 @@
 msgstr ""
 
-#~ msgid "All the ways were empty"
-#~ msgstr "Todos caminhos estavam vazios"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Unir nós com usuários diferentes?"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Unir mesmo assim"
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr ""
-#~ "Os nós selecionados tem relações de usuários diferentes. Você ainda "
-#~ "pretende uni-los?"
+#~ msgid "- running version is {0}"
+#~ msgstr "- versão em execução é {0}"
 
 #~ msgid "Unknown version"
 #~ msgstr "Versão desconhecida"
 
-#~ msgid "Version number missing from OSM data"
-#~ msgstr "Faltando número de versão nos dados dos mapas"
+#~ msgid "Aborting..."
+#~ msgstr "Interrompendo..."
+
+#~ msgid "Rotate"
+#~ msgstr "Rotacionar"
+
+#~ msgid "Change"
+#~ msgstr "Alterar"
+
+#~ msgid "Move"
+#~ msgstr "Mover"
 
 #~ msgid "Found <nd> element in non-way."
 #~ msgstr "Encontrado elemento <nd> em non-way."
 
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> tem ref zero"
-
 #~ msgid "Found <member> element in non-relation."
 #~ msgstr "Encontrado elemento <member> em non-relation."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Identificação de nó mal-formada"
-
-#~ msgid "Aborting..."
-#~ msgstr "Interrompendo..."
-
-#~ msgid "Rotate"
-#~ msgstr "Rotacionar"
-
-#~ msgid "Change"
-#~ msgstr "Alterar"
-
-#~ msgid "Move"
-#~ msgstr "Mover"
 
 #~ msgid ""
@@ -25586,4 +25926,10 @@
 #~ "Atenção - o carregamento do plugin {0} foi solicitado. Este plugin não é "
 #~ "mais necessário."
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "Identificação de nó mal-formada"
+
+#~ msgid "<nd> has zero ref"
+#~ msgstr "<nd> tem ref zero"
 
 #~ msgid ""
@@ -25647,7 +25993,4 @@
 #~ msgstr "Adicionar todos os objetos selecionados como membros"
 
-#~ msgid "Add Selected"
-#~ msgstr "Adicionar Selecionado"
-
 #~ msgid "Move Down"
 #~ msgstr "Mover para baixo"
@@ -25671,7 +26014,4 @@
 #~ msgstr "Existem mudanças não-salvas. Excluir camada mesmo assim?"
 
-#~ msgid "Delete Layer"
-#~ msgstr "Excluir Camada"
-
 #~ msgid "Merge the layer directly below into the selected layer."
 #~ msgstr "Unir camada diretamente inferior com camada selecionada."
@@ -25683,6 +26023,22 @@
 #~ msgstr "Alguns dos nós estão (praticamente) na linha"
 
+#~ msgid "All the ways were empty"
+#~ msgstr "Todos caminhos estavam vazios"
+
 #~ msgid "Those nodes are not in a circle."
 #~ msgstr "Estes nós não estão em um círculo"
+
+#~ msgid ""
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
+#~ msgstr ""
+#~ "Os nós selecionados tem relações de usuários diferentes. Você ainda "
+#~ "pretende uni-los?"
+
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "Unir nós com usuários diferentes?"
+
+#~ msgid "Merge Anyway"
+#~ msgstr "Unir mesmo assim"
 
 #~ msgid "Please select ways with almost right angles to orthogonalize."
@@ -25721,4 +26077,7 @@
 #~ msgid "YAHOO (GNOME Fix)"
 #~ msgstr "YAHOO! (GNOME Fix)"
+
+#~ msgid "Version number missing from OSM data"
+#~ msgstr "Faltando número de versão nos dados dos mapas"
 
 #~ msgid ""
@@ -25796,7 +26155,4 @@
 #~ msgid "relations"
 #~ msgstr "relações"
-
-#~ msgid "changesets"
-#~ msgstr "conjunto de mudanças"
 
 #~ msgid "Could not write bookmark."
Index: applications/editors/josm/i18n/po/ro.po
===================================================================
--- applications/editors/josm/i18n/po/ro.po	(revision 17655)
+++ applications/editors/josm/i18n/po/ro.po	(revision 17697)
@@ -8,6 +8,6 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-12 18:11+0200\n"
-"PO-Revision-Date: 2009-09-06 13:32+0000\n"
+"POT-Creation-Date: 2009-09-19 13:00+0200\n"
+"PO-Revision-Date: 2009-09-15 04:57+0000\n"
 "Last-Translator: Manuel R. Ciosici <manuelciosici@yahoo.com>\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-09-12 16:05+0000\n"
+"X-Launchpad-Export-Date: 2009-09-19 10:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: ROMANIA\n"
@@ -46,10 +46,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:543
 #: ../core/src/org/openstreetmap/josm/Main.java:551
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -74,5 +74,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -90,6 +90,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:358
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
@@ -105,6 +105,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
@@ -128,10 +128,10 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
 msgid "Save and Exit"
 msgstr "Salvez şi Ies"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
 msgid "Discard and Exit"
 msgstr "Renunţ şi Ies"
@@ -142,4 +142,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
@@ -147,27 +148,28 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:296
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:258
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:613
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
@@ -175,5 +177,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -193,6 +195,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
@@ -209,17 +211,17 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:654
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1528
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -230,6 +232,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
@@ -282,9 +284,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:607
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:609
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -344,5 +346,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
 msgid "Plugins"
@@ -394,5 +396,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr ""
@@ -480,5 +482,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -491,4 +493,5 @@
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -524,6 +527,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
@@ -532,6 +535,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:346
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
@@ -639,4 +642,42 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+msgid "Close open changesets"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+msgid "Closes open changesets"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
+#: ../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:114
+#, java-format
+msgid "File: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
+msgid "There are no open changesets"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
+msgid "No open changesets"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
+#, fuzzy
+msgid "Downloading open changesets ..."
+msgstr "Descarc datele OSM..."
+
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
@@ -730,10 +771,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:123
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
@@ -776,31 +818,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
 msgid "Download from OSM..."
 msgstr "Descarc datele OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
 msgid "Download map data from the OSM server."
 msgstr "Descarcă hărţi de la serverul OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
-#, java-format
-msgid "File: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
 msgid "Download"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
 msgid "Please select at least one task to download"
 msgstr ""
@@ -821,5 +862,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1527
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307
@@ -839,6 +880,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:376
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1415
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
 msgid "Duplicate"
 msgstr ""
@@ -910,10 +951,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
@@ -997,25 +1039,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 msgid "Merge Nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
 msgid "Merge nodes into the oldest one."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
 msgid "Please select at least two nodes to merge."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:394
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
@@ -1031,8 +1074,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -1058,6 +1101,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
@@ -1066,9 +1113,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283
 #, java-format
 msgid "Merge {0} nodes"
@@ -1140,5 +1187,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "New"
 msgstr ""
@@ -1410,14 +1457,15 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
+msgid "Status Report"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
-msgid "Status Report"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
 msgid "Copy to clipboard and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
@@ -1492,25 +1540,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24
-msgid "Close current changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-msgid "Close the current changeset ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41
-msgid "There is currently no changeset open."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42
-msgid "No open changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60
-msgid "Closing changeset"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
@@ -1670,14 +1697,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Despre JOSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 msgid "Upload all changes to the OSM server."
 msgstr "Trimite toate schimbările la serverul OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
 #, java-format
 msgid ""
@@ -1686,23 +1713,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
 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:166
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 msgid "No changes to upload."
 msgstr "Nu sunt schimbări de transmis."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
 msgid "Synchronize entire dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
 #, java-format
 msgid ""
@@ -1716,17 +1743,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
 msgid "Conflict detected"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:267
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
 #, java-format
 msgid ""
@@ -1737,28 +1764,40 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
+msgid ""
+"<html>Uploading <strong>failed</strong> because you've been "
+"using<br>changeset {0} which was already closed at {1}.<br>Please upload "
+"again with a new or an existing open changeset."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+#, fuzzy
+msgid "Changeset closed"
+msgstr "Schimb valorile?"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
 msgid "Upload to OSM API failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1975,14 +2014,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:930
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:932
 msgid "Create new node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
 msgid "Select node under cursor."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939
 #, java-format
 msgid "Insert new node into way."
@@ -1991,14 +2030,14 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
 msgid "Start new way from last node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951
 msgid "Continue way from last node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:972
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:974
 msgid "Finish drawing."
 msgstr ""
@@ -2111,60 +2150,70 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Caută obiecte"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
 msgid "Can't search because there is no loaded data."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
+#, fuzzy
+msgid "Please enter a filter string."
+msgstr "Vă rog introduceţi un şir de căutat"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
 msgid "Please enter a search string."
 msgstr "Vă rog introduceţi un şir de căutat"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
 msgid "replace selection"
 msgstr "Înlocuieşte selecţia"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72
 msgid "add to selection"
 msgstr "adaugă la selecţie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73
 msgid "remove from selection"
 msgstr "elimină din selecţie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
+#, fuzzy
+msgid "find in selection"
+msgstr "adaugă la selecţie"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81
 msgid "case sensitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82
 msgid "regular expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid ""
 "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
@@ -2172,109 +2221,126 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
 msgid "<u>Special targets:</u>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 msgid "<b>nodes:</b>... - object with given number of nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
 msgid "<b>modified</b> - all changed objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
 msgid "<b>selected</b> - all selected objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "<b>untagged</b> - all untagged objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
+msgid "Filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Căutare"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
+msgid "Submit filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "Start Search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#, java-format
+msgid "Nothing find in selection by searching for ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262
 #, java-format
 msgid "Found {0} matches"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CS"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CI"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283
 msgid "RX"
 msgstr ""
@@ -2457,5 +2523,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
 msgid "Double conflict"
 msgstr ""
@@ -2695,4 +2761,5 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:134
 msgid "Old value"
 msgstr ""
@@ -2856,26 +2923,54 @@
 
 #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
 msgid "E"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:59
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:203
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
 msgid "Changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:323
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:325
-#, java-format
-msgid "paramete''{0}'' must not be null"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331
-#, java-format
-msgid "unsupported value ''{0}'' or parameter ''{1}''"
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "H"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "Text"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "C"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "I"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "M"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+msgid "R"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+msgid "A"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+msgid "D"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+msgid "F"
 msgstr ""
 
@@ -2890,29 +2985,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
 #, java-format
 msgid "expected id >= 0. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:257
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
 msgid "a primitive with id=0 can't be invisible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:293
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
 #, java-format
 msgid "id > 0 expected. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
 msgid "version > 0 expected. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
 msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
 msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
@@ -2979,9 +3074,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:247
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:249
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:478
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:482
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
@@ -2990,118 +3085,118 @@
 #. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
 #. TODO Remove useless nullcheck when RelationMember.member is encalupsed
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:851
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855
 msgid "Empty member in relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:853
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:864
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652
 msgid "No \"via\" node or way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:885
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:943
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1032
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1044
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1097
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1123
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1327
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331
 msgid "untagged"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1328
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332
 msgid "text"
 msgstr ""
@@ -3122,5 +3217,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
@@ -3143,5 +3238,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
@@ -3190,5 +3285,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
 msgid "Lambert Zone (Estonia)"
 msgstr ""
@@ -3230,9 +3325,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:38
 msgid "Do not show again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
 #, java-format
@@ -3240,31 +3335,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:91
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:116
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154
 msgid "incomplete"
 msgstr "incomplet"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
 msgid "highway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
-#: build/trans_presets.java:3144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: build/trans_presets.java:3156
 msgid "railway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
 msgid "waterway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "landuse"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:474
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
@@ -3274,5 +3369,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
 #, java-format
 msgid "{0} member"
@@ -3317,10 +3412,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67
-#, java-format
-msgid "- running version is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:95
 msgid "Downloading \"Message of the day\""
 msgstr ""
@@ -3386,10 +3476,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:162
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
 msgid "Username"
 msgstr "Nume utilizator"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
 msgid "Password"
 msgstr "Parolă"
@@ -3513,5 +3603,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226
 msgid "Presets"
 msgstr ""
@@ -3585,38 +3675,49 @@
 msgstr "scală"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
 msgid "The geographic longitude at the mouse pointer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The name of the object at the mouse pointer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The geographic latitude at the mouse pointer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The angle between the previous and the current way segment."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The (compass) heading of the line segment being drawn."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The length of the new way segment being drawn."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199
+msgid ""
+"Middle click again to cycle through.<br>Hold CTRL to select directly from "
+"this list with the mouse.<hr>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290
 msgid "(no object)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:301
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418
+#, fuzzy
+msgid "User:"
+msgstr "Nume utilizator"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
 msgid "layer not in list."
 msgstr "stratul nu este în listă."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:488
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3686,7 +3787,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:224
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Tags"
 msgstr ""
@@ -3701,5 +3802,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
@@ -3880,4 +3981,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
 msgid "Up"
 msgstr ""
@@ -3888,4 +3990,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Down"
 msgstr ""
@@ -3898,5 +4001,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
@@ -4319,22 +4422,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:236
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239
 msgid "No conflicts to resolve"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:295
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254
 msgid "Cancel conflict resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:310
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269
 msgid "Apply resolved conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Apply"
 msgstr ""
@@ -4346,5 +4449,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "all"
 msgstr ""
@@ -4388,7 +4491,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
-msgid "not yet decided"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:213
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
@@ -4415,7 +4515,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
@@ -4425,7 +4525,7 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:152
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
@@ -4435,20 +4535,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "Paste ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "From ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:372
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "To ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:428
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
 #, java-format
 msgid "{0} tag"
@@ -4469,7 +4569,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-#, fuzzy
 msgid "Replace"
-msgstr "Nume real"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
@@ -4485,5 +4584,5 @@
 #. --- role editing
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:56
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510
 msgid "Role:"
 msgstr ""
@@ -4499,7 +4598,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70
-#, fuzzy
 msgid "Value:"
-msgstr "Valoare"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86
@@ -4516,7 +4614,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
-#, fuzzy
 msgid "Decision"
-msgstr "Revizia"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -4532,6 +4629,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
@@ -4624,170 +4722,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-msgid "History"
-msgstr "Istoric"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-msgid "Display the history of all selected items."
-msgstr "Afişează istoricul tuturor elementelor selectate."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
-#, java-format
-msgid "index out of bounds Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
-msgid "History item"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Reîncarcă toate obiectele selectate curent şi împrospătează lista."
-
-#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
-msgid "Show"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
-msgid "Dialog not created yet. Invoke createInstance() first"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
-msgid "Layers"
-msgstr "Straturi"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-msgid "Open a list of all loaded layers."
-msgstr "Deschide o listă cu toate straturile încărcate."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:297
-msgid "Delete the selected layer."
-msgstr "Şterge stratul selectat."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:367
-msgid "Show/Hide"
-msgstr "Arată/Ascunde"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:378
-msgid "Toggle visible state of the selected layer."
-msgstr "Comută starea vizibilă a stratului selectat."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:420
-msgid "Activate the selected layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:475
-msgid "Merge this layer into another layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:581
-msgid "Move the selected layer one row up."
-msgstr "Mută stratul selectat un rând în sus."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:600
-msgid "Move the selected layer one row down."
-msgstr "Mută stratul selectat un rând în jos."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
-msgid "Information about layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
-#, java-format
-msgid "This will change up to {0} object."
-msgid_plural "This will change up to {0} objects."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
-msgid "An empty value deletes the key."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
-msgid "<different>"
-msgstr "<diferit>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
-msgid "Change values?"
-msgstr "Schimb valorile?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
-#, java-format
-msgid "Change properties of up to {0} object"
-msgid_plural "Change properties of up to {0} objects"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
-msgid "Please select a key"
-msgstr "Vă rog selectaţi o cheie"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
-msgid "Please select a value"
-msgstr "Vă rog selectaţi o valoare"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
-msgid "Please select the objects you want to change properties for."
-msgstr ""
-"Vă rog selectaţi obiectele pentru care doriţi să schimbaţi proprietăţile."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
-msgid "Properties/Memberships"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-msgid "Properties for selected objects."
-msgstr ""
-
-#. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-msgid "Member Of"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
-msgid "Add Properties"
-msgstr ""
-
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+msgid "Filter objects and hide/disable them."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
@@ -4801,4 +4742,207 @@
 msgstr "Adaugă"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+msgid "Add filter."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
+msgid "Edit filter."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#, fuzzy
+msgid "Delete filter."
+msgstr "Şterge"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
+msgid "Move filter up."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
+msgid "Move filter down."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128
+msgid "Enable filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
+msgid "Hide elements"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
+msgid "Apply also for children"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
+msgid "Inverse filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
+msgid "Filter mode"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
+msgid "History"
+msgstr "Istoric"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+msgid "Display the history of all selected items."
+msgstr "Afişează istoricul tuturor elementelor selectate."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
+msgid "History item"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
+msgid "Reload all currently selected objects and refresh the list."
+msgstr "Reîncarcă toate obiectele selectate curent şi împrospătează lista."
+
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
+msgid "Show"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
+msgid "Display the history of the selected primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84
+msgid "Dialog not created yet. Invoke createInstance() first"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
+msgid "Layers"
+msgstr "Straturi"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+msgid "Open a list of all loaded layers."
+msgstr "Deschide o listă cu toate straturile încărcate."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294
+msgid "Delete the selected layer."
+msgstr "Şterge stratul selectat."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364
+msgid "Show/Hide"
+msgstr "Arată/Ascunde"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375
+msgid "Toggle visible state of the selected layer."
+msgstr "Comută starea vizibilă a stratului selectat."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgid "Activate"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417
+msgid "Activate the selected layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472
+msgid "Merge this layer into another layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578
+msgid "Move the selected layer one row up."
+msgstr "Mută stratul selectat un rând în sus."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597
+msgid "Move the selected layer one row down."
+msgstr "Mută stratul selectat un rând în jos."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+msgid "Information about layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+#, java-format
+msgid "This will change up to {0} object."
+msgid_plural "This will change up to {0} objects."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+msgid "An empty value deletes the key."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+msgid "<different>"
+msgstr "<diferit>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+msgid "Change values?"
+msgstr "Schimb valorile?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#, java-format
+msgid "Change properties of up to {0} object"
+msgid_plural "Change properties of up to {0} objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+msgid "Please select a key"
+msgstr "Vă rog selectaţi o cheie"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+msgid "Please select a value"
+msgstr "Vă rog selectaţi o valoare"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
+msgid "Please select the objects you want to change properties for."
+msgstr ""
+"Vă rog selectaţi obiectele pentru care doriţi să schimbaţi proprietăţile."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
+msgid "Properties/Memberships"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+msgid "Properties for selected objects."
+msgstr ""
+
+#. setting up the membership table
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+msgid "Member Of"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
+msgid "Add Properties"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574
 msgid "Add a new key/value pair to all objects"
@@ -4840,10 +4984,9 @@
 
 #. item "Land use/Quarry" text "Name"
-#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
-#: build/trans_presets.java:3109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168
+#: build/trans_presets.java:3121
 msgid "Relations"
 msgstr ""
@@ -4853,23 +4996,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166
 #, java-format
 msgid "Relations: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276
 msgid "Open an editor for the selected relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
 msgid "Delete the selected relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349
 msgid "Create a new relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:373
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1412
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
@@ -4902,5 +5045,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4912,14 +5055,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441
 msgid "Undock the panel"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:457
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr ""
@@ -4980,5 +5123,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5002,5 +5145,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1502
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1370
 msgid "Download relation members"
 msgstr ""
@@ -5030,5 +5173,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -5036,18 +5179,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
 msgid "Tags and Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:167
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5056,14 +5199,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613
 #, java-format
 msgid ""
@@ -5073,9 +5216,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid ""
@@ -5085,15 +5228,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5101,5 +5244,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5107,20 +5250,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849
 #, java-format
 msgid ""
@@ -5129,57 +5272,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:961
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909
 msgid "Move the currently selected members up"
 msgstr ""
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:979
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:912
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928
 msgid "Move the currently selected members down"
 msgstr ""
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:998
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:931
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5188,9 +5331,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1058
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
 #, java-format
 msgid ""
@@ -5199,56 +5342,41 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090
+msgid "Apply the current updates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123
+msgid "Apply the updates and close the dialog"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
-msgid "Apply the current updates"
+msgid "Cancel the updates and close the dialog"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
+msgid "Add an empty tag"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
+msgid "Download all incomplete ways and nodes in relation"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
+msgid "Download Members"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
-msgid "Apply the updates and close the dialog"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
+msgid "Relation Editor: Download Members"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1208
+msgid "Sets a role for the selected members"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1211
+msgid "Apply Role"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
-msgid "Cancel the updates and close the dialog"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1241
-msgid "Add an empty tag"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
-msgid "Delete the currently selected tags"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319
-msgid "Download all incomplete ways and nodes in relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321
-msgid "Download Members"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322
-msgid "Relation Editor: Download Members"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1340
-msgid "Sets a role for the selected members"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343
-msgid "Apply Role"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1356
 #, java-format
 msgid ""
@@ -5258,13 +5386,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1229
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1367
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
 msgid "Confirm empty role"
 msgstr ""
@@ -5351,37 +5479,37 @@
 msgstr "Semne de carte"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:82
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
 msgid "Please enter the desired coordinates first."
 msgstr "Vă rog întâi introduceţi coordonatele dorite."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
 msgid "Please enter a name for the location."
 msgstr "Vă rog introduceţi un nume pentru locaţie."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:107
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
 msgid "Select a bookmark first."
 msgstr "Selectaţi întâi un semn de carte."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
 msgid "min lat"
 msgstr "min lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
 msgid "min lon"
 msgstr "min lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid "max lat"
 msgstr "max lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
 msgid "max lon"
 msgstr "max lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5389,26 +5517,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
 msgid "Bounding Box"
 msgstr ""
 
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
 msgid "Data Sources and Types"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
 msgid "Download as new layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
 msgid "Download Area"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
 msgid "Download area too large; will probably be rejected by server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
 msgid "Download area ok, size probably acceptable to server"
 msgstr ""
@@ -5433,7 +5561,7 @@
 msgstr ""
 
-#. <separator/>
+#. group "Geography"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2759
 msgid "Places"
 msgstr ""
@@ -5480,21 +5608,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "type"
 msgstr ""
@@ -5974,4 +6102,6 @@
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
 #. <key key="historic" value="wayside_shrine" />
+#. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
+#. <key key="historic" value="boundary_stone" />
 #. item "Leisure/Water Park" label "Edit Water Park"
 #. <key key="leisure" value="water_park" />
@@ -6343,153 +6473,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/trans_presets.java:66 build/trans_presets.java:102
-#: build/trans_presets.java:142 build/trans_presets.java:179
-#: build/trans_presets.java:199 build/trans_presets.java:217
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:272 build/trans_presets.java:305
-#: build/trans_presets.java:351 build/trans_presets.java:371
-#: build/trans_presets.java:386 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:463 build/trans_presets.java:482
-#: build/trans_presets.java:502 build/trans_presets.java:522
-#: build/trans_presets.java:543 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627 build/trans_presets.java:658
-#: build/trans_presets.java:679 build/trans_presets.java:692
-#: build/trans_presets.java:705 build/trans_presets.java:718
-#: build/trans_presets.java:731 build/trans_presets.java:744
-#: build/trans_presets.java:755 build/trans_presets.java:764
-#: build/trans_presets.java:811 build/trans_presets.java:832
-#: build/trans_presets.java:841 build/trans_presets.java:901
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1067 build/trans_presets.java:1075
-#: build/trans_presets.java:1085 build/trans_presets.java:1093
-#: build/trans_presets.java:1098 build/trans_presets.java:1105
-#: build/trans_presets.java:1112 build/trans_presets.java:1117
-#: build/trans_presets.java:1125 build/trans_presets.java:1134
-#: build/trans_presets.java:1140 build/trans_presets.java:1146
-#: build/trans_presets.java:1151 build/trans_presets.java:1157
-#: build/trans_presets.java:1163 build/trans_presets.java:1172
-#: build/trans_presets.java:1181 build/trans_presets.java:1188
-#: build/trans_presets.java:1196 build/trans_presets.java:1209
-#: build/trans_presets.java:1215 build/trans_presets.java:1224
-#: build/trans_presets.java:1230 build/trans_presets.java:1236
-#: build/trans_presets.java:1244 build/trans_presets.java:1299
-#: build/trans_presets.java:1346 build/trans_presets.java:1352
-#: build/trans_presets.java:1358 build/trans_presets.java:1364
-#: build/trans_presets.java:1370 build/trans_presets.java:1381
-#: build/trans_presets.java:1390 build/trans_presets.java:1405
-#: build/trans_presets.java:1412 build/trans_presets.java:1418
-#: build/trans_presets.java:1426 build/trans_presets.java:1433
-#: build/trans_presets.java:1442 build/trans_presets.java:1450
-#: build/trans_presets.java:1457 build/trans_presets.java:1468
-#: build/trans_presets.java:1478 build/trans_presets.java:1488
-#: build/trans_presets.java:1508 build/trans_presets.java:1520
-#: build/trans_presets.java:1531 build/trans_presets.java:1548
-#: build/trans_presets.java:1555 build/trans_presets.java:1570
-#: build/trans_presets.java:1577 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1594
-#: build/trans_presets.java:1599 build/trans_presets.java:1605
-#: build/trans_presets.java:1611 build/trans_presets.java:1619
-#: build/trans_presets.java:1627 build/trans_presets.java:1635
-#: build/trans_presets.java:1642 build/trans_presets.java:1648
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1670 build/trans_presets.java:1677
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1712 build/trans_presets.java:1719
-#: build/trans_presets.java:1736 build/trans_presets.java:1744
-#: build/trans_presets.java:1759 build/trans_presets.java:1769
-#: build/trans_presets.java:1781 build/trans_presets.java:1788
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:1809 build/trans_presets.java:1817
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1841
-#: build/trans_presets.java:1846 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1864
-#: build/trans_presets.java:1872 build/trans_presets.java:1881
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1908 build/trans_presets.java:1914
-#: build/trans_presets.java:1922 build/trans_presets.java:1928
-#: build/trans_presets.java:1934 build/trans_presets.java:1940
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2013
-#: build/trans_presets.java:2022 build/trans_presets.java:2030
-#: build/trans_presets.java:2036 build/trans_presets.java:2042
-#: build/trans_presets.java:2048 build/trans_presets.java:2054
-#: build/trans_presets.java:2060 build/trans_presets.java:2066
-#: build/trans_presets.java:2072 build/trans_presets.java:2078
-#: build/trans_presets.java:2084 build/trans_presets.java:2090
-#: build/trans_presets.java:2096 build/trans_presets.java:2102
-#: build/trans_presets.java:2108 build/trans_presets.java:2114
-#: build/trans_presets.java:2120 build/trans_presets.java:2126
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2158
-#: build/trans_presets.java:2165 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2186
-#: build/trans_presets.java:2192 build/trans_presets.java:2198
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2218 build/trans_presets.java:2225
-#: build/trans_presets.java:2232 build/trans_presets.java:2239
-#: build/trans_presets.java:2247 build/trans_presets.java:2279
-#: build/trans_presets.java:2284 build/trans_presets.java:2289
-#: build/trans_presets.java:2294 build/trans_presets.java:2300
-#: build/trans_presets.java:2306 build/trans_presets.java:2312
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2354
-#: build/trans_presets.java:2451 build/trans_presets.java:2458
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2485 build/trans_presets.java:2492
-#: build/trans_presets.java:2498 build/trans_presets.java:2504
-#: build/trans_presets.java:2526 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2553 build/trans_presets.java:2559
-#: build/trans_presets.java:2565 build/trans_presets.java:2571
-#: build/trans_presets.java:2577 build/trans_presets.java:2583
-#: build/trans_presets.java:2590 build/trans_presets.java:2597
-#: build/trans_presets.java:2604 build/trans_presets.java:2610
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2661
-#: build/trans_presets.java:2667 build/trans_presets.java:2677
-#: build/trans_presets.java:2686 build/trans_presets.java:2701
-#: build/trans_presets.java:2707 build/trans_presets.java:2715
-#: build/trans_presets.java:2722 build/trans_presets.java:2742
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2783
-#: build/trans_presets.java:2790 build/trans_presets.java:2797
-#: build/trans_presets.java:2803 build/trans_presets.java:2809
-#: build/trans_presets.java:2817 build/trans_presets.java:2824
-#: build/trans_presets.java:2831 build/trans_presets.java:2838
-#: build/trans_presets.java:2844 build/trans_presets.java:2851
-#: build/trans_presets.java:2858 build/trans_presets.java:2867
-#: build/trans_presets.java:2873 build/trans_presets.java:2879
-#: build/trans_presets.java:2885 build/trans_presets.java:2891
-#: build/trans_presets.java:2900 build/trans_presets.java:2910
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2948
-#: build/trans_presets.java:2957 build/trans_presets.java:2963
-#: build/trans_presets.java:2969 build/trans_presets.java:2975
-#: build/trans_presets.java:2981 build/trans_presets.java:2987
-#: build/trans_presets.java:2993 build/trans_presets.java:3000
-#: build/trans_presets.java:3006 build/trans_presets.java:3011
-#: build/trans_presets.java:3018 build/trans_presets.java:3025
-#: build/trans_presets.java:3031 build/trans_presets.java:3040
-#: build/trans_presets.java:3048 build/trans_presets.java:3054
-#: build/trans_presets.java:3060 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3080
-#: build/trans_presets.java:3086 build/trans_presets.java:3092
-#: build/trans_presets.java:3098 build/trans_presets.java:3104
-#: build/trans_presets.java:3117 build/trans_presets.java:3131
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:67 build/trans_presets.java:103
+#: build/trans_presets.java:143 build/trans_presets.java:180
+#: build/trans_presets.java:200 build/trans_presets.java:218
+#: build/trans_presets.java:235 build/trans_presets.java:253
+#: build/trans_presets.java:273 build/trans_presets.java:306
+#: build/trans_presets.java:352 build/trans_presets.java:372
+#: build/trans_presets.java:387 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:503 build/trans_presets.java:523
+#: build/trans_presets.java:544 build/trans_presets.java:565
+#: build/trans_presets.java:586 build/trans_presets.java:607
+#: build/trans_presets.java:628 build/trans_presets.java:659
+#: build/trans_presets.java:680 build/trans_presets.java:693
+#: build/trans_presets.java:706 build/trans_presets.java:719
+#: build/trans_presets.java:732 build/trans_presets.java:745
+#: build/trans_presets.java:756 build/trans_presets.java:765
+#: build/trans_presets.java:812 build/trans_presets.java:833
+#: build/trans_presets.java:842 build/trans_presets.java:902
+#: build/trans_presets.java:1053 build/trans_presets.java:1061
+#: build/trans_presets.java:1069 build/trans_presets.java:1077
+#: build/trans_presets.java:1087 build/trans_presets.java:1095
+#: build/trans_presets.java:1100 build/trans_presets.java:1107
+#: build/trans_presets.java:1114 build/trans_presets.java:1119
+#: build/trans_presets.java:1127 build/trans_presets.java:1136
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1153 build/trans_presets.java:1159
+#: build/trans_presets.java:1165 build/trans_presets.java:1174
+#: build/trans_presets.java:1183 build/trans_presets.java:1190
+#: build/trans_presets.java:1198 build/trans_presets.java:1211
+#: build/trans_presets.java:1217 build/trans_presets.java:1226
+#: build/trans_presets.java:1232 build/trans_presets.java:1238
+#: build/trans_presets.java:1246 build/trans_presets.java:1302
+#: build/trans_presets.java:1349 build/trans_presets.java:1355
+#: build/trans_presets.java:1361 build/trans_presets.java:1367
+#: build/trans_presets.java:1373 build/trans_presets.java:1384
+#: build/trans_presets.java:1393 build/trans_presets.java:1408
+#: build/trans_presets.java:1415 build/trans_presets.java:1421
+#: build/trans_presets.java:1429 build/trans_presets.java:1436
+#: build/trans_presets.java:1445 build/trans_presets.java:1453
+#: build/trans_presets.java:1460 build/trans_presets.java:1471
+#: build/trans_presets.java:1481 build/trans_presets.java:1491
+#: build/trans_presets.java:1511 build/trans_presets.java:1523
+#: build/trans_presets.java:1534 build/trans_presets.java:1551
+#: build/trans_presets.java:1558 build/trans_presets.java:1574
+#: build/trans_presets.java:1581 build/trans_presets.java:1586
+#: build/trans_presets.java:1592 build/trans_presets.java:1598
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1646 build/trans_presets.java:1652
+#: build/trans_presets.java:1659 build/trans_presets.java:1666
+#: build/trans_presets.java:1674 build/trans_presets.java:1681
+#: build/trans_presets.java:1689 build/trans_presets.java:1696
+#: build/trans_presets.java:1702 build/trans_presets.java:1709
+#: build/trans_presets.java:1716 build/trans_presets.java:1723
+#: build/trans_presets.java:1740 build/trans_presets.java:1748
+#: build/trans_presets.java:1763 build/trans_presets.java:1773
+#: build/trans_presets.java:1785 build/trans_presets.java:1792
+#: build/trans_presets.java:1798 build/trans_presets.java:1808
+#: build/trans_presets.java:1813 build/trans_presets.java:1821
+#: build/trans_presets.java:1828 build/trans_presets.java:1834
+#: build/trans_presets.java:1840 build/trans_presets.java:1845
+#: build/trans_presets.java:1850 build/trans_presets.java:1855
+#: build/trans_presets.java:1862 build/trans_presets.java:1868
+#: build/trans_presets.java:1873 build/trans_presets.java:1882
+#: build/trans_presets.java:1891 build/trans_presets.java:1900
+#: build/trans_presets.java:1909 build/trans_presets.java:1918
+#: build/trans_presets.java:1924 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 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:2023 build/trans_presets.java:2032
+#: build/trans_presets.java:2040 build/trans_presets.java:2046
+#: build/trans_presets.java:2052 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 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:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2150
+#: build/trans_presets.java:2156 build/trans_presets.java:2162
+#: build/trans_presets.java:2169 build/trans_presets.java:2176
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2197 build/trans_presets.java:2203
+#: build/trans_presets.java:2209 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2229
+#: build/trans_presets.java:2236 build/trans_presets.java:2243
+#: build/trans_presets.java:2250 build/trans_presets.java:2258
+#: build/trans_presets.java:2290 build/trans_presets.java:2295
+#: build/trans_presets.java:2300 build/trans_presets.java:2305
+#: build/trans_presets.java:2311 build/trans_presets.java:2317
+#: build/trans_presets.java:2323 build/trans_presets.java:2331
+#: build/trans_presets.java:2337 build/trans_presets.java:2343
+#: build/trans_presets.java:2349 build/trans_presets.java:2355
+#: build/trans_presets.java:2365 build/trans_presets.java:2462
+#: build/trans_presets.java:2469 build/trans_presets.java:2483
+#: build/trans_presets.java:2489 build/trans_presets.java:2496
+#: build/trans_presets.java:2503 build/trans_presets.java:2509
+#: build/trans_presets.java:2515 build/trans_presets.java:2537
+#: build/trans_presets.java:2544 build/trans_presets.java:2551
+#: build/trans_presets.java:2557 build/trans_presets.java:2564
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2594 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2615
+#: build/trans_presets.java:2621 build/trans_presets.java:2627
+#: build/trans_presets.java:2633 build/trans_presets.java:2639
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2672 build/trans_presets.java:2678
+#: build/trans_presets.java:2688 build/trans_presets.java:2697
+#: build/trans_presets.java:2712 build/trans_presets.java:2718
+#: build/trans_presets.java:2726 build/trans_presets.java:2733
+#: build/trans_presets.java:2753 build/trans_presets.java:2764
+#: build/trans_presets.java:2770 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2788
+#: build/trans_presets.java:2795 build/trans_presets.java:2802
+#: build/trans_presets.java:2809 build/trans_presets.java:2815
+#: build/trans_presets.java:2821 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2912
+#: build/trans_presets.java:2922 build/trans_presets.java:2931
+#: build/trans_presets.java:2937 build/trans_presets.java:2943
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 build/trans_presets.java:2981
+#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:2999 build/trans_presets.java:3005
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3023 build/trans_presets.java:3030
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3066 build/trans_presets.java:3072
+#: build/trans_presets.java:3079 build/trans_presets.java:3085
+#: build/trans_presets.java:3092 build/trans_presets.java:3098
+#: build/trans_presets.java:3104 build/trans_presets.java:3110
+#: build/trans_presets.java:3116 build/trans_presets.java:3129
+#: build/trans_presets.java:3143 build/trans_presets.java:3157
 msgid "Name"
 msgstr "Nume"
@@ -6523,4 +6654,54 @@
 msgid "Version"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
+#, fuzzy
+msgid "Changeset id:"
+msgstr "Schimbă"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
+msgid "Created at:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
+msgid "Changeset comment:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
+msgid "No open changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48
+#, fuzzy
+msgid "<html>Please select the changesets you want to close</html>"
+msgstr ""
+"Vă rog selectaţi obiectele pentru care doriţi să schimbaţi proprietăţile."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
+msgid "Open changesets"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101
+msgid "Close changesets"
+msgstr ""
+
+#. putValue(SMALL_ICON, ImageProvider.get("cancel"));
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
+#, fuzzy
+msgid "Close the selected open changesets"
+msgstr "Mută nodurile selectate într-o linie."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126
+msgid "Cancel closeing of changesets"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37
+msgid "Closing changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77
+#, fuzzy, java-format
+msgid "Closing changeset {0}"
+msgstr "Ultima modificare la {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
@@ -6549,5 +6730,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be uploaded"
+msgid "Layer ''{0}'' has no modifications to be uploaded."
 msgstr ""
 
@@ -6555,5 +6736,5 @@
 #, java-format
 msgid ""
-"Layer ''{0}'' has modifications which should be saved to its assoicated file "
+"Layer ''{0}'' has modifications which should be saved to its associated file "
 "''{1}''."
 msgstr ""
@@ -6561,5 +6742,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be saved"
+msgid "Layer ''{0}'' has no modifications to be saved."
 msgstr ""
 
@@ -6593,17 +6774,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113
 msgid "Unsaved changes - Save/Upload before exiting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194
 #, java-format
 msgid ""
@@ -6616,9 +6797,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205
 msgid "Unsaved data and conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212
 #, java-format
 msgid ""
@@ -6632,9 +6813,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223
 msgid "Unsaved data and missing associated file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230
 #, java-format
 msgid ""
@@ -6649,42 +6830,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243
 msgid "Unsaved data non-writable files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
 msgid "Close this dialog and resume editing in JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322
+msgid "Discard and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
-msgid "Discard and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354
+msgid "Save and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
-msgid "Save and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
 msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402
 #, java-format
 msgid "Preparing layer ''{0}'' for upload ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
@@ -6692,5 +6873,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491
 msgid "Incomplete upload and/or save"
 msgstr ""
@@ -6730,21 +6911,21 @@
 #. item "Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:200
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:278
-#: build/trans_presets.java:311 build/trans_presets.java:357
-#: build/trans_presets.java:372 build/trans_presets.java:387
-#: build/trans_presets.java:409 build/trans_presets.java:429
-#: build/trans_presets.java:450 build/trans_presets.java:470
-#: build/trans_presets.java:489 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:549
-#: build/trans_presets.java:570 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:633
-#: build/trans_presets.java:664 build/trans_presets.java:1060
-#: build/trans_presets.java:1068 build/trans_presets.java:1076
-#: build/trans_presets.java:1086 build/trans_presets.java:1305
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:242
+#: build/trans_presets.java:260 build/trans_presets.java:279
+#: build/trans_presets.java:312 build/trans_presets.java:358
+#: build/trans_presets.java:373 build/trans_presets.java:388
+#: build/trans_presets.java:410 build/trans_presets.java:430
+#: build/trans_presets.java:451 build/trans_presets.java:471
+#: build/trans_presets.java:490 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:665 build/trans_presets.java:1062
+#: build/trans_presets.java:1070 build/trans_presets.java:1078
+#: build/trans_presets.java:1088 build/trans_presets.java:1308
 msgid "Layer"
 msgstr "Strat"
@@ -6763,67 +6944,32 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:200
 msgid "Upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-msgid "Use a new changeset and close it"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
-msgid ""
-"Select to upload the data using a new changeset and to close the changeset "
-"after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
-msgid "Use a new changeset and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
-msgid ""
-"Select to upload the data using a new changeset and to leave the changeset "
-"open after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
-msgid "Upload to a new or to an existing changeset?"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
-msgid "upload all changes in one request"
+msgid "Settings"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
-msgid ""
-"Enable to upload all changes in one request, disable to use one request per "
-"changed primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:216
-msgid "Settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908
 msgid "Tags of new changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:221
 msgid "Objects to add:"
 msgstr "Obiecte de adăugat:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:227
 msgid "Objects to modify:"
 msgstr "Obiecte de modificat:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:233
 msgid "Objects to delete:"
 msgstr "Obiecte de şters:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
 #, java-format
 msgid "{0} object to add:"
@@ -6832,5 +6978,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:277
 #, java-format
 msgid "{0} object to modifiy:"
@@ -6839,5 +6985,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:286
 #, java-format
 msgid "{0} object to delete:"
@@ -6846,52 +6992,85 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422
-#, java-format
-msgid "Use the existing changeset {0} and close it after upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:423
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to close the changeset "
-"after this upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426
-#, java-format
-msgid "Use the existing changeset {0} and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:427
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to leave the changeset "
-"open for further uploads"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:470
+msgid "Upload Changes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472
+msgid "Upload the changed primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
+msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:479
+msgid "Illegal upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
+msgid "Cancel the upload and resume editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606
+#, fuzzy
+msgid "Upload all changes in one request"
+msgstr "Trimite toate schimbările la serverul OSM."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607
+msgid ""
+"Enable to upload all changes in one request, disable to use one request per "
+"changed primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:617
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672
+msgid "Open a new changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
+msgid "Open a new changeset and use it in the next upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
+#, fuzzy
+msgid "Use an open changeset"
+msgstr "Modificări nesalvate"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
+msgid "Upload data to an already opened changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
+#, fuzzy
+msgid "Close changeset after upload"
+msgstr "Nu sunt schimbări de transmis."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
+msgid "Select to close the changeset after the next upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922
 #, java-format
 msgid "Tags of changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584
-msgid "Upload Changes"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586
-msgid "Upload the changed primitives"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
+msgid "Load the list of your open changesets from the server"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
 #, fuzzy
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "Vă rog introduceţi un nume pentru locaţie."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:593
-msgid "Illegal upload comment"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
-msgid "Cancel the upload and resume editing"
+msgid "Close the currently selected open changeset"
+msgstr "Reîncarcă toate obiectele selectate curent şi împrospătează lista."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
+#, java-format
+msgid "changeset id > 0 expected. Got {1}"
 msgstr ""
 
@@ -6971,5 +7150,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
@@ -7007,5 +7186,5 @@
 msgstr "Timpul introdus nu a putut fi interpretat."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
@@ -7013,30 +7192,30 @@
 msgstr "punct gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
 msgid "Customize line drawing"
 msgstr "Personalizează trasarea liniilor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
 msgid "Use global settings."
 msgstr "Utilizează opţiunile globale."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Draw lines between points for this layer."
 msgstr "Trasează linii între puncte pentru acest strat."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Do not draw lines between points for this layer."
 msgstr "Nu trasa linii între puncte pentru acest strat."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 msgid "Select line drawing options"
 msgstr "Selectaţi opţiunile pentru trasarea liniilor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7044,5 +7223,5 @@
 msgstr "Personalizează culoarea"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7051,5 +7230,5 @@
 msgstr "Implicit"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7058,38 +7237,74 @@
 msgstr "Alegeţi o culoare"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
 msgid "Import Audio"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
 msgid "Wave Audio files (*.wav)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #, java-format
 msgid "Audio markers from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
 msgid "Import images"
 msgstr "Importă imagini"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#, java-format
+msgid "Name: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#, java-format
+msgid "Description: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#, fuzzy, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
+msgstr[0] "urmă"
+msgstr[1] "urme"
+msgstr[2] "de urme"
+
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
+#: build/trans_presets.java:3160
+msgid "Description"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+msgid "Timespan"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+msgid "Length"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
+msgid "URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+msgid "Length: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
 #, java-format
 msgid "{0} route, "
@@ -7098,5 +7313,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 #, java-format
 msgid "{0} waypoint"
@@ -7105,29 +7320,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
-#, java-format
-msgid "Name: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
-#, java-format
-msgid "Description: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
-msgid "Timespan: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
-msgid "Length: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Converteşte la strat de date"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7135,10 +7331,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -7149,29 +7345,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
 msgid "Download from OSM along this track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
 msgid "Download everything within:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
 #, java-format
 msgid "{0} meters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 msgid "Maximum area per request:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
 #, java-format
 msgid "{0} sq km"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
 #, java-format
 msgid ""
@@ -7180,13 +7376,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
 msgid "Download data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7194,5 +7390,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7249,21 +7445,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "track"
 msgid_plural "tracks"
@@ -7399,4 +7595,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
@@ -7623,13 +7820,18 @@
 msgstr "Desenează puncte GPS mari."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+msgid "Draw a circle form HDOP value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -7637,6 +7839,6 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1374
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:1377
 msgid "Car"
 msgstr ""
@@ -7657,14 +7859,14 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:324 build/trans_presets.java:650
-#: build/trans_presets.java:857 build/trans_presets.java:876
-#: build/trans_presets.java:890 build/trans_presets.java:912
-#: build/trans_presets.java:949 build/trans_presets.java:962
-#: build/trans_presets.java:974 build/trans_presets.java:986
-#: build/trans_presets.java:998 build/trans_presets.java:1010
-#: build/trans_presets.java:1020 build/trans_presets.java:1029
-#: build/trans_presets.java:1038 build/trans_presets.java:1437
-#: build/trans_presets.java:1510
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:325 build/trans_presets.java:651
+#: build/trans_presets.java:858 build/trans_presets.java:877
+#: build/trans_presets.java:891 build/trans_presets.java:913
+#: build/trans_presets.java:950 build/trans_presets.java:963
+#: build/trans_presets.java:975 build/trans_presets.java:987
+#: build/trans_presets.java:999 build/trans_presets.java:1011
+#: build/trans_presets.java:1021 build/trans_presets.java:1030
+#: build/trans_presets.java:1039 build/trans_presets.java:1440
+#: build/trans_presets.java:1513
 msgid "Bicycle"
 msgstr ""
@@ -7697,62 +7899,62 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:325 build/trans_presets.java:649
-#: build/trans_presets.java:856 build/trans_presets.java:875
-#: build/trans_presets.java:889 build/trans_presets.java:911
-#: build/trans_presets.java:948 build/trans_presets.java:961
-#: build/trans_presets.java:973 build/trans_presets.java:985
-#: build/trans_presets.java:997 build/trans_presets.java:1009
-#: build/trans_presets.java:1019 build/trans_presets.java:1028
-#: build/trans_presets.java:1037
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:326 build/trans_presets.java:650
+#: build/trans_presets.java:857 build/trans_presets.java:876
+#: build/trans_presets.java:890 build/trans_presets.java:912
+#: build/trans_presets.java:949 build/trans_presets.java:962
+#: build/trans_presets.java:974 build/trans_presets.java:986
+#: build/trans_presets.java:998 build/trans_presets.java:1010
+#: build/trans_presets.java:1020 build/trans_presets.java:1029
+#: build/trans_presets.java:1038
 msgid "Foot"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Desenează săgeţi direcţionale"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr ""
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
-msgid "Only interesting direction hints (e.g. with oneway tag)."
-msgstr ""
-
-#. only on the head of a way
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+msgid "Only interesting direction hints (e.g. with oneway tag)."
+msgstr ""
+
+#. only on the head of a way
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Only on the head of a way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:82
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -7760,19 +7962,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length (meters)"
 msgstr ""
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -7781,15 +7983,15 @@
 "despre linii."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:129
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:135
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:141
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -7797,13 +7999,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:144
 msgid "Minimum distance (pixels)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Draw larger dots for the GPS points."
 msgstr "Desenează puncte mai pari pentru punctele GPS."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -7811,9 +8013,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -7821,46 +8023,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202
 msgid "GPS Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:237
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257
 msgid "Draw the inactive data layers in a different color."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "OSM Data"
 msgstr ""
@@ -7939,45 +8141,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Configure available plugins."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50
+#. buttons at the bottom
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
 msgid "Download List"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:100
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 msgid "Update"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Configure Sites..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:125
 msgid "Add JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:126
 msgid "Enter URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:162
 msgid "Please select an entry."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:147
 msgid "Edit JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:148
 msgid "JOSM Plugin description URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:175
 msgid "Configure Plugin Sites"
 msgstr ""
@@ -8307,6 +8510,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:369
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341
 #, java-format
 msgid "Remove old keys from up to {0} object"
@@ -8315,9 +8518,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135
 msgid "Add a new tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160
 msgid "Delete the selection in the tag table"
 msgstr ""
@@ -8352,7 +8555,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:68
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:75
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -8397,4 +8600,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24
+#, java-format
+msgid "Preset group ''{0}'' of group ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
 #, java-format
 msgid "Preset group ''{0}''"
@@ -8415,4 +8623,10 @@
 msgstr "Descarc punctele {0} până la {1}..."
 
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, java-format
+msgid "parameter ''{0}'' > 0 expected. Got {1}"
+msgstr ""
+
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8517,5 +8731,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
 msgid "Parse error: invalid document structure for gpx document"
 msgstr ""
@@ -8635,10 +8849,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -8646,75 +8861,79 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315
 msgid "Creating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
 #, java-format
 msgid "Successfully opened changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#, java-format
+msgid "id of changeset > 0 required. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
-#, java-format
-msgid "Changeset {0} is unchanged. Skipping update."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
 #, java-format
 msgid "Updating changeset {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
-msgid ""
-"Failed to update changeset. Either there is no current changeset or the id "
-"of the current changeset is 0"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
 msgid "Closing changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
-#, java-format
-msgid "Closing changeset {0}..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
-#, java-format
-msgid "Leaving changeset {0} open..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
 msgid "No changeset present for diff upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414
 msgid "Preparing..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419
 msgid "Uploading..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438
 msgid "Waiting 10 seconds ... "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449
 msgid "OK - trying again."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:485
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517
 #, java-format
 msgid "Starting retry {0} of {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
+msgid "current changeset is null. Can't upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
+#, java-format
+msgid "id of current changeset > required. Current id is {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
+#, java-format
+msgid "Open changeset expected. Got closed changeset with id {0}"
 msgstr ""
 
@@ -8740,33 +8959,91 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
+#, java-format
+msgid "missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:128
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:134
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
+#, java-format
+msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
+#, java-format
+msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
+#, java-format
+msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#, java-format
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#, java-format
+msgid "Unsupported version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:176
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Aborting."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#, java-format
+msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
+msgid "Parsing list of changesets..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
 msgid "Incorrect password or username."
 msgstr "Parolă sau nume utilizator incorecte."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:168
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Atenţie: Parola este transferată necriptată."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Save user and password (unencrypted)"
 msgstr "Salvează nume utilizator şi parolă (necriptate)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
 msgid "Enter Password"
 msgstr "Introduceţi parola"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 msgid "Login"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:242
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
 msgid "The base URL for the OSM server (REST API)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -8775,17 +9052,17 @@
 "nici o parolă."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
 msgid "Base Server URL"
 msgstr "Adresă server principal"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
 msgid "OSM password"
 msgstr "Parola OSM"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -8794,5 +9071,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:51
+#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #, java-format
 msgid "(at line {0}, column {1})"
@@ -8882,20 +9159,5 @@
 msgstr "Eroare la prelucrare."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124
-#, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
-#, java-format
-msgid "Missing mandatory attribute ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
-#, fuzzy, java-format
-msgid "Unsupported version: {0}"
-msgstr "rezolvat în versiunea:"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:155
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -8904,38 +9166,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
 msgid "found XML element <nd> element not as direct child of element <way>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
 msgid "Found XML element <member> not as direct child of element <relation>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
 #, java-format
 msgid ""
@@ -8943,24 +9205,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
 msgid "Incomplete <member> specification with ref=0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
-#, java-format
-msgid "Warning: Undefined element ''{0}'' found in input stream. Skipping."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
-#, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Skipping."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
 msgid "Illegal object with id=0"
 msgstr "Obiect ilegal cu id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #, java-format
 msgid ""
@@ -8968,5 +9225,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:303
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
 #, java-format
 msgid ""
@@ -8975,5 +9232,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
 #, java-format
 msgid ""
@@ -8982,5 +9239,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
@@ -8990,25 +9247,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:316
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with id {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
 #, java-format
 msgid ""
@@ -9016,5 +9273,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
 #, java-format
 msgid ""
@@ -9023,5 +9280,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
 #, java-format
 msgid ""
@@ -9029,5 +9286,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
 #, java-format
 msgid ""
@@ -9036,17 +9293,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
 msgid "Prepare OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 msgid "Parsing OSM data..."
-msgstr "Pregătesc datele..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
 msgid "Preparing data set..."
-msgstr "Pregătesc datele..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
@@ -9068,4 +9323,24 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51
+#, fuzzy
+msgid "Reading changesets..."
+msgstr "Citesc {0}..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
+#, fuzzy
+msgid "Downloading changesets ..."
+msgstr "Descarc..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85
+#, fuzzy, java-format
+msgid "Reading changeset {0} ..."
+msgstr "Citesc {0}..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91
+#, fuzzy, java-format
+msgid "Downloading changeset {0} ..."
+msgstr "Descarc punctele {0} până la {1}..."
+
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
@@ -9081,43 +9356,66 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
 msgid "Failed to open connection to API {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
+msgid "Error: failed to add authentication credentials to the connection."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+msgid "XML tag <user> is missing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
+#, java-format
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
+#, java-format
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
 msgid "Starting to upload with one request per primitive ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
 msgid "Starting to upload in one request ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:171
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135
 msgid "Uploading data ..."
-msgstr "Pregătesc datele..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:178
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
 msgid ""
 "WARNING: no API version defined for data to upload. Falling back to version "
@@ -9125,5 +9423,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147
 #, java-format
 msgid ""
@@ -9133,10 +9431,10 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
 msgid "Update Plugins"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 msgid "Download Plugins"
 msgstr ""
@@ -9284,5 +9582,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -9291,18 +9589,18 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
 msgid "No plugin information found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:93
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
 msgid "All installed plugins are up to date."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
 #, java-format
 msgid ""
@@ -9312,9 +9610,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
 msgid "Download missing plugins"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
 #, java-format
 msgid ""
@@ -9326,43 +9624,43 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
 msgid "unknown"
 msgstr "necunoscut"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 msgid "Plugin bundled with JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:357
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -9663,10 +9961,4 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:140
 msgid "(What does that mean?)"
-msgstr ""
-
-#. item "Relations/Route" text "Symbol description"
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3148
-msgid "Description"
 msgstr ""
 
@@ -10417,5 +10709,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
-msgid "Set "
+#, java-format
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
@@ -11034,6 +11327,6 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 #: build/trans_style.java:990 build/trans_style.java:1007
-#: build/trans_style.java:1023 build/trans_style.java:3392
-#: build/trans_style.java:3400
+#: build/trans_style.java:1023 build/trans_style.java:3400
+#: build/trans_style.java:3408
 msgid "water"
 msgstr ""
@@ -11316,4 +11609,55 @@
 #: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java:36
 msgid "Measurements"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Michigan Left"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Adds no left turn for sets of 4 or 5 ways."
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45
+#, fuzzy
+msgid "Please select 4 or 5 ways to assign no left turns."
+msgstr "Selectează te rog cel puţin două căi pentru a le combina."
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61
+#, java-format
+msgid "{0} extrem nodes."
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69
+#, java-format
+msgid "Via node {0}, {1}"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75
+#, java-format
+msgid "{0} via nodes."
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78
+msgid "Unable to find via nodes. Please check your selection"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98
+#, java-format
+msgid "MIddle way: {0}"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121
+msgid "Create Michigan left turn restriction"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129
+#, fuzzy, java-format
+msgid "Processing {0}"
+msgstr "Versiune {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142
+#, java-format
+msgid "Relation: from {0} to {1} via {2}"
 msgstr ""
 
@@ -11780,5 +12124,5 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:158
 msgid "JOSM Tag Editor Plugin"
 msgstr ""
@@ -11788,5 +12132,5 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:370
 #, java-format
 msgid "Updating properties of up to {0} object"
@@ -11795,18 +12139,4 @@
 msgstr[1] ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44
-msgid "INFO: entering compatibilty mode for JOSM with Main.ds"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47
-msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49
-msgid ""
-"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-"found."
-msgstr ""
-
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
 msgid "Group"
@@ -11815,9 +12145,4 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
 msgid "Item"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-msgid "Filter"
 msgstr ""
 
@@ -11904,5 +12229,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2272
 msgid "Street name"
 msgstr ""
@@ -12063,8 +12388,4 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88
 msgid "Zoom (in metres)"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
-msgid "URL"
 msgstr ""
 
@@ -12268,7 +12589,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501
-#, fuzzy
 msgid "Updating map ..."
-msgstr "Pregătesc datele..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69
@@ -12752,7 +13072,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
-#: build/trans_style.java:4179
+#: build/trans_style.java:4159 build/trans_style.java:4166
+#: build/trans_style.java:4173 build/trans_style.java:4180
+#: build/trans_style.java:4187
 msgid "building"
 msgstr ""
@@ -12766,5 +13086,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4186
+#: build/trans_style.java:4194
 msgid "area"
 msgstr ""
@@ -12891,10 +13211,10 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:148
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:155
 msgid "Reached a junction"
 msgstr ""
@@ -13334,6 +13654,11 @@
 msgstr ""
 
+#. Plugin michigan_left
+#: build/trans_plugins.java:35
+msgid "Adds no left turn for sets of 4 or 5 ways"
+msgstr ""
+
 #. Plugin nearclick
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid ""
 "Simulates a click when you do a small and short drag. This is usefull for "
@@ -13343,15 +13668,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13359,5 +13684,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13365,5 +13690,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13372,15 +13697,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13389,10 +13714,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13401,15 +13726,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -13419,10 +13744,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin usertools
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -13431,5 +13756,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -13438,5 +13763,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -13445,5 +13770,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -13452,10 +13777,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -13511,4 +13836,9 @@
 #. <annotations>
 #: build/trans_presets.java:57
+msgid "Highways"
+msgstr ""
+
+#. group "Highways"
+#: build/trans_presets.java:58
 msgid "Streets"
 msgstr ""
@@ -13519,5 +13849,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:58 build/trans_surveyor.java:72
+#: build/trans_presets.java:59 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr ""
@@ -13526,5 +13856,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:61
+#: build/trans_presets.java:62
 msgid "Edit Motorway"
 msgstr ""
@@ -13551,8 +13881,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:120 build/trans_presets.java:140
-#: build/trans_presets.java:177 build/trans_presets.java:197
-#: build/trans_presets.java:1557 build/trans_presets.java:3146
+#: build/trans_presets.java:65 build/trans_presets.java:101
+#: build/trans_presets.java:121 build/trans_presets.java:141
+#: build/trans_presets.java:178 build/trans_presets.java:198
+#: build/trans_presets.java:1560 build/trans_presets.java:3158
 msgid "Reference"
 msgstr ""
@@ -13566,8 +13896,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:358
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:359
 msgid "Lanes"
 msgstr ""
@@ -13584,15 +13914,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:224 build/trans_presets.java:280
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:373 build/trans_presets.java:388
-#: build/trans_presets.java:412 build/trans_presets.java:431
-#: build/trans_presets.java:452 build/trans_presets.java:472
-#: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1307
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:225 build/trans_presets.java:281
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:374 build/trans_presets.java:389
+#: build/trans_presets.java:413 build/trans_presets.java:432
+#: build/trans_presets.java:453 build/trans_presets.java:473
+#: build/trans_presets.java:511 build/trans_presets.java:667
+#: build/trans_presets.java:1310
 msgid "Max. speed (km/h)"
 msgstr ""
@@ -13629,16 +13959,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:293 build/trans_presets.java:306
-#: build/trans_presets.java:320 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:464
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:659 build/trans_presets.java:1300
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:294 build/trans_presets.java:307
+#: build/trans_presets.java:321 build/trans_presets.java:353
+#: build/trans_presets.java:405 build/trans_presets.java:425
+#: build/trans_presets.java:445 build/trans_presets.java:465
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:660 build/trans_presets.java:1303
 msgid "Oneway"
 msgstr ""
@@ -13680,19 +14010,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:353
-#: build/trans_presets.java:362 build/trans_presets.java:405
-#: build/trans_presets.java:425 build/trans_presets.java:445
-#: build/trans_presets.java:465 build/trans_presets.java:485
-#: build/trans_presets.java:504 build/trans_presets.java:523
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:586 build/trans_presets.java:607
-#: build/trans_presets.java:628 build/trans_presets.java:660
-#: build/trans_presets.java:1301 build/trans_surveyor.java:12
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:354
+#: build/trans_presets.java:363 build/trans_presets.java:406
+#: build/trans_presets.java:426 build/trans_presets.java:446
+#: build/trans_presets.java:466 build/trans_presets.java:486
+#: build/trans_presets.java:505 build/trans_presets.java:524
+#: build/trans_presets.java:545 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629 build/trans_presets.java:661
+#: build/trans_presets.java:1304 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr ""
@@ -13728,19 +14058,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:354
-#: build/trans_presets.java:378 build/trans_presets.java:406
-#: build/trans_presets.java:426 build/trans_presets.java:446
-#: build/trans_presets.java:466 build/trans_presets.java:486
-#: build/trans_presets.java:505 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629 build/trans_presets.java:661
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:355
+#: build/trans_presets.java:379 build/trans_presets.java:407
+#: build/trans_presets.java:427 build/trans_presets.java:447
+#: build/trans_presets.java:467 build/trans_presets.java:487
+#: build/trans_presets.java:506 build/trans_presets.java:525
+#: build/trans_presets.java:546 build/trans_presets.java:567
+#: build/trans_presets.java:588 build/trans_presets.java:609
+#: build/trans_presets.java:630 build/trans_presets.java:662
+#: build/trans_presets.java:1305
 msgid "Tunnel"
 msgstr ""
@@ -13774,18 +14104,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:73 build/trans_presets.java:90
-#: build/trans_presets.java:110 build/trans_presets.java:129
-#: build/trans_presets.java:150 build/trans_presets.java:166
-#: build/trans_presets.java:186 build/trans_presets.java:205
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:355
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:467
-#: build/trans_presets.java:487 build/trans_presets.java:506
-#: build/trans_presets.java:525 build/trans_presets.java:546
-#: build/trans_presets.java:567 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:630
-#: build/trans_presets.java:662 build/trans_presets.java:1303
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:356
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:468
+#: build/trans_presets.java:488 build/trans_presets.java:507
+#: build/trans_presets.java:526 build/trans_presets.java:547
+#: build/trans_presets.java:568 build/trans_presets.java:589
+#: build/trans_presets.java:610 build/trans_presets.java:631
+#: build/trans_presets.java:663 build/trans_presets.java:1306
 msgid "Cutting"
 msgstr ""
@@ -13819,18 +14149,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:74 build/trans_presets.java:91
-#: build/trans_presets.java:111 build/trans_presets.java:130
-#: build/trans_presets.java:151 build/trans_presets.java:167
-#: build/trans_presets.java:187 build/trans_presets.java:206
-#: build/trans_presets.java:222 build/trans_presets.java:240
-#: build/trans_presets.java:258 build/trans_presets.java:277
-#: build/trans_presets.java:310 build/trans_presets.java:356
-#: build/trans_presets.java:408 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:468
-#: build/trans_presets.java:488 build/trans_presets.java:507
-#: build/trans_presets.java:526 build/trans_presets.java:547
-#: build/trans_presets.java:568 build/trans_presets.java:589
-#: build/trans_presets.java:610 build/trans_presets.java:631
-#: build/trans_presets.java:663 build/trans_presets.java:1304
+#: build/trans_presets.java:75 build/trans_presets.java:92
+#: build/trans_presets.java:112 build/trans_presets.java:131
+#: build/trans_presets.java:152 build/trans_presets.java:168
+#: build/trans_presets.java:188 build/trans_presets.java:207
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:357
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:469
+#: build/trans_presets.java:489 build/trans_presets.java:508
+#: build/trans_presets.java:527 build/trans_presets.java:548
+#: build/trans_presets.java:569 build/trans_presets.java:590
+#: build/trans_presets.java:611 build/trans_presets.java:632
+#: build/trans_presets.java:664 build/trans_presets.java:1307
 msgid "Embankment"
 msgstr ""
@@ -13838,5 +14168,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Motorway Link"
 msgstr ""
@@ -13845,5 +14175,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:80
+#: build/trans_presets.java:81
 msgid "Edit Motorway Link"
 msgstr ""
@@ -13851,5 +14181,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:94
+#: build/trans_presets.java:95
 msgid "Trunk"
 msgstr ""
@@ -13858,5 +14188,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:97
+#: build/trans_presets.java:98
 msgid "Edit Trunk"
 msgstr ""
@@ -13866,6 +14196,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
 msgid "Motorroad"
 msgstr ""
@@ -13873,5 +14203,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:114
+#: build/trans_presets.java:115
 msgid "Trunk Link"
 msgstr ""
@@ -13880,5 +14210,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:117
+#: build/trans_presets.java:118
 msgid "Edit Trunk Link"
 msgstr ""
@@ -13891,5 +14221,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:134 build/trans_surveyor.java:76
+#: build/trans_presets.java:135 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr ""
@@ -13898,5 +14228,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:137
+#: build/trans_presets.java:138
 msgid "Edit Primary Road"
 msgstr ""
@@ -13904,10 +14234,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:154
+#: build/trans_presets.java:155
 msgid "Primary Link"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:155
+#: build/trans_presets.java:156
 msgid "Edit Primary Link"
 msgstr ""
@@ -13919,5 +14249,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:170 build/trans_surveyor.java:80
+#: build/trans_presets.java:171 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr ""
@@ -13927,5 +14257,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:174
+#: build/trans_presets.java:175
 msgid "Edit Secondary Road"
 msgstr ""
@@ -13933,5 +14263,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:190
+#: build/trans_presets.java:191
 msgid "Tertiary"
 msgstr ""
@@ -13941,5 +14271,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:194
+#: build/trans_presets.java:195
 msgid "Edit Tertiary Road"
 msgstr ""
@@ -13951,5 +14281,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:209 build/trans_surveyor.java:84
+#: build/trans_presets.java:210 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr ""
@@ -13959,5 +14289,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:213
+#: build/trans_presets.java:214
 msgid "Edit Unclassified Road"
 msgstr ""
@@ -13984,19 +14314,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:225 build/trans_presets.java:243
-#: build/trans_presets.java:261 build/trans_presets.java:281
-#: build/trans_presets.java:314 build/trans_presets.java:359
-#: build/trans_presets.java:375 build/trans_presets.java:389
-#: build/trans_presets.java:413 build/trans_presets.java:432
-#: build/trans_presets.java:453 build/trans_presets.java:473
-#: build/trans_presets.java:491 build/trans_presets.java:511
-#: build/trans_presets.java:532 build/trans_presets.java:553
-#: build/trans_presets.java:574 build/trans_presets.java:595
-#: build/trans_presets.java:616 build/trans_presets.java:637
-#: build/trans_presets.java:667 build/trans_presets.java:680
-#: build/trans_presets.java:693 build/trans_presets.java:706
-#: build/trans_presets.java:719 build/trans_presets.java:732
-#: build/trans_presets.java:745 build/trans_presets.java:1308
-#: build/trans_presets.java:1498 build/trans_presets.java:1540
+#: build/trans_presets.java:226 build/trans_presets.java:244
+#: build/trans_presets.java:262 build/trans_presets.java:282
+#: build/trans_presets.java:315 build/trans_presets.java:360
+#: build/trans_presets.java:376 build/trans_presets.java:390
+#: build/trans_presets.java:414 build/trans_presets.java:433
+#: build/trans_presets.java:454 build/trans_presets.java:474
+#: build/trans_presets.java:492 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:554
+#: build/trans_presets.java:575 build/trans_presets.java:596
+#: build/trans_presets.java:617 build/trans_presets.java:638
+#: build/trans_presets.java:668 build/trans_presets.java:681
+#: build/trans_presets.java:694 build/trans_presets.java:707
+#: build/trans_presets.java:720 build/trans_presets.java:733
+#: build/trans_presets.java:746 build/trans_presets.java:1311
+#: build/trans_presets.java:1501 build/trans_presets.java:1543
 msgid "Width (meters)"
 msgstr ""
@@ -14008,5 +14338,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:228 build/trans_surveyor.java:88
+#: build/trans_presets.java:229 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr ""
@@ -14015,5 +14345,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:231
+#: build/trans_presets.java:232
 msgid "Edit Residential Street"
 msgstr ""
@@ -14038,14 +14368,14 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:611
-#: build/trans_presets.java:632 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "Surface"
 msgstr ""
@@ -14066,53 +14396,53 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paved"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "unpaved"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
 msgid "metal"
 msgstr ""
@@ -14126,22 +14456,22 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
-#: build/trans_style.java:3367
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
+#: build/trans_style.java:3375
 msgid "wood"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paving_stones"
 msgstr ""
@@ -14149,77 +14479,77 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "cobblestone"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "gravel"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "grass"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "sand"
 msgstr ""
@@ -14227,13 +14557,13 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "ground"
 msgstr ""
@@ -14241,5 +14571,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:246
+#: build/trans_presets.java:247
 msgid "Living Street"
 msgstr ""
@@ -14248,5 +14578,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:249
+#: build/trans_presets.java:250
 msgid "Edit Living Street"
 msgstr ""
@@ -14254,5 +14584,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:264
+#: build/trans_presets.java:265
 msgid "Service"
 msgstr ""
@@ -14261,5 +14591,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:267
+#: build/trans_presets.java:268
 msgid "Edit Serviceway"
 msgstr ""
@@ -14269,18 +14599,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "parking_aisle"
 msgstr ""
@@ -14288,5 +14618,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:284
+#: build/trans_presets.java:285
 msgid "Parking Aisle"
 msgstr ""
@@ -14296,5 +14626,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:288
+#: build/trans_presets.java:289
 msgid "Edit Parking Aisle"
 msgstr ""
@@ -14302,5 +14632,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:298
+#: build/trans_presets.java:299
 msgid "Road (Unknown Type)"
 msgstr ""
@@ -14309,5 +14639,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Edit Road of unknown type"
 msgstr ""
@@ -14316,20 +14646,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:318
+#: build/trans_presets.java:319
 msgid "Road Restrictions"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:319
+#: build/trans_presets.java:320
 msgid "Edit Road Restrictions"
 msgstr ""
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:321
+#: build/trans_presets.java:322
 msgid "Toll"
 msgstr ""
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:322
+#: build/trans_presets.java:323
 msgid "No exit (cul-de-sac)"
 msgstr ""
@@ -14342,8 +14672,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:323 build/trans_presets.java:529
-#: build/trans_presets.java:550 build/trans_presets.java:571
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:634
+#: build/trans_presets.java:324 build/trans_presets.java:530
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:593 build/trans_presets.java:614
+#: build/trans_presets.java:635
 msgid "Access"
 msgstr ""
@@ -14397,29 +14727,29 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1397
-#: build/trans_presets.java:1398 build/trans_presets.java:1399
-#: build/trans_presets.java:1763 build/trans_presets.java:1773
-#: build/trans_presets.java:2397 build/trans_presets.java:2433
-#: build/trans_presets.java:2442 build/trans_presets.java:2443
-#: build/trans_presets.java:2444 build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:1396
+#: build/trans_presets.java:1397 build/trans_presets.java:1400
+#: build/trans_presets.java:1401 build/trans_presets.java:1402
+#: build/trans_presets.java:1767 build/trans_presets.java:1777
+#: build/trans_presets.java:2408 build/trans_presets.java:2444
+#: build/trans_presets.java:2453 build/trans_presets.java:2454
+#: build/trans_presets.java:2455 build/trans_presets.java:2725
 msgid "yes"
 msgstr ""
@@ -14432,40 +14762,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:212
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:212
 msgid "private"
 msgstr ""
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655
 msgid "designated"
 msgstr ""
@@ -14478,19 +14808,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:219
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:219
 msgid "destination"
 msgstr ""
@@ -14513,71 +14843,71 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:205
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:205
 msgid "permissive"
 msgstr ""
 
-#: build/trans_presets.java:323 build/trans_presets.java:327
-#: build/trans_presets.java:330 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636
+#: build/trans_presets.java:324 build/trans_presets.java:328
+#: build/trans_presets.java:331 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637
 msgid "agricultural"
 msgstr ""
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
-#: build/trans_presets.java:2433 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1396 build/trans_presets.java:1397
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
+#: build/trans_presets.java:2444 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
+#: build/trans_presets.java:2725
 msgid "no"
 msgstr ""
 
-#: build/trans_presets.java:326
+#: build/trans_presets.java:327
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:327
+#: build/trans_presets.java:328
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -14592,10 +14922,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:328 build/trans_presets.java:651
-#: build/trans_presets.java:858 build/trans_presets.java:891
-#: build/trans_presets.java:913 build/trans_presets.java:950
-#: build/trans_presets.java:963 build/trans_presets.java:975
-#: build/trans_presets.java:987 build/trans_presets.java:999
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:329 build/trans_presets.java:652
+#: build/trans_presets.java:859 build/trans_presets.java:892
+#: build/trans_presets.java:914 build/trans_presets.java:951
+#: build/trans_presets.java:964 build/trans_presets.java:976
+#: build/trans_presets.java:988 build/trans_presets.java:1000
+#: build/trans_presets.java:1040
 msgid "Horse"
 msgstr ""
@@ -14611,13 +14941,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:329 build/trans_presets.java:530
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:635 build/trans_presets.java:859
-#: build/trans_presets.java:877 build/trans_presets.java:892
-#: build/trans_presets.java:914 build/trans_presets.java:951
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:330 build/trans_presets.java:531
+#: build/trans_presets.java:552 build/trans_presets.java:573
+#: build/trans_presets.java:594 build/trans_presets.java:615
+#: build/trans_presets.java:636 build/trans_presets.java:860
+#: build/trans_presets.java:878 build/trans_presets.java:893
+#: build/trans_presets.java:915 build/trans_presets.java:952
+#: build/trans_presets.java:965 build/trans_presets.java:977
+#: build/trans_presets.java:989 build/trans_presets.java:1001
+#: build/trans_presets.java:1041
 msgid "Motorcycle"
 msgstr ""
@@ -14632,30 +14962,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:330 build/trans_presets.java:531
-#: build/trans_presets.java:552 build/trans_presets.java:573
-#: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:636 build/trans_presets.java:654
-#: build/trans_presets.java:878 build/trans_presets.java:893
-#: build/trans_presets.java:915 build/trans_presets.java:952
-#: build/trans_presets.java:965 build/trans_presets.java:977
-#: build/trans_presets.java:989 build/trans_presets.java:1001
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:331 build/trans_presets.java:532
+#: build/trans_presets.java:553 build/trans_presets.java:574
+#: build/trans_presets.java:595 build/trans_presets.java:616
+#: build/trans_presets.java:637 build/trans_presets.java:655
+#: build/trans_presets.java:879 build/trans_presets.java:894
+#: build/trans_presets.java:916 build/trans_presets.java:953
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1042
 msgid "Motorcar"
 msgstr ""
 
-#: build/trans_presets.java:331
+#: build/trans_presets.java:332
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
-#: build/trans_presets.java:332
+#: build/trans_presets.java:333
 msgid "Motorboat"
 msgstr ""
 
-#: build/trans_presets.java:333
+#: build/trans_presets.java:334
 msgid "Boat"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:336
 msgid "Min. speed (km/h)"
 msgstr ""
@@ -14663,25 +14993,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:336 build/trans_presets.java:374
+#: build/trans_presets.java:337 build/trans_presets.java:375
 msgid "Max. weight (tonnes)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:337
+#: build/trans_presets.java:338
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:339
+#: build/trans_presets.java:340
 msgid "Max. Length (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:341
+#: build/trans_presets.java:342
 msgid "Roundabout"
 msgstr ""
@@ -14692,5 +15022,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:346
+#: build/trans_presets.java:347
 msgid "Edit Junction"
 msgstr ""
@@ -14712,9 +15042,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:349 build/trans_presets.java:648
-#: build/trans_presets.java:788 build/trans_presets.java:1135
-#: build/trans_presets.java:1392 build/trans_presets.java:2353
-#: build/trans_presets.java:2901 build/trans_presets.java:2911
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:350 build/trans_presets.java:649
+#: build/trans_presets.java:789 build/trans_presets.java:1137
+#: build/trans_presets.java:1395 build/trans_presets.java:2364
+#: build/trans_presets.java:2913 build/trans_presets.java:2923
+#: build/trans_presets.java:2932
 msgid "Type"
 msgstr ""
@@ -14734,10 +15064,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:547
+#: build/trans_presets.java:350 build/trans_style.java:547
 #: build/trans_style.java:555
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "motorway_link"
 msgstr ""
@@ -14759,10 +15089,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:563
+#: build/trans_presets.java:350 build/trans_style.java:563
 #: build/trans_style.java:571
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "trunk_link"
 msgstr ""
@@ -14784,10 +15114,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:579
+#: build/trans_presets.java:350 build/trans_style.java:579
 #: build/trans_style.java:587
 msgid "primary"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "primary_link"
 msgstr ""
@@ -14809,5 +15139,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:595
+#: build/trans_presets.java:350 build/trans_style.java:595
 #: build/trans_style.java:603
 msgid "secondary"
@@ -14822,9 +15152,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:349 build/trans_style.java:611
+#: build/trans_presets.java:350 build/trans_style.java:611
 msgid "tertiary"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "unclassified"
 msgstr ""
@@ -14838,9 +15168,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:349 build/trans_style.java:3143
+#: build/trans_presets.java:350 build/trans_style.java:3151
 msgid "residential"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "living_street"
 msgstr ""
@@ -14870,10 +15200,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:349 build/trans_style.java:667
-#: build/trans_style.java:4244
+#: build/trans_presets.java:350 build/trans_style.java:667
+#: build/trans_style.java:4252
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "bus_guideway"
 msgstr ""
@@ -14903,6 +15233,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:349 build/trans_style.java:877
-#: build/trans_style.java:3208 build/trans_style.java:3209
+#: build/trans_presets.java:350 build/trans_style.java:877
+#: build/trans_style.java:3216 build/trans_style.java:3217
 msgid "construction"
 msgstr ""
@@ -14913,10 +15243,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Edit Bridge"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "Edit Tunnel"
 msgstr ""
@@ -14924,19 +15254,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:393
+#: build/trans_presets.java:394
 msgid "Ways"
 msgstr ""
 
 #. group "Ways"
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Construction"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:395
+#: build/trans_presets.java:396
 msgid "Edit Highway Under Construction"
 msgstr ""
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "Junction"
 msgstr ""
@@ -14952,5 +15282,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:411 build/trans_style.java:895
+#: build/trans_presets.java:412 build/trans_style.java:895
 msgid "roundabout"
 msgstr ""
@@ -14959,5 +15289,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:417
+#: build/trans_presets.java:418
 msgid "Bridleway"
 msgstr ""
@@ -14965,5 +15295,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:419
+#: build/trans_presets.java:420
 msgid "Edit Bridleway"
 msgstr ""
@@ -14971,5 +15301,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:435
+#: build/trans_presets.java:436
 msgid "Cycleway"
 msgstr ""
@@ -14979,10 +15309,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:439
+#: build/trans_presets.java:440
 msgid "Edit Cycleway"
 msgstr ""
 
 #. item "Ways/Cycleway" check "Embankment"
-#: build/trans_presets.java:449
+#: build/trans_presets.java:450
 msgid "Pedestrians"
 msgstr ""
@@ -14990,5 +15320,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Footway"
 msgstr ""
@@ -14997,10 +15327,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Footway"
 msgstr ""
 
 #. item "Ways/Footway" check "Embankment"
-#: build/trans_presets.java:469
+#: build/trans_presets.java:470
 msgid "Bikes"
 msgstr ""
@@ -15008,5 +15338,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:476
+#: build/trans_presets.java:477
 msgid "Pedestrian"
 msgstr ""
@@ -15015,5 +15345,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Edit Pedestrian Street"
 msgstr ""
@@ -15021,5 +15351,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:494
+#: build/trans_presets.java:495
 msgid "Steps"
 msgstr ""
@@ -15029,5 +15359,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:498
+#: build/trans_presets.java:499
 msgid "Edit Flight of Steps"
 msgstr ""
@@ -15036,5 +15366,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:515
+#: build/trans_presets.java:516
 msgid "Track"
 msgstr ""
@@ -15043,5 +15373,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:518
+#: build/trans_presets.java:519
 msgid "Edit Track"
 msgstr ""
@@ -15049,5 +15379,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:535
+#: build/trans_presets.java:536
 msgid "Track Grade 1"
 msgstr ""
@@ -15056,5 +15386,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:538
+#: build/trans_presets.java:539
 msgid "Edit Track of grade 1"
 msgstr ""
@@ -15062,5 +15392,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:556
+#: build/trans_presets.java:557
 msgid "Track Grade 2"
 msgstr ""
@@ -15069,5 +15399,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:559
+#: build/trans_presets.java:560
 msgid "Edit Track of grade 2"
 msgstr ""
@@ -15075,5 +15405,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:577
+#: build/trans_presets.java:578
 msgid "Track Grade 3"
 msgstr ""
@@ -15082,5 +15412,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:580
+#: build/trans_presets.java:581
 msgid "Edit Track of grade 3"
 msgstr ""
@@ -15088,5 +15418,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:598
+#: build/trans_presets.java:599
 msgid "Track Grade 4"
 msgstr ""
@@ -15095,5 +15425,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:601
+#: build/trans_presets.java:602
 msgid "Edit Track of grade 4"
 msgstr ""
@@ -15101,5 +15431,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:619
+#: build/trans_presets.java:620
 msgid "Track Grade 5"
 msgstr ""
@@ -15108,5 +15438,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:622
+#: build/trans_presets.java:623
 msgid "Edit Track of grade 5"
 msgstr ""
@@ -15115,5 +15445,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:641
+#: build/trans_presets.java:642
 msgid "Path"
 msgstr ""
@@ -15122,13 +15452,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:644
+#: build/trans_presets.java:645
 msgid "Edit Path"
 msgstr ""
 
-#: build/trans_presets.java:652
+#: build/trans_presets.java:653
 msgid "Ski"
 msgstr ""
 
-#: build/trans_presets.java:653
+#: build/trans_presets.java:654
 msgid "Snowmobile"
 msgstr ""
@@ -15138,6 +15468,6 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:670 build/trans_presets.java:1725
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:671 build/trans_presets.java:1729
+#: build/trans_presets.java:1752
 msgid "Hiking"
 msgstr ""
@@ -15147,5 +15477,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:674
+#: build/trans_presets.java:675
 msgid "Edit Hiking"
 msgstr ""
@@ -15153,5 +15483,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:683
+#: build/trans_presets.java:684
 msgid "Mountain Hiking"
 msgstr ""
@@ -15161,5 +15491,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:687
+#: build/trans_presets.java:688
 msgid "Edit Mountain Hiking"
 msgstr ""
@@ -15167,5 +15497,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:696
+#: build/trans_presets.java:697
 msgid "Demanding Mountain Hiking"
 msgstr ""
@@ -15175,5 +15505,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:700
+#: build/trans_presets.java:701
 msgid "Edit Demanding Mountain Hiking"
 msgstr ""
@@ -15181,5 +15511,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:709
+#: build/trans_presets.java:710
 msgid "Alpine Hiking"
 msgstr ""
@@ -15189,5 +15519,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:713
+#: build/trans_presets.java:714
 msgid "Edit Alpine Hiking"
 msgstr ""
@@ -15195,5 +15525,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:723
 msgid "Demanding Alpine Hiking"
 msgstr ""
@@ -15203,5 +15533,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:726
+#: build/trans_presets.java:727
 msgid "Edit Demanding Alpine Hiking"
 msgstr ""
@@ -15209,5 +15539,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:735
+#: build/trans_presets.java:736
 msgid "Difficult Alpine Hiking"
 msgstr ""
@@ -15217,5 +15547,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:739
+#: build/trans_presets.java:740
 msgid "Edit Difficult Alpine Hiking"
 msgstr ""
@@ -15223,10 +15553,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:749
+#: build/trans_presets.java:750
 msgid "Waypoints"
 msgstr ""
 
 #. group "Waypoints"
-#: build/trans_presets.java:750
+#: build/trans_presets.java:751
 msgid "Motorway Junction"
 msgstr ""
@@ -15234,15 +15564,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:752
+#: build/trans_presets.java:753
 msgid "Edit Motorway Junction"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:757
 msgid "Number"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:759
 msgid "Services"
 msgstr ""
@@ -15250,5 +15580,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:761
 msgid "Edit Service Station"
 msgstr ""
@@ -15286,15 +15616,15 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:765 build/trans_presets.java:902
-#: build/trans_presets.java:1382 build/trans_presets.java:1406
-#: build/trans_presets.java:1413 build/trans_presets.java:1419
-#: build/trans_presets.java:1427 build/trans_presets.java:1434
-#: build/trans_presets.java:1761 build/trans_presets.java:1771
-#: build/trans_presets.java:2361 build/trans_presets.java:2368
-#: build/trans_presets.java:2384 build/trans_presets.java:2395
-#: build/trans_presets.java:2403 build/trans_presets.java:2410
-#: build/trans_presets.java:2464 build/trans_presets.java:2512
-#: build/trans_presets.java:2678 build/trans_presets.java:2693
-#: build/trans_presets.java:2732 build/trans_presets.java:3151
+#: build/trans_presets.java:766 build/trans_presets.java:903
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
+#: build/trans_presets.java:1416 build/trans_presets.java:1422
+#: build/trans_presets.java:1430 build/trans_presets.java:1437
+#: build/trans_presets.java:1765 build/trans_presets.java:1775
+#: build/trans_presets.java:2372 build/trans_presets.java:2379
+#: build/trans_presets.java:2395 build/trans_presets.java:2406
+#: build/trans_presets.java:2414 build/trans_presets.java:2421
+#: build/trans_presets.java:2475 build/trans_presets.java:2523
+#: build/trans_presets.java:2689 build/trans_presets.java:2704
+#: build/trans_presets.java:2743 build/trans_presets.java:3163
 msgid "Operator"
 msgstr ""
@@ -15303,5 +15633,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:769
+#: build/trans_presets.java:770
 msgid "Traffic Signal"
 msgstr ""
@@ -15311,5 +15641,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:774
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -15318,27 +15648,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "island"
 msgstr ""
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:774 build/trans_presets.java:790
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:775 build/trans_presets.java:791
+#: build/trans_presets.java:1334
 msgid "Cross on horseback"
 msgstr ""
@@ -15346,6 +15676,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:775 build/trans_presets.java:789
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:776 build/trans_presets.java:790
+#: build/trans_presets.java:1335
 msgid "Cross by bicycle"
 msgstr ""
@@ -15354,11 +15684,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:776 build/trans_presets.java:791
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:1336
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:778
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -15366,30 +15696,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:780
+#: build/trans_presets.java:781
 msgid "Stop"
 msgstr ""
@@ -15397,5 +15727,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:783
+#: build/trans_presets.java:784
 msgid "Pedestrian Crossing"
 msgstr ""
@@ -15404,14 +15734,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:786
+#: build/trans_presets.java:787
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:793
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:795
 msgid "Mini-roundabout"
 msgstr ""
@@ -15422,14 +15752,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:801
+#: build/trans_presets.java:802
 msgid "Turning Circle"
 msgstr ""
@@ -15439,20 +15769,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:806
+#: build/trans_presets.java:807
 msgid "City Limit"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:807
+#: build/trans_presets.java:808
 msgid "Edit City Limit Sign"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:812
+#: build/trans_presets.java:813
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:814
+#: build/trans_presets.java:815
 msgid "Speed Camera"
 msgstr ""
@@ -15460,5 +15790,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:817
+#: build/trans_presets.java:818
 msgid "Emergency Phone"
 msgstr ""
@@ -15466,5 +15796,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:820
+#: build/trans_presets.java:821
 msgid "Incline"
 msgstr ""
@@ -15472,5 +15802,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:823
+#: build/trans_presets.java:824
 msgid "Incline Steep"
 msgstr ""
@@ -15479,10 +15809,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:827
+#: build/trans_presets.java:828
 msgid "Ford"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:828
+#: build/trans_presets.java:829
 msgid "Edit Ford"
 msgstr ""
@@ -15490,5 +15820,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:835
+#: build/trans_presets.java:836
 msgid "Mountain Pass"
 msgstr ""
@@ -15496,5 +15826,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:837
+#: build/trans_presets.java:838
 msgid "Edit Mountain Pass"
 msgstr ""
@@ -15506,7 +15836,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:842 build/trans_presets.java:1600
-#: build/trans_presets.java:1745 build/trans_presets.java:2845
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:843 build/trans_presets.java:1604
+#: build/trans_presets.java:1749 build/trans_presets.java:2857
+#: build/trans_presets.java:2864 build/trans_presets.java:2871
 msgid "Elevation"
 msgstr ""
@@ -15514,5 +15844,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:846
+#: build/trans_presets.java:847
 msgid "Barriers"
 msgstr ""
@@ -15520,5 +15850,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:849
+#: build/trans_presets.java:850
 msgid "Bollard"
 msgstr ""
@@ -15526,5 +15856,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:852
 msgid "Edit Bollard"
 msgstr ""
@@ -15569,16 +15899,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:854 build/trans_presets.java:873
-#: build/trans_presets.java:887 build/trans_presets.java:909
-#: build/trans_presets.java:946 build/trans_presets.java:959
-#: build/trans_presets.java:971 build/trans_presets.java:983
-#: build/trans_presets.java:995 build/trans_presets.java:1007
-#: build/trans_presets.java:1017 build/trans_presets.java:1026
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:855 build/trans_presets.java:874
+#: build/trans_presets.java:888 build/trans_presets.java:910
+#: build/trans_presets.java:947 build/trans_presets.java:960
+#: build/trans_presets.java:972 build/trans_presets.java:984
+#: build/trans_presets.java:996 build/trans_presets.java:1008
+#: build/trans_presets.java:1018 build/trans_presets.java:1027
+#: build/trans_presets.java:1036
 msgid "Allowed traffic:"
 msgstr ""
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:861
+#: build/trans_presets.java:862
 msgid "Cycle Barrier"
 msgstr ""
@@ -15587,5 +15917,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:865
+#: build/trans_presets.java:866
 msgid "Block"
 msgstr ""
@@ -15593,5 +15923,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:868
+#: build/trans_presets.java:869
 msgid "Cattle Grid"
 msgstr ""
@@ -15599,10 +15929,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:870
+#: build/trans_presets.java:871
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:880
+#: build/trans_presets.java:881
 msgid "Bus Trap"
 msgstr ""
@@ -15610,15 +15940,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:883
+#: build/trans_presets.java:884
 msgid "Spikes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:884
+#: build/trans_presets.java:885
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:896
 msgid "Toll Booth"
 msgstr ""
@@ -15626,5 +15956,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:897
+#: build/trans_presets.java:898
 msgid "Edit Toll Booth"
 msgstr ""
@@ -15632,10 +15962,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:905
+#: build/trans_presets.java:906
 msgid "Border Control"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:906
+#: build/trans_presets.java:907
 msgid "Edit Border Control"
 msgstr ""
@@ -15645,5 +15975,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:920
+#: build/trans_presets.java:921
 msgid "Hedge"
 msgstr ""
@@ -15652,5 +15982,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:925
 msgid "Fence"
 msgstr ""
@@ -15659,5 +15989,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:929
 msgid "Wall"
 msgstr ""
@@ -15665,5 +15995,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:931
+#: build/trans_presets.java:932
 msgid "City Wall"
 msgstr ""
@@ -15672,5 +16002,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:935
+#: build/trans_presets.java:936
 msgid "Retaining Wall"
 msgstr ""
@@ -15682,15 +16012,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:942
+#: build/trans_presets.java:943
 msgid "Entrance"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:943
+#: build/trans_presets.java:944
 msgid "Edit Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:954
+#: build/trans_presets.java:955
 msgid "Gate"
 msgstr ""
@@ -15698,50 +16028,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:956
+#: build/trans_presets.java:957
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:967
+#: build/trans_presets.java:968
 msgid "Lift Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:968
+#: build/trans_presets.java:969
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:979
+#: build/trans_presets.java:980
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:980
+#: build/trans_presets.java:981
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:991
+#: build/trans_presets.java:992
 msgid "Bump Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:992
+#: build/trans_presets.java:993
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:1003
+#: build/trans_presets.java:1004
 msgid "Kissing Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1004
+#: build/trans_presets.java:1005
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1013
 msgid "Stile"
 msgstr ""
@@ -15749,25 +16079,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1014
+#: build/trans_presets.java:1015
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1023
 msgid "Turnstile"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1024
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1032
 msgid "Sally Port"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1033
 msgid "Edit Sally Port"
 msgstr ""
@@ -15775,13 +16105,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #.
-#. <separator/>
+#. group "Water"
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1046 build/trans_presets.java:1089
+#: build/trans_presets.java:1047 build/trans_presets.java:1048
+#: build/trans_presets.java:1091
 msgid "Water"
 msgstr ""
 
 #. group "Water"
-#: build/trans_presets.java:1047
+#: build/trans_presets.java:1049
 msgid "Spring"
 msgstr ""
@@ -15789,5 +16120,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1049
+#: build/trans_presets.java:1051
 msgid "Edit Spring"
 msgstr ""
@@ -15795,5 +16126,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1056
 msgid "Drain"
 msgstr ""
@@ -15801,10 +16132,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1058
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1064
 msgid "Stream"
 msgstr ""
@@ -15812,10 +16143,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1066
 msgid "Edit Stream"
 msgstr ""
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1072
 msgid "Canal"
 msgstr ""
@@ -15823,10 +16154,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1074
 msgid "Edit Canal"
 msgstr ""
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1080
 msgid "River"
 msgstr ""
@@ -15836,5 +16167,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1084
 msgid "Edit River"
 msgstr ""
@@ -15842,15 +16173,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1093
 msgid "Edit Water"
 msgstr ""
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1097
 msgid "Land"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1098
 msgid "Edit Land"
 msgstr ""
@@ -15858,15 +16189,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1103
 msgid "Basin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1104
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1109
 msgid "Reservoir"
 msgstr ""
@@ -15874,15 +16205,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1109
+#: build/trans_presets.java:1111
 msgid "Edit Reservoir Landuse"
 msgstr ""
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1116
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1117
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -15890,5 +16221,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1120
+#: build/trans_presets.java:1122
 msgid "Riverbank"
 msgstr ""
@@ -15897,10 +16228,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1125
 msgid "Edit Riverbank"
 msgstr ""
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1127
+#: build/trans_presets.java:1129
 msgid "Wetland"
 msgstr ""
@@ -15911,14 +16242,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1134
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "swamp"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "bog"
 msgstr ""
@@ -15932,35 +16263,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1135 build/trans_style.java:3384
+#: build/trans_presets.java:1137 build/trans_style.java:3392
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1139
 msgid "Mud"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1140
 msgid "Edit Mud"
 msgstr ""
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1144
 msgid "Beach"
 msgstr ""
@@ -15968,20 +16299,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1144
+#: build/trans_presets.java:1146
 msgid "Edit Beach"
 msgstr ""
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1150
 msgid "Bay"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1149
+#: build/trans_presets.java:1151
 msgid "Edit Bay"
 msgstr ""
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1155
 msgid "Cliff"
 msgstr ""
@@ -15989,10 +16320,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1157
 msgid "Edit Cliff"
 msgstr ""
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1159
+#: build/trans_presets.java:1161
 msgid "Coastline"
 msgstr ""
@@ -16000,5 +16331,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1163
 msgid "Edit Coastline"
 msgstr ""
@@ -16006,5 +16337,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1168
 msgid "Ferry Route"
 msgstr ""
@@ -16012,5 +16343,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1170
 msgid "Edit Ferry"
 msgstr ""
@@ -16019,5 +16350,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1176
+#: build/trans_presets.java:1178
 msgid "Boatyard"
 msgstr ""
@@ -16025,10 +16356,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:1180
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1185
 msgid "Dock"
 msgstr ""
@@ -16036,5 +16367,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1187
 msgid "Edit Dock"
 msgstr ""
@@ -16042,5 +16373,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1193
 msgid "Dam"
 msgstr ""
@@ -16048,15 +16379,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1195
 msgid "Edit Dam"
 msgstr ""
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1199
+#: build/trans_presets.java:1201
 msgid "Waterway Point"
 msgstr ""
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1202
 msgid "Lock Gate"
 msgstr ""
@@ -16065,5 +16396,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1206
 msgid "Weir"
 msgstr ""
@@ -16071,20 +16402,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1208
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1213
 msgid "Waterfall"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1214
 msgid "Edit Waterfall"
 msgstr ""
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1219
 msgid "Turning Point"
 msgstr ""
@@ -16093,15 +16424,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1221
+#: build/trans_presets.java:1223
 msgid "Marina"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1224
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1228
 msgid "Pier"
 msgstr ""
@@ -16109,10 +16440,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1230
 msgid "Edit Pier"
 msgstr ""
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1234
 msgid "Ferry Terminal"
 msgstr ""
@@ -16120,10 +16451,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1236
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1240
 msgid "Slipway"
 msgstr ""
@@ -16133,16 +16464,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1244
 msgid "Edit Slipway"
 msgstr ""
 
 #. item "Waterway Point/Slipway" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1250
+msgid "Transport"
+msgstr ""
+
+#. group "Transport"
+#: build/trans_presets.java:1251
 msgid "Railway"
 msgstr ""
 
 #. group "Railway"
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1252
 msgid "Rail"
 msgstr ""
@@ -16150,5 +16485,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:1254
 msgid "Edit Rail"
 msgstr ""
@@ -16178,8 +16513,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "Optional Types"
 msgstr ""
@@ -16193,35 +16528,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1259
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1257
+#: build/trans_presets.java:1260
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1265
 msgid "Monorail"
 msgstr ""
@@ -16229,45 +16564,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1267
 msgid "Edit Monorail"
 msgstr ""
 
-#: build/trans_presets.java:1269
+#: build/trans_presets.java:1272
 msgid "Preserved"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1273
 msgid "Edit Preserved Railway"
 msgstr ""
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1278
 msgid "Light Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1279
 msgid "Edit Light Rail"
 msgstr ""
 
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1284
 msgid "Subway"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1285
 msgid "Edit Subway"
 msgstr ""
 
-#: build/trans_presets.java:1287
+#: build/trans_presets.java:1290
 msgid "Tram"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1291
 msgid "Edit Tram"
 msgstr ""
 
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1296
 msgid "Bus Guideway"
 msgstr ""
@@ -16275,5 +16610,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1295
+#: build/trans_presets.java:1298
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -16282,14 +16617,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1315
 msgid "Disused Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1313
+#: build/trans_presets.java:1316
 msgid "Edit Disused Railway"
 msgstr ""
 
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1321
 msgid "Abandoned Rail"
 msgstr ""
@@ -16298,5 +16633,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1325
 msgid "Level Crossing"
 msgstr ""
@@ -16305,5 +16640,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1329
 msgid "Crossing"
 msgstr ""
@@ -16313,5 +16648,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1333
 msgid "Crossing type"
 msgstr ""
@@ -16319,5 +16654,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1339
 msgid "Turntable"
 msgstr ""
@@ -16326,10 +16661,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1344
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1345
 msgid "Chair Lift"
 msgstr ""
@@ -16337,10 +16672,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1347
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1351
 msgid "Drag Lift"
 msgstr ""
@@ -16348,10 +16683,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1353
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1357
 msgid "Cable Car"
 msgstr ""
@@ -16359,10 +16694,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1359
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1360
+#: build/trans_presets.java:1363
 msgid "Gondola"
 msgstr ""
@@ -16370,5 +16705,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1365
 msgid "Edit Gondola"
 msgstr ""
@@ -16376,5 +16711,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1366 build/trans_presets.java:1461
+#: build/trans_presets.java:1369 build/trans_presets.java:1464
 msgid "Station"
 msgstr ""
@@ -16385,10 +16720,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1368 build/trans_presets.java:1464
+#: build/trans_presets.java:1371 build/trans_presets.java:1467
 msgid "Edit Station"
 msgstr ""
 
 #. group "Car"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1378
 msgid "Fuel"
 msgstr ""
@@ -16398,5 +16733,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1382
 msgid "Edit Fuel"
 msgstr ""
@@ -16454,32 +16789,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1671 build/trans_presets.java:1678
-#: build/trans_presets.java:1686 build/trans_presets.java:1699
-#: build/trans_presets.java:1713 build/trans_presets.java:1810
-#: build/trans_presets.java:1818 build/trans_presets.java:1909
-#: build/trans_presets.java:1915 build/trans_presets.java:2226
-#: build/trans_presets.java:2250 build/trans_presets.java:2465
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1703
+#: build/trans_presets.java:1717 build/trans_presets.java:1814
+#: build/trans_presets.java:1822 build/trans_presets.java:1919
+#: build/trans_presets.java:1925 build/trans_presets.java:2237
+#: build/trans_presets.java:2261 build/trans_presets.java:2476
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Opening Hours"
 msgstr ""
@@ -16538,91 +16873,91 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -16637,5 +16972,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1385 build/trans_presets.java:1438
+#: build/trans_presets.java:1388 build/trans_presets.java:1441
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -16645,5 +16980,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1391
 msgid "Edit Parking"
 msgstr ""
@@ -16654,24 +16989,24 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1391 build/trans_presets.java:1762
-#: build/trans_presets.java:1772 build/trans_presets.java:2396
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:1394 build/trans_presets.java:1766
+#: build/trans_presets.java:1776 build/trans_presets.java:2407
+#: build/trans_presets.java:2524
 msgid "Reference number"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "surface"
 msgstr ""
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1396
 msgid "Park and Ride"
 msgstr ""
@@ -16680,38 +17015,38 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1394 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
+#: build/trans_presets.java:1397 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
 msgid "Fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1396
+#: build/trans_presets.java:1399
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1400
 msgid "Spaces for Disabled"
 msgstr ""
 
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1401
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1402
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1403
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1405
 msgid "Wash"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1406
 msgid "Edit Car Wash"
 msgstr ""
@@ -16719,5 +17054,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1408 build/trans_presets.java:1452
+#: build/trans_presets.java:1411 build/trans_presets.java:1455
 msgid "Shop"
 msgstr ""
@@ -16725,15 +17060,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1413
 msgid "Edit Car Shop"
 msgstr ""
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1418
 msgid "Repair"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1419
 msgid "Edit Car Repair"
 msgstr ""
@@ -16741,5 +17076,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1421 build/trans_presets.java:1445
+#: build/trans_presets.java:1424 build/trans_presets.java:1448
 msgid "Rental"
 msgstr ""
@@ -16748,10 +17083,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1427
 msgid "Edit Car Rental"
 msgstr ""
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1432
 msgid "Sharing"
 msgstr ""
@@ -16759,5 +17094,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1434
 msgid "Edit Car Sharing"
 msgstr ""
@@ -16765,10 +17100,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Parking"
 msgstr ""
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1446
 msgid "Capacity"
 msgstr ""
@@ -16777,5 +17112,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1448
+#: build/trans_presets.java:1451
 msgid "Edit Bicycle Rental"
 msgstr ""
@@ -16784,15 +17119,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1458
 msgid "Edit Bicycle Shop"
 msgstr ""
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1463
 msgid "Public Transport"
 msgstr ""
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:1472
 msgid "UIC-Reference"
 msgstr ""
@@ -16800,5 +17135,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1475
 msgid "Railway Halt"
 msgstr ""
@@ -16806,5 +17141,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1477
 msgid "Edit Halt"
 msgstr ""
@@ -16812,5 +17147,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1484
 msgid "Tram Stop"
 msgstr ""
@@ -16819,5 +17154,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1484
+#: build/trans_presets.java:1487
 msgid "Edit Tram Stop"
 msgstr ""
@@ -16825,5 +17160,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1494
 msgid "Railway Platform"
 msgstr ""
@@ -16832,5 +17167,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1497
 msgid "Edit Railway Platform"
 msgstr ""
@@ -16842,5 +17177,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1497 build/trans_presets.java:1539
+#: build/trans_presets.java:1500 build/trans_presets.java:1542
 msgid "Reference (track number)"
 msgstr ""
@@ -16848,10 +17183,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1499 build/trans_presets.java:1541
+#: build/trans_presets.java:1502 build/trans_presets.java:1544
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1504
 msgid "Subway Entrance"
 msgstr ""
@@ -16860,10 +17195,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1507
 msgid "Edit Subway Entrance"
 msgstr ""
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1512
 msgid "Wheelchair"
 msgstr ""
@@ -16872,5 +17207,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1517
 msgid "Bus Station"
 msgstr ""
@@ -16879,5 +17214,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1520
 msgid "Edit Bus Station"
 msgstr ""
@@ -16885,5 +17220,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1526
 msgid "Bus Stop"
 msgstr ""
@@ -16893,5 +17228,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1530
 msgid "Edit Bus Stop"
 msgstr ""
@@ -16900,6 +17235,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1532 build/trans_presets.java:1785
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:1535 build/trans_presets.java:1789
+#: build/trans_presets.java:2453
 msgid "Shelter"
 msgstr ""
@@ -16907,10 +17242,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1538
 msgid "Bus Platform"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1539
 msgid "Edit Bus Platform"
 msgstr ""
@@ -16918,5 +17253,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1547
 msgid "Taxi"
 msgstr ""
@@ -16924,5 +17259,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1549
 msgid "Edit Taxi station"
 msgstr ""
@@ -16930,5 +17265,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1554
 msgid "Airport"
 msgstr ""
@@ -16936,15 +17271,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1556
 msgid "Edit Airport"
 msgstr ""
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1561
 msgid "IATA"
 msgstr ""
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1559
+#: build/trans_presets.java:1562
 msgid "ICAO"
 msgstr ""
@@ -16952,6 +17287,11 @@
 #. item "Public Transport/Airport" text "ICAO"
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1567
+#, fuzzy
+msgid "Travel"
+msgstr "Salvează"
+
+#. group "Travel"
+#: build/trans_presets.java:1568
 msgid "Accomodation"
 msgstr ""
@@ -16963,5 +17303,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1565 build/trans_surveyor.java:43
+#: build/trans_presets.java:1569 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr ""
@@ -16970,15 +17310,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:1568
+#: build/trans_presets.java:1572
 msgid "Edit Hotel"
 msgstr ""
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1575
 msgid "Stars"
 msgstr ""
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1577
 msgid "Motel"
 msgstr ""
@@ -16986,20 +17326,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1579
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1583
 msgid "Guest House"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1584
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1588
 msgid "Chalet"
 msgstr ""
@@ -17007,10 +17347,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1590
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1594
 msgid "Hostel"
 msgstr ""
@@ -17018,30 +17358,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1592
+#: build/trans_presets.java:1596
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1600
 msgid "Alpine Hut"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1601
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1606
 msgid "Caravan Site"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1607
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1611
 msgid "Camping Site"
 msgstr ""
@@ -17049,10 +17389,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1613
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1618
 msgid "Food+Drinks"
 msgstr ""
@@ -17063,5 +17403,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1615 build/trans_surveyor.java:47
+#: build/trans_presets.java:1619 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr ""
@@ -17069,5 +17409,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1621
 msgid "Edit Restaurant"
 msgstr ""
@@ -17075,5 +17415,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "Cuisine"
 msgstr ""
@@ -17081,61 +17421,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "turkish"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "asian"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "thai"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "mexican"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "japanese"
 msgstr ""
 
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1627
 msgid "Fast Food"
 msgstr ""
@@ -17143,9 +17483,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1629
 msgid "Edit Fast Food Restaurant"
 msgstr ""
 
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1635
 msgid "Cafe"
 msgstr ""
@@ -17153,9 +17493,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1633
+#: build/trans_presets.java:1637
 msgid "Edit Cafe"
 msgstr ""
 
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1642
 msgid "Pub"
 msgstr ""
@@ -17163,18 +17503,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1644
 msgid "Edit Pub"
 msgstr ""
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1649
 msgid "Biergarten"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1646
+#: build/trans_presets.java:1650
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1655
 msgid "Bar"
 msgstr ""
@@ -17182,9 +17522,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1657
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1662
 msgid "Nightclub"
 msgstr ""
@@ -17192,24 +17532,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1664
 msgid "Edit Nightclub"
 msgstr ""
 
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1670
 msgid "Tourism"
 msgstr ""
 
 #. group "Tourism"
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1671
 msgid "Attraction"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1672
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1677
 msgid "Museum"
 msgstr ""
@@ -17217,9 +17557,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1679
 msgid "Edit Museum"
 msgstr ""
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1684
 msgid "Zoo"
 msgstr ""
@@ -17228,9 +17568,9 @@
 #. <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:1683
+#: build/trans_presets.java:1687
 msgid "Edit Zoo"
 msgstr ""
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1692
 msgid "Viewpoint"
 msgstr ""
@@ -17238,24 +17578,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1694
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1697
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1699
 msgid "Theme Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1700
 msgid "Edit Theme Park"
 msgstr ""
 
-#: build/trans_presets.java:1701
+#: build/trans_presets.java:1705
 msgid "Artwork"
 msgstr ""
@@ -17263,5 +17603,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1707
 msgid "Edit Artwork"
 msgstr ""
@@ -17269,19 +17609,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1712
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1719
 msgid "Map"
 msgstr ""
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "topo"
 msgstr ""
@@ -17319,5 +17659,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1720 build/trans_style.java:619
+#: build/trans_presets.java:1724 build/trans_style.java:619
 #: build/trans_style.java:635 build/trans_style.java:651
 #: build/trans_style.java:659
@@ -17325,28 +17665,28 @@
 msgstr ""
 
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1722 build/trans_presets.java:1738
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1726 build/trans_presets.java:1742
+#: build/trans_presets.java:1786
 msgid "Closer Description"
 msgstr ""
@@ -17356,5 +17696,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1724 build/trans_presets.java:1747
+#: build/trans_presets.java:1728 build/trans_presets.java:1751
 msgid "Routes shown for:"
 msgstr ""
@@ -17362,6 +17702,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1726 build/trans_presets.java:1749
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1965
 msgid "Cycling"
 msgstr ""
@@ -17369,5 +17709,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1727 build/trans_presets.java:1750
+#: build/trans_presets.java:1731 build/trans_presets.java:1754
 msgid "Mountainbiking"
 msgstr ""
@@ -17375,6 +17715,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1728 build/trans_presets.java:1751
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:1732 build/trans_presets.java:1755
+#: build/trans_presets.java:2019
 msgid "Skiing"
 msgstr ""
@@ -17382,5 +17722,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1729 build/trans_presets.java:1752
+#: build/trans_presets.java:1733 build/trans_presets.java:1756
 msgid "Riding"
 msgstr ""
@@ -17388,46 +17728,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1734 build/trans_presets.java:1757
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1736
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "history"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1744
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1759
 msgid "Information Terminal"
 msgstr ""
@@ -17435,29 +17775,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1760 build/trans_presets.java:1770
+#: build/trans_presets.java:1764 build/trans_presets.java:1774
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1769
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1779
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1780
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1778
+#: build/trans_presets.java:1782
 msgid "Other Information Points"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1790
 msgid "Edit Shelter"
 msgstr ""
@@ -17465,25 +17805,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1789 build/trans_presets.java:1795
+#: build/trans_presets.java:1793 build/trans_presets.java:1799
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1791
+#: build/trans_presets.java:1795
 msgid "Picnic Site"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1796
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1802
 msgid "Historic Places"
 msgstr ""
 
 #. group "Historic Places"
-#: build/trans_presets.java:1799
+#: build/trans_presets.java:1803
 msgid "Castle"
 msgstr ""
@@ -17492,19 +17832,19 @@
 #. <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:1802
+#: build/trans_presets.java:1806
 msgid "Edit Castle"
 msgstr ""
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1810
 msgid "Ruins"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1811
 msgid "Edit Ruins"
 msgstr ""
 
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1816
 msgid "Archaeological Site"
 msgstr ""
@@ -17513,9 +17853,9 @@
 #. <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:1815
+#: build/trans_presets.java:1819
 msgid "Edit Archaeological Site"
 msgstr ""
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1824
 msgid "Battlefield"
 msgstr ""
@@ -17523,5 +17863,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1826
 msgid "Edit Battlefield"
 msgstr ""
@@ -17529,15 +17869,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1831
 msgid "Monument"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1832
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1836
 msgid "Memorial"
 msgstr ""
@@ -17545,45 +17885,55 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1838
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1842
 msgid "Wayside Cross"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1843
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1847
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1848
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1852
+msgid "Boundary Stone"
+msgstr ""
+
+#. item
+#: build/trans_presets.java:1853
+msgid "Edit Boundary Stone"
+msgstr ""
+
+#. item "Historic Places/Boundary Stone" text "Name"
+#: build/trans_presets.java:1858
 msgid "Leisure"
 msgstr ""
 
 #. group "Leisure"
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1859
 msgid "Water Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1860
 msgid "Edit Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1864
 msgid "Playground"
 msgstr ""
@@ -17591,31 +17941,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1866
 msgid "Edit Playground"
 msgstr ""
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1870
 msgid "Fishing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1871
 msgid "Edit Fishing"
 msgstr ""
 
 #. item "Leisure/Fishing" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1877 build/trans_presets.java:2669
+msgid "Sports"
+msgstr ""
+
+#. group "Sports"
+#: build/trans_presets.java:1878
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1879
 msgid "Stadium"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1880
 msgid "Edit Stadium"
 msgstr ""
@@ -17629,6 +17983,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1874 build/trans_presets.java:1883
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1902 build/trans_presets.java:1911
 msgid "select sport:"
 msgstr ""
@@ -18020,30 +18374,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884 build/trans_style.java:3892
-#: build/trans_style.java:3900 build/trans_style.java:3908
-#: build/trans_style.java:3916 build/trans_style.java:3924
-#: build/trans_style.java:3932
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_style.java:3572 build/trans_style.java:3580
+#: build/trans_style.java:3588 build/trans_style.java:3596
+#: build/trans_style.java:3604 build/trans_style.java:3612
+#: build/trans_style.java:3620 build/trans_style.java:3628
+#: build/trans_style.java:3636 build/trans_style.java:3644
+#: build/trans_style.java:3652 build/trans_style.java:3660
+#: build/trans_style.java:3668 build/trans_style.java:3676
+#: build/trans_style.java:3684 build/trans_style.java:3692
+#: build/trans_style.java:3700 build/trans_style.java:3708
+#: build/trans_style.java:3716 build/trans_style.java:3724
+#: build/trans_style.java:3732 build/trans_style.java:3740
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3764 build/trans_style.java:3772
+#: build/trans_style.java:3780 build/trans_style.java:3788
+#: build/trans_style.java:3796 build/trans_style.java:3804
+#: build/trans_style.java:3812 build/trans_style.java:3820
+#: build/trans_style.java:3828 build/trans_style.java:3836
+#: build/trans_style.java:3844 build/trans_style.java:3852
+#: build/trans_style.java:3860 build/trans_style.java:3868
+#: build/trans_style.java:3876 build/trans_style.java:3884
+#: build/trans_style.java:3892 build/trans_style.java:3900
+#: build/trans_style.java:3908 build/trans_style.java:3916
+#: build/trans_style.java:3924 build/trans_style.java:3932
+#: build/trans_style.java:3940
 msgid "sport"
 msgstr ""
@@ -18053,225 +18407,225 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "archery"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "baseball"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "basketball"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "climbing"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "football"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "golf"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "rugby"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skiing"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "soccer"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "swimming"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "table_tennis"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "tennis"
 msgstr ""
 
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1888
 msgid "Sports Centre"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1889
 msgid "Edit Sports Centre"
 msgstr ""
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1897
 msgid "Pitch"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1898
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1906
 msgid "Racetrack"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1907
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1915
 msgid "Golf Course"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1916
 msgid "Edit Golf Course"
 msgstr ""
 
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1921
 msgid "Miniature Golf"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1922
 msgid "Edit Miniature Golf"
 msgstr ""
 
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1928
 msgid "Sport"
 msgstr ""
 
 #. group "Sport"
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1929
 msgid "Multi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1930
 msgid "Edit Multi"
 msgstr ""
@@ -18310,183 +18664,183 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "stadium"
 msgstr ""
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1935
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1936
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1941
 msgid "Athletics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1942
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1947
 msgid "Archery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1948
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1953
 msgid "Climbing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:1954
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1959
 msgid "Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1960
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1966
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1971
 msgid "Dog Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1972
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1977
 msgid "Equestrian"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1978
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1983
 msgid "Horse Racing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1984
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1989
 msgid "Gymnastics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1990
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1995
 msgid "Motor Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1996
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2001
 msgid "Skating"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2002
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2007
 msgid "Skateboard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2008
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2013
 msgid "Swimming"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2014
 msgid "Edit Swimming"
 msgstr ""
@@ -18494,56 +18848,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2021
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2028
 msgid "Shooting"
 msgstr ""
@@ -18551,178 +18905,182 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2030
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2036
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2037
 msgid "Soccer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2038
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2043
 msgid "Football"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2044
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2049
 msgid "Australian Football"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2050
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2055
 msgid "Baseball"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2056
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2061
 msgid "Basketball"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2062
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2067
 msgid "Golf"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2068
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2071
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2073
 msgid "Boule"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2074
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2079
 msgid "Bowls"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2080
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2085
 msgid "Cricket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2086
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2091
 msgid "Cricket Nets"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2092
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2097
 msgid "Croquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2098
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2103
 msgid "Hockey"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2104
 msgid "Edit Hockey"
 msgstr ""
 
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2109
 msgid "Pelota"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2110
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2105
+#: build/trans_presets.java:2115
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2116
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2121
 msgid "Rugby"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2122
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2127
 msgid "Table Tennis"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2128
 msgid "Edit Table Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2123
+#: build/trans_presets.java:2133
 msgid "Tennis"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2134
 msgid "Edit Tennis"
 msgstr ""
 
-#. <separator/>
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2141
+msgid "Man-Made"
+msgstr ""
+
+#. group "Man-Made"
+#: build/trans_presets.java:2142
 msgid "Buildings"
 msgstr ""
 
 #. group "Buildings"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2143
 msgid "Building"
 msgstr ""
@@ -18730,5 +19088,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Public Building"
 msgstr ""
@@ -18736,10 +19094,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2148
 msgid "Edit Public Building"
 msgstr ""
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2152
 msgid "Town hall"
 msgstr ""
@@ -18747,10 +19105,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2154
 msgid "Edit Town hall"
 msgstr ""
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:2158
 msgid "Embassy"
 msgstr ""
@@ -18758,10 +19116,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Edit Embassy"
 msgstr ""
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2164
 msgid "Courthouse"
 msgstr ""
@@ -18770,10 +19128,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:2156
+#: build/trans_presets.java:2167
 msgid "Edit Courthouse"
 msgstr ""
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2171
 msgid "Prison"
 msgstr ""
@@ -18782,10 +19140,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:2163
+#: build/trans_presets.java:2174
 msgid "Edit Prison"
 msgstr ""
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2178
 msgid "Police"
 msgstr ""
@@ -18795,10 +19153,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:2171
+#: build/trans_presets.java:2182
 msgid "Edit Police"
 msgstr ""
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2186
 msgid "Fire Station"
 msgstr ""
@@ -18807,10 +19165,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:2178
+#: build/trans_presets.java:2189
 msgid "Edit Fire Station"
 msgstr ""
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "Post Office"
 msgstr ""
@@ -18818,5 +19176,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Edit Post Office"
 msgstr ""
@@ -18824,15 +19182,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2200
 msgid "Kindergarten"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Kindergarten"
 msgstr ""
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2205
 msgid "School"
 msgstr ""
@@ -18840,10 +19198,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Edit School"
 msgstr ""
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2211
 msgid "University"
 msgstr ""
@@ -18851,10 +19209,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit University"
 msgstr ""
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "College"
 msgstr ""
@@ -18862,5 +19220,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2219
 msgid "Edit College"
 msgstr ""
@@ -18868,5 +19226,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2224
 msgid "Cinema"
 msgstr ""
@@ -18875,10 +19233,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:2216
+#: build/trans_presets.java:2227
 msgid "Edit Cinema"
 msgstr ""
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2231
 msgid "Library"
 msgstr ""
@@ -18887,9 +19245,9 @@
 #. <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:2223
+#: build/trans_presets.java:2234
 msgid "Edit Library"
 msgstr ""
 
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Arts Centre"
 msgstr ""
@@ -18897,10 +19255,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Theatre"
 msgstr ""
@@ -18909,10 +19267,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:2237
+#: build/trans_presets.java:2248
 msgid "Edit Theatre"
 msgstr ""
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2252
 msgid "Place of Worship"
 msgstr ""
@@ -18922,5 +19280,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:2245
+#: build/trans_presets.java:2256
 msgid "Edit Place of Worship"
 msgstr ""
@@ -18929,6 +19287,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "Religion"
 msgstr ""
@@ -18937,66 +19295,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "Denomination"
 msgstr ""
@@ -19005,81 +19363,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2264
 msgid "Addresses"
 msgstr ""
@@ -19088,5 +19446,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:2256
+#: build/trans_presets.java:2267
 msgid "Edit Address Information"
 msgstr ""
@@ -19094,5 +19452,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2269
 msgid "House number"
 msgstr ""
@@ -19100,20 +19458,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "House name"
 msgstr ""
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "City name"
 msgstr ""
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2274
 msgid "Post code"
 msgstr ""
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2275
 msgid "Country code"
 msgstr ""
@@ -19121,5 +19479,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Address Interpolation"
 msgstr ""
@@ -19128,5 +19486,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:2270
+#: build/trans_presets.java:2281
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -19134,67 +19492,67 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "odd"
 msgstr ""
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "even"
 msgstr ""
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2286
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Works"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2288
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2292
 msgid "Tower"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2293
 msgid "Edit Tower"
 msgstr ""
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Water Tower"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2298
 msgid "Edit Water Tower"
 msgstr ""
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Gasometer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2303
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Lighthouse"
 msgstr ""
@@ -19202,10 +19560,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2309
 msgid "Edit Lighthouse"
 msgstr ""
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Windmill"
 msgstr ""
@@ -19213,10 +19571,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2315
 msgid "Edit Windmill"
 msgstr ""
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2319
 msgid "Pipeline"
 msgstr ""
@@ -19224,10 +19582,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Edit Pipeline"
 msgstr ""
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2325
 msgid "Wastewater Plant"
 msgstr ""
@@ -19237,10 +19595,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:2318
+#: build/trans_presets.java:2329
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2333
 msgid "Crane"
 msgstr ""
@@ -19248,10 +19606,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2335
 msgid "Edit Crane"
 msgstr ""
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Beacon"
 msgstr ""
@@ -19259,10 +19617,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2341
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2345
 msgid "Survey Point"
 msgstr ""
@@ -19270,10 +19628,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2351
 msgid "Surveillance"
 msgstr ""
@@ -19281,5 +19639,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2353
 msgid "Edit Surveillance Camera"
 msgstr ""
@@ -19287,5 +19645,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Power Generator"
 msgstr ""
@@ -19295,39 +19653,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:2351
+#: build/trans_presets.java:2362
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "photovoltaic"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "gas"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2367
 msgid "Power Station"
 msgstr ""
@@ -19336,10 +19694,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:2359
+#: build/trans_presets.java:2370
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2374
 msgid "Power Sub Station"
 msgstr ""
@@ -19348,5 +19706,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:2366
+#: build/trans_presets.java:2377
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -19354,10 +19712,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2369 build/trans_presets.java:2385
+#: build/trans_presets.java:2380 build/trans_presets.java:2396
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2382
 msgid "Power Tower"
 msgstr ""
@@ -19368,5 +19726,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:2376
+#: build/trans_presets.java:2387
 msgid "Edit Power Tower"
 msgstr ""
@@ -19374,5 +19732,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2390
 msgid "Power Line"
 msgstr ""
@@ -19381,40 +19739,40 @@
 #. <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:2382
+#: build/trans_presets.java:2393
 msgid "Edit Power Line"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Voltage"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2398
 msgid "Amount of Wires"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2402
 msgid "Toilets"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2398 build/trans_presets.java:2514
+#: build/trans_presets.java:2409 build/trans_presets.java:2525
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2411
 msgid "Post Box"
 msgstr ""
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2416
 msgid "Telephone"
 msgstr ""
@@ -19423,5 +19781,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:2408
+#: build/trans_presets.java:2419
 msgid "Edit Telephone"
 msgstr ""
@@ -19429,5 +19787,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2411 build/trans_presets.java:2515
+#: build/trans_presets.java:2422 build/trans_presets.java:2526
 msgid "Coins"
 msgstr ""
@@ -19435,5 +19793,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2412 build/trans_presets.java:2516
+#: build/trans_presets.java:2423 build/trans_presets.java:2527
 msgid "Notes"
 msgstr ""
@@ -19441,5 +19799,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2413 build/trans_presets.java:2517
+#: build/trans_presets.java:2424 build/trans_presets.java:2528
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -19447,5 +19805,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2414 build/trans_presets.java:2518
+#: build/trans_presets.java:2425 build/trans_presets.java:2529
 msgid "Debit cards"
 msgstr ""
@@ -19453,15 +19811,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2415 build/trans_presets.java:2519
+#: build/trans_presets.java:2426 build/trans_presets.java:2530
 msgid "Credit cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2427
 msgid "Telephone cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2429
 msgid "Recycling"
 msgstr ""
@@ -19470,5 +19828,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:2421
+#: build/trans_presets.java:2432
 msgid "Edit Recycling station"
 msgstr ""
@@ -19476,35 +19834,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Batteries"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2435
 msgid "Cans"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Clothes"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2437
 msgid "Glass"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2438
 msgid "Paper"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2439
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2441
 msgid "Bench"
 msgstr ""
@@ -19513,34 +19871,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2433
+#: build/trans_presets.java:2444
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2434
+#: build/trans_presets.java:2445
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2434
-#, fuzzy
+#: build/trans_presets.java:2445
 msgid "stone"
-msgstr "nici unul"
-
-#: build/trans_presets.java:2434
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "Colour"
-msgstr "Culoare"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "black"
-msgstr "urmă"
-
-#: build/trans_presets.java:2435
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "brown"
 msgstr ""
@@ -19611,36 +19966,35 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2435 build/trans_style.java:3055
-#: build/trans_style.java:3063 build/trans_style.java:3071
-#: build/trans_style.java:3079 build/trans_style.java:3127
-#: build/trans_style.java:3135 build/trans_style.java:3233
-#: build/trans_style.java:3241
+#: build/trans_presets.java:2446 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3135
+#: build/trans_style.java:3143 build/trans_style.java:3241
+#: build/trans_style.java:3249
 msgid "green"
 msgstr ""
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2446
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "blue"
-msgstr "Valoare"
-
-#: build/trans_presets.java:2435
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2447
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2449
 msgid "Hunting Stand"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2450
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -19649,30 +20003,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2441 build/trans_presets.java:2902
+#: build/trans_presets.java:2452 build/trans_presets.java:2914
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2454
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2455
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Fountain"
 msgstr ""
@@ -19681,10 +20035,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:2449
+#: build/trans_presets.java:2460
 msgid "Edit Fountain"
 msgstr ""
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2464
 msgid "Drinking Water"
 msgstr ""
@@ -19693,10 +20047,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:2456
+#: build/trans_presets.java:2467
 msgid "Edit Drinking Water"
 msgstr ""
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2471
 msgid "Baby Hatch"
 msgstr ""
@@ -19704,33 +20058,33 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2479
 msgid "Shops"
 msgstr ""
 
 #. group "Shops"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2480
 msgid "Supermarket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2481
 msgid "Edit Supermarket"
 msgstr ""
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2486
 msgid "Chemist"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2487
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2492
 msgid "Convenience Store"
 msgstr ""
@@ -19738,9 +20092,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2499
 msgid "Kiosk"
 msgstr ""
@@ -19748,27 +20102,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Kiosk"
 msgstr ""
 
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Book Store"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2507
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2512
 msgid "Travel Agency"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2513
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2518
 msgid "Vending machine"
 msgstr ""
@@ -19776,5 +20130,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Edit Vending machine"
 msgstr ""
@@ -19782,88 +20136,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "drinks"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "SIM-cards"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Butcher"
 msgstr ""
@@ -19871,9 +20225,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2535
 msgid "Edit Butcher"
 msgstr ""
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2540
 msgid "Baker"
 msgstr ""
@@ -19881,9 +20235,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2542
 msgid "Edit Baker"
 msgstr ""
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2547
 msgid "Florist"
 msgstr ""
@@ -19891,18 +20245,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Florist"
 msgstr ""
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2554
 msgid "Organic"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Edit Organic Shop"
 msgstr ""
 
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2560
 msgid "Alcohol"
 msgstr ""
@@ -19910,54 +20264,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2562
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2567
 msgid "Beverages"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2568
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2573
 msgid "Computer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2574
 msgid "Edit Computer Shop"
 msgstr ""
 
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Electronics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2580
 msgid "Edit Electronics Shop"
 msgstr ""
 
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2585
 msgid "Hifi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2586
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2591
 msgid "Furniture"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Edit Furniture Shop"
 msgstr ""
 
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Garden Centre"
 msgstr ""
@@ -19965,9 +20319,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2599
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Hardware"
 msgstr ""
@@ -19975,9 +20329,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2606
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -19985,54 +20339,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2613
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2618
 msgid "Stationery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2619
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Hairdresser"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Hairdresser"
 msgstr ""
 
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Shoes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Shoe Shop"
 msgstr ""
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2636
 msgid "Toys"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit Toy Shop"
 msgstr ""
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "Dry Cleaning"
 msgstr ""
@@ -20040,9 +20394,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2650
 msgid "Edit Dry Cleaning"
 msgstr ""
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "Laundry"
 msgstr ""
@@ -20050,9 +20404,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2657
 msgid "Edit Laundry"
 msgstr ""
 
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2662
 msgid "Outdoor"
 msgstr ""
@@ -20060,32 +20414,28 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2664
 msgid "Edit Outdoor Shop"
 msgstr ""
 
-#: build/trans_presets.java:2658
-msgid "Sports"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2659
+#. item
+#: build/trans_presets.java:2670
 msgid "Edit Sports Shop"
 msgstr ""
 
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Optician"
 msgstr ""
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2683
 msgid "Cash"
 msgstr ""
 
 #. group "Cash"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2684
 msgid "Bank"
 msgstr ""
@@ -20093,14 +20443,14 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2686
 msgid "Edit Bank"
 msgstr ""
 
-#: build/trans_presets.java:2680 build/trans_presets.java:2689
+#: build/trans_presets.java:2691 build/trans_presets.java:2700
 msgid "Automated Teller Machine"
 msgstr ""
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2693
 msgid "Money Exchange"
 msgstr ""
@@ -20108,5 +20458,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Edit Money Exchange"
 msgstr ""
@@ -20114,15 +20464,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2691
+#: build/trans_presets.java:2702
 msgid "Edit Automated Teller Machine"
 msgstr ""
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2707
 msgid "Health"
 msgstr ""
 
 #. group "Health"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2708
 msgid "Doctors"
 msgstr ""
@@ -20130,18 +20480,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2710
 msgid "Edit Doctors"
 msgstr ""
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2715
 msgid "Dentist"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Edit Dentist"
 msgstr ""
 
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2721
 msgid "Pharmacy"
 msgstr ""
@@ -20149,5 +20499,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Edit Pharmacy"
 msgstr ""
@@ -20155,9 +20505,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2729
 msgid "Hospital"
 msgstr ""
@@ -20165,10 +20515,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Edit Hospital"
 msgstr ""
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2735
 msgid "Emergency Access Point"
 msgstr ""
@@ -20177,5 +20527,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:2727
+#: build/trans_presets.java:2738
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -20184,20 +20534,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2741
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2742
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Phone Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -20205,5 +20555,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2748
 msgid "Veterinary"
 msgstr ""
@@ -20212,55 +20562,59 @@
 #. <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:2740
+#: build/trans_presets.java:2751
 msgid "Edit Veterinary"
 msgstr ""
 
+#: build/trans_presets.java:2758
+msgid "Geography"
+msgstr ""
+
 #. group "Places"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2760
 msgid "Continent"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2761
 msgid "Edit Continent"
 msgstr ""
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2766
 msgid "Country"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2767
 msgid "Edit Country"
 msgstr ""
 
 #. item "Places/Country" text "Name"
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2772
 msgid "State"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2773
 msgid "Edit State"
 msgstr ""
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2778
 msgid "Region"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2779
 msgid "Edit Region"
 msgstr ""
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2784
 msgid "County"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2785
 msgid "Edit County"
 msgstr ""
@@ -20268,15 +20622,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2791
 msgid "City"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2792
 msgid "Edit City"
 msgstr ""
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2797
 msgid "Town"
 msgstr ""
@@ -20284,10 +20638,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2799
 msgid "Edit Town"
 msgstr ""
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2804
 msgid "Suburb"
 msgstr ""
@@ -20295,25 +20649,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2806
 msgid "Edit Suburb"
 msgstr ""
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2811
 msgid "Village"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2812
 msgid "Edit Village"
 msgstr ""
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2817
 msgid "Hamlet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2818
 msgid "Edit Hamlet"
 msgstr ""
@@ -20321,5 +20675,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2824
 msgid "Locality"
 msgstr ""
@@ -20327,10 +20681,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2826
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2831
 msgid "Island"
 msgstr ""
@@ -20338,10 +20692,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2833
 msgid "Edit Island"
 msgstr ""
 
 #. item "Places/Island" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2838
 msgid "Islet"
 msgstr ""
@@ -20349,5 +20703,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2840
 msgid "Edit Islet"
 msgstr ""
@@ -20355,5 +20709,5 @@
 #. item "Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2846
 msgid "Cave Entrance"
 msgstr ""
@@ -20361,10 +20715,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2848
 msgid "Edit Cave Entrance"
 msgstr ""
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2852
 msgid "Peak"
 msgstr ""
@@ -20372,10 +20726,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2854
 msgid "Edit Peak"
 msgstr ""
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2859
 msgid "Glacier"
 msgstr ""
@@ -20383,10 +20737,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2861
 msgid "Edit Glacier"
 msgstr ""
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2854
+#: build/trans_presets.java:2866
 msgid "Volcano"
 msgstr ""
@@ -20394,70 +20748,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2868
 msgid "Edit Volcano"
 msgstr ""
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2874
 msgid "Boundaries"
 msgstr ""
 
 #. group "Boundaries"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2875
 msgid "National"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2876
 msgid "Edit National Boundary"
 msgstr ""
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2881
 msgid "Administrative"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2882
 msgid "Edit Administrative Boundary"
 msgstr ""
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:2887
 msgid "Civil"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2888
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2893
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2894
 msgid "Edit Political Boundary"
 msgstr ""
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2899
 msgid "National park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2888
+#: build/trans_presets.java:2900
 msgid "Edit National Park Boundary"
 msgstr ""
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2906
 msgid "Land use"
 msgstr ""
 
 #. group "Land use"
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2907
 msgid "Tree"
 msgstr ""
@@ -20466,15 +20820,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:2898
+#: build/trans_presets.java:2910
 msgid "Edit Tree"
 msgstr ""
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2915
 msgid "Botanical Name"
 msgstr ""
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2917
 msgid "Wood"
 msgstr ""
@@ -20483,5 +20837,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:2908
+#: build/trans_presets.java:2920
 msgid "Edit Wood"
 msgstr ""
@@ -20489,17 +20843,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "coniferous"
 msgstr ""
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "mixed"
 msgstr ""
 
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2925
 msgid "Forest"
 msgstr ""
@@ -20508,14 +20862,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:2916
+#: build/trans_presets.java:2928
 msgid "Edit Forest Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2934
 msgid "Nature Reserve"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2935
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -20523,25 +20877,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2940
 msgid "Scree"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2941
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2945
 msgid "Scrub"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2946
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2950
 msgid "Fell"
 msgstr ""
@@ -20549,10 +20903,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2952
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2956
 msgid "Heath"
 msgstr ""
@@ -20560,5 +20914,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2958
 msgid "Edit Heath"
 msgstr ""
@@ -20566,5 +20920,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2963
 msgid "Farmyard"
 msgstr ""
@@ -20573,45 +20927,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:2954
+#: build/trans_presets.java:2966
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2971
 msgid "Farmland"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2972
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2977
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2978
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2983
 msgid "Vineyard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2984
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:2989
 msgid "Allotments"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2990
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -20619,25 +20973,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2996
 msgid "Garden"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2997
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3001
 msgid "Grass"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3002
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3007
 msgid "Village Green"
 msgstr ""
@@ -20645,10 +20999,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3009
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3014
 msgid "Common"
 msgstr ""
@@ -20656,20 +21010,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3004
+#: build/trans_presets.java:3016
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3020
 msgid "Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3021
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3025
 msgid "Recreation Ground"
 msgstr ""
@@ -20677,5 +21031,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3027
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -20683,15 +21037,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3033
 msgid "Residential area"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3022
+#: build/trans_presets.java:3034
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3039
 msgid "Graveyard"
 msgstr ""
@@ -20699,9 +21053,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3029
+#: build/trans_presets.java:3041
 msgid "Edit Graveyard"
 msgstr ""
 
-#: build/trans_presets.java:3035
+#: build/trans_presets.java:3047
 msgid "Cemetery"
 msgstr ""
@@ -20709,39 +21063,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3049
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3056
 msgid "Retail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3057
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3062
 msgid "Commercial"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3063
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3056
+#: build/trans_presets.java:3068
 msgid "Industrial"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3069
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3074
 msgid "Railway land"
 msgstr ""
@@ -20749,15 +21103,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3076
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3081
 msgid "Military"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3082
 msgid "Edit Military Landuse"
 msgstr ""
@@ -20765,55 +21119,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3088
 msgid "Construction area"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3089
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3094
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3095
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3100
 msgid "Greenfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3101
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3106
 msgid "Landfill"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3107
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3112
 msgid "Quarry"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3113
 msgid "Edit Quarry Landuse"
 msgstr ""
 
 #. group "Relations"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3122
 msgid "Multipolygon"
 msgstr ""
@@ -20823,5 +21177,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:3114
+#: build/trans_presets.java:3126
 msgid "Edit Multipolygon"
 msgstr ""
@@ -20830,10 +21184,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3132
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3133
 msgid "inner segment"
 msgstr ""
@@ -20841,5 +21195,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3136
 msgid "Turn restriction"
 msgstr ""
@@ -20848,5 +21202,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3139
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -20854,34 +21208,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_straight_on"
 msgstr ""
@@ -20890,15 +21244,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3146
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3147
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3148
 msgid "to way"
 msgstr ""
@@ -20906,5 +21260,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3151
 msgid "Route"
 msgstr ""
@@ -20913,5 +21267,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3154
 msgid "Edit Route"
 msgstr ""
@@ -20919,5 +21273,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "Route type"
 msgstr ""
@@ -20989,5 +21343,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3144 build/trans_style.java:233
+#: build/trans_presets.java:3156 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -20996,17 +21350,17 @@
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ski"
 msgstr ""
@@ -21059,5 +21413,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3144 build/trans_style.java:247
+#: build/trans_presets.java:3156 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -21066,13 +21420,13 @@
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "detour"
 msgstr ""
@@ -21086,10 +21440,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3144 build/trans_style.java:1206
+#: build/trans_presets.java:3156 build/trans_style.java:1206
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3159
 msgid "Symbol description"
 msgstr ""
@@ -21097,31 +21451,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3162
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "Color (hex)"
 msgstr ""
@@ -21130,30 +21484,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3168
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3169
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3170
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3171
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3172
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3173
 msgid "backward halt point"
 msgstr ""
@@ -21591,11 +21945,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3375 build/trans_style.java:3376
-#: build/trans_style.java:3946 build/trans_style.java:4254
-#: build/trans_style.java:4263 build/trans_style.java:4272
-#: build/trans_style.java:4281 build/trans_style.java:4290
-#: build/trans_style.java:4299 build/trans_style.java:4308
-#: build/trans_style.java:4309 build/trans_style.java:4318
-#: build/trans_style.java:4327
+#: build/trans_style.java:3383 build/trans_style.java:3384
+#: build/trans_style.java:3954 build/trans_style.java:4262
+#: build/trans_style.java:4271 build/trans_style.java:4280
+#: build/trans_style.java:4289 build/trans_style.java:4298
+#: build/trans_style.java:4307 build/trans_style.java:4316
+#: build/trans_style.java:4317 build/trans_style.java:4326
+#: build/trans_style.java:4335
 msgid "deprecated"
 msgstr ""
@@ -23619,5 +23973,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3294
+#: build/trans_style.java:3302
 msgid "light_water"
 msgstr ""
@@ -24299,8 +24653,17 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="boundary_stone"/>
+#. <icon annotate="true" src="historic/boundary_stone.png"/>
 #: build/trans_style.java:2990 build/trans_style.java:2998
 #: build/trans_style.java:3006 build/trans_style.java:3014
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
+#: build/trans_style.java:3054
 msgid "historic"
 msgstr ""
@@ -24314,5 +24677,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3095
 msgid "quarry"
 msgstr ""
@@ -24326,5 +24689,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "landfill"
 msgstr ""
@@ -24346,5 +24709,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3103 build/trans_style.java:3111
+#: build/trans_style.java:3111 build/trans_style.java:3119
 msgid "basin"
 msgstr ""
@@ -24358,5 +24721,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3127
 msgid "forest"
 msgstr ""
@@ -24370,5 +24733,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3159
 msgid "farmyard"
 msgstr ""
@@ -24391,5 +24754,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3160 build/trans_style.java:3168
+#: build/trans_style.java:3168 build/trans_style.java:3176
 msgid "retail"
 msgstr ""
@@ -24403,5 +24766,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3176
+#: build/trans_style.java:3184
 msgid "industrial"
 msgstr ""
@@ -24415,5 +24778,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "brownfield"
 msgstr ""
@@ -24427,5 +24790,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "greenfield"
 msgstr ""
@@ -24439,5 +24802,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "railland"
 msgstr ""
@@ -24494,7 +24857,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3217 build/trans_style.java:3252
-#: build/trans_style.java:3260 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3225 build/trans_style.java:3260
+#: build/trans_style.java:3268 build/trans_style.java:3276
+#: build/trans_style.java:3284 build/trans_style.java:3292
 msgid "military"
 msgstr ""
@@ -24508,5 +24871,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3225
+#: build/trans_style.java:3233
 msgid "cemetery"
 msgstr ""
@@ -24519,5 +24882,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3301
+#: build/trans_style.java:3309
 msgid "peak"
 msgstr ""
@@ -24532,5 +24895,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3310
+#: build/trans_style.java:3318
 msgid "glacier"
 msgstr ""
@@ -24544,5 +24907,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "volcano"
 msgstr ""
@@ -24597,8 +24960,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3326 build/trans_style.java:3327
-#: build/trans_style.java:3335 build/trans_style.java:3351
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440
+#: build/trans_style.java:3334 build/trans_style.java:3335
+#: build/trans_style.java:3343 build/trans_style.java:3359
+#: build/trans_style.java:3432 build/trans_style.java:3440
+#: build/trans_style.java:3448
 msgid "natural"
 msgstr ""
@@ -24612,5 +24975,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3343
+#: build/trans_style.java:3351
 msgid "scrub"
 msgstr ""
@@ -24624,5 +24987,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3359
+#: build/trans_style.java:3367
 msgid "heath"
 msgstr ""
@@ -24636,5 +24999,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3408
+#: build/trans_style.java:3416
 msgid "mud"
 msgstr ""
@@ -24648,5 +25011,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "beach"
 msgstr ""
@@ -24724,8 +25087,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
-#: build/trans_style.java:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496 build/trans_style.java:3504
+#: build/trans_style.java:3512 build/trans_style.java:3520
 msgid "route"
 msgstr ""
@@ -24773,7 +25136,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3522 build/trans_style.java:3530
-#: build/trans_style.java:3538 build/trans_style.java:3546
-#: build/trans_style.java:3554
+#: build/trans_style.java:3530 build/trans_style.java:3538
+#: build/trans_style.java:3546 build/trans_style.java:3554
+#: build/trans_style.java:3562
 msgid "boundary"
 msgstr ""
@@ -24923,11 +25286,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090
+#: build/trans_style.java:4002 build/trans_style.java:4010
+#: build/trans_style.java:4018 build/trans_style.java:4026
+#: build/trans_style.java:4034 build/trans_style.java:4042
+#: build/trans_style.java:4050 build/trans_style.java:4058
+#: build/trans_style.java:4066 build/trans_style.java:4074
+#: build/trans_style.java:4082 build/trans_style.java:4090
+#: build/trans_style.java:4098
 msgid "place"
 msgstr ""
@@ -24975,6 +25338,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4207 build/trans_style.java:4214
-#: build/trans_style.java:4221 build/trans_style.java:4228
+#: build/trans_style.java:4215 build/trans_style.java:4222
+#: build/trans_style.java:4229 build/trans_style.java:4236
 msgid "address"
 msgstr ""
@@ -25282,9 +25645,9 @@
 msgstr ""
 
+#~ msgid "Aborting..."
+#~ msgstr "Anulez..."
+
 #~ msgid "Unknown version"
 #~ msgstr "Versiune necunoscută"
-
-#~ msgid "Aborting..."
-#~ msgstr "Anulez..."
 
 #~ msgid "Click Reload to refresh list"
@@ -25342,7 +25705,4 @@
 #~ msgstr "diferit"
 
-#~ msgid "Change"
-#~ msgstr "Schimbă"
-
 #~ msgid "Move"
 #~ msgstr "Mută"
Index: applications/editors/josm/i18n/po/ru.po
===================================================================
--- applications/editors/josm/i18n/po/ru.po	(revision 17655)
+++ applications/editors/josm/i18n/po/ru.po	(revision 17697)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-12 18:11+0200\n"
-"PO-Revision-Date: 2009-09-10 12:37+0000\n"
-"Last-Translator: Fortress <Unknown>\n"
+"POT-Creation-Date: 2009-09-19 13:00+0200\n"
+"PO-Revision-Date: 2009-09-19 07:38+0000\n"
+"Last-Translator: Calibrator <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-09-12 16:05+0000\n"
+"X-Launchpad-Export-Date: 2009-09-19 10:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
@@ -45,10 +45,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:543
 #: ../core/src/org/openstreetmap/josm/Main.java:551
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -73,5 +73,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -89,6 +89,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:358
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
@@ -104,6 +104,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
@@ -134,10 +134,10 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
 msgid "Save and Exit"
 msgstr "Сохранить и выйти"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
 msgid "Discard and Exit"
 msgstr "Отменить и выйти"
@@ -148,4 +148,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
@@ -153,27 +154,28 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:296
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:258
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:613
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
@@ -181,5 +183,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -199,6 +201,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
@@ -215,17 +217,17 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:654
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1528
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -236,6 +238,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
@@ -288,9 +290,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:607
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:609
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -350,5 +352,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
 msgid "Plugins"
@@ -407,5 +409,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Объединить"
@@ -417,4 +419,6 @@
 "</html>"
 msgstr ""
+"<html>Нет слоёв, с которым исходный слой<br>''{0}''<br>может быть объединён."
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:90
@@ -493,5 +497,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -504,4 +508,5 @@
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -537,6 +542,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
@@ -545,6 +550,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:346
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
@@ -659,4 +664,46 @@
 msgstr "Нет конфликтов чтобы их показать."
 
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#, fuzzy
+msgid "Close open changesets"
+msgstr "Нет открытого пакета изменений"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#, fuzzy
+msgid "Closes open changesets"
+msgstr "Нет открытого пакета изменений"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
+#: ../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:114
+#, java-format
+msgid "File: {0}"
+msgstr "Файл: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
+#, fuzzy
+msgid "There are no open changesets"
+msgstr "Нет открытого пакета изменений"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
+#, fuzzy
+msgid "No open changesets"
+msgstr "Нет открытого пакета изменений"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
+#, fuzzy
+msgid "Downloading open changesets ..."
+msgstr "Закрывается список правок..."
+
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
@@ -753,10 +800,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:123
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
@@ -799,31 +847,30 @@
 msgstr "Расположить точки на равных расстояниях вдоль линии."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
 msgid "Download from OSM..."
 msgstr "Скачать с OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
 msgid "Download map data from the OSM server."
 msgstr "Скачать картографические данные с сервера OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
-#, java-format
-msgid "File: {0}"
-msgstr "Файл: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
 msgid "Download"
 msgstr "Скачать"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
 msgid "Please select at least one task to download"
 msgstr "Выберите хотя бы один тип данных для загрузки."
@@ -844,5 +891,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1527
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307
@@ -862,6 +909,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:376
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1415
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
 msgid "Duplicate"
 msgstr "Дублировать"
@@ -933,10 +980,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
@@ -1023,25 +1071,26 @@
 msgstr "Соединить текущий слой с другим слоем"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 msgid "Merge Nodes"
 msgstr "Объединить точки"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
 msgid "Merge nodes into the oldest one."
 msgstr "Объединить точки в одну (более старую)"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
 msgid "Please select at least two nodes to merge."
 msgstr "Пожалуйста, выберите как минимум две точки для объединения."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:394
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
@@ -1057,8 +1106,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -1084,6 +1133,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
@@ -1092,5 +1145,5 @@
 msgstr "параметр ''{0}'' не должен быть null"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
@@ -1098,5 +1151,5 @@
 "используется."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283
 #, java-format
 msgid "Merge {0} nodes"
@@ -1168,5 +1221,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "New"
 msgstr "Создать"
@@ -1250,4 +1303,8 @@
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
 msgstr ""
+"<html>Вы используете проекцию EPSG:4326, это может привести<br>к "
+"нежелательному результату при выравнивании многоугольника.<br>Смените "
+"проекцию, чтобы избавиться от этого предупреждения.<br>Вы хотите продолжить?"
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:140
@@ -1290,6 +1347,7 @@
 msgid "to {0} primitive"
 msgid_plural "to {0} primtives"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "для одного элемента"
+msgstr[1] "для {0} элементов"
+msgstr[2] "для {0} элементов"
 
 #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:31
@@ -1365,5 +1423,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:68
 msgid "No Exporter found! Nothing saved."
-msgstr ""
+msgstr "Экспортирующая программа не найдена. Ничего не сохранено."
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:96
@@ -1447,14 +1505,15 @@
 msgstr "Справка: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
 msgid "Status Report"
 msgstr "Отчёт о состоянии"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 msgid "Copy to clipboard and close"
 msgstr "Скопировать в буфер и закрыть"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
@@ -1542,25 +1601,4 @@
 msgstr "Разделить линию {0} на {1} частей"
 
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24
-msgid "Close current changeset"
-msgstr "Закрыть текущий пакет изменений"
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-msgid "Close the current changeset ..."
-msgstr "Закрыть текущий пакет изменений ..."
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41
-msgid "There is currently no changeset open."
-msgstr "В данный момент нет открытого пакета изменений"
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42
-msgid "No open changeset"
-msgstr "Нет открытого пакета изменений"
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60
-msgid "Closing changeset"
-msgstr "Закрытие пакета изменений"
-
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
@@ -1726,41 +1764,41 @@
 msgstr "Выборка пуста"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Загрузить на OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 msgid "Upload all changes to the OSM server."
 msgstr "Загрузить все изменения на OSM"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#, java-format
 msgid ""
 "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
 "resolve them first.</html>"
 msgstr ""
-"<html>Присутствуют неразрешённые конфликты на слое ''{0}''.<br>Необходимо "
-"сначала разрешить их.<html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155
+"<html>Имеются неразрешённые конфликты в слое''{0}''.<br>Вам надо их "
+"разрешить.</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
 msgid "Nothing to upload. Get some data first."
 msgstr "Нечего загружать. Сначала создайте данные."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 msgid "No changes to upload."
 msgstr "Нет изменений для загрузки."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Синхронизированы только {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
 msgid "Synchronize entire dataset"
 msgstr "Синхронизировать весь набор данных"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
 #, java-format
 msgid ""
@@ -1782,17 +1820,17 @@
 "редактирование.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
 msgid "Conflict detected"
 msgstr "Обнаружен конфликт"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr "неожиданное возвращённое значение. Получено {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:267
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
 #, java-format
 msgid ""
@@ -1808,5 +1846,17 @@
 "редактирования.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
+msgid ""
+"<html>Uploading <strong>failed</strong> because you've been "
+"using<br>changeset {0} which was already closed at {1}.<br>Please upload "
+"again with a new or an existing open changeset."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+#, fuzzy
+msgid "Changeset closed"
+msgstr "наборы изменений"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
@@ -1815,23 +1865,23 @@
 "\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr "Заголовок \"{0}\" не соответствуетожидаемой структуре \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr "<html>Не удалось загрузить данные.<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
 msgid "Upload to OSM API failed"
 msgstr "Ошибка выгрузки в OSM API"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
 msgid "Updating primitive"
 msgstr "Обновление примитива"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -2056,14 +2106,14 @@
 msgstr "Добавить точку к линии и объединить"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:930
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:932
 msgid "Create new node."
 msgstr "Создать новую точку"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
 msgid "Select node under cursor."
 msgstr "Выбирете точко под курсором"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939
 #, java-format
 msgid "Insert new node into way."
@@ -2073,14 +2123,14 @@
 msgstr[2] "Вставить новую точку в {0} линий"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
 msgid "Start new way from last node."
 msgstr "Начать путь с последней точки"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951
 msgid "Continue way from last node."
 msgstr "Продолжить путь с последней точки"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:972
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:974
 msgid "Finish drawing."
 msgstr "Закончено вычерчивание"
@@ -2207,60 +2257,70 @@
 "карту, нажав правую кнопку мыши, или Ctrl+вверх/вниз/влево/вправо"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Поиск..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Поиск объектов."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
 msgid "Can't search because there is no loaded data."
 msgstr "Поиск невозможен, так как не загружено никаких данных."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
+#, fuzzy
+msgid "Please enter a filter string."
+msgstr "Пожалуйста, введите строку для поиска."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
 msgid "Please enter a search string."
 msgstr "Пожалуйста, введите строку для поиска."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
 msgid "replace selection"
 msgstr "заменить выделение"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72
 msgid "add to selection"
 msgstr "добавить к выделению"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73
 msgid "remove from selection"
 msgstr "убрать из выделения"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
+#, fuzzy
+msgid "find in selection"
+msgstr "добавить к выделению"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81
 msgid "case sensitive"
 msgstr "регистрозависимый"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82
 msgid "regular expression"
 msgstr "регулярное выражение"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
 msgstr "<b>Baker Street</b> - 'Baker' и 'Street' в любом ключе или названии."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
 msgstr "<b>\"Baker Street\"</b> - 'Baker Street' в любом ключе или названии."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
 msgstr "<b>name:Bak</b> - 'Bak' в любом месте названия."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
 msgstr "<b>type=route</b> - ключ 'type' с точным значением 'route'."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid ""
 "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
@@ -2270,50 +2330,50 @@
 "b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
 msgstr "<b>-name:Bak</b> - название не содержит 'Bak'."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - key=foot устанавливает в любых значениях."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
 msgid "<u>Special targets:</u>"
 msgstr "<u>Специальные цели:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr "<b>type:</b> - тип объекта (<b>node</b>, <b>way</b>, <b>relation</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - все объекты, измененные заданным пользователем"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr "<b>id:</b>... - объект с данным ID (0 для новых объектов)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 msgid "<b>nodes:</b>... - object with given number of nodes"
 msgstr "<b>nodes:</b>... - объект с заданным количеством узлов"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - все измененные объекты"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - все выбранные объекты"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - все незаконченные объекты"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - все объекты без тэгов"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
@@ -2322,5 +2382,5 @@
 "выражению"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2329,5 +2389,5 @@
 "выражению"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
@@ -2335,5 +2395,5 @@
 "«или»"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
@@ -2341,46 +2401,63 @@
 "ключ содержит двоеточие)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Используйте <b>(</b> и <b>)</b> для группировки выражений"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
+msgid "Filter"
+msgstr "Фильтр"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Поиск"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
+msgid "Submit filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "Start Search"
 msgstr "Начать поиск"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Не найдено совпадений для ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Ничего не добавлено к выделению в результате поиска ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Ничего не удалено из выделения в результате поиска ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#, fuzzy, java-format
+msgid "Nothing find in selection by searching for ''{0}''"
+msgstr "Ничего не добавлено к выделению в результате поиска ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262
 #, java-format
 msgid "Found {0} matches"
 msgstr "Найдено {0} совпадений"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283
 msgid "RX"
 msgstr "RX"
@@ -2569,7 +2646,9 @@
 "conflict can't be added.</html>"
 msgstr ""
+"<html>В слое ''{0}'' уже есть конфликт для элемента<br>''{1}''."
+"<br>Невозможно добавить данный конфликт.</html>"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
 msgid "Double conflict"
 msgstr "Двойной конфликт"
@@ -2581,9 +2660,11 @@
 "primitmive ''{1}''"
 msgstr ""
+"Предупреждение: слой ''{0}'' больше не существует. Невозможно удалить "
+"конфликт для элемента ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70
 #, java-format
 msgid "Add conflict for ''{0}''"
-msgstr ""
+msgstr "Добавить конфликт для элемента ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:62
@@ -2826,4 +2907,5 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:134
 msgid "Old value"
 msgstr "Старое значение"
@@ -2878,4 +2960,6 @@
 "isn't a directory."
 msgstr ""
+"Предупреждение: Ошибка инициализации параметров. Каталог параметров ''{0}'' "
+"не является каталогом."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:380
@@ -2885,4 +2969,6 @@
 "isn't a directory.</html>"
 msgstr ""
+"<html>Ошибка инициализации параметров.<br>Каталог параметров ''{0}'' не "
+"является каталогом.</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:388
@@ -2892,4 +2978,6 @@
 "preference directory: {0}"
 msgstr ""
+"Предупреждение: Ошибка инициализации параметров. Не удается создать "
+"отсутствующий каталог параметров: {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:391
@@ -2899,4 +2987,6 @@
 "preference directory: {0}</html>"
 msgstr ""
+"<html>Ошибка инициализации параметров.<br>Не удается создать отсутствующий "
+"каталог параметров: {0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:402
@@ -2905,4 +2995,6 @@
 "Warning: Missing preference file ''{0}''. Creating a default preference file."
 msgstr ""
+"Внимание: Отсутствует файл параметров ''{0}''. Будет создан файл с "
+"параметрами по умолчанию."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:406
@@ -2912,4 +3004,6 @@
 "file."
 msgstr ""
+"Предупреждение: Существующий файл параметров ''{0}'' будет заменен на файл "
+"параметров по умолчанию."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:414
@@ -2919,4 +3013,6 @@
 "to default: {0}</html>"
 msgstr ""
+"<html>Ошибка инициализации параметров.<br>Не удалось сбросить файл "
+"параметров к состоянию по умолчанию: {0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:427
@@ -2926,4 +3022,6 @@
 "<br> and creating a new default preference file.</html>"
 msgstr ""
+"<html>Файл настроек содержит ошибки.<br> Этот файл будет переименован в "
+"резервный<br>{0}<br> а новый будет создан с параметрами по умолчанию.</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:437
@@ -2933,4 +3031,6 @@
 "default: {0}"
 msgstr ""
+"Предупреждение: Ошибка инициализации параметров. Не удалось сбросить файл "
+"параметров {0} к состоянию по умолчанию."
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:87
@@ -2989,27 +3089,59 @@
 
 #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
 msgid "E"
 msgstr "В"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:59
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:203
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
 msgid "Changeset {0}"
 msgstr "Пакет изменений {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:323
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
 msgstr "параметр {0} должен быть > 0. Текущее значение {1}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:325
-#, fuzzy, java-format
-msgid "paramete''{0}'' must not be null"
-msgstr "параметр ''{0}'' не должен быть null"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331
-#, fuzzy, java-format
-msgid "unsupported value ''{0}'' or parameter ''{1}''"
-msgstr "Нет полезного значения ''{0}'' для пути ''{1}''."
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "H"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "Text"
+msgstr "текст"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "C"
+msgstr "CS"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "I"
+msgstr "CI"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "M"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#, fuzzy
+msgid "R"
+msgstr "RX"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+msgid "A"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+msgid "D"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+msgid "F"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
@@ -3023,29 +3155,29 @@
 msgstr "Предупреждение: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
+#, java-format
 msgid "expected id >= 0. Got {0}"
-msgstr "неожиданное возвращённое значение. Получено {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:257
+msgstr "обнаружен id >= 0. Получено {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
 msgid "a primitive with id=0 can't be invisible"
 msgstr "примитив с id=0 не может быть невидимым"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:293
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
+#, java-format
 msgid "id > 0 expected. Got {0}"
-msgstr "Неожиданный знак: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295
-#, fuzzy, java-format
+msgstr "обнаружено id > 0. Получено {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
+#, java-format
 msgid "version > 0 expected. Got {0}"
-msgstr "Неожиданный знак: {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26
+msgstr "обнаружена версия > 0. Получено {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
 msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
 msgstr "параметр ''{0}'' - имя недопустимого типа, получен ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
 msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
@@ -3066,5 +3198,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
 msgid "can't add node {0} to incomplete way {1}"
-msgstr ""
+msgstr "невозможно добавить узел {0} к незавершённой линии {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154
@@ -3114,9 +3246,9 @@
 msgstr "параметр {0} не в интервале 0..{1}, текущее значение {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:247
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:249
 msgid "Area style way is not closed."
 msgstr "Путь, обозначающий границу области, не закрыт."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:478
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:482
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
@@ -3125,118 +3257,118 @@
 #. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
 #. TODO Remove useless nullcheck when RelationMember.member is encalupsed
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:851
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855
 msgid "Empty member in relation."
 msgstr "В отношении имеется пустой член."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:853
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "В отношении «{0}» имеется член, который был удален."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:864
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Путь «{0}» имеет меньше двух точек."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "More than one \"from\" way found."
 msgstr "Найден больше чем один \"from\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "More than one \"to\" way found."
 msgstr "Найден больше чем один \"to\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "More than one \"via\" found."
 msgstr "Найден больше чем один \"via\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Неизвестная роль «{0}»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Неизвестный тип членства для «{0}»."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"from\" way found."
 msgstr "Не найден путь \"from\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"to\" way found."
 msgstr "Не найден путь \"to\""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652
 msgid "No \"via\" node or way found."
 msgstr "Не найдена \"via\" точка или путь"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "\"from\" путь не начинается или заканчивается на \"via\" точке."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "\"to\" путь не начинается или заканчивается на \"via\" точке."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "\"from\" путь не начинается или заканчивается на \"via\" пути."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "\"to\" путь не начинается или заканчивается на \"via\" пути."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Стиль для ограничения {0} не найден."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Нет полезного значения ''{0}'' для пути ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:885
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "не-линия ''{0}'' в мультиполигональном отношении"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:943
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Для мультиполигона «{0}» отсутствует внешний путь."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1032
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Перекрёсток между линиями ''{0}'' и ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1044
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Внутренний путь «{0}» находится снаружи."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1097
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Стиль для внутренней ''{0}''одинаков с мультиполигоном."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1123
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Стиль для внешней границы ''{0}'' отсутствует."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1327
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331
 msgid "untagged"
 msgstr "без тэга"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1328
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332
 msgid "text"
 msgstr "текст"
@@ -3260,5 +3392,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
@@ -3281,5 +3413,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
@@ -3334,5 +3466,5 @@
 msgstr "Зоны Ламберта (Франция)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambert Зона (Эстония)"
@@ -3375,9 +3507,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:38
 msgid "Do not show again"
 msgstr "Больше не показывать"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
 #, java-format
@@ -3385,31 +3517,31 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:91
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:116
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154
 msgid "incomplete"
 msgstr "неполный"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
 msgid "highway"
 msgstr "дорога"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
-#: build/trans_presets.java:3144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: build/trans_presets.java:3156
 msgid "railway"
 msgstr "железная дорога"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
 msgid "waterway"
 msgstr "водоёмы"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "landuse"
 msgstr "землепользование"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:474
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
@@ -3420,5 +3552,5 @@
 msgstr[2] "{0} точек"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
 #, java-format
 msgid "{0} member"
@@ -3449,7 +3581,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
-#, fuzzy
 msgid "Bad Request"
-msgstr "Редактировать Ракетка"
+msgstr "Неверный запрос"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144
@@ -3465,10 +3596,5 @@
 msgstr "Сообщение дня недоступно"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67
-#, java-format
-msgid "- running version is {0}"
-msgstr "- сейчас запущена версия {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:95
 msgid "Downloading \"Message of the day\""
 msgstr "Загружается \"Сообщение дня\""
@@ -3540,10 +3666,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:162
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
 msgid "Username"
 msgstr "Имя пользователя"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
 msgid "Password"
 msgstr "Пароль"
@@ -3607,5 +3733,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:115
 msgid "Change the folder for all user settings"
-msgstr ""
+msgstr "Сменить папку для всех настроек пользователя"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:116
@@ -3671,5 +3797,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226
 msgid "Presets"
 msgstr "Шаблоны"
@@ -3743,38 +3869,49 @@
 msgstr "масштаб"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Географическая долгота положения курсора"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The name of the object at the mouse pointer."
 msgstr "Название объекта, на который наведён курсор"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Географическая широта положения курсора"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The angle between the previous and the current way segment."
 msgstr "Угол между предыдущим и текущим сегментом линии"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "Путевой угол создаваемого сегмента"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The length of the new way segment being drawn."
 msgstr "Длина создаваемого сегмента линии"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199
+msgid ""
+"Middle click again to cycle through.<br>Hold CTRL to select directly from "
+"this list with the mouse.<hr>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290
 msgid "(no object)"
 msgstr "(нет объекта)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:301
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418
+#, fuzzy
+msgid "User:"
+msgstr "Пользователь"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
 msgid "layer not in list."
 msgstr "слоя нет в списке."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:488
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3844,7 +3981,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:224
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Tags"
 msgstr "Тэги"
@@ -3859,5 +3996,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
@@ -4055,4 +4192,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
 msgid "Up"
 msgstr "Вверх"
@@ -4063,4 +4201,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Down"
 msgstr "Вниз"
@@ -4073,5 +4212,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
@@ -4256,4 +4395,6 @@
 "elements when merge decisions are applied."
 msgstr ""
+"Параметры в объединённом элементе. Параметры в моём элементе будут заменены "
+"при объединении."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:91
@@ -4351,4 +4492,7 @@
 "yo agree?</html>"
 msgstr ""
+"<html>Чтобы спасти вашу локальную версию, JOSM<br>сбросит значение id "
+"элемента {0} в 0.<br>При очередной загрузке на сервер,<br>id элемента "
+"получит новое значение.<br>Вы согласны?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:590
@@ -4512,23 +4656,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:236
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239
 msgid "No conflicts to resolve"
-msgstr "Нет неразрешённых конфликтов тегов"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:295
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257
+msgstr "Конфликтов не обнаружено"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254
 msgid "Cancel conflict resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:310
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269
 msgid "Apply resolved conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Apply"
 msgstr "Применить"
@@ -4540,5 +4683,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "all"
 msgstr "все"
@@ -4546,29 +4689,29 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:52
 msgid "Choose a value"
-msgstr ""
+msgstr "Выберите значение"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:54
 msgid "Please decided which values to keep"
-msgstr ""
+msgstr "Необходимо выбрать значение для сохранения"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:59
 #, java-format
 msgid "Value ''{0}'' is going to be applied for key ''{1}''"
-msgstr ""
+msgstr "Значение ''{0}'' будет присовено ключу ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:65
 #, java-format
 msgid "The key ''{0}'' and all it's values are going to be removed"
-msgstr ""
+msgstr "Ключ ''{0}'' и все его значения будут удалены"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:70
 #, java-format
 msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''"
-msgstr ""
+msgstr "Все присоединённые значения ''{0}'' будут присовены ключу ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:53
 #, java-format
 msgid "parameter ''{0}'' must not be empty"
-msgstr ""
+msgstr "параметр ''{0}'' не должен быть пустым"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:55
@@ -4579,10 +4722,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
 msgid "tag collection doesn't include the selected value ''{0}''"
-msgstr ""
+msgstr "набор тегов не содержит выделенное значение ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
-msgid "not yet decided"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:213
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
@@ -4591,25 +4731,25 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:63
 msgid "Not decided yet"
-msgstr ""
+msgstr "Ещё не решено"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49
 msgid "Tags from nodes"
-msgstr ""
+msgstr "Теги точек"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50
 msgid "Tags from ways"
-msgstr ""
+msgstr "Теги линий"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51
 msgid "Tags from relations"
-msgstr ""
+msgstr "Теги отношений"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78
 msgid "Conflicts in pasted tags"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:475
+msgstr "Конфликты в назначенных тегах"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
@@ -4620,7 +4760,7 @@
 msgstr[2] "{0} линий"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:152
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
@@ -4631,25 +4771,26 @@
 msgstr[2] "{0} отношений"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "Paste ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+msgstr "Вставить ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "From ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:372
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+msgstr "Из ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "To ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:428
+msgstr "В ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
 #, java-format
 msgid "{0} tag"
 msgid_plural "{0} tags"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} тег"
+msgstr[1] "{0} тега"
+msgstr[2] "{0} тегов"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java:24
@@ -4660,13 +4801,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
-#, fuzzy
 msgid "Remove this relation member from the relation"
-msgstr "Удалить текущего участника из отношения"
+msgstr "Удалить это отношение из отношения"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-#, fuzzy
 msgid "Replace"
-msgstr "место"
+msgstr "Заменить"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
@@ -4677,11 +4816,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
-#, fuzzy
 msgid "Undecided"
-msgstr "Восстановить конфликт"
+msgstr "Нерешённый"
 
 #. --- role editing
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:56
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510
 msgid "Role:"
 msgstr "Роль:"
@@ -4697,11 +4835,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70
-#, fuzzy
 msgid "Value:"
-msgstr "Значение"
+msgstr "Значение:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86
 msgid "Apply this role to all members"
-msgstr ""
+msgstr "Назначить эту роль всем членам"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33
@@ -4710,12 +4847,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51
-#, fuzzy
 msgid "Orig. Way"
-msgstr "Односторонняя"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
-#, fuzzy
 msgid "Decision"
-msgstr "Версия"
+msgstr "Решение"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -4731,6 +4866,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
@@ -4790,5 +4926,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:193
 msgid "Close anyway"
-msgstr ""
+msgstr "Закрыть в любом случае"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:194
@@ -4808,5 +4944,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:204
 msgid "Conflict not resolved completely"
-msgstr ""
+msgstr "Конфликт не был полностью разрешён"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241
@@ -4817,173 +4953,15 @@
 #, java-format
 msgid "Resolve conflicts for ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-msgid "History"
-msgstr "Журнал"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-msgid "Display the history of all selected items."
-msgstr "Отобразить журнал по всем выделенным объектам."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
-#, java-format
-msgid "index out of bounds Got {0}"
-msgstr "Индекс вне допустимых пределов. Текущее значение {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr "Узел {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
-msgid "History item"
-msgstr "Пункт истории"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Перегрузить все выбранные объекты, и обновить список."
-
-#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
-msgid "Show"
-msgstr "Показать"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
-msgstr "Показать историю выделенного примитива"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
-msgid "Dialog not created yet. Invoke createInstance() first"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
-msgid "Layers"
-msgstr "Слои"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-msgid "Open a list of all loaded layers."
-msgstr "Показать список всех загруженных слоёв."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:297
-msgid "Delete the selected layer."
-msgstr "Удалить выбранный слой."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:367
-msgid "Show/Hide"
-msgstr "Показать/скрыть"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:378
-msgid "Toggle visible state of the selected layer."
-msgstr "Показать/скрыть выбранный слой"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:420
-msgid "Activate the selected layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:475
-msgid "Merge this layer into another layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:581
-msgid "Move the selected layer one row up."
-msgstr "Переместить выделенный слой вверх."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:600
-msgid "Move the selected layer one row down."
-msgstr "Переместить выделенный слой вниз."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
-msgid "Information about layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
-#, java-format
-msgid "This will change up to {0} object."
-msgid_plural "This will change up to {0} objects."
-msgstr[0] "Количество изменяемых объектов: {0}"
-msgstr[1] "Это изменит до {0} объектов."
-msgstr[2] "Это изменит до {0} объектов."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
-msgid "An empty value deletes the key."
-msgstr "Пустое значение удаляет ключ."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
-msgid "<different>"
-msgstr "<различные>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
-msgid "Change values?"
-msgstr "Изменить значения?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
-#, java-format
-msgid "Change properties of up to {0} object"
-msgid_plural "Change properties of up to {0} objects"
-msgstr[0] "Изменить параметры {0} объекта"
-msgstr[1] "Изменить параметры {0} объектов"
-msgstr[2] "Изменить параметры {0} объектов"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
-msgid "Please select a key"
-msgstr "Пожалуйста, выберите ключ"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
-msgid "Please select a value"
-msgstr "Выберите значение"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
-msgid "Please select the objects you want to change properties for."
-msgstr "Выберите объекты, для которых вы желаете изменить параметры."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
-msgid "Properties/Memberships"
-msgstr "Параметры/отношения"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-msgid "Properties for selected objects."
-msgstr "Параметры выделенных объектов."
-
-#. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-msgid "Member Of"
-msgstr "Член группы"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
-msgid "Add Properties"
-msgstr "Добавить параметры"
-
+msgstr "Разрешить конфликты для ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+msgid "Filter objects and hide/disable them."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
@@ -4997,4 +4975,214 @@
 msgstr "Добавить"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#, fuzzy
+msgid "Add filter."
+msgstr "Добавить выбранное"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
+#, fuzzy
+msgid "Edit filter."
+msgstr "Править пирс"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#, fuzzy
+msgid "Delete filter."
+msgstr "Удалить мои"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
+#, fuzzy
+msgid "Move filter up."
+msgstr "Переместить вверх"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
+#, fuzzy
+msgid "Move filter down."
+msgstr "Переместить вниз"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128
+msgid "Enable filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
+#, fuzzy
+msgid "Hide elements"
+msgstr "Отдельные элементы"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
+msgid "Apply also for children"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
+msgid "Inverse filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
+#, fuzzy
+msgid "Filter mode"
+msgstr "Фильтр"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
+msgid "History"
+msgstr "Журнал"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+msgid "Display the history of all selected items."
+msgstr "Отобразить журнал по всем выделенным объектам."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr "Индекс вне допустимых пределов. Текущее значение {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr "Узел {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr "Линия {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr "Отношение {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
+msgid "History item"
+msgstr "Пункт истории"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
+msgid "Reload all currently selected objects and refresh the list."
+msgstr "Перегрузить все выбранные объекты, и обновить список."
+
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
+msgid "Show"
+msgstr "Показать"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
+msgid "Display the history of the selected primitive"
+msgstr "Показать историю выделенного примитива"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84
+msgid "Dialog not created yet. Invoke createInstance() first"
+msgstr "Диалог ещё не создан. Сначала используйте createInstance()"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
+msgid "Layers"
+msgstr "Слои"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+msgid "Open a list of all loaded layers."
+msgstr "Показать список всех загруженных слоёв."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294
+msgid "Delete the selected layer."
+msgstr "Удалить выбранный слой."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364
+msgid "Show/Hide"
+msgstr "Показать/скрыть"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375
+msgid "Toggle visible state of the selected layer."
+msgstr "Показать/скрыть выбранный слой"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgid "Activate"
+msgstr "Включить"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417
+msgid "Activate the selected layer"
+msgstr "Включить текущий слой"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472
+msgid "Merge this layer into another layer"
+msgstr "Объединить этот слой с другим слоем"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578
+msgid "Move the selected layer one row up."
+msgstr "Переместить выделенный слой вверх."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597
+msgid "Move the selected layer one row down."
+msgstr "Переместить выделенный слой вниз."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+msgid "Information about layer"
+msgstr "Информация о слое"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+#, java-format
+msgid "This will change up to {0} object."
+msgid_plural "This will change up to {0} objects."
+msgstr[0] "Количество изменяемых объектов: {0}"
+msgstr[1] "Это изменит до {0} объектов."
+msgstr[2] "Это изменит до {0} объектов."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+msgid "An empty value deletes the key."
+msgstr "Пустое значение удаляет ключ."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+msgid "<different>"
+msgstr "<различные>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+msgid "Change values?"
+msgstr "Изменить значения?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#, java-format
+msgid "Change properties of up to {0} object"
+msgid_plural "Change properties of up to {0} objects"
+msgstr[0] "Изменить параметры {0} объекта"
+msgstr[1] "Изменить параметры {0} объектов"
+msgstr[2] "Изменить параметры {0} объектов"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+msgid "Please select a key"
+msgstr "Пожалуйста, выберите ключ"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+msgid "Please select a value"
+msgstr "Выберите значение"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
+msgid "Please select the objects you want to change properties for."
+msgstr "Выберите объекты, для которых вы желаете изменить параметры."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
+msgid "Properties/Memberships"
+msgstr "Параметры/отношения"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+msgid "Properties for selected objects."
+msgstr "Параметры выделенных объектов."
+
+#. setting up the membership table
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+msgid "Member Of"
+msgstr "Член группы"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
+msgid "Add Properties"
+msgstr "Добавить параметры"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574
 msgid "Add a new key/value pair to all objects"
@@ -5036,10 +5224,9 @@
 
 #. item "Land use/Quarry" text "Name"
-#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
-#: build/trans_presets.java:3109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168
+#: build/trans_presets.java:3121
 msgid "Relations"
 msgstr "Отношения"
@@ -5049,23 +5236,23 @@
 msgstr "Показать список всех отношений."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166
 #, java-format
 msgid "Relations: {0}"
 msgstr "Отношений: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276
 msgid "Open an editor for the selected relation"
 msgstr "Открыть редактор для выбранного отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
 msgid "Delete the selected relation"
 msgstr "Удалить выбранное отношение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349
 msgid "Create a new relation"
 msgstr "Создать новое отношение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:373
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1412
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "Создать копию этих отношений и открыть их в другом окне"
@@ -5098,5 +5285,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5108,9 +5295,9 @@
 msgstr "Выбор: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441
 msgid "Undock the panel"
 msgstr "Отсоединить панель"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5119,5 +5306,5 @@
 "панели."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:457
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Щёлкните для уменьшения/увеличения содержимого панели"
@@ -5137,18 +5324,19 @@
 msgid "{0} Author"
 msgid_plural "{0} Authors"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} Автор"
+msgstr[1] "{0} Автора"
+msgstr[2] "{0} Авторов"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:142
 msgid "Select primitives submitted by this user"
-msgstr ""
+msgstr "Выбрать примитивы, созданные этим пользователем"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:172
 msgid "Show info"
-msgstr ""
+msgstr "Показать информацию"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:173
 msgid "Launches a browser with information about the user"
-msgstr ""
+msgstr "Открыть в браузере информацию о пользователе"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:185
@@ -5157,4 +5345,6 @@
 "Warning: only launching info browsers for the first {0} of {1} selected users"
 msgstr ""
+"Внимание: открываются страницы информации о первых {0} из {1} выбранных "
+"пользователей"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:208
@@ -5167,5 +5357,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:210
 msgid "Missing encoding"
-msgstr ""
+msgstr "Отсутствует кодировка"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:272
@@ -5178,5 +5368,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5200,5 +5390,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1502
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1370
 msgid "Download relation members"
 msgstr ""
@@ -5224,9 +5414,9 @@
 #, java-format
 msgid "Downloading relation {0}"
-msgstr ""
+msgstr "Скачивается отношение {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -5234,18 +5424,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
 msgid "Tags and Members"
 msgstr "Теги и члены"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:167
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5254,14 +5444,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613
 #, java-format
 msgid ""
@@ -5271,9 +5461,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid ""
@@ -5283,5 +5473,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
@@ -5290,5 +5480,5 @@
 "членом"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
@@ -5297,5 +5487,5 @@
 "члена"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5305,5 +5495,5 @@
 "выделенным членом"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5313,20 +5503,20 @@
 "выделенного члена"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
 msgid "Relation Editor: Remove Selected"
 msgstr "Редактор зависимостей: удалить выбранные"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849
 #, java-format
 msgid ""
@@ -5335,57 +5525,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:961
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897
 msgid "Relation Editor: Sort"
 msgstr "Редактор зависимостей: сортировать"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909
 msgid "Move the currently selected members up"
 msgstr "Переместить выбранных членов отношения вверх"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:979
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:912
 msgid "Relation Editor: Move Up"
 msgstr "Редактор зависимостей: поднять"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928
 msgid "Move the currently selected members down"
 msgstr "Переместить выбранных членов отношения вниз"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:998
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:931
 msgid "Relation Editor: Move Down"
 msgstr "Редактор зависимостей: опустить"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
 msgid "Relation Editor: Remove"
 msgstr "Редактор зависимостей: удалить"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Yes, create a conflict and close"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1117
+msgstr "Да, создать конфликт и закрыть"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050
 msgid "No, continue editing"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
+msgstr "Нет, продолжить редактирование"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5394,9 +5584,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1058
 msgid "Conflict in data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143
+msgstr "Конфликт в данных"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
 #, java-format
 msgid ""
@@ -5405,56 +5595,41 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090
 msgid "Apply the current updates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
+msgstr "Записать внесённые изменения"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123
 msgid "Apply the updates and close the dialog"
 msgstr "Применить обновления и закрыть диалог"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Cancel the updates and close the dialog"
 msgstr "Отменить обновления и закрыть диалог"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 msgid "Add an empty tag"
 msgstr "Добавить пустой тег"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
-msgid "Delete the currently selected tags"
-msgstr "Удалить выделенные теги"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Скачать недостающие части линий и узлов, участвующих в отношении"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 msgid "Download Members"
 msgstr "Скачать участников"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Relation Editor: Download Members"
 msgstr "Редактор зависимостей: скачать членов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1208
 msgid "Sets a role for the selected members"
 msgstr "Задать роль для выбранных членов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1211
 msgid "Apply Role"
 msgstr "Применить роль"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1356
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 #, java-format
 msgid ""
@@ -5464,13 +5639,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228
 msgid "Yes, apply it"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
+msgstr "Да, записать"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1229
 msgid "No, don't apply"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1367
+msgstr "Нет, не записывать"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
 msgid "Confirm empty role"
 msgstr ""
@@ -5478,5 +5653,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:192
 msgid "Zoom to"
-msgstr ""
+msgstr "Задать масштаб"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:193
@@ -5557,37 +5732,37 @@
 msgstr "Закладки"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:82
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
 msgid "Please enter the desired coordinates first."
 msgstr "Пожалуйста, введите сначала желаемые координаты"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
 msgid "Please enter a name for the location."
 msgstr "Пожалуйста, введите название места."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:107
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
 msgid "Select a bookmark first."
 msgstr "Сначала выберите закладку"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
 msgid "min lat"
 msgstr "мин. широта"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
 msgid "min lon"
 msgstr "мин. долгота"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid "max lat"
 msgstr "макс. широта"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
 msgid "max lon"
 msgstr "макс. долгота"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5597,22 +5772,22 @@
 "область)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
 msgid "Bounding Box"
 msgstr "Рамка"
 
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
 msgid "Data Sources and Types"
 msgstr "Источники и типы данных"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
 msgid "Download as new layer"
 msgstr "Скачать как новый слой"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
 msgid "Download Area"
 msgstr "Область для скачивания"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
 msgid "Download area too large; will probably be rejected by server"
 msgstr ""
@@ -5620,5 +5795,5 @@
 "запрос."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
 msgid "Download area ok, size probably acceptable to server"
 msgstr "Область для скачивания приемлема по площади."
@@ -5643,7 +5818,7 @@
 msgstr "Название места для поиска:"
 
-#. <separator/>
+#. group "Geography"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2759
 msgid "Places"
 msgstr "Места"
@@ -5690,21 +5865,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "type"
 msgstr "тип"
@@ -5721,5 +5896,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-#, fuzzy
 msgid ""
 "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
@@ -5727,6 +5901,4 @@
 "Hold left mousebutton and draw a frame."
 msgstr ""
-"Масштабирование: Колесо прокрутки или двойной щелчок.  Сдвинуть карту: "
-"Нажмите правую кнопку мыши и двигайте карту мышью. Выбор: щелчок."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
@@ -6187,4 +6359,6 @@
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
 #. <key key="historic" value="wayside_shrine" />
+#. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
+#. <key key="historic" value="boundary_stone" />
 #. item "Leisure/Water Park" label "Edit Water Park"
 #. <key key="leisure" value="water_park" />
@@ -6556,153 +6730,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/trans_presets.java:66 build/trans_presets.java:102
-#: build/trans_presets.java:142 build/trans_presets.java:179
-#: build/trans_presets.java:199 build/trans_presets.java:217
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:272 build/trans_presets.java:305
-#: build/trans_presets.java:351 build/trans_presets.java:371
-#: build/trans_presets.java:386 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:463 build/trans_presets.java:482
-#: build/trans_presets.java:502 build/trans_presets.java:522
-#: build/trans_presets.java:543 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627 build/trans_presets.java:658
-#: build/trans_presets.java:679 build/trans_presets.java:692
-#: build/trans_presets.java:705 build/trans_presets.java:718
-#: build/trans_presets.java:731 build/trans_presets.java:744
-#: build/trans_presets.java:755 build/trans_presets.java:764
-#: build/trans_presets.java:811 build/trans_presets.java:832
-#: build/trans_presets.java:841 build/trans_presets.java:901
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1067 build/trans_presets.java:1075
-#: build/trans_presets.java:1085 build/trans_presets.java:1093
-#: build/trans_presets.java:1098 build/trans_presets.java:1105
-#: build/trans_presets.java:1112 build/trans_presets.java:1117
-#: build/trans_presets.java:1125 build/trans_presets.java:1134
-#: build/trans_presets.java:1140 build/trans_presets.java:1146
-#: build/trans_presets.java:1151 build/trans_presets.java:1157
-#: build/trans_presets.java:1163 build/trans_presets.java:1172
-#: build/trans_presets.java:1181 build/trans_presets.java:1188
-#: build/trans_presets.java:1196 build/trans_presets.java:1209
-#: build/trans_presets.java:1215 build/trans_presets.java:1224
-#: build/trans_presets.java:1230 build/trans_presets.java:1236
-#: build/trans_presets.java:1244 build/trans_presets.java:1299
-#: build/trans_presets.java:1346 build/trans_presets.java:1352
-#: build/trans_presets.java:1358 build/trans_presets.java:1364
-#: build/trans_presets.java:1370 build/trans_presets.java:1381
-#: build/trans_presets.java:1390 build/trans_presets.java:1405
-#: build/trans_presets.java:1412 build/trans_presets.java:1418
-#: build/trans_presets.java:1426 build/trans_presets.java:1433
-#: build/trans_presets.java:1442 build/trans_presets.java:1450
-#: build/trans_presets.java:1457 build/trans_presets.java:1468
-#: build/trans_presets.java:1478 build/trans_presets.java:1488
-#: build/trans_presets.java:1508 build/trans_presets.java:1520
-#: build/trans_presets.java:1531 build/trans_presets.java:1548
-#: build/trans_presets.java:1555 build/trans_presets.java:1570
-#: build/trans_presets.java:1577 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1594
-#: build/trans_presets.java:1599 build/trans_presets.java:1605
-#: build/trans_presets.java:1611 build/trans_presets.java:1619
-#: build/trans_presets.java:1627 build/trans_presets.java:1635
-#: build/trans_presets.java:1642 build/trans_presets.java:1648
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1670 build/trans_presets.java:1677
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1712 build/trans_presets.java:1719
-#: build/trans_presets.java:1736 build/trans_presets.java:1744
-#: build/trans_presets.java:1759 build/trans_presets.java:1769
-#: build/trans_presets.java:1781 build/trans_presets.java:1788
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:1809 build/trans_presets.java:1817
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1841
-#: build/trans_presets.java:1846 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1864
-#: build/trans_presets.java:1872 build/trans_presets.java:1881
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1908 build/trans_presets.java:1914
-#: build/trans_presets.java:1922 build/trans_presets.java:1928
-#: build/trans_presets.java:1934 build/trans_presets.java:1940
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2013
-#: build/trans_presets.java:2022 build/trans_presets.java:2030
-#: build/trans_presets.java:2036 build/trans_presets.java:2042
-#: build/trans_presets.java:2048 build/trans_presets.java:2054
-#: build/trans_presets.java:2060 build/trans_presets.java:2066
-#: build/trans_presets.java:2072 build/trans_presets.java:2078
-#: build/trans_presets.java:2084 build/trans_presets.java:2090
-#: build/trans_presets.java:2096 build/trans_presets.java:2102
-#: build/trans_presets.java:2108 build/trans_presets.java:2114
-#: build/trans_presets.java:2120 build/trans_presets.java:2126
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2158
-#: build/trans_presets.java:2165 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2186
-#: build/trans_presets.java:2192 build/trans_presets.java:2198
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2218 build/trans_presets.java:2225
-#: build/trans_presets.java:2232 build/trans_presets.java:2239
-#: build/trans_presets.java:2247 build/trans_presets.java:2279
-#: build/trans_presets.java:2284 build/trans_presets.java:2289
-#: build/trans_presets.java:2294 build/trans_presets.java:2300
-#: build/trans_presets.java:2306 build/trans_presets.java:2312
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2354
-#: build/trans_presets.java:2451 build/trans_presets.java:2458
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2485 build/trans_presets.java:2492
-#: build/trans_presets.java:2498 build/trans_presets.java:2504
-#: build/trans_presets.java:2526 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2553 build/trans_presets.java:2559
-#: build/trans_presets.java:2565 build/trans_presets.java:2571
-#: build/trans_presets.java:2577 build/trans_presets.java:2583
-#: build/trans_presets.java:2590 build/trans_presets.java:2597
-#: build/trans_presets.java:2604 build/trans_presets.java:2610
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2661
-#: build/trans_presets.java:2667 build/trans_presets.java:2677
-#: build/trans_presets.java:2686 build/trans_presets.java:2701
-#: build/trans_presets.java:2707 build/trans_presets.java:2715
-#: build/trans_presets.java:2722 build/trans_presets.java:2742
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2783
-#: build/trans_presets.java:2790 build/trans_presets.java:2797
-#: build/trans_presets.java:2803 build/trans_presets.java:2809
-#: build/trans_presets.java:2817 build/trans_presets.java:2824
-#: build/trans_presets.java:2831 build/trans_presets.java:2838
-#: build/trans_presets.java:2844 build/trans_presets.java:2851
-#: build/trans_presets.java:2858 build/trans_presets.java:2867
-#: build/trans_presets.java:2873 build/trans_presets.java:2879
-#: build/trans_presets.java:2885 build/trans_presets.java:2891
-#: build/trans_presets.java:2900 build/trans_presets.java:2910
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2948
-#: build/trans_presets.java:2957 build/trans_presets.java:2963
-#: build/trans_presets.java:2969 build/trans_presets.java:2975
-#: build/trans_presets.java:2981 build/trans_presets.java:2987
-#: build/trans_presets.java:2993 build/trans_presets.java:3000
-#: build/trans_presets.java:3006 build/trans_presets.java:3011
-#: build/trans_presets.java:3018 build/trans_presets.java:3025
-#: build/trans_presets.java:3031 build/trans_presets.java:3040
-#: build/trans_presets.java:3048 build/trans_presets.java:3054
-#: build/trans_presets.java:3060 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3080
-#: build/trans_presets.java:3086 build/trans_presets.java:3092
-#: build/trans_presets.java:3098 build/trans_presets.java:3104
-#: build/trans_presets.java:3117 build/trans_presets.java:3131
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:67 build/trans_presets.java:103
+#: build/trans_presets.java:143 build/trans_presets.java:180
+#: build/trans_presets.java:200 build/trans_presets.java:218
+#: build/trans_presets.java:235 build/trans_presets.java:253
+#: build/trans_presets.java:273 build/trans_presets.java:306
+#: build/trans_presets.java:352 build/trans_presets.java:372
+#: build/trans_presets.java:387 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:503 build/trans_presets.java:523
+#: build/trans_presets.java:544 build/trans_presets.java:565
+#: build/trans_presets.java:586 build/trans_presets.java:607
+#: build/trans_presets.java:628 build/trans_presets.java:659
+#: build/trans_presets.java:680 build/trans_presets.java:693
+#: build/trans_presets.java:706 build/trans_presets.java:719
+#: build/trans_presets.java:732 build/trans_presets.java:745
+#: build/trans_presets.java:756 build/trans_presets.java:765
+#: build/trans_presets.java:812 build/trans_presets.java:833
+#: build/trans_presets.java:842 build/trans_presets.java:902
+#: build/trans_presets.java:1053 build/trans_presets.java:1061
+#: build/trans_presets.java:1069 build/trans_presets.java:1077
+#: build/trans_presets.java:1087 build/trans_presets.java:1095
+#: build/trans_presets.java:1100 build/trans_presets.java:1107
+#: build/trans_presets.java:1114 build/trans_presets.java:1119
+#: build/trans_presets.java:1127 build/trans_presets.java:1136
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1153 build/trans_presets.java:1159
+#: build/trans_presets.java:1165 build/trans_presets.java:1174
+#: build/trans_presets.java:1183 build/trans_presets.java:1190
+#: build/trans_presets.java:1198 build/trans_presets.java:1211
+#: build/trans_presets.java:1217 build/trans_presets.java:1226
+#: build/trans_presets.java:1232 build/trans_presets.java:1238
+#: build/trans_presets.java:1246 build/trans_presets.java:1302
+#: build/trans_presets.java:1349 build/trans_presets.java:1355
+#: build/trans_presets.java:1361 build/trans_presets.java:1367
+#: build/trans_presets.java:1373 build/trans_presets.java:1384
+#: build/trans_presets.java:1393 build/trans_presets.java:1408
+#: build/trans_presets.java:1415 build/trans_presets.java:1421
+#: build/trans_presets.java:1429 build/trans_presets.java:1436
+#: build/trans_presets.java:1445 build/trans_presets.java:1453
+#: build/trans_presets.java:1460 build/trans_presets.java:1471
+#: build/trans_presets.java:1481 build/trans_presets.java:1491
+#: build/trans_presets.java:1511 build/trans_presets.java:1523
+#: build/trans_presets.java:1534 build/trans_presets.java:1551
+#: build/trans_presets.java:1558 build/trans_presets.java:1574
+#: build/trans_presets.java:1581 build/trans_presets.java:1586
+#: build/trans_presets.java:1592 build/trans_presets.java:1598
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1646 build/trans_presets.java:1652
+#: build/trans_presets.java:1659 build/trans_presets.java:1666
+#: build/trans_presets.java:1674 build/trans_presets.java:1681
+#: build/trans_presets.java:1689 build/trans_presets.java:1696
+#: build/trans_presets.java:1702 build/trans_presets.java:1709
+#: build/trans_presets.java:1716 build/trans_presets.java:1723
+#: build/trans_presets.java:1740 build/trans_presets.java:1748
+#: build/trans_presets.java:1763 build/trans_presets.java:1773
+#: build/trans_presets.java:1785 build/trans_presets.java:1792
+#: build/trans_presets.java:1798 build/trans_presets.java:1808
+#: build/trans_presets.java:1813 build/trans_presets.java:1821
+#: build/trans_presets.java:1828 build/trans_presets.java:1834
+#: build/trans_presets.java:1840 build/trans_presets.java:1845
+#: build/trans_presets.java:1850 build/trans_presets.java:1855
+#: build/trans_presets.java:1862 build/trans_presets.java:1868
+#: build/trans_presets.java:1873 build/trans_presets.java:1882
+#: build/trans_presets.java:1891 build/trans_presets.java:1900
+#: build/trans_presets.java:1909 build/trans_presets.java:1918
+#: build/trans_presets.java:1924 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 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:2023 build/trans_presets.java:2032
+#: build/trans_presets.java:2040 build/trans_presets.java:2046
+#: build/trans_presets.java:2052 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 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:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2150
+#: build/trans_presets.java:2156 build/trans_presets.java:2162
+#: build/trans_presets.java:2169 build/trans_presets.java:2176
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2197 build/trans_presets.java:2203
+#: build/trans_presets.java:2209 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2229
+#: build/trans_presets.java:2236 build/trans_presets.java:2243
+#: build/trans_presets.java:2250 build/trans_presets.java:2258
+#: build/trans_presets.java:2290 build/trans_presets.java:2295
+#: build/trans_presets.java:2300 build/trans_presets.java:2305
+#: build/trans_presets.java:2311 build/trans_presets.java:2317
+#: build/trans_presets.java:2323 build/trans_presets.java:2331
+#: build/trans_presets.java:2337 build/trans_presets.java:2343
+#: build/trans_presets.java:2349 build/trans_presets.java:2355
+#: build/trans_presets.java:2365 build/trans_presets.java:2462
+#: build/trans_presets.java:2469 build/trans_presets.java:2483
+#: build/trans_presets.java:2489 build/trans_presets.java:2496
+#: build/trans_presets.java:2503 build/trans_presets.java:2509
+#: build/trans_presets.java:2515 build/trans_presets.java:2537
+#: build/trans_presets.java:2544 build/trans_presets.java:2551
+#: build/trans_presets.java:2557 build/trans_presets.java:2564
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2594 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2615
+#: build/trans_presets.java:2621 build/trans_presets.java:2627
+#: build/trans_presets.java:2633 build/trans_presets.java:2639
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2672 build/trans_presets.java:2678
+#: build/trans_presets.java:2688 build/trans_presets.java:2697
+#: build/trans_presets.java:2712 build/trans_presets.java:2718
+#: build/trans_presets.java:2726 build/trans_presets.java:2733
+#: build/trans_presets.java:2753 build/trans_presets.java:2764
+#: build/trans_presets.java:2770 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2788
+#: build/trans_presets.java:2795 build/trans_presets.java:2802
+#: build/trans_presets.java:2809 build/trans_presets.java:2815
+#: build/trans_presets.java:2821 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2912
+#: build/trans_presets.java:2922 build/trans_presets.java:2931
+#: build/trans_presets.java:2937 build/trans_presets.java:2943
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 build/trans_presets.java:2981
+#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:2999 build/trans_presets.java:3005
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3023 build/trans_presets.java:3030
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3066 build/trans_presets.java:3072
+#: build/trans_presets.java:3079 build/trans_presets.java:3085
+#: build/trans_presets.java:3092 build/trans_presets.java:3098
+#: build/trans_presets.java:3104 build/trans_presets.java:3110
+#: build/trans_presets.java:3116 build/trans_presets.java:3129
+#: build/trans_presets.java:3143 build/trans_presets.java:3157
 msgid "Name"
 msgstr "Название"
@@ -6736,4 +6911,58 @@
 msgid "Version"
 msgstr "Версия"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
+#, fuzzy
+msgid "Changeset id:"
+msgstr "Пакет изменений {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
+#, fuzzy
+msgid "Created at:"
+msgstr "Создание областей"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
+#, fuzzy
+msgid "Changeset comment:"
+msgstr "Пакет изменений {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
+msgid "No open changeset"
+msgstr "Нет открытого пакета изменений"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48
+#, fuzzy
+msgid "<html>Please select the changesets you want to close</html>"
+msgstr "Пожалуйста, выберите, какие параметры нужно изменить."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
+#, fuzzy
+msgid "Open changesets"
+msgstr "Нет открытого пакета изменений"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101
+#, fuzzy
+msgid "Close changesets"
+msgstr "Закрытие пакета изменений"
+
+#. putValue(SMALL_ICON, ImageProvider.get("cancel"));
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
+#, fuzzy
+msgid "Close the selected open changesets"
+msgstr "Закрыть текущий пакет изменений ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126
+#, fuzzy
+msgid "Cancel closeing of changesets"
+msgstr "Закрытие пакета изменений"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37
+msgid "Closing changeset"
+msgstr "Закрытие пакета изменений"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77
+#, fuzzy, java-format
+msgid "Closing changeset {0}"
+msgstr "Закрытие пакета изменений"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
@@ -6762,5 +6991,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be uploaded"
+msgid "Layer ''{0}'' has no modifications to be uploaded."
 msgstr ""
 
@@ -6768,5 +6997,5 @@
 #, java-format
 msgid ""
-"Layer ''{0}'' has modifications which should be saved to its assoicated file "
+"Layer ''{0}'' has modifications which should be saved to its associated file "
 "''{1}''."
 msgstr ""
@@ -6774,5 +7003,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be saved"
+msgid "Layer ''{0}'' has no modifications to be saved."
 msgstr ""
 
@@ -6806,17 +7035,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113
 msgid "Unsaved changes - Save/Upload before exiting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194
 #, java-format
 msgid ""
@@ -6829,10 +7058,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205
 msgid "Unsaved data and conflicts"
-msgstr "Устранить конфликт"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212
 #, java-format
 msgid ""
@@ -6846,9 +7074,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223
 msgid "Unsaved data and missing associated file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230
 #, java-format
 msgid ""
@@ -6863,42 +7091,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243
 msgid "Unsaved data non-writable files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
 msgid "Close this dialog and resume editing in JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322
+msgid "Discard and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
-msgid "Discard and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354
+msgid "Save and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
-msgid "Save and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
 msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402
 #, java-format
 msgid "Preparing layer ''{0}'' for upload ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
@@ -6906,5 +7134,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491
 msgid "Incomplete upload and/or save"
 msgstr ""
@@ -6944,21 +7172,21 @@
 #. item "Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:200
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:278
-#: build/trans_presets.java:311 build/trans_presets.java:357
-#: build/trans_presets.java:372 build/trans_presets.java:387
-#: build/trans_presets.java:409 build/trans_presets.java:429
-#: build/trans_presets.java:450 build/trans_presets.java:470
-#: build/trans_presets.java:489 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:549
-#: build/trans_presets.java:570 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:633
-#: build/trans_presets.java:664 build/trans_presets.java:1060
-#: build/trans_presets.java:1068 build/trans_presets.java:1076
-#: build/trans_presets.java:1086 build/trans_presets.java:1305
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:242
+#: build/trans_presets.java:260 build/trans_presets.java:279
+#: build/trans_presets.java:312 build/trans_presets.java:358
+#: build/trans_presets.java:373 build/trans_presets.java:388
+#: build/trans_presets.java:410 build/trans_presets.java:430
+#: build/trans_presets.java:451 build/trans_presets.java:471
+#: build/trans_presets.java:490 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:665 build/trans_presets.java:1062
+#: build/trans_presets.java:1070 build/trans_presets.java:1078
+#: build/trans_presets.java:1088 build/trans_presets.java:1308
 msgid "Layer"
 msgstr "Слой"
@@ -6977,73 +7205,32 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:200
 msgid "Upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-msgid "Use a new changeset and close it"
-msgstr "Использовать новый пакет изменений и закрыть его"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
-msgid ""
-"Select to upload the data using a new changeset and to close the changeset "
-"after the upload"
-msgstr ""
-"Выберите, чтобы выгрузить данные в новый пакет изменений, и закрыть его "
-"после загрузки."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
-msgid "Use a new changeset and leave it open"
-msgstr "Использовать новый пакет изменений и оставить его открытым"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
-msgid ""
-"Select to upload the data using a new changeset and to leave the changeset "
-"open after the upload"
-msgstr ""
-"Выберите, чтобы выгрузить данные в новый пакет изменений, и оставить его "
-"открытым после загрузки."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
-msgid "Upload to a new or to an existing changeset?"
-msgstr "Выгрузить в новый или существующий пакет изменений?"
-
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
-msgid "upload all changes in one request"
-msgstr "Выгрузить все изменения за один запрос"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
-msgid ""
-"Enable to upload all changes in one request, disable to use one request per "
-"changed primitive"
-msgstr ""
-"Включите, чтобы выгрузить все изменения за один запрос, отключите, чтобы "
-"делать отдельный запрос для каждого изменённого примитива"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "Опишите изменения для закачиваемых данных:"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:216
 msgid "Settings"
 msgstr "Настройки"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908
 msgid "Tags of new changeset"
 msgstr "Теги нового пакета изменений"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:221
 msgid "Objects to add:"
 msgstr "Новые объекты:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:227
 msgid "Objects to modify:"
 msgstr "Изменённые объекты:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:233
 msgid "Objects to delete:"
 msgstr "Удаляемые объекты:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
 #, java-format
 msgid "{0} object to add:"
@@ -7053,5 +7240,5 @@
 msgstr[2] "Добавить {0} объектов:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:277
 #, java-format
 msgid "{0} object to modifiy:"
@@ -7061,5 +7248,5 @@
 msgstr[2] "Изменить {0} объектов:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:286
 #, java-format
 msgid "{0} object to delete:"
@@ -7069,59 +7256,95 @@
 msgstr[2] "Удалить {0} объектов:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422
-#, java-format
-msgid "Use the existing changeset {0} and close it after upload"
-msgstr "Использовать текущий набор изменений {0} и закрыть его после загрузки"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:423
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to close the changeset "
-"after this upload"
-msgstr ""
-"Выберите, чтобы использовать существующий пакет изменений {0}, и закрыть его "
-"после загрузки"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426
-#, java-format
-msgid "Use the existing changeset {0} and leave it open"
-msgstr "Использовать текущий список изменений {0} и оставить открытым"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:427
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to leave the changeset "
-"open for further uploads"
-msgstr ""
-"Выберите, чтобы использовать существующий пакет изменений {0}, и оставить "
-"его открытым после загрузки"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:470
+msgid "Upload Changes"
+msgstr "Загрузить изменения"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472
+msgid "Upload the changed primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
+msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:479
+msgid "Illegal upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
+msgid "Cancel the upload and resume editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606
+#, fuzzy
+msgid "Upload all changes in one request"
+msgstr "Выгрузить все изменения за один запрос"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607
+msgid ""
+"Enable to upload all changes in one request, disable to use one request per "
+"changed primitive"
+msgstr ""
+"Включите, чтобы выгрузить все изменения за один запрос, отключите, чтобы "
+"делать отдельный запрос для каждого изменённого примитива"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:617
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "Опишите изменения для закачиваемых данных:"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672
+#, fuzzy
+msgid "Open a new changeset"
+msgstr "Теги нового пакета изменений"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
+#, fuzzy
+msgid "Open a new changeset and use it in the next upload"
+msgstr "Использовать новый пакет изменений и оставить его открытым"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
+#, fuzzy
+msgid "Use an open changeset"
+msgstr "Нет открытого пакета изменений"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
+#, fuzzy
+msgid "Upload data to an already opened changeset"
+msgstr "Выгрузить в новый или существующий пакет изменений?"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
+#, fuzzy
+msgid "Close changeset after upload"
+msgstr "Нет изменений для загрузки."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
+#, fuzzy
+msgid "Select to close the changeset after the next upload"
+msgstr ""
+"Выберите, чтобы выгрузить данные в новый пакет изменений, и закрыть его "
+"после загрузки."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922
 #, java-format
 msgid "Tags of changeset {0}"
 msgstr "Теги пакета изменений {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584
-msgid "Upload Changes"
-msgstr "Загрузить изменения"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
 #, fuzzy
-msgid "Upload the changed primitives"
-msgstr "Загрузить эти изменения?"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592
+msgid "Load the list of your open changesets from the server"
+msgstr "Загрузить текущие параметры на сервер"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
 #, fuzzy
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "Пожалуйста, введите название места."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:593
-msgid "Illegal upload comment"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
-#, fuzzy
-msgid "Cancel the upload and resume editing"
-msgstr "Отменить обновления и закрыть диалог"
+msgid "Close the currently selected open changeset"
+msgstr "Удалить выделенные теги"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
+#, fuzzy, java-format
+msgid "changeset id > 0 expected. Got {1}"
+msgstr "обнаружено id > 0. Получено {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63
@@ -7200,5 +7423,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
@@ -7236,5 +7459,5 @@
 msgstr "Введённое время невозможно использовать"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
@@ -7242,30 +7465,30 @@
 msgstr "точка GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
 msgid "Customize line drawing"
 msgstr "Настроить отрисовку линий"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
 msgid "Use global settings."
 msgstr "Использовать глобальные настройки."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Draw lines between points for this layer."
 msgstr "Отображать линии между точками для этого слоя."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Do not draw lines between points for this layer."
 msgstr "Не отображать линии между точками для этого слоя."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 msgid "Select line drawing options"
 msgstr "Выбрать варианты отрисовки линий"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7273,5 +7496,5 @@
 msgstr "Выбрать цвет"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7280,5 +7503,5 @@
 msgstr "По умолчанию"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7287,39 +7510,76 @@
 msgstr "Выбор цвета"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
 msgid "Markers From Named Points"
 msgstr "Маркеры из именованых точек"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Назвать маршрутные точки из {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
 msgid "Import Audio"
 msgstr "Импортировать аудиофайлы"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
 msgid "Wave Audio files (*.wav)"
 msgstr "Аудиофайлы Wave (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Аудиомаркеры из {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
 msgid "Import images"
 msgstr "Импорт изображений"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#, java-format
+msgid "Name: {0}"
+msgstr "Название: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#, java-format
+msgid "Description: {0}"
+msgstr "Описание: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#, fuzzy, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
 msgstr[0] "{0} дорожка, "
 msgstr[1] "{0} дорожки, "
 msgstr[2] "{0} дорожек, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
+#: build/trans_presets.java:3160
+msgid "Description"
+msgstr "Описание"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#, fuzzy
+msgid "Timespan"
+msgstr "Временной интервал: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#, fuzzy
+msgid "Length"
+msgstr "Длина: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
+msgid "URL"
+msgstr "URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+msgid "Length: "
+msgstr "Длина: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
 #, java-format
 msgid "{0} route, "
@@ -7329,5 +7589,5 @@
 msgstr[2] "{0} маршрутов, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 #, java-format
 msgid "{0} waypoint"
@@ -7337,29 +7597,10 @@
 msgstr[2] "{0} путевых точек"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
-#, java-format
-msgid "Name: {0}"
-msgstr "Название: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
-#, java-format
-msgid "Description: {0}"
-msgstr "Описание: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
-msgid "Timespan: "
-msgstr "Временной интервал: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
-msgid "Length: "
-msgstr "Длина: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Преобразовать в слой данных"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7369,10 +7610,10 @@
 "<br>Если хотите загрузить трэк, сделайте это по ссылке:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -7383,29 +7624,29 @@
 msgstr "Преобразовано из: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
 msgid "Download from OSM along this track"
 msgstr "Скачать с JSM данные вдоль трэка"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
 msgid "Download everything within:"
 msgstr "Скачать всё в пределах:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
 #, java-format
 msgid "{0} meters"
 msgstr "{0} метров"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 msgid "Maximum area per request:"
 msgstr "Максимальная область для одного запроса:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} кв. км."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
 #, java-format
 msgid ""
@@ -7416,13 +7657,13 @@
 "Продолжить?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
 msgid "Download data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
 msgid "No GPX track available in layer to associate audio with."
 msgstr "На слое отсутствует трек GPX, чтобы наложить звук."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7432,5 +7673,5 @@
 "будут пропущены или перенесены в начало трека."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7484,30 +7725,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
-#, fuzzy
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
 "<br>If you want to upload traces, look here:</html>"
 msgstr ""
-"<html>Загрузка на карту необработанных данных GPS считается вредоносной."
-"<br>Если хотите загрузить трэк, сделайте это по ссылке:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "track"
 msgid_plural "tracks"
@@ -7652,4 +7890,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
@@ -7893,9 +8132,14 @@
 msgstr "Отображать крупные точки GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+msgid "Draw a circle form HDOP value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Скорость (красный = медленно, зелёный = быстро)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
@@ -7903,5 +8147,5 @@
 "имеются)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Одним цетом (может быть определено для именованных слоев"
@@ -7909,6 +8153,6 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1374
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:1377
 msgid "Car"
 msgstr "Авто"
@@ -7929,14 +8173,14 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:324 build/trans_presets.java:650
-#: build/trans_presets.java:857 build/trans_presets.java:876
-#: build/trans_presets.java:890 build/trans_presets.java:912
-#: build/trans_presets.java:949 build/trans_presets.java:962
-#: build/trans_presets.java:974 build/trans_presets.java:986
-#: build/trans_presets.java:998 build/trans_presets.java:1010
-#: build/trans_presets.java:1020 build/trans_presets.java:1029
-#: build/trans_presets.java:1038 build/trans_presets.java:1437
-#: build/trans_presets.java:1510
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:325 build/trans_presets.java:651
+#: build/trans_presets.java:858 build/trans_presets.java:877
+#: build/trans_presets.java:891 build/trans_presets.java:913
+#: build/trans_presets.java:950 build/trans_presets.java:963
+#: build/trans_presets.java:975 build/trans_presets.java:987
+#: build/trans_presets.java:999 build/trans_presets.java:1011
+#: build/trans_presets.java:1021 build/trans_presets.java:1030
+#: build/trans_presets.java:1039 build/trans_presets.java:1440
+#: build/trans_presets.java:1513
 msgid "Bicycle"
 msgstr "Вело"
@@ -7969,28 +8213,28 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:325 build/trans_presets.java:649
-#: build/trans_presets.java:856 build/trans_presets.java:875
-#: build/trans_presets.java:889 build/trans_presets.java:911
-#: build/trans_presets.java:948 build/trans_presets.java:961
-#: build/trans_presets.java:973 build/trans_presets.java:985
-#: build/trans_presets.java:997 build/trans_presets.java:1009
-#: build/trans_presets.java:1019 build/trans_presets.java:1028
-#: build/trans_presets.java:1037
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:326 build/trans_presets.java:650
+#: build/trans_presets.java:857 build/trans_presets.java:876
+#: build/trans_presets.java:890 build/trans_presets.java:912
+#: build/trans_presets.java:949 build/trans_presets.java:962
+#: build/trans_presets.java:974 build/trans_presets.java:986
+#: build/trans_presets.java:998 build/trans_presets.java:1010
+#: build/trans_presets.java:1020 build/trans_presets.java:1029
+#: build/trans_presets.java:1038
 msgid "Foot"
 msgstr "Пешком"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Отображать стрелки направления"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Быстрая отрисовка (выглядит хуже)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
@@ -7999,34 +8243,34 @@
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Only on the head of a way."
 msgstr "Только в начале пути"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Отображать порядковые номера сегментов"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Отображать границы скачанных данных"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Отображать виртуальные точки в режиме выделения"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Отображать неактивные слои другим цветом"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Сглаженные линии (антиалиасинг)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:82
 msgid "Draw lines between raw GPS points"
 msgstr "Рисовать линии между точками GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -8036,9 +8280,9 @@
 "чтобы рисовать все линии."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
 msgid "Maximum length for local files (meters)"
 msgstr "Максимальная длина для локальных файлов (в метрах)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
@@ -8047,20 +8291,20 @@
 "чтобы отображать все линии."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length (meters)"
 msgstr "Максимальная длина (в метрах)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "Отображать линии, даже если не импортировано информации о линиях."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:129
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Отображать стрелки на линиях, соединяющих точки GPS."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:135
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -8069,5 +8313,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:141
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -8076,13 +8320,13 @@
 "Не изображать стрелки, если их нет на этом расстоянии от последних стрелок"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:144
 msgid "Minimum distance (pixels)"
 msgstr "Минимальное расстояние (в пикселях)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Draw larger dots for the GPS points."
 msgstr "Отображать точки GPS более жирно"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -8092,9 +8336,9 @@
 "Менеджере Слоев."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Colors points and track segments by velocity."
 msgstr "Цвета точек и сегментов треков по скорости."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -8104,46 +8348,46 @@
 "(HDOP). Ваше устройство должно журналировать эту информацию."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Позволяет настраивать окраску трека для различных средних скоростей."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid "Track and Point Coloring"
 msgstr "Разцветить трэки и точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202
 msgid "GPS Points"
 msgstr "Точки GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "Draw direction hints for way segments."
 msgstr "Показывать направление на сегментах путей."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:237
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Показывать порядковые номера на всех сегментах пути."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Применить сглаживание карты."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Отображать границы области, скачанной с сервера."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Отображать виртуальные точки в режиме выбора, для удобства правки."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257
 msgid "Draw the inactive data layers in a different color."
 msgstr "Отображать неактивные слои данных другим цветом."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "OSM Data"
 msgstr "Данные OSM"
@@ -8224,45 +8468,46 @@
 msgstr "Использованный стиль"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Configure available plugins."
 msgstr "Настроить доступные модули."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50
+#. buttons at the bottom
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
 msgid "Download List"
 msgstr "Скачать список"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:100
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 msgid "Update"
 msgstr "Обновить"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Configure Sites..."
 msgstr "Настроить сайты..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:125
 msgid "Add JOSM Plugin description URL."
 msgstr "Добавить ссылку на описание JOSM плагина"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:126
 msgid "Enter URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:162
 msgid "Please select an entry."
 msgstr "Пожалуйста, выберите запись."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:147
 msgid "Edit JOSM Plugin description URL."
 msgstr "Редактировать ссылку на описание JOSM плагина"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:148
 msgid "JOSM Plugin description URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:175
 msgid "Configure Plugin Sites"
 msgstr "Настроить сайты с модулями"
@@ -8612,6 +8857,6 @@
 msgstr "<множественный>"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:369
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341
 #, java-format
 msgid "Remove old keys from up to {0} object"
@@ -8621,9 +8866,9 @@
 msgstr[2] "Удалить старые ключи из  {0} объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135
 msgid "Add a new tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160
 msgid "Delete the selection in the tag table"
 msgstr ""
@@ -8658,7 +8903,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:68
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:75
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -8703,4 +8948,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24
+#, fuzzy, java-format
+msgid "Preset group ''{0}'' of group ''{1}''"
+msgstr "Использовать шаблон ''{0}'' из группы ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
 #, java-format
 msgid "Preset group ''{0}''"
@@ -8721,4 +8971,10 @@
 msgstr "Загрузка точек с {0} до {1}..."
 
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, fuzzy, java-format
+msgid "parameter ''{0}'' > 0 expected. Got {1}"
+msgstr "параметр ''{0}'' должен быть > 0, текущее значение ''{1}''"
+
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8827,5 +9083,5 @@
 msgstr "Парсинг файла \"{0}\" потерпел неудачу"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "Ошибка разбора: неправильная структура документа gpx"
@@ -8949,10 +9205,11 @@
 msgstr "Соединение с {0} установлено используя протокол {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
 msgstr "сервер вернул неожиданный формат id, текущее значение \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -8962,75 +9219,79 @@
 "значение \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315
 msgid "Creating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
 #, java-format
 msgid "Successfully opened changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#, fuzzy, java-format
+msgid "id of changeset > 0 required. Got {0}"
+msgstr "требуется параметр id ''{0}'' > 0. Получен {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
-#, java-format
-msgid "Changeset {0} is unchanged. Skipping update."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
 #, java-format
 msgid "Updating changeset {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
-msgid ""
-"Failed to update changeset. Either there is no current changeset or the id "
-"of the current changeset is 0"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
 msgid "Closing changeset..."
 msgstr "Закрывается список правок..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
-#, java-format
-msgid "Closing changeset {0}..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
-#, java-format
-msgid "Leaving changeset {0} open..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
 msgid "No changeset present for diff upload"
 msgstr "Нет изменений для выгрузки"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414
 msgid "Preparing..."
 msgstr "Подготовка..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419
 msgid "Uploading..."
 msgstr "Закачка..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438
 msgid "Waiting 10 seconds ... "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449
 msgid "OK - trying again."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:485
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517
 #, java-format
 msgid "Starting retry {0} of {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
+msgid "current changeset is null. Can't upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
+#, java-format
+msgid "id of current changeset > required. Current id is {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, fuzzy, java-format
+msgid "Changeset id > 0 expected. Got {0}"
+msgstr "обнаружено id > 0. Получено {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
+#, java-format
+msgid "Open changeset expected. Got closed changeset with id {0}"
 msgstr ""
 
@@ -9056,50 +9317,115 @@
 msgstr "bz2 файл содержит ошибки"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
+#, fuzzy, java-format
+msgid "missing mandatory attribute ''{0}''"
+msgstr "обязательный атрибут ''{0}'' отсутствует"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:128
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:134
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
+#, fuzzy, java-format
+msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+"неверное значение обязательного атрибута ''{0}'' типа int, текущее значение "
+"''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
+#, fuzzy, java-format
+msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+"неверное значение обязательного атрибута ''{0}'' типа int, текущее значение "
+"''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
+#, fuzzy, java-format
+msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+"неверное значение обязательного атрибута ''{0}'' типа int, текущее значение "
+"''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#, java-format
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#, java-format
+msgid "Unsupported version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:176
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Aborting."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#, java-format
+msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
+#, fuzzy
+msgid "Parsing list of changesets..."
+msgstr "Закрывается список правок..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
 msgid "Incorrect password or username."
 msgstr "Неправильный пароль или имя пользователя."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:168
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Внимание: Пароль будет передан в незашифрованном виде."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Save user and password (unencrypted)"
 msgstr "Сохранить имя пользователя и пароль (не зашифровано)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
 msgid "Enter Password"
 msgstr "Введите пароль"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 msgid "Login"
 msgstr "Идентификатор пользователя"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:242
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Основной адрес сервера OSM (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
 msgid "Login name (e-mail) to the OSM account."
 msgstr "Логин (e-mail) учётной записи OSM"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr "Пароль учётной записи OSM. Оставьте пустым, чтобы не сохранять пароль."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
 msgid "Base Server URL"
 msgstr "Основной адрес сервера"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
 msgid "OSM username (e-mail)"
 msgstr "Имя пользователя на OSM (e-mail)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
 msgid "OSM password"
 msgstr "OSM пароль"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -9111,5 +9437,5 @@
 "<br><b>Не используйте важные Пароли.</b></html"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:51
+#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #, java-format
 msgid "(at line {0}, column {1})"
@@ -9213,20 +9539,5 @@
 msgstr "Ошибка при разборе."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124
-#, fuzzy, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr "обязательный атрибут ''{0}'' отсутствует"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
-#, fuzzy, java-format
-msgid "Missing mandatory attribute ''{0}''"
-msgstr "обязательный атрибут ''{0}'' отсутствует"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
-#, fuzzy, java-format
-msgid "Unsupported version: {0}"
-msgstr "Версия неизвестна: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:155
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -9235,79 +9546,64 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
 msgid "found XML element <nd> element not as direct child of element <way>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
-msgstr "обязательный атрибут ''{0}'' отсутствует"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
 msgstr ""
-"Неверное значение атрибута \"ref\" участника отношения {0}, текущее значение "
-"{1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
 msgid "Found XML element <member> not as direct child of element <relation>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}"
-msgstr "Отсутствует атрибут \"ref\" участника отношения {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
-"Неверное значение атрибута \"ref\" участника отношения {0}, текущее значение "
-"{1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
-#, fuzzy, java-format
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}"
-msgstr "Отсутствует атрибут \"type\" участника {0} в отношении {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#, java-format
 msgid ""
 "Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}."
 msgstr ""
-"Неверное значение атрибута \"ref\" участника отношения {0}, текущее значение "
-"{1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Неполная спецификация <member> с ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
-#, java-format
-msgid "Warning: Undefined element ''{0}'' found in input stream. Skipping."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
-#, fuzzy, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
-msgstr ""
-"неверное значение обязательного атрибута ''{0}'' типа int, текущее значение "
-"''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Skipping."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
 msgid "Illegal object with id=0"
 msgstr "Недопустимый объект с id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#, java-format
 msgid ""
 "Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
 msgstr ""
-"Неверное значение атрибута \"version\" OSM примитива с id {0}, текущее "
-"значение {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:303
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
 #, java-format
 msgid ""
@@ -9316,5 +9612,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
 #, java-format
 msgid ""
@@ -9323,5 +9619,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
@@ -9331,27 +9627,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:316
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#, java-format
 msgid "Unknown or unsupported API version. Got {0}"
-msgstr "Версия неизвестна: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#, java-format
 msgid "Missing attribute ''version'' on OSM primitive with id {0}"
-msgstr "Отсутствует атрибут \"version\" OSM примитива с id {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#, java-format
 msgid "Missing required attribute ''{0}''."
-msgstr "Отсутствует необходимый атрибут \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
 msgstr ""
-"неверное значение обязательного атрибута ''{0}'' типа int, текущее значение "
-"''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
 #, java-format
 msgid ""
@@ -9359,5 +9653,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
 #, java-format
 msgid ""
@@ -9366,5 +9660,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
 #, java-format
 msgid ""
@@ -9372,24 +9666,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#, java-format
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
 "id ''{1}''"
-msgstr "невозможно сравнить примитив с id ''{0}'' и примитив с id ''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
 msgid "Prepare OSM data..."
 msgstr "Подготовка данных..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 msgid "Parsing OSM data..."
-msgstr "Подготовка данных..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
 msgid "Preparing data set..."
-msgstr "Подготовка данных..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
@@ -9410,4 +9702,24 @@
 msgid "Downloading referring relations ..."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51
+#, fuzzy
+msgid "Reading changesets..."
+msgstr "Закрывается список правок..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
+#, fuzzy
+msgid "Downloading changesets ..."
+msgstr "Закрывается список правок..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85
+#, fuzzy, java-format
+msgid "Reading changeset {0} ..."
+msgstr "Чтение {0}..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91
+#, fuzzy, java-format
+msgid "Downloading changeset {0} ..."
+msgstr "Загрузка Плагина {0}..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
@@ -9424,10 +9736,14 @@
 msgstr "Соединение с сервером..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
 msgid "Failed to open connection to API {0}"
 msgstr "Не удалось установить соединение с API {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
+msgid "Error: failed to add authentication credentials to the connection."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -9436,33 +9752,54 @@
 "соединение."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+msgid "XML tag <user> is missing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
+#, fuzzy, java-format
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgstr "Использовать шаблон ''{0}'' из группы ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
+#, fuzzy, java-format
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgstr ""
+"неверное значение обязательного атрибута ''{0}'' типа int, текущее значение "
+"''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
 msgid "Starting to upload with one request per primitive ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
 msgid "Starting to upload in one request ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:171
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135
 msgid "Uploading data ..."
-msgstr "Закачка..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:178
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
 msgid ""
 "WARNING: no API version defined for data to upload. Falling back to version "
@@ -9470,5 +9807,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147
 #, java-format
 msgid ""
@@ -9478,10 +9815,10 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
 msgid "Update Plugins"
 msgstr "Обновить модули"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 msgid "Download Plugins"
 msgstr "Скачать модули"
@@ -9641,5 +9978,5 @@
 msgstr "Подробнее"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -9649,18 +9986,18 @@
 msgstr[2] "Скачать информацию о модуле с {0} сайтов"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
 msgid "No plugin information found."
 msgstr "Информации о модулях не найдено."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr "Плагин {0} не доступен. Обновление пропущено."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:93
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
 msgid "All installed plugins are up to date."
 msgstr "Все установленные модули имеют последнюю версию."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
 #, java-format
 msgid ""
@@ -9673,9 +10010,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
 msgid "Download missing plugins"
 msgstr "Скачивание недостающих модулей"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
 #, java-format
 msgid ""
@@ -9690,43 +10027,43 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
 msgid "unknown"
 msgstr "неизвестный"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Версия {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 msgid "Plugin bundled with JOSM"
 msgstr "Модуль из поставки JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:357
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -9866,5 +10203,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:165
-#, fuzzy
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -9872,6 +10208,4 @@
 "community."
 msgstr ""
-"Максимальная площадь рамки - 0.25. Вы запросили слишком большую область. "
-"Уменьшите область, либо воспользуйтесь planet.osm"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:168
@@ -10071,10 +10405,4 @@
 msgid "(What does that mean?)"
 msgstr ""
-
-#. item "Relations/Route" text "Symbol description"
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3148
-msgid "Description"
-msgstr "Описание"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
@@ -10854,6 +11182,7 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
-msgid "Set "
-msgstr ""
+#, fuzzy, java-format
+msgid "Set {0} Lambert coordinates"
+msgstr "Оставить их координаты"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -11482,6 +11811,6 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 #: build/trans_style.java:990 build/trans_style.java:1007
-#: build/trans_style.java:1023 build/trans_style.java:3392
-#: build/trans_style.java:3400
+#: build/trans_style.java:1023 build/trans_style.java:3400
+#: build/trans_style.java:3408
 msgid "water"
 msgstr "вода"
@@ -11780,4 +12109,57 @@
 msgstr "Измерения"
 
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Michigan Left"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Adds no left turn for sets of 4 or 5 ways."
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45
+#, fuzzy
+msgid "Please select 4 or 5 ways to assign no left turns."
+msgstr ""
+"Пожалуйста, выберите один или более путей, состоящих из как минимум четырех "
+"точек."
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61
+#, fuzzy, java-format
+msgid "{0} extrem nodes."
+msgstr "{0} точка"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69
+#, fuzzy, java-format
+msgid "Via node {0}, {1}"
+msgstr "Изменить точку {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75
+#, fuzzy, java-format
+msgid "{0} via nodes."
+msgstr "{0} точка"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78
+msgid "Unable to find via nodes. Please check your selection"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98
+#, fuzzy, java-format
+msgid "MIddle way: {0}"
+msgstr "Добавить линию {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121
+msgid "Create Michigan left turn restriction"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129
+#, fuzzy, java-format
+msgid "Processing {0}"
+msgstr "Версия {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142
+#, fuzzy, java-format
+msgid "Relation: from {0} to {1} via {2}"
+msgstr "Версия {0} дата создания: {1} автор: {2}"
+
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
 msgid "OpenLayers"
@@ -11935,7 +12317,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
-#, fuzzy
 msgid "create new objects"
-msgstr "Создать новую точку"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
@@ -12000,8 +12381,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
-#, fuzzy
 msgid "Remote Control has been asked to create a new node."
 msgstr ""
-"модуль дистанционного управления получил запрос на загрузку данных из API."
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
@@ -12265,5 +12644,5 @@
 msgstr "Запуск диалога тег редактора"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:158
 msgid "JOSM Tag Editor Plugin"
 msgstr "JOSM Тег Редактор Плагин"
@@ -12273,5 +12652,5 @@
 msgstr "Выделение"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:370
 #, java-format
 msgid "Updating properties of up to {0} object"
@@ -12281,19 +12660,4 @@
 msgstr[2] "Обновление свойств {0} объектов"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44
-msgid "INFO: entering compatibilty mode for JOSM with Main.ds"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47
-msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49
-msgid ""
-"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-"found."
-msgstr ""
-"Неожиданная версия JOSM. Ни Main.ds, ни Main.getCurrentDataSet() не найдены."
-
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
 msgid "Group"
@@ -12303,9 +12667,4 @@
 msgid "Item"
 msgstr "Запись"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-msgid "Filter"
-msgstr "Фильтр"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63
@@ -12393,5 +12752,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2272
 msgid "Street name"
 msgstr "Название улицы"
@@ -12561,8 +12920,4 @@
 msgid "Zoom (in metres)"
 msgstr "Приближение (в метрах)"
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
-msgid "URL"
-msgstr "URL"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -12777,7 +13132,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501
-#, fuzzy
 msgid "Updating map ..."
-msgstr "Обновление данных"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69
@@ -13274,7 +13628,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
-#: build/trans_style.java:4179
+#: build/trans_style.java:4159 build/trans_style.java:4166
+#: build/trans_style.java:4173 build/trans_style.java:4180
+#: build/trans_style.java:4187
 msgid "building"
 msgstr "здание"
@@ -13288,5 +13642,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4186
+#: build/trans_style.java:4194
 msgid "area"
 msgstr "область"
@@ -13416,10 +13770,10 @@
 msgstr "Выделите начальный узел в конце пути"
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:148
 msgid "Reached the end of the line"
 msgstr "Достигнут конец линии"
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:155
 msgid "Reached a junction"
 msgstr "Достигнут перекрёсток"
@@ -13740,12 +14094,10 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
-#, fuzzy
 msgid "% of east:"
-msgstr "% широты:"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
-#, fuzzy
 msgid "% of north:"
-msgstr "% широты:"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -13916,6 +14268,11 @@
 "(которые также могут быть импортированы из GPS слой)."
 
+#. Plugin michigan_left
+#: build/trans_plugins.java:35
+msgid "Adds no left turn for sets of 4 or 5 ways"
+msgstr ""
+
 #. Plugin nearclick
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid ""
 "Simulates a click when you do a small and short drag. This is usefull for "
@@ -13928,15 +14285,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid "Displays an OpenLayers background image"
 msgstr "Отобразить фоновый рисунок OpenLayers"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Импорт вопросов из OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13946,5 +14303,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13952,5 +14309,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13961,15 +14318,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Великолепный JGoodies Пластиковый Скин."
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Let other applications send commands to JOSM."
 msgstr "Разрешить другим приложениям посылать команды JOSM."
 
 #. Plugin routes
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13980,10 +14337,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Provides routing capabilities."
 msgstr "Предоставляет возможности маршрутизации."
 
 #. Plugin slippymap
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13994,15 +14351,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Разрешить добавить теги/узлы на текущей GPS позиции."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Показывает окно для редактирования тегов в табличной сетке."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -14016,10 +14373,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Make terraced houses out of single blocks."
 msgstr "Сделать ряд домов вдоль улицы из одного блока."
 
 #. Plugin usertools
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -14031,5 +14388,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -14040,5 +14397,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -14050,5 +14407,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -14057,10 +14414,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Быстрая загрузка вдоль большого набор пересекающихся линий"
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -14118,4 +14475,10 @@
 #. <annotations>
 #: build/trans_presets.java:57
+#, fuzzy
+msgid "Highways"
+msgstr "дорога"
+
+#. group "Highways"
+#: build/trans_presets.java:58
 msgid "Streets"
 msgstr "Улицы"
@@ -14126,5 +14489,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:58 build/trans_surveyor.java:72
+#: build/trans_presets.java:59 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Автобан"
@@ -14133,5 +14496,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:61
+#: build/trans_presets.java:62
 msgid "Edit Motorway"
 msgstr "Править автобан"
@@ -14158,8 +14521,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:120 build/trans_presets.java:140
-#: build/trans_presets.java:177 build/trans_presets.java:197
-#: build/trans_presets.java:1557 build/trans_presets.java:3146
+#: build/trans_presets.java:65 build/trans_presets.java:101
+#: build/trans_presets.java:121 build/trans_presets.java:141
+#: build/trans_presets.java:178 build/trans_presets.java:198
+#: build/trans_presets.java:1560 build/trans_presets.java:3158
 msgid "Reference"
 msgstr "Сноска"
@@ -14173,8 +14536,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:358
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:359
 msgid "Lanes"
 msgstr "Полосы"
@@ -14191,15 +14554,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:224 build/trans_presets.java:280
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:373 build/trans_presets.java:388
-#: build/trans_presets.java:412 build/trans_presets.java:431
-#: build/trans_presets.java:452 build/trans_presets.java:472
-#: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1307
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:225 build/trans_presets.java:281
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:374 build/trans_presets.java:389
+#: build/trans_presets.java:413 build/trans_presets.java:432
+#: build/trans_presets.java:453 build/trans_presets.java:473
+#: build/trans_presets.java:511 build/trans_presets.java:667
+#: build/trans_presets.java:1310
 msgid "Max. speed (km/h)"
 msgstr "Макс. скорость (км/ч)"
@@ -14236,16 +14599,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:293 build/trans_presets.java:306
-#: build/trans_presets.java:320 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:464
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:659 build/trans_presets.java:1300
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:294 build/trans_presets.java:307
+#: build/trans_presets.java:321 build/trans_presets.java:353
+#: build/trans_presets.java:405 build/trans_presets.java:425
+#: build/trans_presets.java:445 build/trans_presets.java:465
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:660 build/trans_presets.java:1303
 msgid "Oneway"
 msgstr "Односторонняя"
@@ -14287,19 +14650,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:353
-#: build/trans_presets.java:362 build/trans_presets.java:405
-#: build/trans_presets.java:425 build/trans_presets.java:445
-#: build/trans_presets.java:465 build/trans_presets.java:485
-#: build/trans_presets.java:504 build/trans_presets.java:523
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:586 build/trans_presets.java:607
-#: build/trans_presets.java:628 build/trans_presets.java:660
-#: build/trans_presets.java:1301 build/trans_surveyor.java:12
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:354
+#: build/trans_presets.java:363 build/trans_presets.java:406
+#: build/trans_presets.java:426 build/trans_presets.java:446
+#: build/trans_presets.java:466 build/trans_presets.java:486
+#: build/trans_presets.java:505 build/trans_presets.java:524
+#: build/trans_presets.java:545 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629 build/trans_presets.java:661
+#: build/trans_presets.java:1304 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Мост"
@@ -14335,19 +14698,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:354
-#: build/trans_presets.java:378 build/trans_presets.java:406
-#: build/trans_presets.java:426 build/trans_presets.java:446
-#: build/trans_presets.java:466 build/trans_presets.java:486
-#: build/trans_presets.java:505 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629 build/trans_presets.java:661
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:355
+#: build/trans_presets.java:379 build/trans_presets.java:407
+#: build/trans_presets.java:427 build/trans_presets.java:447
+#: build/trans_presets.java:467 build/trans_presets.java:487
+#: build/trans_presets.java:506 build/trans_presets.java:525
+#: build/trans_presets.java:546 build/trans_presets.java:567
+#: build/trans_presets.java:588 build/trans_presets.java:609
+#: build/trans_presets.java:630 build/trans_presets.java:662
+#: build/trans_presets.java:1305
 msgid "Tunnel"
 msgstr "Тоннель"
@@ -14381,18 +14744,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:73 build/trans_presets.java:90
-#: build/trans_presets.java:110 build/trans_presets.java:129
-#: build/trans_presets.java:150 build/trans_presets.java:166
-#: build/trans_presets.java:186 build/trans_presets.java:205
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:355
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:467
-#: build/trans_presets.java:487 build/trans_presets.java:506
-#: build/trans_presets.java:525 build/trans_presets.java:546
-#: build/trans_presets.java:567 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:630
-#: build/trans_presets.java:662 build/trans_presets.java:1303
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:356
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:468
+#: build/trans_presets.java:488 build/trans_presets.java:507
+#: build/trans_presets.java:526 build/trans_presets.java:547
+#: build/trans_presets.java:568 build/trans_presets.java:589
+#: build/trans_presets.java:610 build/trans_presets.java:631
+#: build/trans_presets.java:663 build/trans_presets.java:1306
 msgid "Cutting"
 msgstr "Отсечь"
@@ -14426,18 +14789,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:74 build/trans_presets.java:91
-#: build/trans_presets.java:111 build/trans_presets.java:130
-#: build/trans_presets.java:151 build/trans_presets.java:167
-#: build/trans_presets.java:187 build/trans_presets.java:206
-#: build/trans_presets.java:222 build/trans_presets.java:240
-#: build/trans_presets.java:258 build/trans_presets.java:277
-#: build/trans_presets.java:310 build/trans_presets.java:356
-#: build/trans_presets.java:408 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:468
-#: build/trans_presets.java:488 build/trans_presets.java:507
-#: build/trans_presets.java:526 build/trans_presets.java:547
-#: build/trans_presets.java:568 build/trans_presets.java:589
-#: build/trans_presets.java:610 build/trans_presets.java:631
-#: build/trans_presets.java:663 build/trans_presets.java:1304
+#: build/trans_presets.java:75 build/trans_presets.java:92
+#: build/trans_presets.java:112 build/trans_presets.java:131
+#: build/trans_presets.java:152 build/trans_presets.java:168
+#: build/trans_presets.java:188 build/trans_presets.java:207
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:357
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:469
+#: build/trans_presets.java:489 build/trans_presets.java:508
+#: build/trans_presets.java:527 build/trans_presets.java:548
+#: build/trans_presets.java:569 build/trans_presets.java:590
+#: build/trans_presets.java:611 build/trans_presets.java:632
+#: build/trans_presets.java:664 build/trans_presets.java:1307
 msgid "Embankment"
 msgstr "Насыпь"
@@ -14445,5 +14808,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Motorway Link"
 msgstr "Съезд с автобана"
@@ -14452,5 +14815,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:80
+#: build/trans_presets.java:81
 msgid "Edit Motorway Link"
 msgstr "Править съезд с автобана"
@@ -14458,5 +14821,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:94
+#: build/trans_presets.java:95
 msgid "Trunk"
 msgstr "Автострада"
@@ -14465,5 +14828,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:97
+#: build/trans_presets.java:98
 msgid "Edit Trunk"
 msgstr "Править автостраду"
@@ -14473,6 +14836,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
 msgid "Motorroad"
 msgstr "Автомагистраль"
@@ -14480,5 +14843,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:114
+#: build/trans_presets.java:115
 msgid "Trunk Link"
 msgstr "Съезд с автострады"
@@ -14487,5 +14850,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:117
+#: build/trans_presets.java:118
 msgid "Edit Trunk Link"
 msgstr "Править съезд с автострады"
@@ -14498,5 +14861,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:134 build/trans_surveyor.java:76
+#: build/trans_presets.java:135 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Основная"
@@ -14505,5 +14868,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:137
+#: build/trans_presets.java:138
 msgid "Edit Primary Road"
 msgstr "Править основную дорогу"
@@ -14511,10 +14874,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:154
+#: build/trans_presets.java:155
 msgid "Primary Link"
 msgstr "Съезд с основной"
 
 #. item
-#: build/trans_presets.java:155
+#: build/trans_presets.java:156
 msgid "Edit Primary Link"
 msgstr "Править съезд с основной"
@@ -14526,5 +14889,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:170 build/trans_surveyor.java:80
+#: build/trans_presets.java:171 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Вторичная"
@@ -14534,5 +14897,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:174
+#: build/trans_presets.java:175
 msgid "Edit Secondary Road"
 msgstr "Править вторичную"
@@ -14540,5 +14903,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:190
+#: build/trans_presets.java:191
 msgid "Tertiary"
 msgstr "Третичная"
@@ -14548,5 +14911,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:194
+#: build/trans_presets.java:195
 msgid "Edit Tertiary Road"
 msgstr "Править третичную"
@@ -14558,5 +14921,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:209 build/trans_surveyor.java:84
+#: build/trans_presets.java:210 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Не классифицировано"
@@ -14566,5 +14929,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:213
+#: build/trans_presets.java:214
 msgid "Edit Unclassified Road"
 msgstr "Править неклассифицированную дорогу"
@@ -14591,19 +14954,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:225 build/trans_presets.java:243
-#: build/trans_presets.java:261 build/trans_presets.java:281
-#: build/trans_presets.java:314 build/trans_presets.java:359
-#: build/trans_presets.java:375 build/trans_presets.java:389
-#: build/trans_presets.java:413 build/trans_presets.java:432
-#: build/trans_presets.java:453 build/trans_presets.java:473
-#: build/trans_presets.java:491 build/trans_presets.java:511
-#: build/trans_presets.java:532 build/trans_presets.java:553
-#: build/trans_presets.java:574 build/trans_presets.java:595
-#: build/trans_presets.java:616 build/trans_presets.java:637
-#: build/trans_presets.java:667 build/trans_presets.java:680
-#: build/trans_presets.java:693 build/trans_presets.java:706
-#: build/trans_presets.java:719 build/trans_presets.java:732
-#: build/trans_presets.java:745 build/trans_presets.java:1308
-#: build/trans_presets.java:1498 build/trans_presets.java:1540
+#: build/trans_presets.java:226 build/trans_presets.java:244
+#: build/trans_presets.java:262 build/trans_presets.java:282
+#: build/trans_presets.java:315 build/trans_presets.java:360
+#: build/trans_presets.java:376 build/trans_presets.java:390
+#: build/trans_presets.java:414 build/trans_presets.java:433
+#: build/trans_presets.java:454 build/trans_presets.java:474
+#: build/trans_presets.java:492 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:554
+#: build/trans_presets.java:575 build/trans_presets.java:596
+#: build/trans_presets.java:617 build/trans_presets.java:638
+#: build/trans_presets.java:668 build/trans_presets.java:681
+#: build/trans_presets.java:694 build/trans_presets.java:707
+#: build/trans_presets.java:720 build/trans_presets.java:733
+#: build/trans_presets.java:746 build/trans_presets.java:1311
+#: build/trans_presets.java:1501 build/trans_presets.java:1543
 msgid "Width (meters)"
 msgstr "Ширина (метры)"
@@ -14615,5 +14978,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:228 build/trans_surveyor.java:88
+#: build/trans_presets.java:229 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Местного значения"
@@ -14622,5 +14985,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:231
+#: build/trans_presets.java:232
 msgid "Edit Residential Street"
 msgstr "Править улицу местного значения"
@@ -14645,14 +15008,14 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:611
-#: build/trans_presets.java:632 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "Surface"
 msgstr "Дорожное покрытие"
@@ -14673,53 +15036,53 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paved"
 msgstr "асфальтированная"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "unpaved"
 msgstr "неасфальтированная"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "concrete"
 msgstr "бетон"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
 msgid "metal"
 msgstr ""
@@ -14733,22 +15096,22 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
-#: build/trans_style.java:3367
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
+#: build/trans_style.java:3375
 msgid "wood"
 msgstr "лес"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paving_stones"
 msgstr ""
@@ -14756,77 +15119,77 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "cobblestone"
 msgstr "мостовая"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "gravel"
 msgstr "гравий"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "grass"
 msgstr "трава"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "sand"
 msgstr "песок"
@@ -14834,13 +15197,13 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "ground"
 msgstr "грунт"
@@ -14848,5 +15211,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:246
+#: build/trans_presets.java:247
 msgid "Living Street"
 msgstr "Жилая улица"
@@ -14855,5 +15218,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:249
+#: build/trans_presets.java:250
 msgid "Edit Living Street"
 msgstr "Править жилую улицу"
@@ -14861,5 +15224,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:264
+#: build/trans_presets.java:265
 msgid "Service"
 msgstr "Служебная"
@@ -14868,5 +15231,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:267
+#: build/trans_presets.java:268
 msgid "Edit Serviceway"
 msgstr "Править служебную дорогу"
@@ -14876,18 +15239,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "Serviceway type"
 msgstr "Тип служебного проезда"
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "alley"
 msgstr "Внутридворовый проезд, переулок"
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "driveway"
 msgstr "проезд"
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "parking_aisle"
 msgstr "парковочный проезд"
@@ -14895,5 +15258,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:284
+#: build/trans_presets.java:285
 msgid "Parking Aisle"
 msgstr "Проезд на парковке"
@@ -14903,5 +15266,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:288
+#: build/trans_presets.java:289
 msgid "Edit Parking Aisle"
 msgstr "Изменить автомобильный проезд"
@@ -14909,5 +15272,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:298
+#: build/trans_presets.java:299
 msgid "Road (Unknown Type)"
 msgstr "Дорога (тип неизвестен)"
@@ -14916,5 +15279,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Edit Road of unknown type"
 msgstr "Править дорогу неизвестного типа"
@@ -14923,20 +15286,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:318
+#: build/trans_presets.java:319
 msgid "Road Restrictions"
 msgstr "Дорожные ограничения"
 
 #. item
-#: build/trans_presets.java:319
+#: build/trans_presets.java:320
 msgid "Edit Road Restrictions"
 msgstr "Править дорожные ограничения"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:321
+#: build/trans_presets.java:322
 msgid "Toll"
 msgstr "Платная"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:322
+#: build/trans_presets.java:323
 msgid "No exit (cul-de-sac)"
 msgstr "Тупик"
@@ -14949,8 +15312,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:323 build/trans_presets.java:529
-#: build/trans_presets.java:550 build/trans_presets.java:571
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:634
+#: build/trans_presets.java:324 build/trans_presets.java:530
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:593 build/trans_presets.java:614
+#: build/trans_presets.java:635
 msgid "Access"
 msgstr "Доступ"
@@ -15004,29 +15367,29 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1397
-#: build/trans_presets.java:1398 build/trans_presets.java:1399
-#: build/trans_presets.java:1763 build/trans_presets.java:1773
-#: build/trans_presets.java:2397 build/trans_presets.java:2433
-#: build/trans_presets.java:2442 build/trans_presets.java:2443
-#: build/trans_presets.java:2444 build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:1396
+#: build/trans_presets.java:1397 build/trans_presets.java:1400
+#: build/trans_presets.java:1401 build/trans_presets.java:1402
+#: build/trans_presets.java:1767 build/trans_presets.java:1777
+#: build/trans_presets.java:2408 build/trans_presets.java:2444
+#: build/trans_presets.java:2453 build/trans_presets.java:2454
+#: build/trans_presets.java:2455 build/trans_presets.java:2725
 msgid "yes"
 msgstr "да"
@@ -15039,40 +15402,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:212
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:212
 msgid "private"
 msgstr "частный"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655
 msgid "designated"
 msgstr "предусмотрен"
@@ -15085,19 +15448,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:219
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:219
 msgid "destination"
 msgstr "назначение"
@@ -15120,71 +15483,71 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:205
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:205
 msgid "permissive"
 msgstr "разрешающее"
 
-#: build/trans_presets.java:323 build/trans_presets.java:327
-#: build/trans_presets.java:330 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636
+#: build/trans_presets.java:324 build/trans_presets.java:328
+#: build/trans_presets.java:331 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637
 msgid "agricultural"
 msgstr "сельскохозяйственное"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
-#: build/trans_presets.java:2433 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1396 build/trans_presets.java:1397
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
+#: build/trans_presets.java:2444 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
+#: build/trans_presets.java:2725
 msgid "no"
 msgstr "нет"
 
-#: build/trans_presets.java:326
+#: build/trans_presets.java:327
 msgid "Goods"
 msgstr "Грузовик (до 3.5т)"
 
-#: build/trans_presets.java:327
+#: build/trans_presets.java:328
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Грузовик (более 3.5т)"
@@ -15199,10 +15562,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:328 build/trans_presets.java:651
-#: build/trans_presets.java:858 build/trans_presets.java:891
-#: build/trans_presets.java:913 build/trans_presets.java:950
-#: build/trans_presets.java:963 build/trans_presets.java:975
-#: build/trans_presets.java:987 build/trans_presets.java:999
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:329 build/trans_presets.java:652
+#: build/trans_presets.java:859 build/trans_presets.java:892
+#: build/trans_presets.java:914 build/trans_presets.java:951
+#: build/trans_presets.java:964 build/trans_presets.java:976
+#: build/trans_presets.java:988 build/trans_presets.java:1000
+#: build/trans_presets.java:1040
 msgid "Horse"
 msgstr "Лошадь"
@@ -15218,13 +15581,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:329 build/trans_presets.java:530
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:635 build/trans_presets.java:859
-#: build/trans_presets.java:877 build/trans_presets.java:892
-#: build/trans_presets.java:914 build/trans_presets.java:951
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:330 build/trans_presets.java:531
+#: build/trans_presets.java:552 build/trans_presets.java:573
+#: build/trans_presets.java:594 build/trans_presets.java:615
+#: build/trans_presets.java:636 build/trans_presets.java:860
+#: build/trans_presets.java:878 build/trans_presets.java:893
+#: build/trans_presets.java:915 build/trans_presets.java:952
+#: build/trans_presets.java:965 build/trans_presets.java:977
+#: build/trans_presets.java:989 build/trans_presets.java:1001
+#: build/trans_presets.java:1041
 msgid "Motorcycle"
 msgstr "Мотоцикл"
@@ -15239,30 +15602,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:330 build/trans_presets.java:531
-#: build/trans_presets.java:552 build/trans_presets.java:573
-#: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:636 build/trans_presets.java:654
-#: build/trans_presets.java:878 build/trans_presets.java:893
-#: build/trans_presets.java:915 build/trans_presets.java:952
-#: build/trans_presets.java:965 build/trans_presets.java:977
-#: build/trans_presets.java:989 build/trans_presets.java:1001
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:331 build/trans_presets.java:532
+#: build/trans_presets.java:553 build/trans_presets.java:574
+#: build/trans_presets.java:595 build/trans_presets.java:616
+#: build/trans_presets.java:637 build/trans_presets.java:655
+#: build/trans_presets.java:879 build/trans_presets.java:894
+#: build/trans_presets.java:916 build/trans_presets.java:953
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1042
 msgid "Motorcar"
 msgstr "Автомобиль"
 
-#: build/trans_presets.java:331
+#: build/trans_presets.java:332
 msgid "Public Service Vehicles (psv)"
 msgstr "Транспортные средства общего пользования"
 
-#: build/trans_presets.java:332
+#: build/trans_presets.java:333
 msgid "Motorboat"
 msgstr "Моторная лодка"
 
-#: build/trans_presets.java:333
+#: build/trans_presets.java:334
 msgid "Boat"
 msgstr "Лодка"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:336
 msgid "Min. speed (km/h)"
 msgstr "Мин. скорость (км/ч)"
@@ -15270,25 +15633,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:336 build/trans_presets.java:374
+#: build/trans_presets.java:337 build/trans_presets.java:375
 msgid "Max. weight (tonnes)"
 msgstr "Макс. масса (т)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:337
+#: build/trans_presets.java:338
 msgid "Max. Height (meters)"
 msgstr "Макс. Высота (метры)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Max. Width (meters)"
 msgstr "Макс. Ширина (метры)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:339
+#: build/trans_presets.java:340
 msgid "Max. Length (meters)"
 msgstr "Макс. Длина (метры)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:341
+#: build/trans_presets.java:342
 msgid "Roundabout"
 msgstr "Круг"
@@ -15299,5 +15662,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:346
+#: build/trans_presets.java:347
 msgid "Edit Junction"
 msgstr "Править перекрёсток"
@@ -15319,9 +15682,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:349 build/trans_presets.java:648
-#: build/trans_presets.java:788 build/trans_presets.java:1135
-#: build/trans_presets.java:1392 build/trans_presets.java:2353
-#: build/trans_presets.java:2901 build/trans_presets.java:2911
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:350 build/trans_presets.java:649
+#: build/trans_presets.java:789 build/trans_presets.java:1137
+#: build/trans_presets.java:1395 build/trans_presets.java:2364
+#: build/trans_presets.java:2913 build/trans_presets.java:2923
+#: build/trans_presets.java:2932
 msgid "Type"
 msgstr "Тип"
@@ -15341,10 +15704,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:547
+#: build/trans_presets.java:350 build/trans_style.java:547
 #: build/trans_style.java:555
 msgid "motorway"
 msgstr "Автобан"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "motorway_link"
 msgstr "Съезд с автомагистрали"
@@ -15366,10 +15729,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:563
+#: build/trans_presets.java:350 build/trans_style.java:563
 #: build/trans_style.java:571
 msgid "trunk"
 msgstr "Автострада"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "trunk_link"
 msgstr "Съезд с автострады"
@@ -15391,10 +15754,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:579
+#: build/trans_presets.java:350 build/trans_style.java:579
 #: build/trans_style.java:587
 msgid "primary"
 msgstr "Основная"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "primary_link"
 msgstr "Съезд с основной"
@@ -15416,5 +15779,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:595
+#: build/trans_presets.java:350 build/trans_style.java:595
 #: build/trans_style.java:603
 msgid "secondary"
@@ -15429,9 +15792,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:349 build/trans_style.java:611
+#: build/trans_presets.java:350 build/trans_style.java:611
 msgid "tertiary"
 msgstr "Третичная"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "unclassified"
 msgstr "Неклассифицировано"
@@ -15445,9 +15808,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:349 build/trans_style.java:3143
+#: build/trans_presets.java:350 build/trans_style.java:3151
 msgid "residential"
 msgstr "местного значения"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "living_street"
 msgstr "Жилая"
@@ -15477,10 +15840,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:349 build/trans_style.java:667
-#: build/trans_style.java:4244
+#: build/trans_presets.java:350 build/trans_style.java:667
+#: build/trans_style.java:4252
 msgid "service"
 msgstr "Служебная"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "bus_guideway"
 msgstr "Автобусная дорога"
@@ -15510,6 +15873,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:349 build/trans_style.java:877
-#: build/trans_style.java:3208 build/trans_style.java:3209
+#: build/trans_presets.java:350 build/trans_style.java:877
+#: build/trans_style.java:3216 build/trans_style.java:3217
 msgid "construction"
 msgstr "Строительство"
@@ -15520,10 +15883,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Edit Bridge"
 msgstr "Править мост"
 
 #. item
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "Edit Tunnel"
 msgstr "Редактировать Тоннель"
@@ -15531,19 +15894,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:393
+#: build/trans_presets.java:394
 msgid "Ways"
 msgstr "Дороги"
 
 #. group "Ways"
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Construction"
 msgstr "Строительство"
 
 #. item
-#: build/trans_presets.java:395
+#: build/trans_presets.java:396
 msgid "Edit Highway Under Construction"
 msgstr "Править дорогу, на которой ведётся строительство"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "Junction"
 msgstr "Перекрёсток"
@@ -15559,5 +15922,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:411 build/trans_style.java:895
+#: build/trans_presets.java:412 build/trans_style.java:895
 msgid "roundabout"
 msgstr "Круг"
@@ -15566,5 +15929,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:417
+#: build/trans_presets.java:418
 msgid "Bridleway"
 msgstr "Дорога для всадников"
@@ -15572,5 +15935,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:419
+#: build/trans_presets.java:420
 msgid "Edit Bridleway"
 msgstr "Редактировать дорогу для всадников"
@@ -15578,5 +15941,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:435
+#: build/trans_presets.java:436
 msgid "Cycleway"
 msgstr "Велодорожка"
@@ -15586,10 +15949,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:439
+#: build/trans_presets.java:440
 msgid "Edit Cycleway"
 msgstr "Править велодорожку"
 
 #. item "Ways/Cycleway" check "Embankment"
-#: build/trans_presets.java:449
+#: build/trans_presets.java:450
 msgid "Pedestrians"
 msgstr ""
@@ -15597,5 +15960,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Footway"
 msgstr "Тротуар"
@@ -15604,10 +15967,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Footway"
 msgstr "Править тротуар"
 
 #. item "Ways/Footway" check "Embankment"
-#: build/trans_presets.java:469
+#: build/trans_presets.java:470
 msgid "Bikes"
 msgstr ""
@@ -15615,5 +15978,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:476
+#: build/trans_presets.java:477
 msgid "Pedestrian"
 msgstr "Пешеходная"
@@ -15622,5 +15985,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Edit Pedestrian Street"
 msgstr "Править пешеходную улицу"
@@ -15628,5 +15991,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:494
+#: build/trans_presets.java:495
 msgid "Steps"
 msgstr "Лестница"
@@ -15636,5 +15999,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:498
+#: build/trans_presets.java:499
 msgid "Edit Flight of Steps"
 msgstr "Править лестницу"
@@ -15643,5 +16006,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:515
+#: build/trans_presets.java:516
 msgid "Track"
 msgstr "Грунтовка"
@@ -15650,5 +16013,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:518
+#: build/trans_presets.java:519
 msgid "Edit Track"
 msgstr "Править грунтовку"
@@ -15656,5 +16019,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:535
+#: build/trans_presets.java:536
 msgid "Track Grade 1"
 msgstr "Грунтовка 1 класса"
@@ -15663,5 +16026,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:538
+#: build/trans_presets.java:539
 msgid "Edit Track of grade 1"
 msgstr "Править грунтовку 1 класса"
@@ -15669,5 +16032,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:556
+#: build/trans_presets.java:557
 msgid "Track Grade 2"
 msgstr "Грунтовка 2 класса"
@@ -15676,5 +16039,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:559
+#: build/trans_presets.java:560
 msgid "Edit Track of grade 2"
 msgstr "Править грунтовку 2 класса"
@@ -15682,5 +16045,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:577
+#: build/trans_presets.java:578
 msgid "Track Grade 3"
 msgstr "Грунтовка 3 класса"
@@ -15689,5 +16052,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:580
+#: build/trans_presets.java:581
 msgid "Edit Track of grade 3"
 msgstr "Править грунтовку 3 класса"
@@ -15695,5 +16058,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:598
+#: build/trans_presets.java:599
 msgid "Track Grade 4"
 msgstr "Грунтовка 4 класса"
@@ -15702,5 +16065,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:601
+#: build/trans_presets.java:602
 msgid "Edit Track of grade 4"
 msgstr "Править грунтовку 4 класса"
@@ -15708,5 +16071,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:619
+#: build/trans_presets.java:620
 msgid "Track Grade 5"
 msgstr "Грунтовка 5 класса"
@@ -15715,5 +16078,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:622
+#: build/trans_presets.java:623
 msgid "Edit Track of grade 5"
 msgstr "Править грунтовку 5 класса"
@@ -15722,5 +16085,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:641
+#: build/trans_presets.java:642
 msgid "Path"
 msgstr "Тропа"
@@ -15729,13 +16092,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:644
+#: build/trans_presets.java:645
 msgid "Edit Path"
 msgstr "Править тропу"
 
-#: build/trans_presets.java:652
+#: build/trans_presets.java:653
 msgid "Ski"
 msgstr "Лыжи"
 
-#: build/trans_presets.java:653
+#: build/trans_presets.java:654
 msgid "Snowmobile"
 msgstr "Снегоход"
@@ -15745,6 +16108,6 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:670 build/trans_presets.java:1725
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:671 build/trans_presets.java:1729
+#: build/trans_presets.java:1752
 msgid "Hiking"
 msgstr "Туризм"
@@ -15754,5 +16117,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:674
+#: build/trans_presets.java:675
 msgid "Edit Hiking"
 msgstr "Править туризм"
@@ -15760,5 +16123,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:683
+#: build/trans_presets.java:684
 msgid "Mountain Hiking"
 msgstr "Горный туризм"
@@ -15768,5 +16131,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:687
+#: build/trans_presets.java:688
 msgid "Edit Mountain Hiking"
 msgstr "Править горный туризм"
@@ -15774,5 +16137,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:696
+#: build/trans_presets.java:697
 msgid "Demanding Mountain Hiking"
 msgstr "Продвинутый горный туризм"
@@ -15782,5 +16145,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:700
+#: build/trans_presets.java:701
 msgid "Edit Demanding Mountain Hiking"
 msgstr "Править продвинутый горный туризм"
@@ -15788,5 +16151,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:709
+#: build/trans_presets.java:710
 msgid "Alpine Hiking"
 msgstr "Альпийский туризм"
@@ -15796,5 +16159,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:713
+#: build/trans_presets.java:714
 msgid "Edit Alpine Hiking"
 msgstr "Править альпийский туризм"
@@ -15802,5 +16165,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:723
 msgid "Demanding Alpine Hiking"
 msgstr "Продвинутый альпийский туризм"
@@ -15810,5 +16173,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:726
+#: build/trans_presets.java:727
 msgid "Edit Demanding Alpine Hiking"
 msgstr "Править продвинутый альпийский туризм"
@@ -15816,5 +16179,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:735
+#: build/trans_presets.java:736
 msgid "Difficult Alpine Hiking"
 msgstr "Сложный альпийский туризм"
@@ -15824,5 +16187,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:739
+#: build/trans_presets.java:740
 msgid "Edit Difficult Alpine Hiking"
 msgstr "Править сложный альпийский туризм"
@@ -15830,10 +16193,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:749
+#: build/trans_presets.java:750
 msgid "Waypoints"
 msgstr "Путевые точки"
 
 #. group "Waypoints"
-#: build/trans_presets.java:750
+#: build/trans_presets.java:751
 msgid "Motorway Junction"
 msgstr "Развязка Автобана"
@@ -15841,15 +16204,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:752
+#: build/trans_presets.java:753
 msgid "Edit Motorway Junction"
 msgstr "Править развязку автобана"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:757
 msgid "Number"
 msgstr "Номер"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:759
 msgid "Services"
 msgstr "Службы"
@@ -15857,5 +16220,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:761
 msgid "Edit Service Station"
 msgstr "Править службы"
@@ -15893,15 +16256,15 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:765 build/trans_presets.java:902
-#: build/trans_presets.java:1382 build/trans_presets.java:1406
-#: build/trans_presets.java:1413 build/trans_presets.java:1419
-#: build/trans_presets.java:1427 build/trans_presets.java:1434
-#: build/trans_presets.java:1761 build/trans_presets.java:1771
-#: build/trans_presets.java:2361 build/trans_presets.java:2368
-#: build/trans_presets.java:2384 build/trans_presets.java:2395
-#: build/trans_presets.java:2403 build/trans_presets.java:2410
-#: build/trans_presets.java:2464 build/trans_presets.java:2512
-#: build/trans_presets.java:2678 build/trans_presets.java:2693
-#: build/trans_presets.java:2732 build/trans_presets.java:3151
+#: build/trans_presets.java:766 build/trans_presets.java:903
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
+#: build/trans_presets.java:1416 build/trans_presets.java:1422
+#: build/trans_presets.java:1430 build/trans_presets.java:1437
+#: build/trans_presets.java:1765 build/trans_presets.java:1775
+#: build/trans_presets.java:2372 build/trans_presets.java:2379
+#: build/trans_presets.java:2395 build/trans_presets.java:2406
+#: build/trans_presets.java:2414 build/trans_presets.java:2421
+#: build/trans_presets.java:2475 build/trans_presets.java:2523
+#: build/trans_presets.java:2689 build/trans_presets.java:2704
+#: build/trans_presets.java:2743 build/trans_presets.java:3163
 msgid "Operator"
 msgstr "Оператор"
@@ -15910,5 +16273,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:769
+#: build/trans_presets.java:770
 msgid "Traffic Signal"
 msgstr "Светофор"
@@ -15918,5 +16281,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:774
 msgid "Pedestrian crossing type"
 msgstr "Тип пешеходного перехода"
@@ -15925,27 +16288,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "uncontrolled"
 msgstr "неуправляемый"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "traffic_signals"
 msgstr "Светофор"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "island"
 msgstr "остров"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "unmarked"
 msgstr "Необозначенный"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:774 build/trans_presets.java:790
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:775 build/trans_presets.java:791
+#: build/trans_presets.java:1334
 msgid "Cross on horseback"
 msgstr "Пересечение с дорогой для всадников"
@@ -15953,6 +16316,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:775 build/trans_presets.java:789
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:776 build/trans_presets.java:790
+#: build/trans_presets.java:1335
 msgid "Cross by bicycle"
 msgstr "Пересечение с велодорожкой"
@@ -15961,11 +16324,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:776 build/trans_presets.java:791
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:1336
 msgid "Crossing attendant"
 msgstr "Пересекая сопутствующие"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:778
 msgid "Crossing type name (UK)"
 msgstr "Имя типа пересечения (Великобритания)"
@@ -15973,30 +16336,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "zebra"
 msgstr "Зебра"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pelican"
 msgstr "Пеликан"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "toucan"
 msgstr "Тукан"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "puffin"
 msgstr "Тупик (птица)"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pegasus"
 msgstr "Пегас"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "tiger"
 msgstr "Тигр"
 
 #. </optional>
-#: build/trans_presets.java:780
+#: build/trans_presets.java:781
 msgid "Stop"
 msgstr "Стоп"
@@ -16004,5 +16367,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:783
+#: build/trans_presets.java:784
 msgid "Pedestrian Crossing"
 msgstr "Пешеходный переход"
@@ -16011,14 +16374,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:786
+#: build/trans_presets.java:787
 msgid "Edit Crossing"
 msgstr "Редактирование пересечения"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:793
 msgid "Type name (UK)"
 msgstr "Имя типа (UK)"
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:795
 msgid "Mini-roundabout"
 msgstr "Мини-круг"
@@ -16029,14 +16392,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "Direction"
 msgstr "Направление"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "clockwise"
 msgstr "по часовой стрелке"
 
-#: build/trans_presets.java:801
+#: build/trans_presets.java:802
 msgid "Turning Circle"
 msgstr "Круг для разворота"
@@ -16046,20 +16409,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:806
+#: build/trans_presets.java:807
 msgid "City Limit"
 msgstr "Граница населённого пункта"
 
 #. item
-#: build/trans_presets.java:807
+#: build/trans_presets.java:808
 msgid "Edit City Limit Sign"
 msgstr "Править границу населённого пункта"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:812
+#: build/trans_presets.java:813
 msgid "Second Name"
 msgstr "Второе название"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:814
+#: build/trans_presets.java:815
 msgid "Speed Camera"
 msgstr "Автоматический радар"
@@ -16067,5 +16430,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:817
+#: build/trans_presets.java:818
 msgid "Emergency Phone"
 msgstr "Телефон первой необходимости"
@@ -16073,5 +16436,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:820
+#: build/trans_presets.java:821
 msgid "Incline"
 msgstr "Подъём"
@@ -16079,5 +16442,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:823
+#: build/trans_presets.java:824
 msgid "Incline Steep"
 msgstr "Крутой подъём"
@@ -16086,10 +16449,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:827
+#: build/trans_presets.java:828
 msgid "Ford"
 msgstr "Брод"
 
 #. item
-#: build/trans_presets.java:828
+#: build/trans_presets.java:829
 msgid "Edit Ford"
 msgstr "Править брод"
@@ -16097,5 +16460,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:835
+#: build/trans_presets.java:836
 msgid "Mountain Pass"
 msgstr "Перевал"
@@ -16103,5 +16466,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:837
+#: build/trans_presets.java:838
 msgid "Edit Mountain Pass"
 msgstr "Править перевал"
@@ -16113,7 +16476,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:842 build/trans_presets.java:1600
-#: build/trans_presets.java:1745 build/trans_presets.java:2845
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:843 build/trans_presets.java:1604
+#: build/trans_presets.java:1749 build/trans_presets.java:2857
+#: build/trans_presets.java:2864 build/trans_presets.java:2871
 msgid "Elevation"
 msgstr "Возвышение"
@@ -16121,5 +16484,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:846
+#: build/trans_presets.java:847
 msgid "Barriers"
 msgstr "Преграды"
@@ -16127,5 +16490,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:849
+#: build/trans_presets.java:850
 msgid "Bollard"
 msgstr "Столбик"
@@ -16133,5 +16496,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:852
 msgid "Edit Bollard"
 msgstr "Править столбик"
@@ -16176,16 +16539,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:854 build/trans_presets.java:873
-#: build/trans_presets.java:887 build/trans_presets.java:909
-#: build/trans_presets.java:946 build/trans_presets.java:959
-#: build/trans_presets.java:971 build/trans_presets.java:983
-#: build/trans_presets.java:995 build/trans_presets.java:1007
-#: build/trans_presets.java:1017 build/trans_presets.java:1026
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:855 build/trans_presets.java:874
+#: build/trans_presets.java:888 build/trans_presets.java:910
+#: build/trans_presets.java:947 build/trans_presets.java:960
+#: build/trans_presets.java:972 build/trans_presets.java:984
+#: build/trans_presets.java:996 build/trans_presets.java:1008
+#: build/trans_presets.java:1018 build/trans_presets.java:1027
+#: build/trans_presets.java:1036
 msgid "Allowed traffic:"
 msgstr "Разрешено движение:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:861
+#: build/trans_presets.java:862
 msgid "Cycle Barrier"
 msgstr "Преграда для велосипедов"
@@ -16194,5 +16557,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:865
+#: build/trans_presets.java:866
 msgid "Block"
 msgstr "Бетонный блок"
@@ -16200,5 +16563,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:868
+#: build/trans_presets.java:869
 msgid "Cattle Grid"
 msgstr "Забор препятствующий выходу скота с пастбища на дорогу"
@@ -16206,10 +16569,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:870
+#: build/trans_presets.java:871
 msgid "Edit Cattle Grid"
 msgstr "Редактировать Забор препятствующий выходу скота с пастбища на дорогу"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:880
+#: build/trans_presets.java:881
 msgid "Bus Trap"
 msgstr "Автобусное место"
@@ -16217,15 +16580,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:883
+#: build/trans_presets.java:884
 msgid "Spikes"
 msgstr "Шипы"
 
 #. item
-#: build/trans_presets.java:884
+#: build/trans_presets.java:885
 msgid "Edit Spikes"
 msgstr "Редактировать выступ"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:896
 msgid "Toll Booth"
 msgstr "Оплата проезда"
@@ -16233,5 +16596,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:897
+#: build/trans_presets.java:898
 msgid "Edit Toll Booth"
 msgstr "Править пункт оплаты проезда"
@@ -16239,10 +16602,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:905
+#: build/trans_presets.java:906
 msgid "Border Control"
 msgstr "Пограничный контороль"
 
 #. item
-#: build/trans_presets.java:906
+#: build/trans_presets.java:907
 msgid "Edit Border Control"
 msgstr "Править пограничный контороль"
@@ -16252,5 +16615,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:920
+#: build/trans_presets.java:921
 msgid "Hedge"
 msgstr "Живая изгородь"
@@ -16259,5 +16622,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:925
 msgid "Fence"
 msgstr "Забор"
@@ -16266,5 +16629,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:929
 msgid "Wall"
 msgstr "Стена"
@@ -16272,5 +16635,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:931
+#: build/trans_presets.java:932
 msgid "City Wall"
 msgstr "Городская стена"
@@ -16279,5 +16642,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:935
+#: build/trans_presets.java:936
 msgid "Retaining Wall"
 msgstr "Подпорная стена"
@@ -16289,15 +16652,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:942
+#: build/trans_presets.java:943
 msgid "Entrance"
 msgstr "Вход"
 
 #. item
-#: build/trans_presets.java:943
+#: build/trans_presets.java:944
 msgid "Edit Entrance"
 msgstr "Править вход"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:954
+#: build/trans_presets.java:955
 msgid "Gate"
 msgstr "Ворота"
@@ -16305,76 +16668,76 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:956
+#: build/trans_presets.java:957
 msgid "Edit Gate"
 msgstr "Править ворота"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:967
+#: build/trans_presets.java:968
 msgid "Lift Gate"
 msgstr "Шлагбаум"
 
 #. item
-#: build/trans_presets.java:968
+#: build/trans_presets.java:969
 msgid "Edit Lift Gate"
 msgstr "Править шлагбаум"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:979
+#: build/trans_presets.java:980
 msgid "Hampshire Gate"
 msgstr "Ворота Гэмпшир"
 
 #. item
-#: build/trans_presets.java:980
+#: build/trans_presets.java:981
 msgid "Edit Hampshire Gate"
 msgstr "Редактировать Ворота Гэмпшир"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:991
+#: build/trans_presets.java:992
 msgid "Bump Gate"
 msgstr "Портовые ворота"
 
 #. item
-#: build/trans_presets.java:992
+#: build/trans_presets.java:993
 msgid "Edit Bump Gate"
 msgstr "Редактировать Портовые ворота"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:1003
+#: build/trans_presets.java:1004
 msgid "Kissing Gate"
 msgstr "Узкая калитка"
 
 #. item
-#: build/trans_presets.java:1004
+#: build/trans_presets.java:1005
 msgid "Edit Kissing Gate"
 msgstr "Редактировать Узкая калитка"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1013
 msgid "Stile"
-msgstr "ступеньки для перехода через ограждение"
+msgstr "Турникет"
 
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1014
+#: build/trans_presets.java:1015
 msgid "Edit Stile"
 msgstr "Редактировать ступеньки для перехода через ограждение"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1023
 msgid "Turnstile"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1024
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1032
 msgid "Sally Port"
 msgstr "Двойные ворота"
 
 #. item
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1033
 msgid "Edit Sally Port"
 msgstr "Править двойные ворота"
@@ -16382,13 +16745,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #.
-#. <separator/>
+#. group "Water"
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1046 build/trans_presets.java:1089
+#: build/trans_presets.java:1047 build/trans_presets.java:1048
+#: build/trans_presets.java:1091
 msgid "Water"
 msgstr "Вода"
 
 #. group "Water"
-#: build/trans_presets.java:1047
+#: build/trans_presets.java:1049
 msgid "Spring"
 msgstr "Источник"
@@ -16396,5 +16760,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1049
+#: build/trans_presets.java:1051
 msgid "Edit Spring"
 msgstr "Править источник"
@@ -16402,5 +16766,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1056
 msgid "Drain"
 msgstr "Водосток"
@@ -16408,10 +16772,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1058
 msgid "Edit Drain"
 msgstr "Править водосток"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1064
 msgid "Stream"
 msgstr "Ручей"
@@ -16419,10 +16783,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1066
 msgid "Edit Stream"
 msgstr "Править ручей"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1072
 msgid "Canal"
 msgstr "Канал"
@@ -16430,10 +16794,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1074
 msgid "Edit Canal"
 msgstr "Править канал"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1080
 msgid "River"
 msgstr "Река"
@@ -16443,5 +16807,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1084
 msgid "Edit River"
 msgstr "Править реку"
@@ -16449,15 +16813,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1093
 msgid "Edit Water"
 msgstr "Править воду"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1097
 msgid "Land"
 msgstr "Суша"
 
 #. item
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1098
 msgid "Edit Land"
 msgstr "Править сушу"
@@ -16465,15 +16829,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1103
 msgid "Basin"
 msgstr "Бассейн"
 
 #. item
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1104
 msgid "Edit Basin Landuse"
 msgstr "Править резервуар"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1109
 msgid "Reservoir"
 msgstr "Резервуар"
@@ -16481,15 +16845,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1109
+#: build/trans_presets.java:1111
 msgid "Edit Reservoir Landuse"
 msgstr "Править резервуар"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1116
 msgid "Covered Reservoir"
 msgstr "Крытый резервуар"
 
 #. item
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1117
 msgid "Edit Covered Reservoir"
 msgstr "Править крытый резервуар"
@@ -16497,5 +16861,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1120
+#: build/trans_presets.java:1122
 msgid "Riverbank"
 msgstr "Берег реки"
@@ -16504,10 +16868,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1125
 msgid "Edit Riverbank"
 msgstr "Править берег реки"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1127
+#: build/trans_presets.java:1129
 msgid "Wetland"
 msgstr "Заболоченная территория"
@@ -16518,14 +16882,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1134
 msgid "Edit Wetland"
 msgstr "Редактировать заболоченная территория"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "swamp"
 msgstr "болото"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "bog"
 msgstr "трясина"
@@ -16539,35 +16903,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1135 build/trans_style.java:3384
+#: build/trans_presets.java:1137 build/trans_style.java:3392
 msgid "marsh"
 msgstr "Болото"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "reedbed"
 msgstr "плавни"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "saltmarsh"
 msgstr "солевое болото"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "tidalflat"
 msgstr "ватты"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "mangrove"
 msgstr "мангры"
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1139
 msgid "Mud"
 msgstr "Грязь"
 
 #. item
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1140
 msgid "Edit Mud"
 msgstr "Править грязь"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1144
 msgid "Beach"
 msgstr "Пляж"
@@ -16575,20 +16939,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1144
+#: build/trans_presets.java:1146
 msgid "Edit Beach"
 msgstr "Править пляж"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1150
 msgid "Bay"
 msgstr "Бухта"
 
 #. item
-#: build/trans_presets.java:1149
+#: build/trans_presets.java:1151
 msgid "Edit Bay"
 msgstr "Править бухту"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1155
 msgid "Cliff"
 msgstr "Скала"
@@ -16596,10 +16960,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1157
 msgid "Edit Cliff"
 msgstr "Править скалу"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1159
+#: build/trans_presets.java:1161
 msgid "Coastline"
 msgstr "Побережье"
@@ -16607,5 +16971,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1163
 msgid "Edit Coastline"
 msgstr "Править побережье"
@@ -16613,5 +16977,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1168
 msgid "Ferry Route"
 msgstr "Паромная переправа"
@@ -16619,5 +16983,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1170
 msgid "Edit Ferry"
 msgstr "Править переправу"
@@ -16626,5 +16990,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1176
+#: build/trans_presets.java:1178
 msgid "Boatyard"
 msgstr "Лодочная мастерская"
@@ -16632,10 +16996,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:1180
 msgid "Edit Boatyard"
 msgstr "Править лодочную мастерскую"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1185
 msgid "Dock"
 msgstr "Причал"
@@ -16643,5 +17007,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1187
 msgid "Edit Dock"
 msgstr "Править причал"
@@ -16649,5 +17013,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1193
 msgid "Dam"
 msgstr "Дамба"
@@ -16655,15 +17019,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1195
 msgid "Edit Dam"
 msgstr "Править дамбу"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1199
+#: build/trans_presets.java:1201
 msgid "Waterway Point"
 msgstr "Гидротехнические сооружения"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1202
 msgid "Lock Gate"
 msgstr "Ворота шлюза"
@@ -16672,5 +17036,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1206
 msgid "Weir"
 msgstr "Водослив"
@@ -16678,20 +17042,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1208
 msgid "Edit Weir"
 msgstr "Править водослив"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1213
 msgid "Waterfall"
 msgstr "Водопад"
 
 #. item
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1214
 msgid "Edit Waterfall"
 msgstr "Править водопад"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1219
 msgid "Turning Point"
 msgstr "Разворот"
@@ -16700,15 +17064,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1221
+#: build/trans_presets.java:1223
 msgid "Marina"
 msgstr "Пристань для яхт"
 
 #. item
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1224
 msgid "Edit Marina"
 msgstr "Править пристань для яхт"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1228
 msgid "Pier"
 msgstr "Пирс"
@@ -16716,10 +17080,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1230
 msgid "Edit Pier"
 msgstr "Править пирс"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1234
 msgid "Ferry Terminal"
 msgstr "Паромная станция"
@@ -16727,10 +17091,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1236
 msgid "Edit Ferry Terminal"
 msgstr "Править паромную станцию"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1240
 msgid "Slipway"
 msgstr "Слип"
@@ -16740,16 +17104,21 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1244
 msgid "Edit Slipway"
 msgstr "Править слип"
 
 #. item "Waterway Point/Slipway" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1250
+#, fuzzy
+msgid "Transport"
+msgstr "Общественный транспорт"
+
+#. group "Transport"
+#: build/trans_presets.java:1251
 msgid "Railway"
 msgstr "Железная дорога"
 
 #. group "Railway"
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1252
 msgid "Rail"
 msgstr "Железная дорога"
@@ -16757,5 +17126,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:1254
 msgid "Edit Rail"
 msgstr "Править железную дорогу"
@@ -16785,8 +17154,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "Optional Types"
 msgstr "Необязательные типы"
@@ -16800,35 +17169,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "yard"
 msgstr "сад"
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "siding"
 msgstr "запасный путь"
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "spur"
 msgstr "ответвление"
 
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1259
 msgid "Narrow Gauge Rail"
 msgstr "Узкоколейка"
 
 #. item
-#: build/trans_presets.java:1257
+#: build/trans_presets.java:1260
 msgid "Edit Narrow Gauge Rail"
 msgstr "Править узкоколейку"
 
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1265
 msgid "Monorail"
 msgstr "Монорельс"
@@ -16836,45 +17205,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1267
 msgid "Edit Monorail"
 msgstr "Править монорельс"
 
-#: build/trans_presets.java:1269
+#: build/trans_presets.java:1272
 msgid "Preserved"
 msgstr "Историческая"
 
 #. item
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1273
 msgid "Edit Preserved Railway"
 msgstr "Править историческую дорогу"
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1278
 msgid "Light Rail"
 msgstr "Лёгкая железная дорога"
 
 #. item
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1279
 msgid "Edit Light Rail"
 msgstr "Править лёгкую железную дорогу"
 
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1284
 msgid "Subway"
 msgstr "Метрополитен"
 
 #. item
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1285
 msgid "Edit Subway"
 msgstr "Править метрополитен"
 
-#: build/trans_presets.java:1287
+#: build/trans_presets.java:1290
 msgid "Tram"
 msgstr "Трамвай"
 
 #. item
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1291
 msgid "Edit Tram"
 msgstr "Править трамвай"
 
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1296
 msgid "Bus Guideway"
 msgstr "Направляемый автобус"
@@ -16882,5 +17251,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1295
+#: build/trans_presets.java:1298
 msgid "Edit Bus Guideway"
 msgstr "Править рельсовый автобус"
@@ -16889,14 +17258,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1315
 msgid "Disused Rail"
 msgstr "Неиспользуемая"
 
 #. item
-#: build/trans_presets.java:1313
+#: build/trans_presets.java:1316
 msgid "Edit Disused Railway"
 msgstr "Править неиспользуемую дорогу"
 
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1321
 msgid "Abandoned Rail"
 msgstr "Заброшенная"
@@ -16905,5 +17274,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1325
 msgid "Level Crossing"
 msgstr "Переезд"
@@ -16912,5 +17281,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1329
 msgid "Crossing"
 msgstr "Пересечение"
@@ -16920,5 +17289,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1333
 msgid "Crossing type"
 msgstr "Тип пересечения"
@@ -16926,5 +17295,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1339
 msgid "Turntable"
 msgstr "Поворотный стол"
@@ -16933,10 +17302,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1344
 msgid "Aerialway"
 msgstr "Надземные пути"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1345
 msgid "Chair Lift"
 msgstr "Кресельная дорога"
@@ -16944,10 +17313,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1347
 msgid "Edit Chair Lift"
 msgstr "Править кресельную дорогу"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1351
 msgid "Drag Lift"
 msgstr "Бугельный подъёмник"
@@ -16955,10 +17324,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1353
 msgid "Edit Drag Lift"
 msgstr "Править бугельный подъёмник"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1357
 msgid "Cable Car"
 msgstr "Канатная дорога"
@@ -16966,10 +17335,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1359
 msgid "Edit Cable Car"
 msgstr "Править канатную дорогу"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1360
+#: build/trans_presets.java:1363
 msgid "Gondola"
 msgstr "Гондола"
@@ -16977,5 +17346,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1365
 msgid "Edit Gondola"
 msgstr "Редактировать Гондолу"
@@ -16983,5 +17352,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1366 build/trans_presets.java:1461
+#: build/trans_presets.java:1369 build/trans_presets.java:1464
 msgid "Station"
 msgstr "Станция"
@@ -16992,10 +17361,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1368 build/trans_presets.java:1464
+#: build/trans_presets.java:1371 build/trans_presets.java:1467
 msgid "Edit Station"
 msgstr "Править станцию"
 
 #. group "Car"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1378
 msgid "Fuel"
 msgstr "Заправка"
@@ -17005,5 +17374,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1382
 msgid "Edit Fuel"
 msgstr "Править заправку"
@@ -17061,32 +17430,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1671 build/trans_presets.java:1678
-#: build/trans_presets.java:1686 build/trans_presets.java:1699
-#: build/trans_presets.java:1713 build/trans_presets.java:1810
-#: build/trans_presets.java:1818 build/trans_presets.java:1909
-#: build/trans_presets.java:1915 build/trans_presets.java:2226
-#: build/trans_presets.java:2250 build/trans_presets.java:2465
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1703
+#: build/trans_presets.java:1717 build/trans_presets.java:1814
+#: build/trans_presets.java:1822 build/trans_presets.java:1919
+#: build/trans_presets.java:1925 build/trans_presets.java:2237
+#: build/trans_presets.java:2261 build/trans_presets.java:2476
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Opening Hours"
 msgstr "Часы работы"
@@ -17145,91 +17514,91 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -17244,5 +17613,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1385 build/trans_presets.java:1438
+#: build/trans_presets.java:1388 build/trans_presets.java:1441
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -17252,5 +17621,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1391
 msgid "Edit Parking"
 msgstr "Править стоянку"
@@ -17261,24 +17630,24 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1391 build/trans_presets.java:1762
-#: build/trans_presets.java:1772 build/trans_presets.java:2396
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:1394 build/trans_presets.java:1766
+#: build/trans_presets.java:1776 build/trans_presets.java:2407
+#: build/trans_presets.java:2524
 msgid "Reference number"
 msgstr "Справочный номер"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "multi-storey"
 msgstr "многоуровневая"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "surface"
 msgstr "наземная"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "underground"
 msgstr "подземная"
 
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1396
 msgid "Park and Ride"
 msgstr ""
@@ -17287,38 +17656,38 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1394 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
+#: build/trans_presets.java:1397 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
 msgid "Fee"
 msgstr "Денежный сбор"
 
 #. <space />
-#: build/trans_presets.java:1396
+#: build/trans_presets.java:1399
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1400
 msgid "Spaces for Disabled"
 msgstr "Места для инвалидов"
 
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1401
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1402
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1403
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1405
 msgid "Wash"
 msgstr "Мойка"
 
 #. item
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1406
 msgid "Edit Car Wash"
 msgstr "Править автомойку"
@@ -17326,5 +17695,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1408 build/trans_presets.java:1452
+#: build/trans_presets.java:1411 build/trans_presets.java:1455
 msgid "Shop"
 msgstr "Магазин"
@@ -17332,15 +17701,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1413
 msgid "Edit Car Shop"
 msgstr "Править автомагазин"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1418
 msgid "Repair"
 msgstr "Мастерская"
 
 #. item
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1419
 msgid "Edit Car Repair"
 msgstr "Править автомастерскую"
@@ -17348,5 +17717,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1421 build/trans_presets.java:1445
+#: build/trans_presets.java:1424 build/trans_presets.java:1448
 msgid "Rental"
 msgstr "Прокат"
@@ -17355,10 +17724,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1427
 msgid "Edit Car Rental"
 msgstr "Править прокат авто"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1432
 msgid "Sharing"
 msgstr "Совместное использование"
@@ -17366,5 +17735,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1434
 msgid "Edit Car Sharing"
 msgstr "Править совместное использование"
@@ -17372,10 +17741,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Parking"
 msgstr "Править стоянку для велосипедов"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1446
 msgid "Capacity"
 msgstr "Вместимость"
@@ -17384,5 +17753,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1448
+#: build/trans_presets.java:1451
 msgid "Edit Bicycle Rental"
 msgstr "Править прокат велосипедов"
@@ -17391,15 +17760,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1458
 msgid "Edit Bicycle Shop"
 msgstr "Править веломастерскую"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1463
 msgid "Public Transport"
 msgstr "Общественный транспорт"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:1472
 msgid "UIC-Reference"
 msgstr "UIC-Справка"
@@ -17407,5 +17776,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1475
 msgid "Railway Halt"
 msgstr "Полустанок"
@@ -17413,5 +17782,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1477
 msgid "Edit Halt"
 msgstr "Править полустанок"
@@ -17419,5 +17788,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1484
 msgid "Tram Stop"
 msgstr "Трамвайная остановка"
@@ -17426,5 +17795,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1484
+#: build/trans_presets.java:1487
 msgid "Edit Tram Stop"
 msgstr "Править трамвайную остановку"
@@ -17432,5 +17801,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1494
 msgid "Railway Platform"
 msgstr "Ж/Д платформа"
@@ -17439,5 +17808,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1497
 msgid "Edit Railway Platform"
 msgstr "Править ж/д платформу"
@@ -17449,5 +17818,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1497 build/trans_presets.java:1539
+#: build/trans_presets.java:1500 build/trans_presets.java:1542
 msgid "Reference (track number)"
 msgstr "Справка (номер платформы)"
@@ -17455,10 +17824,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1499 build/trans_presets.java:1541
+#: build/trans_presets.java:1502 build/trans_presets.java:1544
 msgid "Area"
 msgstr "Область"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1504
 msgid "Subway Entrance"
 msgstr "Вход в метро"
@@ -17467,10 +17836,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1507
 msgid "Edit Subway Entrance"
 msgstr "Править вход в метро"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1512
 msgid "Wheelchair"
 msgstr "Кресло-каталка"
@@ -17479,5 +17848,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1517
 msgid "Bus Station"
 msgstr "Автовокзал"
@@ -17486,5 +17855,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1520
 msgid "Edit Bus Station"
 msgstr "Править автовокзал"
@@ -17492,5 +17861,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1526
 msgid "Bus Stop"
 msgstr "Автобусная остановка"
@@ -17500,5 +17869,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1530
 msgid "Edit Bus Stop"
 msgstr "Править автобусную остановку"
@@ -17507,6 +17876,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1532 build/trans_presets.java:1785
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:1535 build/trans_presets.java:1789
+#: build/trans_presets.java:2453
 msgid "Shelter"
 msgstr "Навес"
@@ -17514,10 +17883,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1538
 msgid "Bus Platform"
 msgstr "Автобусная платформа"
 
 #. item
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1539
 msgid "Edit Bus Platform"
 msgstr "Править автобусную платформу"
@@ -17525,5 +17894,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1547
 msgid "Taxi"
 msgstr "Такси"
@@ -17531,5 +17900,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1549
 msgid "Edit Taxi station"
 msgstr "Править стоянку такси"
@@ -17537,5 +17906,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1554
 msgid "Airport"
 msgstr "Аэропорт"
@@ -17543,15 +17912,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1556
 msgid "Edit Airport"
 msgstr "Редактировать Аэродром"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1561
 msgid "IATA"
 msgstr "Международная ассоциация воздушного транспорта"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1559
+#: build/trans_presets.java:1562
 msgid "ICAO"
 msgstr "Международная организация гражданской авиации"
@@ -17559,6 +17928,11 @@
 #. item "Public Transport/Airport" text "ICAO"
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1567
+#, fuzzy
+msgid "Travel"
+msgstr "гравий"
+
+#. group "Travel"
+#: build/trans_presets.java:1568
 msgid "Accomodation"
 msgstr "Проживание"
@@ -17570,5 +17944,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1565 build/trans_surveyor.java:43
+#: build/trans_presets.java:1569 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Гостиница"
@@ -17577,15 +17951,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:1568
+#: build/trans_presets.java:1572
 msgid "Edit Hotel"
 msgstr "Править гостиницу"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1575
 msgid "Stars"
 msgstr "Звёзды"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1577
 msgid "Motel"
 msgstr "Мотель"
@@ -17593,20 +17967,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1579
 msgid "Edit Motel"
 msgstr "Править иотель"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1583
 msgid "Guest House"
 msgstr "Домик для гостей"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1584
 msgid "Edit Guest House"
 msgstr "Редактировать Домик для гостей"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1588
 msgid "Chalet"
 msgstr "Дача/Коттедж"
@@ -17614,10 +17988,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1590
 msgid "Edit Chalet"
 msgstr "Редактировать Дача/Коттедж"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1594
 msgid "Hostel"
 msgstr "Студенческое общежитие"
@@ -17625,30 +17999,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1592
+#: build/trans_presets.java:1596
 msgid "Edit Hostel"
 msgstr "Править студенческое общежитие"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1600
 msgid "Alpine Hut"
 msgstr "Альпийский шалаш"
 
 #. item
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1601
 msgid "Edit Alpine Hut"
 msgstr "Редактировать Альпийский шалаш"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1606
 msgid "Caravan Site"
 msgstr "Площадка для домов на колёсах"
 
 #. item
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1607
 msgid "Edit Caravan Site"
 msgstr "Править площадку для домов на колёсах"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1611
 msgid "Camping Site"
 msgstr "Кэмпинг"
@@ -17656,10 +18030,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1613
 msgid "Edit Camping Site"
 msgstr "Править кэмпинг"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1618
 msgid "Food+Drinks"
 msgstr "Питание"
@@ -17670,5 +18044,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1615 build/trans_surveyor.java:47
+#: build/trans_presets.java:1619 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Ресторан"
@@ -17676,5 +18050,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1621
 msgid "Edit Restaurant"
 msgstr "Править ресторан"
@@ -17682,5 +18056,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "Cuisine"
 msgstr "Кухня"
@@ -17688,61 +18062,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "italian"
 msgstr "итальянская"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "chinese"
 msgstr "китайская"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "pizza"
 msgstr "пицца"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "burger"
 msgstr "бургеры"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "greek"
 msgstr "греческая"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "german"
 msgstr "немецкая"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "indian"
 msgstr "индийская"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "regional"
 msgstr "местная"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "kebab"
 msgstr "кебаб"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "turkish"
 msgstr "турецкая"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "asian"
 msgstr "азиатская"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "thai"
 msgstr "тайская"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "mexican"
 msgstr "мексиканская"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "japanese"
 msgstr "японская"
 
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1627
 msgid "Fast Food"
 msgstr "Фастфуд"
@@ -17750,9 +18124,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1629
 msgid "Edit Fast Food Restaurant"
 msgstr "Правка фастфуда"
 
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1635
 msgid "Cafe"
 msgstr "Кафе"
@@ -17760,9 +18134,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1633
+#: build/trans_presets.java:1637
 msgid "Edit Cafe"
 msgstr "Править кафе"
 
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1642
 msgid "Pub"
 msgstr "Бар"
@@ -17770,18 +18144,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1644
 msgid "Edit Pub"
 msgstr "Править бар"
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1649
 msgid "Biergarten"
 msgstr "Пивная"
 
 #. item
-#: build/trans_presets.java:1646
+#: build/trans_presets.java:1650
 msgid "Edit Biergarten"
 msgstr "Править пивную"
 
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1655
 msgid "Bar"
 msgstr "Закусочная"
@@ -17789,9 +18163,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1657
 msgid "Edit Bar"
 msgstr "Редактировать Закусочная"
 
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1662
 msgid "Nightclub"
 msgstr "Ночной клуб"
@@ -17799,24 +18173,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1664
 msgid "Edit Nightclub"
 msgstr "Править ночной клуб"
 
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1670
 msgid "Tourism"
 msgstr "Туризм"
 
 #. group "Tourism"
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1671
 msgid "Attraction"
 msgstr "Достопримечательность"
 
 #. item
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1672
 msgid "Edit Attraction"
 msgstr "Править достопримечательность"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1677
 msgid "Museum"
 msgstr "Музей"
@@ -17824,9 +18198,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1679
 msgid "Edit Museum"
 msgstr "Править музей"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1684
 msgid "Zoo"
 msgstr "Зоопарк"
@@ -17835,9 +18209,9 @@
 #. <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:1683
+#: build/trans_presets.java:1687
 msgid "Edit Zoo"
 msgstr "Править зоопарк"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1692
 msgid "Viewpoint"
 msgstr "Смотровая площадка"
@@ -17845,24 +18219,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1694
 msgid "Edit Viewpoint"
 msgstr "Править смотровую площадку"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1697
 msgid "Look-Out Tower"
 msgstr "Каланча"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1699
 msgid "Theme Park"
 msgstr "Парк развлечений"
 
 #. item
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1700
 msgid "Edit Theme Park"
 msgstr "Править парк развлечений"
 
-#: build/trans_presets.java:1701
+#: build/trans_presets.java:1705
 msgid "Artwork"
 msgstr "Рисунки"
@@ -17870,5 +18244,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1707
 msgid "Edit Artwork"
 msgstr "Редактировать рисунки"
@@ -17876,19 +18250,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1712
 msgid "Information Office"
 msgstr "Справочное бюро"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1719
 msgid "Map"
 msgstr "Карта"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "topo"
 msgstr ""
@@ -17926,5 +18300,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1720 build/trans_style.java:619
+#: build/trans_presets.java:1724 build/trans_style.java:619
 #: build/trans_style.java:635 build/trans_style.java:651
 #: build/trans_style.java:659
@@ -17932,28 +18306,28 @@
 msgstr "улица"
 
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1722 build/trans_presets.java:1738
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1726 build/trans_presets.java:1742
+#: build/trans_presets.java:1786
 msgid "Closer Description"
 msgstr "Ближайшее описание"
@@ -17963,5 +18337,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1724 build/trans_presets.java:1747
+#: build/trans_presets.java:1728 build/trans_presets.java:1751
 msgid "Routes shown for:"
 msgstr ""
@@ -17969,6 +18343,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1726 build/trans_presets.java:1749
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1965
 msgid "Cycling"
 msgstr "Велоспорт"
@@ -17976,5 +18350,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1727 build/trans_presets.java:1750
+#: build/trans_presets.java:1731 build/trans_presets.java:1754
 msgid "Mountainbiking"
 msgstr ""
@@ -17982,6 +18356,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1728 build/trans_presets.java:1751
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:1732 build/trans_presets.java:1755
+#: build/trans_presets.java:2019
 msgid "Skiing"
 msgstr "Лыжный спорт"
@@ -17989,5 +18363,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1729 build/trans_presets.java:1752
+#: build/trans_presets.java:1733 build/trans_presets.java:1756
 msgid "Riding"
 msgstr ""
@@ -17995,46 +18369,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1734 build/trans_presets.java:1757
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1736
 msgid "Information Board"
 msgstr "Информационный стенд"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "history"
 msgstr "история"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "nature"
 msgstr "природа"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "wildlife"
 msgstr "животный мир"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "plants"
 msgstr "растения"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1744
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1759
 msgid "Information Terminal"
 msgstr "Информационная стойка"
@@ -18042,29 +18416,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1760 build/trans_presets.java:1770
+#: build/trans_presets.java:1764 build/trans_presets.java:1774
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1769
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1779
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1780
 msgid "Phone number"
 msgstr "Номер телефона"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1778
+#: build/trans_presets.java:1782
 msgid "Other Information Points"
 msgstr "Другие Информационные точки"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1790
 msgid "Edit Shelter"
 msgstr "Править навес"
@@ -18072,25 +18446,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1789 build/trans_presets.java:1795
+#: build/trans_presets.java:1793 build/trans_presets.java:1799
 msgid "Fireplace"
 msgstr "Очаг"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1791
+#: build/trans_presets.java:1795
 msgid "Picnic Site"
 msgstr "Место для пикника"
 
 #. item
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1796
 msgid "Edit Picnic Site"
 msgstr "Править место для пикника"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1802
 msgid "Historic Places"
 msgstr "Исторические места"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1799
+#: build/trans_presets.java:1803
 msgid "Castle"
 msgstr "Замок"
@@ -18099,19 +18473,19 @@
 #. <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:1802
+#: build/trans_presets.java:1806
 msgid "Edit Castle"
 msgstr "Править замок"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1810
 msgid "Ruins"
 msgstr "Руины"
 
 #. item
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1811
 msgid "Edit Ruins"
 msgstr "Править руины"
 
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1816
 msgid "Archaeological Site"
 msgstr "Место раскопок"
@@ -18120,9 +18494,9 @@
 #. <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:1815
+#: build/trans_presets.java:1819
 msgid "Edit Archaeological Site"
 msgstr "Править место раскопок"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1824
 msgid "Battlefield"
 msgstr "Поле битвы"
@@ -18130,5 +18504,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1826
 msgid "Edit Battlefield"
 msgstr "Править поле битвы"
@@ -18136,15 +18510,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1831
 msgid "Monument"
 msgstr "Памятник"
 
 #. item
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1832
 msgid "Edit Monument"
 msgstr "Править памятник"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1836
 msgid "Memorial"
 msgstr "Мемориал"
@@ -18152,45 +18526,57 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1838
 msgid "Edit Memorial"
 msgstr "Править мемориал"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1842
 msgid "Wayside Cross"
 msgstr "Придорожный крест"
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1843
 msgid "Edit Wayside Cross"
 msgstr "Править придорожный крест"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1847
 msgid "Wayside Shrine"
 msgstr "Придорожная святыня"
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1848
 msgid "Edit Wayside Shrine"
 msgstr "Править придорожную святыню"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1852
+#, fuzzy
+msgid "Boundary Stone"
+msgstr "Границы"
+
+#. item
+#: build/trans_presets.java:1853
+#, fuzzy
+msgid "Edit Boundary Stone"
+msgstr "Править книжный магазин"
+
+#. item "Historic Places/Boundary Stone" text "Name"
+#: build/trans_presets.java:1858
 msgid "Leisure"
 msgstr "Досуг"
 
 #. group "Leisure"
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1859
 msgid "Water Park"
 msgstr "Аквапарк"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1860
 msgid "Edit Water Park"
 msgstr "Править аквапарк"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1864
 msgid "Playground"
 msgstr "Игровая площадка"
@@ -18198,31 +18584,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1866
 msgid "Edit Playground"
 msgstr "Править игровую площадку"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1870
 msgid "Fishing"
 msgstr "Рыбалка"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1871
 msgid "Edit Fishing"
 msgstr "Править рыбалку"
 
 #. item "Leisure/Fishing" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1877 build/trans_presets.java:2669
+msgid "Sports"
+msgstr "Спорт"
+
+#. group "Sports"
+#: build/trans_presets.java:1878
 msgid "Sport Facilities"
 msgstr "Спортивные учреждения"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1879
 msgid "Stadium"
 msgstr "Стадион"
 
 #. item
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1880
 msgid "Edit Stadium"
 msgstr "Править стадион"
@@ -18236,6 +18626,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1874 build/trans_presets.java:1883
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1902 build/trans_presets.java:1911
 msgid "select sport:"
 msgstr "вид спорта:"
@@ -18627,30 +19017,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884 build/trans_style.java:3892
-#: build/trans_style.java:3900 build/trans_style.java:3908
-#: build/trans_style.java:3916 build/trans_style.java:3924
-#: build/trans_style.java:3932
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_style.java:3572 build/trans_style.java:3580
+#: build/trans_style.java:3588 build/trans_style.java:3596
+#: build/trans_style.java:3604 build/trans_style.java:3612
+#: build/trans_style.java:3620 build/trans_style.java:3628
+#: build/trans_style.java:3636 build/trans_style.java:3644
+#: build/trans_style.java:3652 build/trans_style.java:3660
+#: build/trans_style.java:3668 build/trans_style.java:3676
+#: build/trans_style.java:3684 build/trans_style.java:3692
+#: build/trans_style.java:3700 build/trans_style.java:3708
+#: build/trans_style.java:3716 build/trans_style.java:3724
+#: build/trans_style.java:3732 build/trans_style.java:3740
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3764 build/trans_style.java:3772
+#: build/trans_style.java:3780 build/trans_style.java:3788
+#: build/trans_style.java:3796 build/trans_style.java:3804
+#: build/trans_style.java:3812 build/trans_style.java:3820
+#: build/trans_style.java:3828 build/trans_style.java:3836
+#: build/trans_style.java:3844 build/trans_style.java:3852
+#: build/trans_style.java:3860 build/trans_style.java:3868
+#: build/trans_style.java:3876 build/trans_style.java:3884
+#: build/trans_style.java:3892 build/trans_style.java:3900
+#: build/trans_style.java:3908 build/trans_style.java:3916
+#: build/trans_style.java:3924 build/trans_style.java:3932
+#: build/trans_style.java:3940
 msgid "sport"
 msgstr "спорт"
@@ -18660,225 +19050,225 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "multi"
 msgstr "несколько"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "archery"
 msgstr "стрельба из лука"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "athletics"
 msgstr "атлетика"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "australian_football"
 msgstr "австралийский футбол"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "baseball"
 msgstr "бейсбол"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "basketball"
 msgstr "баскетбол"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "boules"
 msgstr "ж/д пути"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "bowls"
 msgstr "изгибаться"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "canoe"
 msgstr "каноэ"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "climbing"
 msgstr "альпинизм"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket"
 msgstr "крикет"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket_nets"
 msgstr "крикет_сеть"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "croquet"
 msgstr "крокет"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cycling"
 msgstr "велоспорт"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "dog_racing"
 msgstr "собачьи бега"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "equestrian"
 msgstr "наездник"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "football"
 msgstr "футбол"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "golf"
 msgstr "гольф"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "gymnastics"
 msgstr "гимнастика"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "hockey"
 msgstr "хоккей"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "horse_racing"
 msgstr "лошадиные бега"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "motor"
 msgstr "машина"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "pelota"
 msgstr "пелота"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "racquet"
 msgstr "производить шум"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "rugby"
 msgstr "рэгби"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "shooting"
 msgstr "стрельба"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skateboard"
 msgstr "скейтборд"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skating"
 msgstr "фигурное катание"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skiing"
 msgstr "лыжный спорт"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "soccer"
 msgstr "футбол"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "swimming"
 msgstr "плаванье"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "table_tennis"
 msgstr "настольный теннис"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "tennis"
 msgstr "теннис"
 
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1888
 msgid "Sports Centre"
 msgstr "Спортивный центр"
 
 #. item
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1889
 msgid "Edit Sports Centre"
 msgstr "Править спортивный центр"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1897
 msgid "Pitch"
 msgstr "Спортивное поле"
 
 #. item
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1898
 msgid "Edit Pitch"
 msgstr "Править спортивное поле"
 
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1906
 msgid "Racetrack"
 msgstr "Трек"
 
 #. item
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1907
 msgid "Edit Racetrack"
 msgstr "Править трек"
 
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1915
 msgid "Golf Course"
 msgstr "Поле для гольфа"
 
 #. item
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1916
 msgid "Edit Golf Course"
 msgstr "Править поле для гольфа"
 
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1921
 msgid "Miniature Golf"
 msgstr "Минигольф"
 
 #. item
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1922
 msgid "Edit Miniature Golf"
 msgstr "Править минигольф"
 
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1928
 msgid "Sport"
 msgstr "Спорт"
 
 #. group "Sport"
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1929
 msgid "Multi"
 msgstr "Несколько"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1930
 msgid "Edit Multi"
 msgstr "Править несколько видов спорта"
@@ -18917,183 +19307,183 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "pitch"
 msgstr "спортивное поле"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "sports_centre"
 msgstr "спортивный центр"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "stadium"
 msgstr "стадион"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1935
 msgid "10pin"
 msgstr "10штырьковый"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1936
 msgid "Edit 10pin"
 msgstr "Редактировать 10 пин"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1941
 msgid "Athletics"
 msgstr "Атлетика"
 
 #. item
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1942
 msgid "Edit Athletics"
 msgstr "Править атлетику"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1947
 msgid "Archery"
 msgstr "Стрельба из лука"
 
 #. item
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1948
 msgid "Edit Archery"
 msgstr "Править стрельбу из лука"
 
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1953
 msgid "Climbing"
 msgstr "Скалолазанье"
 
 #. item
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:1954
 msgid "Edit Climbing"
 msgstr "Править скалолазанье"
 
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1959
 msgid "Canoeing"
 msgstr "Каноэ"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1960
 msgid "Edit Canoeing"
 msgstr "Править каноэ"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1966
 msgid "Edit Cycling"
 msgstr "Править велоспорт"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1971
 msgid "Dog Racing"
 msgstr "Собачьи бега"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1972
 msgid "Edit Dog Racing"
 msgstr "Править собачьи бега"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1977
 msgid "Equestrian"
 msgstr "Наездник"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1978
 msgid "Edit Equestrian"
 msgstr "Редактировать Наездник"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1983
 msgid "Horse Racing"
 msgstr "Лошадиные бега"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1984
 msgid "Edit Horse Racing"
 msgstr "Править лошадиные бега"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1989
 msgid "Gymnastics"
 msgstr "Гимнастика"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1990
 msgid "Edit Gymnastics"
 msgstr "Править гимнастику"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1995
 msgid "Motor Sports"
 msgstr "Моторные виды спорта"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1996
 msgid "Edit Motor Sports"
 msgstr "Править моторные виды спорта"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2001
 msgid "Skating"
 msgstr "Фигурное катание"
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2002
 msgid "Edit Skating"
 msgstr "Править фигурное катание"
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2007
 msgid "Skateboard"
 msgstr "Скейтборд"
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2008
 msgid "Edit Skateboard"
 msgstr "Править скейтборд"
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2013
 msgid "Swimming"
 msgstr "Плавание"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2014
 msgid "Edit Swimming"
 msgstr "Править плаванье"
@@ -19101,56 +19491,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2021
 msgid "Edit Skiing"
 msgstr "Править лыжный сопрт"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "Piste type"
 msgstr "Тип лыжня"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "downhill"
 msgstr "спуск"
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "nordic"
 msgstr "лыжный спорт"
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "snow_park"
 msgstr "снежный городок"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "Difficulty"
 msgstr "Сложность"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "novice"
 msgstr "новичок"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "easy"
 msgstr "лёгкий"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "intermediate"
 msgstr "Промежуточный"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "advanced"
 msgstr "улучшенный"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "expert"
 msgstr "эксперт"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "freeride"
 msgstr "свободный"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2028
 msgid "Shooting"
 msgstr "Стрельба"
@@ -19158,178 +19548,183 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2030
 msgid "Edit Shooting"
 msgstr "Править стрельбу"
 
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2036
 msgid "Sport (Ball)"
 msgstr "Спорт (с мячом)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2037
 msgid "Soccer"
 msgstr "Футбол"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2038
 msgid "Edit Soccer"
 msgstr "Править футбол"
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2043
 msgid "Football"
 msgstr "Американский футбол"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2044
 msgid "Edit Football"
 msgstr "Править американский футбол"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2049
 msgid "Australian Football"
 msgstr "Австралийский футбол"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2050
 msgid "Edit Australian Football"
 msgstr "Править австралийский футбол"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2055
 msgid "Baseball"
 msgstr "Бейсбол"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2056
 msgid "Edit Baseball"
 msgstr "Править бейсбол"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2061
 msgid "Basketball"
 msgstr "Баскетбол"
 
 #. item
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2062
 msgid "Edit Basketball"
 msgstr "Править баскетбол"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2067
 msgid "Golf"
 msgstr "Гольф"
 
 #. item
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2068
 msgid "Edit Golf"
 msgstr "Править гольф"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2071
 msgid "golf_course"
 msgstr "поле для гольфа"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2073
 msgid "Boule"
 msgstr "Рубин"
 
 #. item
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2074
 msgid "Edit Boule"
 msgstr "Редактировать Рубин"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2079
 msgid "Bowls"
 msgstr "Стадион"
 
 #. item
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2080
 msgid "Edit Bowls"
 msgstr "Редактировать Стадион"
 
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2085
 msgid "Cricket"
 msgstr "Крикет"
 
 #. item
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2086
 msgid "Edit Cricket"
 msgstr "Редактировать Крикет"
 
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2091
 msgid "Cricket Nets"
 msgstr "Крикет сети"
 
 #. item
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2092
 msgid "Edit Cricket Nets"
 msgstr "Редактировать Крикет сети"
 
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2097
 msgid "Croquet"
 msgstr "Крокет"
 
 #. item
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2098
 msgid "Edit Croquet"
 msgstr "Редактировать Крокет"
 
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2103
 msgid "Hockey"
 msgstr "Хоккей"
 
 #. item
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2104
 msgid "Edit Hockey"
 msgstr "Править хоккей"
 
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2109
 msgid "Pelota"
 msgstr "Пелота"
 
 #. item
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2110
 msgid "Edit Pelota"
 msgstr "Редактировать Пелота"
 
-#: build/trans_presets.java:2105
+#: build/trans_presets.java:2115
 msgid "Racquet"
 msgstr "Ракетка"
 
 #. item
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2116
 msgid "Edit Racquet"
 msgstr "Редактировать Ракетка"
 
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2121
 msgid "Rugby"
 msgstr "Регби"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2122
 msgid "Edit Rugby"
 msgstr "Править рэгби"
 
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2127
 msgid "Table Tennis"
 msgstr "Настольный теннис"
 
 #. item
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2128
 msgid "Edit Table Tennis"
 msgstr "Править настольный теннис"
 
-#: build/trans_presets.java:2123
+#: build/trans_presets.java:2133
 msgid "Tennis"
 msgstr "Теннис"
 
 #. item
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2134
 msgid "Edit Tennis"
 msgstr "Править теннис"
 
-#. <separator/>
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2141
+#, fuzzy
+msgid "Man-Made"
+msgstr "Рукотворное"
+
+#. group "Man-Made"
+#: build/trans_presets.java:2142
 msgid "Buildings"
 msgstr "Здания"
 
 #. group "Buildings"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2143
 msgid "Building"
 msgstr "Здание"
@@ -19337,5 +19732,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Public Building"
 msgstr "Общественное здание"
@@ -19343,10 +19738,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2148
 msgid "Edit Public Building"
 msgstr "Править общественное здание"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2152
 msgid "Town hall"
 msgstr "Муниципалитет"
@@ -19354,10 +19749,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2154
 msgid "Edit Town hall"
 msgstr "Править здание муниципалитета"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:2158
 msgid "Embassy"
 msgstr "Посольство"
@@ -19365,10 +19760,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Edit Embassy"
 msgstr "Править посольство"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2164
 msgid "Courthouse"
 msgstr "Здание суда"
@@ -19377,10 +19772,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:2156
+#: build/trans_presets.java:2167
 msgid "Edit Courthouse"
 msgstr "Править здание суда"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2171
 msgid "Prison"
 msgstr "Тюрьма"
@@ -19389,10 +19784,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:2163
+#: build/trans_presets.java:2174
 msgid "Edit Prison"
 msgstr "Править тюрьму"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2178
 msgid "Police"
 msgstr "Полиция/Милиция"
@@ -19402,10 +19797,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:2171
+#: build/trans_presets.java:2182
 msgid "Edit Police"
 msgstr "Править полицию"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2186
 msgid "Fire Station"
 msgstr "Пожарное депо"
@@ -19414,10 +19809,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:2178
+#: build/trans_presets.java:2189
 msgid "Edit Fire Station"
 msgstr "Править пожарное депо"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "Post Office"
 msgstr "Почтовое отделение"
@@ -19425,5 +19820,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Edit Post Office"
 msgstr "Править почтовое отделение"
@@ -19431,15 +19826,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2200
 msgid "Kindergarten"
 msgstr "Детский сад"
 
 #. item
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Kindergarten"
 msgstr "Править детсад"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2205
 msgid "School"
 msgstr "Школа"
@@ -19447,10 +19842,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Edit School"
 msgstr "Править школу"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2211
 msgid "University"
 msgstr "Университет"
@@ -19458,10 +19853,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit University"
 msgstr "Править университет"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "College"
 msgstr "Колледж"
@@ -19469,5 +19864,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2219
 msgid "Edit College"
 msgstr "Править колледж"
@@ -19475,5 +19870,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2224
 msgid "Cinema"
 msgstr "Кинотеатр"
@@ -19482,10 +19877,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:2216
+#: build/trans_presets.java:2227
 msgid "Edit Cinema"
 msgstr "Править кинотеатр"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2231
 msgid "Library"
 msgstr "Библиотека"
@@ -19494,9 +19889,9 @@
 #. <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:2223
+#: build/trans_presets.java:2234
 msgid "Edit Library"
 msgstr "Править библиотеку"
 
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Arts Centre"
 msgstr "Центр искусств"
@@ -19504,10 +19899,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Arts Centre"
 msgstr "Править центр искусств"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Theatre"
 msgstr "Театр"
@@ -19516,10 +19911,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:2237
+#: build/trans_presets.java:2248
 msgid "Edit Theatre"
 msgstr "Править театр"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2252
 msgid "Place of Worship"
 msgstr "Место поклонения"
@@ -19529,5 +19924,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:2245
+#: build/trans_presets.java:2256
 msgid "Edit Place of Worship"
 msgstr "Править место поклонения"
@@ -19536,6 +19931,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "Religion"
 msgstr "Религия"
@@ -19544,66 +19939,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "bahai"
 msgstr "Бахаи"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "buddhist"
 msgstr "Буддизм"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "christian"
 msgstr "Христианство"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "hindu"
 msgstr "Индуизм"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jain"
 msgstr "Джайнизм"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jewish"
 msgstr "Иудаизм"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "muslim"
 msgstr "Мусульманство"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "sikh"
 msgstr "сикхизм"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "spiritualist"
 msgstr "Спиритуализм"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "taoist"
 msgstr "Даосизм"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "unitarian"
 msgstr "унитарный"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "zoroastrian"
 msgstr "зороастризм"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "Denomination"
 msgstr "Конфессия"
@@ -19612,81 +20007,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "anglican"
 msgstr "Англиканская"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "baptist"
 msgstr "Баптизм"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "catholic"
 msgstr "Католическая"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "evangelical"
 msgstr "Евангельская"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "jehovahs_witness"
 msgstr "Свидетели Иеговы"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "lutheran"
 msgstr "Лютеранство"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "methodist"
 msgstr "Методизм"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "mormon"
 msgstr "Мормон"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "orthodox"
 msgstr "Православие"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "pentecostal"
 msgstr "пятидесятник"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "presbyterian"
 msgstr "пресвитерианин"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "protestant"
 msgstr "Протестантизм"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "quaker"
 msgstr "квакер"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "shia"
 msgstr "шиизм"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "sunni"
 msgstr "суннизм"
 
 #. <separator/>
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2264
 msgid "Addresses"
 msgstr "Адреса"
@@ -19695,5 +20090,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:2256
+#: build/trans_presets.java:2267
 msgid "Edit Address Information"
 msgstr "Править адреса"
@@ -19701,5 +20096,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2269
 msgid "House number"
 msgstr "Номер дома"
@@ -19707,20 +20102,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "House name"
 msgstr "Название дома"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "City name"
 msgstr "Название города"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2274
 msgid "Post code"
 msgstr "Почтовый индекс"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2275
 msgid "Country code"
 msgstr "Код страны"
@@ -19728,5 +20123,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Address Interpolation"
 msgstr "Интерполяция адресов"
@@ -19735,5 +20130,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:2270
+#: build/trans_presets.java:2281
 msgid "Edit Address Interpolation"
 msgstr "Править интерполяцию адресов"
@@ -19741,67 +20136,67 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "Numbering scheme"
 msgstr "Схема нумерации"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "odd"
 msgstr "нечётные"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "even"
 msgstr "чётные"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "alphabetic"
 msgstr "алфавитный"
 
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2286
 msgid "Man Made"
 msgstr "Рукотворное"
 
 #. group "Man Made"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Works"
 msgstr "Цеха"
 
 #. item
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2288
 msgid "Edit Works"
 msgstr "Править цеха"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2292
 msgid "Tower"
 msgstr "Башня"
 
 #. item
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2293
 msgid "Edit Tower"
 msgstr "Править башню"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Water Tower"
 msgstr "Водонапорная башня"
 
 #. item
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2298
 msgid "Edit Water Tower"
 msgstr "Править водонапорную башню"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Gasometer"
 msgstr "Газгольдер"
 
 #. item
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2303
 msgid "Edit Gasometer"
 msgstr "Править газгольдер"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Lighthouse"
 msgstr "Маяк"
@@ -19809,10 +20204,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2309
 msgid "Edit Lighthouse"
 msgstr "Править маяк"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Windmill"
 msgstr "Ветряная мельница"
@@ -19820,10 +20215,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2315
 msgid "Edit Windmill"
 msgstr "Править ветряную мельницу"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2319
 msgid "Pipeline"
 msgstr "Трубопровод"
@@ -19831,10 +20226,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Edit Pipeline"
 msgstr "Править трубопровод"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2325
 msgid "Wastewater Plant"
 msgstr "Очистные сооружения"
@@ -19844,10 +20239,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:2318
+#: build/trans_presets.java:2329
 msgid "Edit Wastewater Plant"
 msgstr "Править очистные сооружения"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2333
 msgid "Crane"
 msgstr "Кран"
@@ -19855,10 +20250,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2335
 msgid "Edit Crane"
 msgstr "Править кран"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Beacon"
 msgstr "Буй"
@@ -19866,10 +20261,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2341
 msgid "Edit Beacon"
 msgstr "Править буй"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2345
 msgid "Survey Point"
 msgstr "Точка наблюдений"
@@ -19877,10 +20272,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Edit Survey Point"
 msgstr "Править точку наблюдений"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2351
 msgid "Surveillance"
 msgstr "Видеонаблюдение"
@@ -19888,5 +20283,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2353
 msgid "Edit Surveillance Camera"
 msgstr "Править видеонаблюдение"
@@ -19894,5 +20289,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Power Generator"
 msgstr "Электростанция"
@@ -19902,39 +20297,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:2351
+#: build/trans_presets.java:2362
 msgid "Edit Power Generator"
 msgstr "Править электростанцию"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "wind"
 msgstr "энергия ветра"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "hydro"
 msgstr "энергия воды"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "fossil"
 msgstr "энергия сгорания топлива"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "nuclear"
 msgstr "атомный"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "coal"
 msgstr "уголь"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "photovoltaic"
 msgstr "энергия солнца"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "gas"
 msgstr "газ"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2367
 msgid "Power Station"
 msgstr "Электроподстанция"
@@ -19943,10 +20338,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:2359
+#: build/trans_presets.java:2370
 msgid "Edit Power Station"
 msgstr "Править электроподстанцию"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2374
 msgid "Power Sub Station"
 msgstr "Трансформаторная будка"
@@ -19955,5 +20350,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:2366
+#: build/trans_presets.java:2377
 msgid "Edit Power Sub Station"
 msgstr "Править трансформатор"
@@ -19961,10 +20356,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2369 build/trans_presets.java:2385
+#: build/trans_presets.java:2380 build/trans_presets.java:2396
 msgid "Line reference"
 msgstr "электролиния"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2382
 msgid "Power Tower"
 msgstr "Опора ЛЭП"
@@ -19975,5 +20370,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:2376
+#: build/trans_presets.java:2387
 msgid "Edit Power Tower"
 msgstr "Править опору ЛЭП"
@@ -19981,5 +20376,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2390
 msgid "Power Line"
 msgstr "Линия электропередач"
@@ -19988,40 +20383,40 @@
 #. <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:2382
+#: build/trans_presets.java:2393
 msgid "Edit Power Line"
 msgstr "Править линию электропередач"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Voltage"
 msgstr "Напряжение"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2398
 msgid "Amount of Wires"
 msgstr "Количество кабелей"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Amenities"
 msgstr "Удобства"
 
 #. group "Amenities"
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2402
 msgid "Toilets"
 msgstr "Туалеты"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2398 build/trans_presets.java:2514
+#: build/trans_presets.java:2409 build/trans_presets.java:2525
 msgid "Note"
 msgstr "Примечание"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2411
 msgid "Post Box"
 msgstr "Почтовый ящик"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2416
 msgid "Telephone"
 msgstr "Телефон"
@@ -20030,5 +20425,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:2408
+#: build/trans_presets.java:2419
 msgid "Edit Telephone"
 msgstr "Править телефон"
@@ -20036,5 +20431,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2411 build/trans_presets.java:2515
+#: build/trans_presets.java:2422 build/trans_presets.java:2526
 msgid "Coins"
 msgstr "Монеты"
@@ -20042,5 +20437,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2412 build/trans_presets.java:2516
+#: build/trans_presets.java:2423 build/trans_presets.java:2527
 msgid "Notes"
 msgstr "Банкноты"
@@ -20048,5 +20443,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2413 build/trans_presets.java:2517
+#: build/trans_presets.java:2424 build/trans_presets.java:2528
 msgid "Electronic purses and Charge cards"
 msgstr "Электронные средства оплаты"
@@ -20054,5 +20449,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2414 build/trans_presets.java:2518
+#: build/trans_presets.java:2425 build/trans_presets.java:2529
 msgid "Debit cards"
 msgstr "Дебитные карты"
@@ -20060,15 +20455,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2415 build/trans_presets.java:2519
+#: build/trans_presets.java:2426 build/trans_presets.java:2530
 msgid "Credit cards"
 msgstr "Кредитные карты"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2427
 msgid "Telephone cards"
 msgstr "Телефонные карты"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2429
 msgid "Recycling"
 msgstr "Переработка отходов"
@@ -20077,5 +20472,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:2421
+#: build/trans_presets.java:2432
 msgid "Edit Recycling station"
 msgstr "Править переработку отходов"
@@ -20083,35 +20478,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Batteries"
 msgstr "Батарейки"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2435
 msgid "Cans"
 msgstr "Консервные банки"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Clothes"
 msgstr "Одежда"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2437
 msgid "Glass"
 msgstr "Стекло"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2438
 msgid "Paper"
 msgstr "Бумага"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2439
 msgid "Scrap Metal"
 msgstr "Металлолом"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2441
 msgid "Bench"
 msgstr "Скамейка"
@@ -20120,40 +20515,33 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2433
-#, fuzzy
+#: build/trans_presets.java:2444
 msgid "Backrest"
-msgstr "Назад"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "Material"
-msgstr "Мемориал"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2434
-#, fuzzy
+#: build/trans_presets.java:2445
 msgid "stone"
-msgstr "ничего"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "plastic"
-msgstr "место"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "Colour"
-msgstr "Цвет"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "black"
-msgstr "Назад"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "brown"
-msgstr "вниз"
+msgstr ""
 
 #. color historic
@@ -20222,39 +20610,35 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2435 build/trans_style.java:3055
-#: build/trans_style.java:3063 build/trans_style.java:3071
-#: build/trans_style.java:3079 build/trans_style.java:3127
-#: build/trans_style.java:3135 build/trans_style.java:3233
-#: build/trans_style.java:3241
+#: build/trans_presets.java:2446 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3135
+#: build/trans_style.java:3143 build/trans_style.java:3241
+#: build/trans_style.java:3249
 msgid "green"
 msgstr "зеленый"
 
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "red"
-msgstr "конец"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "blue"
-msgstr "Значение"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "white"
-msgstr "вода"
-
-#: build/trans_presets.java:2436
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2447
 msgid "Amount of Seats"
-msgstr "Количество кабелей"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2449
 msgid "Hunting Stand"
 msgstr "Охотничий стенд"
 
 #. item
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2450
 msgid "Edit Hunting Stand"
 msgstr "Править охотничий стенд"
@@ -20263,30 +20647,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2441 build/trans_presets.java:2902
+#: build/trans_presets.java:2452 build/trans_presets.java:2914
 msgid "Height"
 msgstr "Высота"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "low"
 msgstr "низкий"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "half"
 msgstr "средний"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "full"
 msgstr "полный"
 
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2454
 msgid "Hide"
 msgstr "Укрытие"
 
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2455
 msgid "Lock"
 msgstr "Заблокирован"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Fountain"
 msgstr "Фонтан"
@@ -20295,10 +20679,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:2449
+#: build/trans_presets.java:2460
 msgid "Edit Fountain"
 msgstr "Править фонтан"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2464
 msgid "Drinking Water"
 msgstr "Питьевая вода"
@@ -20307,10 +20691,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:2456
+#: build/trans_presets.java:2467
 msgid "Edit Drinking Water"
 msgstr "Править источник воды"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2471
 msgid "Baby Hatch"
 msgstr "Детская комната"
@@ -20318,33 +20702,33 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Baby Hatch"
 msgstr "Редактировать Детская комната"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2479
 msgid "Shops"
 msgstr "Магазины"
 
 #. group "Shops"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2480
 msgid "Supermarket"
 msgstr "Супермаркет"
 
 #. item
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2481
 msgid "Edit Supermarket"
 msgstr "Править супермаркет"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2486
 msgid "Chemist"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2487
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2492
 msgid "Convenience Store"
 msgstr "Продуктовый магазин"
@@ -20352,9 +20736,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Edit Convenience Store"
 msgstr "Править продуктовый магазин"
 
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2499
 msgid "Kiosk"
 msgstr "Киоск"
@@ -20362,27 +20746,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Kiosk"
 msgstr "Править киоск"
 
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Book Store"
 msgstr "Книжный магазин"
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2507
 msgid "Edit Book Store"
 msgstr "Править книжный магазин"
 
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2512
 msgid "Travel Agency"
 msgstr "Туристическое агенство"
 
 #. item
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2513
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2518
 msgid "Vending machine"
 msgstr "Торговый автомат"
@@ -20390,5 +20774,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Edit Vending machine"
 msgstr "Править торговый автомат"
@@ -20396,88 +20780,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "Vending products"
 msgstr "Реализуемая продукция"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_tickets"
 msgstr "билеты на общественный транспорт"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_plans"
 msgstr "план общественного транспорта"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "parking_tickets"
 msgstr "билеты на парковку"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "food"
 msgstr "еда"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "drinks"
 msgstr "напитки"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "sweets"
 msgstr "сладости"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "cigarettes"
 msgstr "сигареты"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "photos"
 msgstr "фотографии"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "animal_food"
 msgstr "еда для животных"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "news_papers"
 msgstr "газеты"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "toys"
 msgstr "игрушки"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "stamps"
 msgstr "марки"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "SIM-cards"
 msgstr "SIM-карты"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "telephone_vouchers"
 msgstr "телефонные ваучеры"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "vouchers"
 msgstr "ваучеры"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "condoms"
 msgstr "презервативы"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "tampons"
 msgstr "тампоны"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "excrement_bags"
 msgstr "пакеты для экскрементов"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Account or loyalty cards"
 msgstr "Счета или карты лояльности"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Butcher"
 msgstr "Мясная лавка"
@@ -20485,9 +20869,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2535
 msgid "Edit Butcher"
 msgstr "Править мясную лавку"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2540
 msgid "Baker"
 msgstr "Булочная"
@@ -20495,9 +20879,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2542
 msgid "Edit Baker"
 msgstr "Править булочную"
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2547
 msgid "Florist"
 msgstr "Флорист"
@@ -20505,18 +20889,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Florist"
 msgstr "Редактировать флориста"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2554
 msgid "Organic"
 msgstr "Цветочный"
 
 #. item
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Edit Organic Shop"
 msgstr "Редактировать Цветочный Магазин"
 
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2560
 msgid "Alcohol"
 msgstr "Алкоголь"
@@ -20524,54 +20908,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2562
 msgid "Edit Alcohol Shop"
 msgstr "Редактировать магазин алкогольной продукции"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2567
 msgid "Beverages"
 msgstr "Напитки"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2568
 msgid "Edit Beverages Shop"
 msgstr "Редактировать магазин напитков"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2573
 msgid "Computer"
 msgstr "Компьютер"
 
 #. item
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2574
 msgid "Edit Computer Shop"
 msgstr "Редактировать магазин компьютеров"
 
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Electronics"
 msgstr "Электроника"
 
 #. item
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2580
 msgid "Edit Electronics Shop"
 msgstr "Редактиновать Магазан электрнонной техники"
 
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2585
 msgid "Hifi"
 msgstr "Звуковая аппаратура"
 
 #. item
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2586
 msgid "Edit Hifi Shop"
 msgstr "Редактировать Магазин звуковой аппаратуры"
 
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2591
 msgid "Furniture"
 msgstr "Мебельный"
 
 #. item
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Edit Furniture Shop"
 msgstr "Править мебельный магазин"
 
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Garden Centre"
 msgstr "Садовый магазин"
@@ -20579,9 +20963,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2599
 msgid "Edit Garden Centre"
 msgstr "Редактировать Садовый магазин"
 
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Hardware"
 msgstr "Оборудование"
@@ -20589,9 +20973,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2606
 msgid "Edit Hardware Store"
 msgstr "Редактировать Магазин оборудования"
 
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "Do-it-yourself-store"
 msgstr "Строительный магазин"
@@ -20599,54 +20983,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2613
 msgid "Edit Do-it-yourself-store"
 msgstr "Править строительный магазин"
 
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2618
 msgid "Stationery"
 msgstr "Канцтовары"
 
 #. item
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2619
 msgid "Edit Stationery Shop"
 msgstr "Редактировать Магазин Канцтоваров"
 
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Hairdresser"
 msgstr "Парикмахерская"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Hairdresser"
 msgstr "Править парихмахерскую"
 
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Shoes"
 msgstr "Обувь"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Shoe Shop"
 msgstr "Редактировать обувной магазин"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2636
 msgid "Toys"
 msgstr "Игрушки"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit Toy Shop"
 msgstr "Редактировать магазин игрушек"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Video"
 msgstr "Видео"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Video Shop"
 msgstr "Редактировать Магазин видеозаписей"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "Dry Cleaning"
 msgstr "Химчистка"
@@ -20654,9 +21038,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2650
 msgid "Edit Dry Cleaning"
 msgstr "Править химчистку"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "Laundry"
 msgstr "Прачечная"
@@ -20664,9 +21048,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2657
 msgid "Edit Laundry"
 msgstr "Править прачечную"
 
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2662
 msgid "Outdoor"
 msgstr "Товары для активного отдыха"
@@ -20674,32 +21058,28 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2664
 msgid "Edit Outdoor Shop"
 msgstr "Править магазин товаров для активного отдыха"
 
-#: build/trans_presets.java:2658
-msgid "Sports"
-msgstr "Спорт"
-
-#. item
-#: build/trans_presets.java:2659
+#. item
+#: build/trans_presets.java:2670
 msgid "Edit Sports Shop"
 msgstr "Редактировать Спортивный магазин"
 
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Optician"
 msgstr "Оптик"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Optician"
 msgstr "Править оптику"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2683
 msgid "Cash"
 msgstr "Наличные"
 
 #. group "Cash"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2684
 msgid "Bank"
 msgstr "Банк"
@@ -20707,14 +21087,14 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2686
 msgid "Edit Bank"
 msgstr "Править банк"
 
-#: build/trans_presets.java:2680 build/trans_presets.java:2689
+#: build/trans_presets.java:2691 build/trans_presets.java:2700
 msgid "Automated Teller Machine"
 msgstr "Банкомат"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2693
 msgid "Money Exchange"
 msgstr "Обмен валют"
@@ -20722,5 +21102,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Edit Money Exchange"
 msgstr "Править обмен валют"
@@ -20728,15 +21108,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2691
+#: build/trans_presets.java:2702
 msgid "Edit Automated Teller Machine"
 msgstr "Править банкомат"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2707
 msgid "Health"
 msgstr "Здоровье"
 
 #. group "Health"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2708
 msgid "Doctors"
 msgstr "Врач"
@@ -20744,18 +21124,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2710
 msgid "Edit Doctors"
 msgstr "Править врача"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2715
 msgid "Dentist"
 msgstr "Стоматолог"
 
 #. item
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Edit Dentist"
 msgstr "Править стоматологию"
 
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2721
 msgid "Pharmacy"
 msgstr "Аптека"
@@ -20763,5 +21143,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Edit Pharmacy"
 msgstr "Править аптеку"
@@ -20769,9 +21149,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Dispensing"
 msgstr "Отпуск лекарств по рецептам"
 
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2729
 msgid "Hospital"
 msgstr "Больница"
@@ -20779,10 +21159,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Edit Hospital"
 msgstr "Править больницу"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2735
 msgid "Emergency Access Point"
 msgstr "Пункт вызова экстренной помощи"
@@ -20791,5 +21171,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:2727
+#: build/trans_presets.java:2738
 msgid "Edit Emergency Access Point"
 msgstr "Править пункт вызова экстренной помощи"
@@ -20798,20 +21178,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2741
 msgid "Point Number"
 msgstr "Номер пункта"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2742
 msgid "Point Name"
 msgstr "Название точки"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Phone Number"
 msgstr "Номер телефона"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Используйте международный код, как например +12-345-67890)"
@@ -20819,5 +21199,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2748
 msgid "Veterinary"
 msgstr "Ветеринар"
@@ -20826,55 +21206,60 @@
 #. <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:2740
+#: build/trans_presets.java:2751
 msgid "Edit Veterinary"
 msgstr "Править ветеринара"
 
+#: build/trans_presets.java:2758
+#, fuzzy
+msgid "Geography"
+msgstr "Географическая WGS84"
+
 #. group "Places"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2760
 msgid "Continent"
 msgstr "Континент"
 
 #. item
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2761
 msgid "Edit Continent"
 msgstr "Править континент"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2766
 msgid "Country"
 msgstr "Страна"
 
 #. item
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2767
 msgid "Edit Country"
 msgstr "Править страну"
 
 #. item "Places/Country" text "Name"
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2772
 msgid "State"
 msgstr "Штат"
 
 #. item
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2773
 msgid "Edit State"
 msgstr "Править штат"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2778
 msgid "Region"
 msgstr "Область"
 
 #. item
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2779
 msgid "Edit Region"
 msgstr "Править область"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2784
 msgid "County"
 msgstr "Графство"
 
 #. item
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2785
 msgid "Edit County"
 msgstr "Править графство"
@@ -20882,15 +21267,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2791
 msgid "City"
 msgstr "Город (более 100 000)"
 
 #. item
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2792
 msgid "Edit City"
 msgstr "Править город"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2797
 msgid "Town"
 msgstr "Город (до 100 000)"
@@ -20898,10 +21283,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2799
 msgid "Edit Town"
 msgstr "Править город"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2804
 msgid "Suburb"
 msgstr "Пригород"
@@ -20909,25 +21294,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2806
 msgid "Edit Suburb"
 msgstr "Править пригород"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2811
 msgid "Village"
 msgstr "Село"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2812
 msgid "Edit Village"
 msgstr "Править село"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2817
 msgid "Hamlet"
 msgstr "Деревня"
 
 #. item
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2818
 msgid "Edit Hamlet"
 msgstr "Править деревню"
@@ -20935,5 +21320,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2824
 msgid "Locality"
 msgstr "Местность"
@@ -20941,10 +21326,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2826
 msgid "Edit Locality"
 msgstr "Править местность"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2831
 msgid "Island"
 msgstr "Остров"
@@ -20952,10 +21337,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2833
 msgid "Edit Island"
 msgstr "Править остров"
 
 #. item "Places/Island" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2838
 msgid "Islet"
 msgstr ""
@@ -20963,5 +21348,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2840
 msgid "Edit Islet"
 msgstr ""
@@ -20969,5 +21354,5 @@
 #. item "Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2846
 msgid "Cave Entrance"
 msgstr "Вход в пещеру"
@@ -20975,10 +21360,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2848
 msgid "Edit Cave Entrance"
 msgstr "Править вход в пещеру"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2852
 msgid "Peak"
 msgstr "Вершина"
@@ -20986,10 +21371,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2854
 msgid "Edit Peak"
 msgstr "Править вершину"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2859
 msgid "Glacier"
 msgstr "Ледник"
@@ -20997,10 +21382,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2861
 msgid "Edit Glacier"
 msgstr "Править ледник"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2854
+#: build/trans_presets.java:2866
 msgid "Volcano"
 msgstr "Вулкан"
@@ -21008,70 +21393,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2868
 msgid "Edit Volcano"
 msgstr "Править вулкан"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2874
 msgid "Boundaries"
 msgstr "Границы"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2875
 msgid "National"
 msgstr "Государственная"
 
 #. item
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2876
 msgid "Edit National Boundary"
 msgstr "Править государственную границу"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2881
 msgid "Administrative"
 msgstr "Административная"
 
 #. item
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2882
 msgid "Edit Administrative Boundary"
 msgstr "Править административную границу"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:2887
 msgid "Civil"
 msgstr "Гражданская"
 
 #. item
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2888
 msgid "Edit Civil Boundary"
 msgstr "Править гражданскую границу"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2893
 msgid "Political"
 msgstr "Политическая"
 
 #. item
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2894
 msgid "Edit Political Boundary"
 msgstr "Править политическую границу"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2899
 msgid "National park"
 msgstr "Национальный парк"
 
 #. item
-#: build/trans_presets.java:2888
+#: build/trans_presets.java:2900
 msgid "Edit National Park Boundary"
 msgstr "Править национальный парк"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2906
 msgid "Land use"
 msgstr "Землепользование"
 
 #. group "Land use"
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2907
 msgid "Tree"
 msgstr "Дерево"
@@ -21080,15 +21465,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:2898
+#: build/trans_presets.java:2910
 msgid "Edit Tree"
 msgstr "Править дерево"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2915
 msgid "Botanical Name"
 msgstr "Научное название"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2917
 msgid "Wood"
 msgstr "Лесистая местность"
@@ -21097,5 +21482,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:2908
+#: build/trans_presets.java:2920
 msgid "Edit Wood"
 msgstr "Править лесистую местность"
@@ -21103,17 +21488,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "coniferous"
 msgstr "Хвойный"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "deciduous"
 msgstr "Лиственный"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "mixed"
 msgstr "Смешанный"
 
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2925
 msgid "Forest"
 msgstr "Лес"
@@ -21122,14 +21507,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:2916
+#: build/trans_presets.java:2928
 msgid "Edit Forest Landuse"
 msgstr "Править лес"
 
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2934
 msgid "Nature Reserve"
 msgstr "Заповедник"
 
 #. item
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2935
 msgid "Edit Nature Reserve"
 msgstr "Править заповедник"
@@ -21137,25 +21522,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2940
 msgid "Scree"
 msgstr "Каменистая осыпь"
 
 #. item
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2941
 msgid "Edit Scree"
 msgstr "Редактировать Каменистая осыпь"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2945
 msgid "Scrub"
 msgstr "Кустарник"
 
 #. item
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2946
 msgid "Edit Scrub"
 msgstr "Редактировать Кустарник"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2950
 msgid "Fell"
 msgstr "Вырубленный лес"
@@ -21163,10 +21548,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2952
 msgid "Edit Fell"
 msgstr "Редактировать Вырубленный лес"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2956
 msgid "Heath"
 msgstr "Пустошь"
@@ -21174,5 +21559,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2958
 msgid "Edit Heath"
 msgstr "Редактировать Здоровье"
@@ -21180,5 +21565,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2963
 msgid "Farmyard"
 msgstr "Двор фермы"
@@ -21187,45 +21572,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:2954
+#: build/trans_presets.java:2966
 msgid "Edit Farmyard Landuse"
 msgstr "Править двор фермы"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2971
 msgid "Farmland"
 msgstr "Обрабатываемая земля"
 
 #. item
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2972
 msgid "Edit Farmland Landuse"
 msgstr "Править обрабатываемую землю"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2977
 msgid "Meadow"
 msgstr "Луг"
 
 #. item
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2978
 msgid "Edit Meadow Landuse"
 msgstr "Редактировать Луг"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2983
 msgid "Vineyard"
 msgstr "Виноградник"
 
 #. item
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2984
 msgid "Edit Vineyard Landuse"
 msgstr "Править виноградник"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:2989
 msgid "Allotments"
 msgstr "Огороды"
 
 #. item
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2990
 msgid "Edit Allotments Landuse"
 msgstr "Править огороды"
@@ -21233,25 +21618,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2996
 msgid "Garden"
 msgstr "Сад"
 
 #. item
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2997
 msgid "Edit Garden"
 msgstr "Править сад"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3001
 msgid "Grass"
 msgstr "Трава"
 
 #. item
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3002
 msgid "Edit Grass Landuse"
 msgstr "Править траву"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3007
 msgid "Village Green"
 msgstr "Село"
@@ -21259,10 +21644,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3009
 msgid "Edit Village Green Landuse"
 msgstr "Редактировать Село"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3014
 msgid "Common"
 msgstr "Общее"
@@ -21270,20 +21655,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3004
+#: build/trans_presets.java:3016
 msgid "Edit Common"
 msgstr "Править общее"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3020
 msgid "Park"
 msgstr "Парк"
 
 #. item
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3021
 msgid "Edit Park"
 msgstr "Править парк"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3025
 msgid "Recreation Ground"
 msgstr "Спортплощадка"
@@ -21291,5 +21676,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3027
 msgid "Edit Recreation Ground Landuse"
 msgstr "Править спортплощадку"
@@ -21297,15 +21682,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3033
 msgid "Residential area"
 msgstr "Жилая зона"
 
 #. item
-#: build/trans_presets.java:3022
+#: build/trans_presets.java:3034
 msgid "Edit Residential Landuse"
 msgstr "Править жилую зону"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3039
 msgid "Graveyard"
 msgstr "Церковное кладбище"
@@ -21313,9 +21698,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3029
+#: build/trans_presets.java:3041
 msgid "Edit Graveyard"
 msgstr "Править церковное кладбище"
 
-#: build/trans_presets.java:3035
+#: build/trans_presets.java:3047
 msgid "Cemetery"
 msgstr "Кладбище"
@@ -21323,39 +21708,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3049
 msgid "Edit Cemetery Landuse"
 msgstr "Править кладбище"
 
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3056
 msgid "Retail"
 msgstr "Розничная торговля"
 
 #. item
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3057
 msgid "Edit Retail Landuse"
 msgstr "Править розничную торговлю"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3062
 msgid "Commercial"
 msgstr "Коммерция"
 
 #. item
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3063
 msgid "Edit Commercial Landuse"
 msgstr "Править коммерцию"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3056
+#: build/trans_presets.java:3068
 msgid "Industrial"
 msgstr "Промышленность"
 
 #. item
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3069
 msgid "Edit Industrial Landuse"
 msgstr "Править промышленность"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3074
 msgid "Railway land"
 msgstr "Железная дорога"
@@ -21363,15 +21748,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3076
 msgid "Edit Railway Landuse"
 msgstr "Править ж/д пути"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3081
 msgid "Military"
 msgstr "Военное"
 
 #. item
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3082
 msgid "Edit Military Landuse"
 msgstr "Править военное"
@@ -21379,55 +21764,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3088
 msgid "Construction area"
 msgstr "Стройплощадка"
 
 #. item
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3089
 msgid "Edit Construction Landuse"
 msgstr "Править стройплощадку"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3094
 msgid "Brownfield"
 msgstr "Пустырь с развалинами"
 
 #. item
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3095
 msgid "Edit Brownfield Landuse"
 msgstr "Править пустырь с развалинами"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3100
 msgid "Greenfield"
 msgstr "Пустырь"
 
 #. item
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3101
 msgid "Edit Greenfield Landuse"
 msgstr "Править пустырь"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3106
 msgid "Landfill"
 msgstr "Свалка"
 
 #. item
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3107
 msgid "Edit Landfill Landuse"
 msgstr "Править свалку"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3112
 msgid "Quarry"
 msgstr "Карьер"
 
 #. item
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3113
 msgid "Edit Quarry Landuse"
 msgstr "Править карьер"
 
 #. group "Relations"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3122
 msgid "Multipolygon"
 msgstr "Мультиполигональное"
@@ -21437,5 +21822,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:3114
+#: build/trans_presets.java:3126
 msgid "Edit Multipolygon"
 msgstr "Править мультиполигональное отношение"
@@ -21444,10 +21829,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3132
 msgid "outer segment"
 msgstr "внешний сегмент"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3133
 msgid "inner segment"
 msgstr "внутренний сегмент"
@@ -21455,5 +21840,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3136
 msgid "Turn restriction"
 msgstr "Ограничение на поворот"
@@ -21462,5 +21847,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3139
 msgid "Edit Turn Restriction"
 msgstr "Править ограничение на поворот"
@@ -21468,34 +21853,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "Restriction"
 msgstr "Ограничение"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_left_turn"
 msgstr "поворот налево запрещён"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_right_turn"
 msgstr "поворот направо запрещён"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_straight_on"
 msgstr "движение прямо запрещено"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_u_turn"
 msgstr "разворот запрещён"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_right_turn"
 msgstr "движение только направо"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_left_turn"
 msgstr "движение только налево"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_straight_on"
 msgstr "движение только прямо"
@@ -21504,15 +21889,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3146
 msgid "from way"
 msgstr "с улицы"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3147
 msgid "via node or way"
 msgstr "через точку или линию"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3148
 msgid "to way"
 msgstr "на улицу"
@@ -21520,5 +21905,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3151
 msgid "Route"
 msgstr "Маршрут"
@@ -21527,5 +21912,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3154
 msgid "Edit Route"
 msgstr "Править маршрут"
@@ -21533,5 +21918,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "Route type"
 msgstr "Тип маршрута"
@@ -21603,5 +21988,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3144 build/trans_style.java:233
+#: build/trans_presets.java:3156 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -21610,17 +21995,17 @@
 msgstr "велосипедный"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "bus"
 msgstr "автобусный"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "road"
 msgstr "трасса"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ferry"
 msgstr "паромный"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ski"
 msgstr "лыжный"
@@ -21673,5 +22058,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3144 build/trans_style.java:247
+#: build/trans_presets.java:3156 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -21680,13 +22065,13 @@
 msgstr "пеший"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "hiking"
 msgstr "туристический"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "tram"
 msgstr "трамвайный"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "detour"
 msgstr "объездной"
@@ -21700,10 +22085,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3144 build/trans_style.java:1206
+#: build/trans_presets.java:3156 build/trans_style.java:1206
 msgid "subway"
 msgstr "метро"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3159
 msgid "Symbol description"
 msgstr "Описание символа"
@@ -21711,31 +22096,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3162
 msgid "Network"
 msgstr "Сеть"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "proposed"
 msgstr "планируемый"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "alternate"
 msgstr "альтернативный"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "temporary"
 msgstr "временный"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "connection"
 msgstr "соединяющий"
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "Color (hex)"
 msgstr "Цвет (hex)"
@@ -21744,30 +22129,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3168
 msgid "route segment"
 msgstr "сегмент маршрута"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3169
 msgid "forward segment"
 msgstr "сегмент вперёд"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3170
 msgid "backward segment"
 msgstr "сегмент назад"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3171
 msgid "halt point"
 msgstr "конечная точка"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3172
 msgid "forward halt point"
 msgstr "конечная вперёд"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3173
 msgid "backward halt point"
 msgstr "конечная назад"
@@ -22205,11 +22590,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3375 build/trans_style.java:3376
-#: build/trans_style.java:3946 build/trans_style.java:4254
-#: build/trans_style.java:4263 build/trans_style.java:4272
-#: build/trans_style.java:4281 build/trans_style.java:4290
-#: build/trans_style.java:4299 build/trans_style.java:4308
-#: build/trans_style.java:4309 build/trans_style.java:4318
-#: build/trans_style.java:4327
+#: build/trans_style.java:3383 build/trans_style.java:3384
+#: build/trans_style.java:3954 build/trans_style.java:4262
+#: build/trans_style.java:4271 build/trans_style.java:4280
+#: build/trans_style.java:4289 build/trans_style.java:4298
+#: build/trans_style.java:4307 build/trans_style.java:4316
+#: build/trans_style.java:4317 build/trans_style.java:4326
+#: build/trans_style.java:4335
 msgid "deprecated"
 msgstr "уменьшать"
@@ -24233,5 +24618,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3294
+#: build/trans_style.java:3302
 msgid "light_water"
 msgstr "легкая вода"
@@ -24913,8 +25298,17 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="boundary_stone"/>
+#. <icon annotate="true" src="historic/boundary_stone.png"/>
 #: build/trans_style.java:2990 build/trans_style.java:2998
 #: build/trans_style.java:3006 build/trans_style.java:3014
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
+#: build/trans_style.java:3054
 msgid "historic"
 msgstr "исторический"
@@ -24928,5 +25322,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3095
 msgid "quarry"
 msgstr "карьер"
@@ -24940,5 +25334,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "landfill"
 msgstr "мусорная свалка"
@@ -24960,5 +25354,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3103 build/trans_style.java:3111
+#: build/trans_style.java:3111 build/trans_style.java:3119
 msgid "basin"
 msgstr "водоём"
@@ -24972,5 +25366,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3127
 msgid "forest"
 msgstr "лес"
@@ -24984,5 +25378,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3159
 msgid "farmyard"
 msgstr "двор фермы"
@@ -25005,5 +25399,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3160 build/trans_style.java:3168
+#: build/trans_style.java:3168 build/trans_style.java:3176
 msgid "retail"
 msgstr "розничная продажа"
@@ -25017,5 +25411,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3176
+#: build/trans_style.java:3184
 msgid "industrial"
 msgstr "промышленный"
@@ -25029,5 +25423,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "brownfield"
 msgstr "заброшенная застройка"
@@ -25041,5 +25435,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "greenfield"
 msgstr "участок для застройки"
@@ -25053,5 +25447,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "railland"
 msgstr "жд разъезд"
@@ -25108,7 +25502,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3217 build/trans_style.java:3252
-#: build/trans_style.java:3260 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3225 build/trans_style.java:3260
+#: build/trans_style.java:3268 build/trans_style.java:3276
+#: build/trans_style.java:3284 build/trans_style.java:3292
 msgid "military"
 msgstr "военный"
@@ -25122,5 +25516,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3225
+#: build/trans_style.java:3233
 msgid "cemetery"
 msgstr "кладбище"
@@ -25133,5 +25527,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3301
+#: build/trans_style.java:3309
 msgid "peak"
 msgstr "пик"
@@ -25146,5 +25540,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3310
+#: build/trans_style.java:3318
 msgid "glacier"
 msgstr "ледник"
@@ -25158,5 +25552,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "volcano"
 msgstr "вулкан"
@@ -25211,8 +25605,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3326 build/trans_style.java:3327
-#: build/trans_style.java:3335 build/trans_style.java:3351
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440
+#: build/trans_style.java:3334 build/trans_style.java:3335
+#: build/trans_style.java:3343 build/trans_style.java:3359
+#: build/trans_style.java:3432 build/trans_style.java:3440
+#: build/trans_style.java:3448
 msgid "natural"
 msgstr "природный"
@@ -25226,5 +25620,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3343
+#: build/trans_style.java:3351
 msgid "scrub"
 msgstr "кустарник"
@@ -25238,5 +25632,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3359
+#: build/trans_style.java:3367
 msgid "heath"
 msgstr "здоровье"
@@ -25250,5 +25644,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3408
+#: build/trans_style.java:3416
 msgid "mud"
 msgstr "грязь"
@@ -25262,5 +25656,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "beach"
 msgstr "пляж"
@@ -25338,8 +25732,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
-#: build/trans_style.java:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496 build/trans_style.java:3504
+#: build/trans_style.java:3512 build/trans_style.java:3520
 msgid "route"
 msgstr "маршрут"
@@ -25387,7 +25781,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3522 build/trans_style.java:3530
-#: build/trans_style.java:3538 build/trans_style.java:3546
-#: build/trans_style.java:3554
+#: build/trans_style.java:3530 build/trans_style.java:3538
+#: build/trans_style.java:3546 build/trans_style.java:3554
+#: build/trans_style.java:3562
 msgid "boundary"
 msgstr "граница"
@@ -25537,11 +25931,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090
+#: build/trans_style.java:4002 build/trans_style.java:4010
+#: build/trans_style.java:4018 build/trans_style.java:4026
+#: build/trans_style.java:4034 build/trans_style.java:4042
+#: build/trans_style.java:4050 build/trans_style.java:4058
+#: build/trans_style.java:4066 build/trans_style.java:4074
+#: build/trans_style.java:4082 build/trans_style.java:4090
+#: build/trans_style.java:4098
 msgid "place"
 msgstr "место"
@@ -25589,6 +25983,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4207 build/trans_style.java:4214
-#: build/trans_style.java:4221 build/trans_style.java:4228
+#: build/trans_style.java:4215 build/trans_style.java:4222
+#: build/trans_style.java:4229 build/trans_style.java:4236
 msgid "address"
 msgstr "адрес"
@@ -25830,5 +26224,5 @@
 #: build/trans_wms.java:6
 msgid "Open Aerial Map"
-msgstr "Открыте Воздушные Карты"
+msgstr "Подложка OpenAerialMap"
 
 #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
@@ -25896,12 +26290,178 @@
 msgstr ""
 
+#~ msgid "Close current changeset"
+#~ msgstr "Закрыть текущий пакет изменений"
+
+#~ msgid "There is currently no changeset open."
+#~ msgstr "В данный момент нет открытого пакета изменений"
+
+#~ msgid "paramete''{0}'' must not be null"
+#~ msgstr "параметр ''{0}'' не может быть нулём"
+
+#~ msgid "unsupported value ''{0}'' or parameter ''{1}''"
+#~ msgstr "неподдерживаемое значение ''{0}'' параметра ''{1}''"
+
+#~ msgid "- running version is {0}"
+#~ msgstr "- сейчас запущена версия {0}"
+
+#~ msgid "not yet decided"
+#~ msgstr "ещё не решено"
+
+#~ msgid "Use a new changeset and close it"
+#~ msgstr "Использовать новый пакет изменений и закрыть его"
+
+#~ msgid ""
+#~ "Select to upload the data using a new changeset and to leave the "
+#~ "changeset open after the upload"
+#~ msgstr ""
+#~ "Выберите, чтобы выгрузить данные в новый пакет изменений, и оставить его "
+#~ "открытым после загрузки."
+
+#~ msgid "Use the existing changeset {0} and close it after upload"
+#~ msgstr ""
+#~ "Использовать текущий набор изменений {0} и закрыть его после загрузки"
+
+#~ msgid ""
+#~ "Select to upload to the existing changeset {0} and to close the changeset "
+#~ "after this upload"
+#~ msgstr ""
+#~ "Выберите, чтобы использовать существующий пакет изменений {0}, и закрыть "
+#~ "его после загрузки"
+
+#~ msgid "Use the existing changeset {0} and leave it open"
+#~ msgstr "Использовать текущий список изменений {0} и оставить открытым"
+
+#~ msgid ""
+#~ "Select to upload to the existing changeset {0} and to leave the changeset "
+#~ "open for further uploads"
+#~ msgstr ""
+#~ "Выберите, чтобы использовать существующий пакет изменений {0}, и оставить "
+#~ "его открытым после загрузки"
+
+#~ msgid ""
+#~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
+#~ "found."
+#~ msgstr ""
+#~ "Неожиданная версия JOSM. Ни Main.ds, ни Main.getCurrentDataSet() не "
+#~ "найдены."
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Неизвестное расширение файла."
+
+#~ msgid "Email"
+#~ msgstr "Электронная почта"
+
+#~ msgid "Contacting the OSM server..."
+#~ msgstr "Соединение с OSM сервером..."
+
+#~ msgid "Unknown version"
+#~ msgstr "Неизвестная версия"
+
+#~ msgid "Aborting..."
+#~ msgstr "Прерывание..."
+
+#~ msgid "position"
+#~ msgstr "положение"
+
+#~ msgid "different"
+#~ msgstr "различный"
+
+#~ msgid "true"
+#~ msgstr "истина"
+
+#~ msgid "false"
+#~ msgstr "ложь"
+
+#~ msgid "Change"
+#~ msgstr "Изменить"
+
+#~ msgid "unnamed"
+#~ msgstr "безымянный"
+
+#~ msgid "Move"
+#~ msgstr "Переместить"
+
 #~ msgid "All the ways were empty"
 #~ msgstr "Все линии были пустыми"
 
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Объединить точки из разных отношений?"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Объединить в любом случае"
+#~ msgid "Rotate"
+#~ msgstr "Вращать"
+
+#~ msgid "Resolve {0} conflicts in {1} objects"
+#~ msgstr "Разрешить {0} конфликтов в {1} объектах"
+
+#~ msgid "Delete {1} {0}"
+#~ msgstr "Удалить {1} {0}"
+
+#~ msgid "my version:"
+#~ msgstr "моя версия:"
+
+#~ msgid "{0} object has conflicts:"
+#~ msgid_plural "{0} objects have conflicts:"
+#~ msgstr[0] "{0} объект имеет конфликты."
+#~ msgstr[1] "{0} объекта имеет конфликты."
+#~ msgstr[2] "{0} объектов имеет конфликты."
+
+#~ msgid "Resolve Conflicts"
+#~ msgstr "Разрешить конфликты"
+
+#~ msgid "their version:"
+#~ msgstr "их версия:"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Нажмите \"Обновить\" для обновления списка"
+
+#~ msgid "Date"
+#~ msgstr "Дата"
+
+#~ msgid "Object"
+#~ msgstr "Объект"
+
+#~ msgid "Revert"
+#~ msgstr "Откатить"
+
+#~ msgid "Tags (empty value deletes tag)"
+#~ msgstr "Тэги (пустое значение удаляет тэг)"
+
+#~ msgid "Cannot connect to server."
+#~ msgstr "Невозможно связаться с сервером."
+
+#~ msgid "There were conflicts during import."
+#~ msgstr "При импортировании возникли конфликтные ситуации."
+
+#~ msgid "Add either site-josm.xml or Wiki Pages."
+#~ msgstr "Добавьте site-josm.xml, либо страницы Wiki"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "Имя пользователя (e-mail) учётной записи OSM"
+
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "Найден элемент <nd> вне пути."
+
+#~ msgid "Commit comment"
+#~ msgstr "Комментарий правки"
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "Сервер сообщил о внутренней ошибке. Попробуйте уменьшить область, или "
+#~ "повторите попытку позже."
+
+#~ msgid ""
+#~ "The plugin could not be removed. Please tell the people you got JOSM from "
+#~ "about the problem."
+#~ msgstr ""
+#~ "Невозможно удалить модуль. Сообщите разработчикам JOSM об этой проблеме."
+
+#~ msgid "Occupied By"
+#~ msgstr "Объект"
+
+#~ msgid ""
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
+#~ msgstr ""
+#~ "Внутренняя ошибка: невозможно проверить условия без слоя. Пожалуйста, "
+#~ "создайте отчёт об ошибке."
 
 #~ msgid ""
@@ -25912,134 +26472,6 @@
 #~ "объединить?"
 
-#~ msgid "Unknown version"
-#~ msgstr "Неизвестная версия"
-
-#~ msgid "Version number missing from OSM data"
-#~ msgstr "Номер версии отсутствует по  данным OSM"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "Найден элемент <nd> вне пути."
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "у <nd> нет ссылок ref"
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Найден тэг <member> вне отношения."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Неверный номер точки"
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Неизвестное расширение файла."
-
-#~ msgid "Email"
-#~ msgstr "Электронная почта"
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Соединение с OSM сервером..."
-
-#~ msgid "Aborting..."
-#~ msgstr "Прерывание..."
-
-#~ msgid "position"
-#~ msgstr "положение"
-
-#~ msgid "different"
-#~ msgstr "различный"
-
-#~ msgid "true"
-#~ msgstr "истина"
-
-#~ msgid "false"
-#~ msgstr "ложь"
-
-#~ msgid "Change"
-#~ msgstr "Изменить"
-
-#~ msgid "unnamed"
-#~ msgstr "безымянный"
-
-#~ msgid "Move"
-#~ msgstr "Переместить"
-
-#~ msgid "Rotate"
-#~ msgstr "Вращать"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Разрешить {0} конфликтов в {1} объектах"
-
-#~ msgid "Delete {1} {0}"
-#~ msgstr "Удалить {1} {0}"
-
-#~ msgid "my version:"
-#~ msgstr "моя версия:"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} объект имеет конфликты."
-#~ msgstr[1] "{0} объекта имеет конфликты."
-#~ msgstr[2] "{0} объектов имеет конфликты."
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Разрешить конфликты"
-
-#~ msgid "their version:"
-#~ msgstr "их версия:"
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Нажмите \"Обновить\" для обновления списка"
-
-#~ msgid "Date"
-#~ msgstr "Дата"
-
-#~ msgid "Object"
-#~ msgstr "Объект"
-
-#~ msgid "Revert"
-#~ msgstr "Откатить"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Тэги (пустое значение удаляет тэг)"
-
-#~ msgid "Add Selected"
-#~ msgstr "Добавить выбранное"
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Невозможно связаться с сервером."
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "При импортировании возникли конфликтные ситуации."
-
-#~ msgid "Add either site-josm.xml or Wiki Pages."
-#~ msgstr "Добавьте site-josm.xml, либо страницы Wiki"
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "Имя пользователя (e-mail) учётной записи OSM"
-
-#~ msgid "Commit comment"
-#~ msgstr "Комментарий правки"
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr ""
-#~ "Сервер сообщил о внутренней ошибке. Попробуйте уменьшить область, или "
-#~ "повторите попытку позже."
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr ""
-#~ "Невозможно удалить модуль. Сообщите разработчикам JOSM об этой проблеме."
-
-#~ msgid "Occupied By"
-#~ msgstr "Объект"
-
-#~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
-#~ msgstr ""
-#~ "Внутренняя ошибка: невозможно проверить условия без слоя. Пожалуйста, "
-#~ "создайте отчёт об ошибке."
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "Объединить точки из разных отношений?"
 
 #~ msgid "resolved version:"
@@ -26124,4 +26556,10 @@
 #~ msgid "Add all currently selected objects as members"
 #~ msgstr "Сделать все выбранные объекты участниками отношения"
+
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "Найден тэг <member> вне отношения."
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "Неверный номер точки"
 
 #~ msgid ""
@@ -26178,4 +26616,7 @@
 #~ msgid "Error parsing server response."
 #~ msgstr "Ошибка при разборе ответа от сервера."
+
+#~ msgid "<nd> has zero ref"
+#~ msgstr "у <nd> нет ссылок ref"
 
 #~ msgid "EPSG:4326"
@@ -26445,4 +26886,7 @@
 #~ msgstr "Не возможно прочесть числовое знаечение из ответа"
 
+#~ msgid "Version number missing from OSM data"
+#~ msgstr "Номер версии отсутствует по  данным OSM"
+
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -26511,7 +26955,4 @@
 #~ msgstr "Сохранить мои"
 
-#~ msgid "Delete mine"
-#~ msgstr "Удалить мои"
-
 #~ msgid "nodes"
 #~ msgstr "точки"
@@ -26526,9 +26967,9 @@
 #~ msgstr "Сбой инициализации API. Пожалуйста, попробуйте снова позднее."
 
-#~ msgid "changesets"
-#~ msgstr "наборы изменений"
-
 #~ msgid "ways"
 #~ msgstr "линии"
+
+#~ msgid "Merge Anyway"
+#~ msgstr "Объединить в любом случае"
 
 #~ msgid "Apply partial resolutions"
Index: applications/editors/josm/i18n/po/sk.po
===================================================================
--- applications/editors/josm/i18n/po/sk.po	(revision 17655)
+++ applications/editors/josm/i18n/po/sk.po	(revision 17697)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-12 18:11+0200\n"
-"PO-Revision-Date: 2009-09-12 05:45+0000\n"
+"POT-Creation-Date: 2009-09-19 13:00+0200\n"
+"PO-Revision-Date: 2009-09-18 03:51+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-09-12 16:04+0000\n"
+"X-Launchpad-Export-Date: 2009-09-19 10:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -42,10 +42,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:543
 #: ../core/src/org/openstreetmap/josm/Main.java:551
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -70,5 +70,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -86,6 +86,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:358
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
@@ -101,6 +101,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
@@ -128,10 +128,10 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
 msgid "Save and Exit"
 msgstr "Uložiť a Ukončiť"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
 msgid "Discard and Exit"
 msgstr "Zrušiť a Ukončiť"
@@ -142,4 +142,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
@@ -147,27 +148,28 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:296
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:258
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:613
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
@@ -175,5 +177,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -193,6 +195,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
@@ -209,17 +211,17 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:654
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1528
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -230,6 +232,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
@@ -282,9 +284,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:607
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:609
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -344,5 +346,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
 msgid "Plugins"
@@ -399,5 +401,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Zlúčiť"
@@ -487,5 +489,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -498,4 +500,5 @@
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -531,6 +534,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
@@ -539,6 +542,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:346
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
@@ -652,4 +655,46 @@
 msgstr "Nie je žiadny konflikt, čo by sa mohol priblížiť"
 
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#, fuzzy
+msgid "Close open changesets"
+msgstr "Neotvárajte súbor zmien"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#, fuzzy
+msgid "Closes open changesets"
+msgstr "Neotvárajte súbor zmien"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
+#: ../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:114
+#, java-format
+msgid "File: {0}"
+msgstr "Súbor: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
+#, fuzzy
+msgid "There are no open changesets"
+msgstr "Neotvárajte súbor zmien"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
+#, fuzzy
+msgid "No open changesets"
+msgstr "Neotvárajte súbor zmien"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
+#, fuzzy
+msgid "Downloading open changesets ..."
+msgstr "Zatváranie súboru zmien..."
+
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
@@ -746,10 +791,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:123
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
@@ -792,31 +838,30 @@
 msgstr "Rozložiť zvolené body v rovnakej vzdialenosti od seba pozdĺž trasy."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
 msgid "Download from OSM..."
 msgstr "Stiahnuť z OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
 msgid "Download map data from the OSM server."
 msgstr "Stiahnutie mapových údajov z OSM servera."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
-#, java-format
-msgid "File: {0}"
-msgstr "Súbor: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
 msgid "Download"
 msgstr "Stiahnuť"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
 msgid "Please select at least one task to download"
 msgstr "Prosím zvolte aspoň jednu úlohu k stiahnutiu"
@@ -837,5 +882,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1527
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307
@@ -855,6 +900,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:376
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1415
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
 msgid "Duplicate"
 msgstr "Duplikovať"
@@ -926,10 +971,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
@@ -1016,25 +1062,26 @@
 msgstr "Zlúčiť aktuálnu vrstvu do inej vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 msgid "Merge Nodes"
 msgstr "Zlúčiť body"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
 msgid "Merge nodes into the oldest one."
 msgstr "Zlúčiť body do najstaršieho bodu"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
 msgid "Please select at least two nodes to merge."
 msgstr "Zvoľte minimálne dva body pre zlúčenie"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:394
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
@@ -1050,8 +1097,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -1077,6 +1124,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
@@ -1085,10 +1136,10 @@
 msgstr "parameter ''{0}'' nesmie byť nulový"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
 "Nemôžem zlúčiť body: Zmazala by sa tak cesta, ktorá je stále používaná."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283
 #, java-format
 msgid "Merge {0} nodes"
@@ -1160,5 +1211,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "New"
 msgstr "Nový"
@@ -1439,14 +1490,15 @@
 msgstr "Pomoc: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
 msgid "Status Report"
 msgstr "Správa o stave"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 msgid "Copy to clipboard and close"
 msgstr "Kopírovať do schránky a zavrieť"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
@@ -1537,25 +1589,4 @@
 msgstr "Rozdeliť cestu {0} do {1} častí"
 
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24
-msgid "Close current changeset"
-msgstr "Zavrieť aktuálny súbor zmien"
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-msgid "Close the current changeset ..."
-msgstr "Zatváram aktuálny súbor zmien ..."
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41
-msgid "There is currently no changeset open."
-msgstr "Teraz tam nie je otvorený súbor zmien."
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42
-msgid "No open changeset"
-msgstr "Neotvárajte súbor zmien"
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60
-msgid "Closing changeset"
-msgstr "Zatváranie súboru zmien"
-
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
@@ -1723,41 +1754,41 @@
 msgstr "Výber je prázdny"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Uložiť do OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 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:133
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#, java-format
 msgid ""
 "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
 "resolve them first.</html>"
 msgstr ""
-"<html>Sú nevyriešené konflikty vo vrstve ''{0}''.<br>Najskôr ich vyriešte."
-"<html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155
+"<html>Vo vrstve sa nachádzajú nevyriešené konflikty ''{0}''.<br>Najskôr ich "
+"vyriešte.</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
 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:166
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 msgid "No changes to upload."
 msgstr "Žiadne zmeny pre uloženie."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Synchronizovať {0} {1} iba"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
 msgid "Synchronize entire dataset"
 msgstr "Synchronizovať celú dátovú sadu"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
 #, java-format
 msgid ""
@@ -1778,17 +1809,17 @@
 "zrušenie a pokračovanie v editácii.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
 msgid "Conflict detected"
 msgstr "Zistený konflikt"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr "neočakávaná hodnota. Dostal {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:267
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
 #, java-format
 msgid ""
@@ -1803,5 +1834,17 @@
 "<strong>{1}</strong> pre zrušenie a pokračovanie v editácii.<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
+msgid ""
+"<html>Uploading <strong>failed</strong> because you've been "
+"using<br>changeset {0} which was already closed at {1}.<br>Please upload "
+"again with a new or an existing open changeset."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+#, fuzzy
+msgid "Changeset closed"
+msgstr "Info súboru zmien"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
@@ -1809,23 +1852,23 @@
 "Varovanie: chybné záhlavie \"{0}\" nie je zhoda  s očakávanou schémou \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr "Chybná hlavička \"{0}\" nie je zhoda podľa očakávaného vzoru \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr "<html>Upload <strong>zlyhal</strong>.<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
 msgid "Upload to OSM API failed"
 msgstr "Nahrávanie na OSM API neúspešné"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
 msgid "Updating primitive"
 msgstr "Aktualizácia pôvodných"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -2049,14 +2092,14 @@
 msgstr "Pridať bod do cesty a spojiť"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:930
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:932
 msgid "Create new node."
 msgstr "Vytvoriť nový bod."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
 msgid "Select node under cursor."
 msgstr "Zvoliť bod pod kurzorom."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939
 #, java-format
 msgid "Insert new node into way."
@@ -2066,14 +2109,14 @@
 msgstr[2] "Vložiť nový bod do {0} ciest."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
 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:949
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951
 msgid "Continue way from last node."
 msgstr "Pokračovanie cesty z posledného bodu."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:972
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:974
 msgid "Finish drawing."
 msgstr "Koniec kreslenia."
@@ -2197,82 +2240,92 @@
 "hore dolu doľava doprava; pohyb so zväčšením možno tiež pravým tlačítkom myši"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Vyhľadávať..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Vyhľadávať objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
 msgid "Can't search because there is no loaded data."
 msgstr "Nemôžem vyhľadávať, pretože nie sú načítané dáta."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
+#, fuzzy
+msgid "Please enter a filter string."
+msgstr "Zadajte hladaný reťazec."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
 msgid "Please enter a search string."
 msgstr "Zadajte hladaný reťazec."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
 msgid "replace selection"
 msgstr "nahradiť označené"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72
 msgid "add to selection"
 msgstr "pridať k výberu"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73
 msgid "remove from selection"
 msgstr "odobrať z výberu"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
+#, fuzzy
+msgid "find in selection"
+msgstr "pridať k výberu"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81
 msgid "case sensitive"
 msgstr "veľkosť písmen rozhoduje"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82
 msgid "regular expression"
 msgstr "regulárny výraz"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
 msgstr ""
 "<b>Baker Street</b> - 'Baker' a 'Street' v akomkoľvek kľúči, alebo mene."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
 msgstr ""
 "<b>\"Baker Street\"</b> - 'Baker Street' v akomkoľvek kľúči, alebo mene."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
 msgstr "<b>name:Bak</b> - 'Bak' kdekoľvek v mene."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
-msgstr "<b>typ=cesta</b> - kľúč 'typ' s presnou hodnotou 'cesta'."
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
+msgstr "<b>type=cesta</b> - kľúč 'type' s presnou hodnotou 'cesta'."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid ""
 "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
 "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
 msgstr ""
-"<b>typ=*</b> - kľúč 'typ' s nejakou hodnotou. Skúste tiež <b>*=hodnota</b>, "
-"<b>typ=</b>, <b>*=*</b>, <b>*=</b>"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
+"<b>type=*</b> - kľúč 'type' s nejakou hodnotou. Skúste tiež <b>*=hodnota</"
+"b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
 msgstr "<b>-name:Bak</b> - neobsahuje 'Bak' v mene."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - klúč 'foot' nastavený na akúkoľvek hodnotu."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
 msgid "<u>Special targets:</u>"
 msgstr "<u>Špeciálne ciele:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
@@ -2281,38 +2334,38 @@
 "b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - všetky objekty nahraté užívateľom"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr "<b>id:</b>... - objekt s určeným ID (0 pre nové objekty)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 msgid "<b>nodes:</b>... - object with given number of nodes"
 msgstr "<b>nodes:</b>... - objekt s pridanými číslami bodov"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - všetky zmenené objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - všetky vybraté objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - všetky nekompletné objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>untagged</b> - všetky neoznačené objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr "<b>dieťa <i>výraz</i></b> - všetky deti objektov vyhovujúcich výrazu"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
@@ -2320,54 +2373,71 @@
 "<b>rodič <i>výraz</i></b> - všetci rodičia objektov vyhovujúcich výrazu"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Použite <b>|</b> alebo <b>OR</b> pri kombinácii s logickým \"alebo\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr "Použite <b>\"</b> ako úvodzovky (napríklad ak kľúč obsahuje dvojbodku)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Použite <b>(</b> a <b>)</b> k zoskupeniu výrazov"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
+msgid "Filter"
+msgstr "Filter"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Hľadať"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
+msgid "Submit filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "Start Search"
 msgstr "Začať vyhľadávanie"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Neboli nájdené záznamy pre \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Nič nebolo pridané do výberu hľadaním \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Nič nebolo odstránené z výberu hľadaním \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#, fuzzy, java-format
+msgid "Nothing find in selection by searching for ''{0}''"
+msgstr "Nič nebolo pridané do výberu hľadaním \"{0}\""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262
 #, java-format
 msgid "Found {0} matches"
 msgstr "Najdených {0} zodpovedajúcich výrazov"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283
 msgid "RX"
 msgstr "RX"
@@ -2560,5 +2630,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
 msgid "Double conflict"
 msgstr "Dvojitý konflikt"
@@ -2816,4 +2886,5 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:134
 msgid "Old value"
 msgstr "Stará hodnota"
@@ -2997,27 +3068,59 @@
 
 #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
 msgid "E"
 msgstr "V"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:59
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:203
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
 msgid "Changeset {0}"
 msgstr "Súbor zmien {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:323
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
 msgstr "parameter {0} > 0 požadovaný. Dostal {1}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:325
-#, fuzzy, java-format
-msgid "paramete''{0}'' must not be null"
-msgstr "parameter ''{0}'' nesmie byť nulový"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331
-#, fuzzy, java-format
-msgid "unsupported value ''{0}'' or parameter ''{1}''"
-msgstr "Neplatná funkcia ''{0}'' pre Cestu ''{1}''."
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "H"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "Text"
+msgstr "text"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "C"
+msgstr "CS"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "I"
+msgstr "CI"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "M"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#, fuzzy
+msgid "R"
+msgstr "RX"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+msgid "A"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+msgid "D"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+msgid "F"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
@@ -3031,29 +3134,29 @@
 msgstr "Varovanie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
+#, java-format
 msgid "expected id >= 0. Got {0}"
-msgstr "neočakávaný index stĺpca. Got {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:257
+msgstr "očekávané id >= 0. Got {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
 msgid "a primitive with id=0 can't be invisible"
 msgstr "pôvodné s id=0 nemôžu byť neviditeľné"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:293
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
+#, java-format
 msgid "id > 0 expected. Got {0}"
-msgstr "id > 0 očakávaný, got {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295
-#, fuzzy, java-format
+msgstr "id > 0 očakávané. Got {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
+#, java-format
 msgid "version > 0 expected. Got {0}"
-msgstr "id > 0 očakávaný, got {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26
+msgstr "verzia > 0 očakávaná. Got {0}"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
 msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
 msgstr "parameter ''{0}'' je nesprávny typ mena, dostava ''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
 msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
@@ -3074,5 +3177,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:230
 msgid "can't add node {0} to incomplete way {1}"
-msgstr ""
+msgstr "nemôžem pridať bod {0} do nedokončenej cesty {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:154
@@ -3122,9 +3225,9 @@
 msgstr "parameter {0} nie je v rozsahu 0..{1}, dostáva {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:247
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:249
 msgid "Area style way is not closed."
 msgstr "Cesta označená ako plocha nie je uzavretá."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:478
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:482
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
@@ -3133,118 +3236,118 @@
 #. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
 #. TODO Remove useless nullcheck when RelationMember.member is encalupsed
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:851
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855
 msgid "Empty member in relation."
 msgstr "Prázdny člen vo vzťahu (relation)."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:853
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Vymazaný člen ''{0}'' vo vzťahu (relation)."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:864
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Cesta ''{0}'' s menej, než dvoma bodmi."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "More than one \"from\" way found."
 msgstr "Najdená viac než jedna \"from\" cesta."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "More than one \"to\" way found."
 msgstr "Najdené viac cieľových \"to\" ciest."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "More than one \"via\" found."
 msgstr "Viac ako jedna \"via\" najdená."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Neznáma funkcia ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Neznámy typ člena pre ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"from\" way found."
 msgstr "Nenajdená cesta \"from\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"to\" way found."
 msgstr "Nenajdená cesta \"to\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652
 msgid "No \"via\" node or way found."
 msgstr "Nie je \"via\" bod alebo cesta najdená."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "Cesta \"from\" nezačína, ani nekončí v bode \"via\"."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "Táto \"to\" cesta nezačína a nekončí na \"via\" bode."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "Táto \"from\" cesta nezačína a nekončí na \"via\" ceste."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "Táto \"to\" cesta nezačína a nekončí na \"via\" ceste."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Štýl pre obmedzenie {0} nenajdený."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Neplatná funkcia ''{0}'' pre Cestu ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:885
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Cesta v opačnom smere(Non-Way) ''{0}'' v multipolygóne."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:943
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Multipolygón ''{0}'' nemá žiadnu vonkajšiu(obvodovú) cestu."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1032
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Cesty ''{0}'' a ''{1}'' se pretínajú."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1044
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Vnútorná(inner) cesta ''{0}'' je vonku."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1097
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Štýl pre vnútornú cestu ''{0}'' je ekvivalentný polygónu."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1123
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Označenie pre vonkajšiu(obvodovú) cestu ''{0}'' je zamenené."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1327
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331
 msgid "untagged"
 msgstr "neoznačený"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1328
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332
 msgid "text"
 msgstr "text"
@@ -3268,5 +3371,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
@@ -3289,5 +3392,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
@@ -3342,5 +3445,5 @@
 msgstr "Lambertova zóna (Francie)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambertova zóna (Estónsko)"
@@ -3382,9 +3485,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:38
 msgid "Do not show again"
 msgstr "Nezobrazovať v budúcnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
 #, java-format
@@ -3392,31 +3495,31 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:91
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:116
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154
 msgid "incomplete"
 msgstr "neúplný"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
 msgid "highway"
 msgstr "komunikácie"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
-#: build/trans_presets.java:3144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: build/trans_presets.java:3156
 msgid "railway"
 msgstr "železnica"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
 msgid "waterway"
 msgstr "vodný tok"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "landuse"
 msgstr "využitie oblasti (landuse)"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:474
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
@@ -3427,5 +3530,5 @@
 msgstr[2] "{0} bodov"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
 #, java-format
 msgid "{0} member"
@@ -3456,7 +3559,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
-#, fuzzy
 msgid "Bad Request"
-msgstr "Upraviť racquetbal"
+msgstr "Chybná požiadavka"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144
@@ -3472,10 +3574,5 @@
 msgstr "Správu dňa nie je možné zobraziť"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67
-#, java-format
-msgid "- running version is {0}"
-msgstr "- teraz používaná verzia je {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:95
 msgid "Downloading \"Message of the day\""
 msgstr "Sťahujem \"Správu dňa\""
@@ -3548,10 +3645,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:162
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
 msgid "Username"
 msgstr "Meno používateľa"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
 msgid "Password"
 msgstr "Heslo"
@@ -3678,5 +3775,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226
 msgid "Presets"
 msgstr "Predvoľby"
@@ -3750,38 +3847,49 @@
 msgstr "mierka"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Zemepisná dĺžka na mieste kurzoru myši."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The name of the object at the mouse pointer."
 msgstr "Meno objektu na mieste kurzoru myši."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Zemepisná šírka na mieste kurzoru myši."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The angle between the previous and the current way segment."
 msgstr "Uhol medzi predchádzajúcim a súčasným úsekom cesty."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "Bude zobrazená smerová šípka v segmente línie."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The length of the new way segment being drawn."
 msgstr "Dĺžka nového nakresleného segmentu trasy bude zobrazená."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199
+msgid ""
+"Middle click again to cycle through.<br>Hold CTRL to select directly from "
+"this list with the mouse.<hr>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290
 msgid "(no object)"
 msgstr "(žiadny objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:301
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418
+#, fuzzy
+msgid "User:"
+msgstr "Užívateľ"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
 msgid "layer not in list."
 msgstr "vrstva nie je v zozname"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:488
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3851,7 +3959,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:224
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Tags"
 msgstr "Značky"
@@ -3866,5 +3974,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
@@ -4062,4 +4170,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
 msgid "Up"
 msgstr "Hore"
@@ -4070,4 +4179,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Down"
 msgstr "Dole"
@@ -4080,5 +4190,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
@@ -4511,35 +4621,34 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:97
 msgid "Conflicts when combining primitives"
-msgstr ""
+msgstr "Konflikty pri spojovaní pôvodných"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:103
 #, java-format
 msgid "Conflicts when combining ways - combined way is ''{0}''"
-msgstr ""
+msgstr "Konflikty pri spojovaní ciest - spojovaná cesta je ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:110
 #, java-format
 msgid "Conflicts when merging nodes - merged node is ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:236
-#, fuzzy
+msgstr "Konflikty pri spojovaní bodov - spojovaný bod je ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239
 msgid "No conflicts to resolve"
-msgstr "Nevyriešený konflikt značiek musí byť vyriešený"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:295
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257
+msgstr "Žiadne konflikty na rozhodnutie"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254
 msgid "Cancel conflict resolution"
 msgstr "Zrušiť rozhodnutie konfliktu"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:310
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269
 msgid "Apply resolved conflicts"
 msgstr "Použiť vyriešený konflikt"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Apply"
 msgstr "Použiť"
@@ -4551,5 +4660,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "all"
 msgstr "všetky"
@@ -4594,7 +4703,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
-msgid "not yet decided"
-msgstr "ešte žiadne rozhodnutie"
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:213
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
@@ -4621,7 +4727,7 @@
 msgstr "Konflikty vo vkladaných značkách"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
@@ -4632,7 +4738,7 @@
 msgstr[2] "{0} cesty"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:152
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
@@ -4643,20 +4749,20 @@
 msgstr[2] "{0} relácií"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "Paste ..."
 msgstr "Vkladám ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "From ..."
 msgstr "Z ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:372
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "To ..."
 msgstr "Do ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:428
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
 #, java-format
 msgid "{0} tag"
@@ -4669,39 +4775,35 @@
 #, java-format
 msgid "pos {0} is out of range. current number of members: {1}"
-msgstr ""
+msgstr "pozícia {0} je mimo rozsah. aktuálne číslo z  členov: {1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
-#, fuzzy
 msgid "Remove this relation member from the relation"
-msgstr "Odstrániť práve vybraté členy z tejto relácie"
+msgstr "Odstrániť tohoto člena relácie z relácie"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-#, fuzzy
 msgid "Replace"
-msgstr "miesto"
+msgstr "Nahradiť"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:58
 msgid "Replace the way this member refers to with the combined way"
-msgstr ""
+msgstr "Nahradiť cestu s odkazom na jej člena so spojením cesty"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
-#, fuzzy
 msgid "Undecided"
-msgstr "Nerozhodnuté"
+msgstr "Nerozhodnutý"
 
 #. --- role editing
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:56
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510
 msgid "Role:"
 msgstr "Funkcia:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:65
-#, fuzzy
 msgid "Tag modified relations with   "
-msgstr "Značky z relácií"
+msgstr "Značka zmenená vzťahmi s   "
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:68
@@ -4711,25 +4813,22 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70
-#, fuzzy
 msgid "Value:"
-msgstr "Hodnota"
+msgstr "Hodnota:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86
 msgid "Apply this role to all members"
-msgstr ""
+msgstr "Použiť túto funkciu pre všetkých členov"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33
 msgid "Pos."
-msgstr ""
+msgstr "Pos."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51
-#, fuzzy
 msgid "Orig. Way"
-msgstr "Jednosmerka"
+msgstr "Orig. Cesta"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
-#, fuzzy
 msgid "Decision"
-msgstr "Revízia"
+msgstr "Rozhodnutie"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -4745,6 +4844,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
@@ -4842,171 +4942,13 @@
 msgstr "Rozhodnúť konflikt pre ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-msgid "History"
-msgstr "História"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-msgid "Display the history of all selected items."
-msgstr "Zobraziť históriu všetkých zobrazených objektov"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
-#, java-format
-msgid "index out of bounds Got {0}"
-msgstr "index je mimo hranice Dostať {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr "Bod {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr "Cesta {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr "Relácia {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
-msgid "History item"
-msgstr "Položka priebehu"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Znovu nahrať vybrané objekty a obnoviť zoznam."
-
-#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
-msgid "Show"
-msgstr "Ukázať"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
-msgstr "Zobraziť priebeh z vybraných pôvodných"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
-msgid "Dialog not created yet. Invoke createInstance() first"
-msgstr "Dialóg ešte nie je vytvorený. Odvoláva sa na createInstance() first"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
-msgid "Layers"
-msgstr "Vrstvy"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-msgid "Open a list of all loaded layers."
-msgstr "Otvoriť zoznam všetkých nahratých vrstiev."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:297
-msgid "Delete the selected layer."
-msgstr "Odstrániť vybranú vrstvu."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:367
-msgid "Show/Hide"
-msgstr "Zobraziť/Skryť"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:378
-msgid "Toggle visible state of the selected layer."
-msgstr "Prepnúť viditeľnosť zvolenej vrstvy."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414
-msgid "Activate"
-msgstr "Aktivovať"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:420
-msgid "Activate the selected layer"
-msgstr "Aktivovať vybratú vrstvu"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:475
-msgid "Merge this layer into another layer"
-msgstr "Spojiť túto vrstvu do ďalšej vrstvy"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:581
-msgid "Move the selected layer one row up."
-msgstr "Presunúť zvolenú vrstvu o riadok hore."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:600
-msgid "Move the selected layer one row down."
-msgstr "Presunúť zvolenú vrstvu o riadok dole."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
-msgid "Information about layer"
-msgstr "Informácie o vrstve"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
-#, java-format
-msgid "This will change up to {0} object."
-msgid_plural "This will change up to {0} objects."
-msgstr[0] "Toto zmení až {0} objektov."
-msgstr[1] "Toto zmení až {0} objekt."
-msgstr[2] "Toto zmení až {0} objekty."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
-msgid "An empty value deletes the key."
-msgstr "Prázdna hodnota zmaže klúče"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
-msgid "<different>"
-msgstr "<rôzne>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
-msgid "Change values?"
-msgstr "Zmeniť hodnoty ?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
-#, java-format
-msgid "Change properties of up to {0} object"
-msgid_plural "Change properties of up to {0} objects"
-msgstr[0] "Zmeniť vlastnosti až {0} objektu."
-msgstr[1] "Zmeniť vlastnosti až {0} objektov."
-msgstr[2] "Zmeniť vlastnosti až {0} objektov."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
-msgid "Please select a key"
-msgstr "Vyberte prosím kľúč"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
-msgid "Please select a value"
-msgstr "Vyberte prosím hodnotu"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
-msgid "Please select the objects you want to change properties for."
-msgstr "Vyberte prosím objekty, ktorým chcete zmeniť vlastnosti."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
-msgid "Properties/Memberships"
-msgstr "Vlastnosti/Členstvo(memberships)"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-msgid "Properties for selected objects."
-msgstr "Vlastnosti pre zvolené objekty"
-
-#. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-msgid "Member Of"
-msgstr "Člen"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
-msgid "Add Properties"
-msgstr "Pridať vlastnosti"
-
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+msgid "Filter objects and hide/disable them."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
@@ -5020,4 +4962,214 @@
 msgstr "Pridať"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#, fuzzy
+msgid "Add filter."
+msgstr "Pridať vybrané"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
+#, fuzzy
+msgid "Edit filter."
+msgstr "Upraviť mólo"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#, fuzzy
+msgid "Delete filter."
+msgstr "Zmazať moje"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
+#, fuzzy
+msgid "Move filter up."
+msgstr "Posunúť vyššie"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
+#, fuzzy
+msgid "Move filter down."
+msgstr "Posunúť nižšie"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128
+msgid "Enable filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
+#, fuzzy
+msgid "Hide elements"
+msgstr "Jednotlivé prvky"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
+msgid "Apply also for children"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
+msgid "Inverse filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
+#, fuzzy
+msgid "Filter mode"
+msgstr "Filter"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
+msgid "History"
+msgstr "História"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+msgid "Display the history of all selected items."
+msgstr "Zobraziť históriu všetkých zobrazených objektov"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr "index je mimo hranice Dostať {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr "Bod {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr "Cesta {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr "Relácia {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
+msgid "History item"
+msgstr "Položka priebehu"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
+msgid "Reload all currently selected objects and refresh the list."
+msgstr "Znovu nahrať vybrané objekty a obnoviť zoznam."
+
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
+msgid "Show"
+msgstr "Ukázať"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
+msgid "Display the history of the selected primitive"
+msgstr "Zobraziť priebeh z vybraných pôvodných"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84
+msgid "Dialog not created yet. Invoke createInstance() first"
+msgstr "Dialóg ešte nie je vytvorený. Odvoláva sa na createInstance() first"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
+msgid "Layers"
+msgstr "Vrstvy"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+msgid "Open a list of all loaded layers."
+msgstr "Otvoriť zoznam všetkých nahratých vrstiev."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294
+msgid "Delete the selected layer."
+msgstr "Odstrániť vybranú vrstvu."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364
+msgid "Show/Hide"
+msgstr "Zobraziť/Skryť"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375
+msgid "Toggle visible state of the selected layer."
+msgstr "Prepnúť viditeľnosť zvolenej vrstvy."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgid "Activate"
+msgstr "Aktivovať"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417
+msgid "Activate the selected layer"
+msgstr "Aktivovať vybratú vrstvu"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472
+msgid "Merge this layer into another layer"
+msgstr "Spojiť túto vrstvu do ďalšej vrstvy"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578
+msgid "Move the selected layer one row up."
+msgstr "Presunúť zvolenú vrstvu o riadok hore."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597
+msgid "Move the selected layer one row down."
+msgstr "Presunúť zvolenú vrstvu o riadok dole."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+msgid "Information about layer"
+msgstr "Informácie o vrstve"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+#, java-format
+msgid "This will change up to {0} object."
+msgid_plural "This will change up to {0} objects."
+msgstr[0] "Toto zmení až {0} objektov."
+msgstr[1] "Toto zmení až {0} objekt."
+msgstr[2] "Toto zmení až {0} objekty."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+msgid "An empty value deletes the key."
+msgstr "Prázdna hodnota zmaže klúče"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+msgid "<different>"
+msgstr "<rôzne>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+msgid "Change values?"
+msgstr "Zmeniť hodnoty ?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#, java-format
+msgid "Change properties of up to {0} object"
+msgid_plural "Change properties of up to {0} objects"
+msgstr[0] "Zmeniť vlastnosti až {0} objektu."
+msgstr[1] "Zmeniť vlastnosti až {0} objektov."
+msgstr[2] "Zmeniť vlastnosti až {0} objektov."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+msgid "Please select a key"
+msgstr "Vyberte prosím kľúč"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+msgid "Please select a value"
+msgstr "Vyberte prosím hodnotu"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
+msgid "Please select the objects you want to change properties for."
+msgstr "Vyberte prosím objekty, ktorým chcete zmeniť vlastnosti."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
+msgid "Properties/Memberships"
+msgstr "Vlastnosti/Členstvo(memberships)"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+msgid "Properties for selected objects."
+msgstr "Vlastnosti pre zvolené objekty"
+
+#. setting up the membership table
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+msgid "Member Of"
+msgstr "Člen"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
+msgid "Add Properties"
+msgstr "Pridať vlastnosti"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574
 msgid "Add a new key/value pair to all objects"
@@ -5059,10 +5211,9 @@
 
 #. item "Land use/Quarry" text "Name"
-#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
-#: build/trans_presets.java:3109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168
+#: build/trans_presets.java:3121
 msgid "Relations"
 msgstr "Relácie"
@@ -5072,23 +5223,23 @@
 msgstr "Otvoríť zoznam všetkých relácií"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relácie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276
 msgid "Open an editor for the selected relation"
 msgstr "Otvoriť editor pre zvolenú reláciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
 msgid "Delete the selected relation"
 msgstr "Zmazať vybraté relácie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349
 msgid "Create a new relation"
 msgstr "Vytvoriť novú reláciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:373
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1412
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "Vytvoriť kópiu z tejto relácie a otvoriť ju inom editovacom okne"
@@ -5121,5 +5272,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5131,9 +5282,9 @@
 msgstr "Výber: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441
 msgid "Undock the panel"
 msgstr "Uvoľniť panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5142,5 +5293,5 @@
 "lište."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:457
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Kľuknite pre minimalizovanie/maximalizovanie obsahu panelu"
@@ -5206,5 +5357,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr "Upraviť vzťah aktuálne vybraného člena relácie odkazujúceho na"
@@ -5228,5 +5379,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1502
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1370
 msgid "Download relation members"
 msgstr "Stiahnuť členov relácie"
@@ -5257,5 +5408,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -5263,18 +5414,18 @@
 msgstr "Varovanie: ignorujem výnimku pretože úloha bola ukončená. Výnimka: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
 msgid "Tags and Members"
 msgstr "Značky a Členy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:167
 msgid "Parent Relations"
 msgstr "Nadradené vzťahy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
 msgid "Child Relations"
 msgstr "Relácia dieťa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5286,14 +5437,14 @@
 "pokračovať s kruhovou závislosťou?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
 msgid "Remove them, clean up relation"
 msgstr "Odstraňte ich, vyčistite reláciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
 msgid "Ignore them, leave relation as is"
 msgstr "Ignorujte ich, nechajte reláciu tak ako je"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613
 #, java-format
 msgid ""
@@ -5306,9 +5457,9 @@
 "</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
 msgid "Multiple members referring to same primitive"
 msgstr "Viacnásobné členy odkazujú na rovnaké obecné"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid ""
@@ -5320,5 +5471,5 @@
 "odkazy a je preto znechutený.<br>Vynechanie relácie ''{0}''.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
@@ -5326,5 +5477,5 @@
 "Pridať všetky vybrané pôvodné v aktuálnej dátovej sade pred prvým členom"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
@@ -5332,5 +5483,5 @@
 "Pridať všetky vybrané pôvodné v aktuálnej dátovej sade za posledným členom"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5340,5 +5491,5 @@
 "členom"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5348,20 +5499,20 @@
 "členom"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
 msgid "Remove all members referring to one of the selected primitives"
 msgstr "Odstrániť všetky členy odkazujúce na jeden zo selektovaných pôvodných"
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
 msgid "Relation Editor: Remove Selected"
 msgstr "Editor Relácií: Odstrániť Vybrané"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr "Vybrať člena relácie, ktorý sa týka pôvodných v aktuálnom výbere"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849
 #, java-format
 msgid ""
@@ -5371,57 +5522,57 @@
 "Vybrať člena relácie, ktorý odkazuje na {0} pôvodných v aktuálnom výbere"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873
 msgid "Select primitives for selected relation members"
 msgstr "Výber pôvodných pre vybraté členy relácie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:961
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
 msgid "Sort the relation members"
 msgstr "Triedenie členov relácie"
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897
 msgid "Relation Editor: Sort"
 msgstr "Editor Relácií: Triedenie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909
 msgid "Move the currently selected members up"
 msgstr "Pridať všetky zvolené objekty medzi členy"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:979
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:912
 msgid "Relation Editor: Move Up"
 msgstr "Editor Relácií: Posun Hore"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928
 msgid "Move the currently selected members down"
 msgstr "Presunúť zvolenú vrstvu o riadok dolu."
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:998
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:931
 msgid "Relation Editor: Move Down"
 msgstr "Editor Relácií: Posun Dole"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947
 msgid "Remove the currently selected members from this relation"
 msgstr "Odstrániť práve vybraté členy z tejto relácie"
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
 msgid "Relation Editor: Remove"
 msgstr "Editor Relácií: Odstrániť"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
 msgid "Delete the currently edited relation"
 msgstr "Vymazať práve vydanú reláciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Yes, create a conflict and close"
 msgstr "Áno, vyriešiť konflikt a zavrieť"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050
 msgid "No, continue editing"
 msgstr "Nie, pokračovať v editácii"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5433,9 +5584,9 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1058
 msgid "Conflict in data"
 msgstr "Konflikt v dátach"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
 #, java-format
 msgid ""
@@ -5446,56 +5597,41 @@
 "rozhodnite najskôr tento konflikt, potom skúste znovu.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090
 msgid "Apply the current updates"
 msgstr "Použiť súčasnú aktuálizáciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123
 msgid "Apply the updates and close the dialog"
 msgstr "Použiť aktualizácie a zavrieť dialógové okno"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
 msgid "Cancel the updates and close the dialog"
 msgstr "Zrušiť(nepoužiť) aktualizácie a zavrieť dialógové okno"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 msgid "Add an empty tag"
 msgstr "Pridať prázdnu značku"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
-msgid "Delete the currently selected tags"
-msgstr "Vymazať aktuálne vybrané značky"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Stiahnuť všetky nekompletné cesty a uzly v relácii"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 msgid "Download Members"
 msgstr "Stiahnuť členov"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Relation Editor: Download Members"
 msgstr "Editor Relácií: Sťahovanie Členov"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1208
 msgid "Sets a role for the selected members"
 msgstr "Nastavenie funkcie pre vybrané členy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1211
 msgid "Apply Role"
 msgstr "Použiť Funkciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1356
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 #, java-format
 msgid ""
@@ -5508,13 +5644,13 @@
 "</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228
 msgid "Yes, apply it"
 msgstr "Áno, Použiť to"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1229
 msgid "No, don't apply"
 msgstr "Nie, použite to"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1367
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
 msgid "Confirm empty role"
 msgstr "Potvrdiť prázdnu funkciu"
@@ -5550,7 +5686,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:82
-#, fuzzy, java-format
+#, java-format
 msgid "child.getId() >0 expected. Got {1}"
-msgstr "dieťa.id >0 očakávané. Got {1}"
+msgstr "child.getId() >0 očakávaný. Got {1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
@@ -5602,37 +5738,37 @@
 msgstr "Záložky"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:82
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
 msgid "Please enter the desired coordinates first."
 msgstr "Prosím najskôr zadajte požadované koordináty."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
 msgid "Please enter a name for the location."
 msgstr "Prosím zadajte meno pre umiestnenie."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
 msgid "Name of location"
 msgstr "Názov miesta"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:107
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
 msgid "Select a bookmark first."
 msgstr "Najskôr zvoľte záložku"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
 msgid "min lat"
 msgstr "min šírka"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
 msgid "min lon"
 msgstr "min dĺžka"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid "max lat"
 msgstr "max šírka"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
 msgid "max lon"
 msgstr "max dĺžka"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5642,27 +5778,27 @@
 "oblasti)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
 msgid "Bounding Box"
 msgstr "Ohraničujúcí box"
 
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
 msgid "Data Sources and Types"
 msgstr "Zdroje a typy dát"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
 msgid "Download as new layer"
 msgstr "Načítať na novú vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
 msgid "Download Area"
 msgstr "Stiahnuť plochu"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
 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:219
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
 msgid "Download area ok, size probably acceptable to server"
 msgstr "Sťahovaná plocha je v poriadku, veľkosť je akceptovaná serverom"
@@ -5687,7 +5823,7 @@
 msgstr "Zapíšte názov miesta pre vyhľadávanie:"
 
-#. <separator/>
+#. group "Geography"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2759
 msgid "Places"
 msgstr "Miesta"
@@ -5734,21 +5870,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "type"
 msgstr "typ"
@@ -5765,5 +5901,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-#, fuzzy
 msgid ""
 "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
@@ -5771,7 +5906,7 @@
 "Hold left mousebutton and draw a frame."
 msgstr ""
-"<b>Zoom:</b> Koliesko myši, dvojklik alebo Ctrl + Hore/Dole <b>Pohyb mapy:</"
-"b> Podržať pravé tlašítko myši a pohnúť myšou alebo použiť kurzorové "
-"klávesy. <b>Vybrať:</b> Click."
+"<b>Zväčšenie:</b> Kolieskom myši, dvojklik alebo Ctrl + Hore(Up)/Dole(Down) "
+"<b>Posun mapy:</b> Podržať pravé tlačítko myši a pohnúť myšou, alebo použiť "
+"kurzorové klávesy. <b>Výber:</b> Podržať ľavé tlačítko myši a nakresliť rám."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
@@ -6233,4 +6368,6 @@
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
 #. <key key="historic" value="wayside_shrine" />
+#. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
+#. <key key="historic" value="boundary_stone" />
 #. item "Leisure/Water Park" label "Edit Water Park"
 #. <key key="leisure" value="water_park" />
@@ -6602,158 +6739,159 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/trans_presets.java:66 build/trans_presets.java:102
-#: build/trans_presets.java:142 build/trans_presets.java:179
-#: build/trans_presets.java:199 build/trans_presets.java:217
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:272 build/trans_presets.java:305
-#: build/trans_presets.java:351 build/trans_presets.java:371
-#: build/trans_presets.java:386 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:463 build/trans_presets.java:482
-#: build/trans_presets.java:502 build/trans_presets.java:522
-#: build/trans_presets.java:543 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627 build/trans_presets.java:658
-#: build/trans_presets.java:679 build/trans_presets.java:692
-#: build/trans_presets.java:705 build/trans_presets.java:718
-#: build/trans_presets.java:731 build/trans_presets.java:744
-#: build/trans_presets.java:755 build/trans_presets.java:764
-#: build/trans_presets.java:811 build/trans_presets.java:832
-#: build/trans_presets.java:841 build/trans_presets.java:901
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1067 build/trans_presets.java:1075
-#: build/trans_presets.java:1085 build/trans_presets.java:1093
-#: build/trans_presets.java:1098 build/trans_presets.java:1105
-#: build/trans_presets.java:1112 build/trans_presets.java:1117
-#: build/trans_presets.java:1125 build/trans_presets.java:1134
-#: build/trans_presets.java:1140 build/trans_presets.java:1146
-#: build/trans_presets.java:1151 build/trans_presets.java:1157
-#: build/trans_presets.java:1163 build/trans_presets.java:1172
-#: build/trans_presets.java:1181 build/trans_presets.java:1188
-#: build/trans_presets.java:1196 build/trans_presets.java:1209
-#: build/trans_presets.java:1215 build/trans_presets.java:1224
-#: build/trans_presets.java:1230 build/trans_presets.java:1236
-#: build/trans_presets.java:1244 build/trans_presets.java:1299
-#: build/trans_presets.java:1346 build/trans_presets.java:1352
-#: build/trans_presets.java:1358 build/trans_presets.java:1364
-#: build/trans_presets.java:1370 build/trans_presets.java:1381
-#: build/trans_presets.java:1390 build/trans_presets.java:1405
-#: build/trans_presets.java:1412 build/trans_presets.java:1418
-#: build/trans_presets.java:1426 build/trans_presets.java:1433
-#: build/trans_presets.java:1442 build/trans_presets.java:1450
-#: build/trans_presets.java:1457 build/trans_presets.java:1468
-#: build/trans_presets.java:1478 build/trans_presets.java:1488
-#: build/trans_presets.java:1508 build/trans_presets.java:1520
-#: build/trans_presets.java:1531 build/trans_presets.java:1548
-#: build/trans_presets.java:1555 build/trans_presets.java:1570
-#: build/trans_presets.java:1577 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1594
-#: build/trans_presets.java:1599 build/trans_presets.java:1605
-#: build/trans_presets.java:1611 build/trans_presets.java:1619
-#: build/trans_presets.java:1627 build/trans_presets.java:1635
-#: build/trans_presets.java:1642 build/trans_presets.java:1648
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1670 build/trans_presets.java:1677
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1712 build/trans_presets.java:1719
-#: build/trans_presets.java:1736 build/trans_presets.java:1744
-#: build/trans_presets.java:1759 build/trans_presets.java:1769
-#: build/trans_presets.java:1781 build/trans_presets.java:1788
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:1809 build/trans_presets.java:1817
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1841
-#: build/trans_presets.java:1846 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1864
-#: build/trans_presets.java:1872 build/trans_presets.java:1881
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1908 build/trans_presets.java:1914
-#: build/trans_presets.java:1922 build/trans_presets.java:1928
-#: build/trans_presets.java:1934 build/trans_presets.java:1940
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2013
-#: build/trans_presets.java:2022 build/trans_presets.java:2030
-#: build/trans_presets.java:2036 build/trans_presets.java:2042
-#: build/trans_presets.java:2048 build/trans_presets.java:2054
-#: build/trans_presets.java:2060 build/trans_presets.java:2066
-#: build/trans_presets.java:2072 build/trans_presets.java:2078
-#: build/trans_presets.java:2084 build/trans_presets.java:2090
-#: build/trans_presets.java:2096 build/trans_presets.java:2102
-#: build/trans_presets.java:2108 build/trans_presets.java:2114
-#: build/trans_presets.java:2120 build/trans_presets.java:2126
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2158
-#: build/trans_presets.java:2165 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2186
-#: build/trans_presets.java:2192 build/trans_presets.java:2198
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2218 build/trans_presets.java:2225
-#: build/trans_presets.java:2232 build/trans_presets.java:2239
-#: build/trans_presets.java:2247 build/trans_presets.java:2279
-#: build/trans_presets.java:2284 build/trans_presets.java:2289
-#: build/trans_presets.java:2294 build/trans_presets.java:2300
-#: build/trans_presets.java:2306 build/trans_presets.java:2312
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2354
-#: build/trans_presets.java:2451 build/trans_presets.java:2458
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2485 build/trans_presets.java:2492
-#: build/trans_presets.java:2498 build/trans_presets.java:2504
-#: build/trans_presets.java:2526 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2553 build/trans_presets.java:2559
-#: build/trans_presets.java:2565 build/trans_presets.java:2571
-#: build/trans_presets.java:2577 build/trans_presets.java:2583
-#: build/trans_presets.java:2590 build/trans_presets.java:2597
-#: build/trans_presets.java:2604 build/trans_presets.java:2610
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2661
-#: build/trans_presets.java:2667 build/trans_presets.java:2677
-#: build/trans_presets.java:2686 build/trans_presets.java:2701
-#: build/trans_presets.java:2707 build/trans_presets.java:2715
-#: build/trans_presets.java:2722 build/trans_presets.java:2742
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2783
-#: build/trans_presets.java:2790 build/trans_presets.java:2797
-#: build/trans_presets.java:2803 build/trans_presets.java:2809
-#: build/trans_presets.java:2817 build/trans_presets.java:2824
-#: build/trans_presets.java:2831 build/trans_presets.java:2838
-#: build/trans_presets.java:2844 build/trans_presets.java:2851
-#: build/trans_presets.java:2858 build/trans_presets.java:2867
-#: build/trans_presets.java:2873 build/trans_presets.java:2879
-#: build/trans_presets.java:2885 build/trans_presets.java:2891
-#: build/trans_presets.java:2900 build/trans_presets.java:2910
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2948
-#: build/trans_presets.java:2957 build/trans_presets.java:2963
-#: build/trans_presets.java:2969 build/trans_presets.java:2975
-#: build/trans_presets.java:2981 build/trans_presets.java:2987
-#: build/trans_presets.java:2993 build/trans_presets.java:3000
-#: build/trans_presets.java:3006 build/trans_presets.java:3011
-#: build/trans_presets.java:3018 build/trans_presets.java:3025
-#: build/trans_presets.java:3031 build/trans_presets.java:3040
-#: build/trans_presets.java:3048 build/trans_presets.java:3054
-#: build/trans_presets.java:3060 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3080
-#: build/trans_presets.java:3086 build/trans_presets.java:3092
-#: build/trans_presets.java:3098 build/trans_presets.java:3104
-#: build/trans_presets.java:3117 build/trans_presets.java:3131
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:67 build/trans_presets.java:103
+#: build/trans_presets.java:143 build/trans_presets.java:180
+#: build/trans_presets.java:200 build/trans_presets.java:218
+#: build/trans_presets.java:235 build/trans_presets.java:253
+#: build/trans_presets.java:273 build/trans_presets.java:306
+#: build/trans_presets.java:352 build/trans_presets.java:372
+#: build/trans_presets.java:387 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:503 build/trans_presets.java:523
+#: build/trans_presets.java:544 build/trans_presets.java:565
+#: build/trans_presets.java:586 build/trans_presets.java:607
+#: build/trans_presets.java:628 build/trans_presets.java:659
+#: build/trans_presets.java:680 build/trans_presets.java:693
+#: build/trans_presets.java:706 build/trans_presets.java:719
+#: build/trans_presets.java:732 build/trans_presets.java:745
+#: build/trans_presets.java:756 build/trans_presets.java:765
+#: build/trans_presets.java:812 build/trans_presets.java:833
+#: build/trans_presets.java:842 build/trans_presets.java:902
+#: build/trans_presets.java:1053 build/trans_presets.java:1061
+#: build/trans_presets.java:1069 build/trans_presets.java:1077
+#: build/trans_presets.java:1087 build/trans_presets.java:1095
+#: build/trans_presets.java:1100 build/trans_presets.java:1107
+#: build/trans_presets.java:1114 build/trans_presets.java:1119
+#: build/trans_presets.java:1127 build/trans_presets.java:1136
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1153 build/trans_presets.java:1159
+#: build/trans_presets.java:1165 build/trans_presets.java:1174
+#: build/trans_presets.java:1183 build/trans_presets.java:1190
+#: build/trans_presets.java:1198 build/trans_presets.java:1211
+#: build/trans_presets.java:1217 build/trans_presets.java:1226
+#: build/trans_presets.java:1232 build/trans_presets.java:1238
+#: build/trans_presets.java:1246 build/trans_presets.java:1302
+#: build/trans_presets.java:1349 build/trans_presets.java:1355
+#: build/trans_presets.java:1361 build/trans_presets.java:1367
+#: build/trans_presets.java:1373 build/trans_presets.java:1384
+#: build/trans_presets.java:1393 build/trans_presets.java:1408
+#: build/trans_presets.java:1415 build/trans_presets.java:1421
+#: build/trans_presets.java:1429 build/trans_presets.java:1436
+#: build/trans_presets.java:1445 build/trans_presets.java:1453
+#: build/trans_presets.java:1460 build/trans_presets.java:1471
+#: build/trans_presets.java:1481 build/trans_presets.java:1491
+#: build/trans_presets.java:1511 build/trans_presets.java:1523
+#: build/trans_presets.java:1534 build/trans_presets.java:1551
+#: build/trans_presets.java:1558 build/trans_presets.java:1574
+#: build/trans_presets.java:1581 build/trans_presets.java:1586
+#: build/trans_presets.java:1592 build/trans_presets.java:1598
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1646 build/trans_presets.java:1652
+#: build/trans_presets.java:1659 build/trans_presets.java:1666
+#: build/trans_presets.java:1674 build/trans_presets.java:1681
+#: build/trans_presets.java:1689 build/trans_presets.java:1696
+#: build/trans_presets.java:1702 build/trans_presets.java:1709
+#: build/trans_presets.java:1716 build/trans_presets.java:1723
+#: build/trans_presets.java:1740 build/trans_presets.java:1748
+#: build/trans_presets.java:1763 build/trans_presets.java:1773
+#: build/trans_presets.java:1785 build/trans_presets.java:1792
+#: build/trans_presets.java:1798 build/trans_presets.java:1808
+#: build/trans_presets.java:1813 build/trans_presets.java:1821
+#: build/trans_presets.java:1828 build/trans_presets.java:1834
+#: build/trans_presets.java:1840 build/trans_presets.java:1845
+#: build/trans_presets.java:1850 build/trans_presets.java:1855
+#: build/trans_presets.java:1862 build/trans_presets.java:1868
+#: build/trans_presets.java:1873 build/trans_presets.java:1882
+#: build/trans_presets.java:1891 build/trans_presets.java:1900
+#: build/trans_presets.java:1909 build/trans_presets.java:1918
+#: build/trans_presets.java:1924 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 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:2023 build/trans_presets.java:2032
+#: build/trans_presets.java:2040 build/trans_presets.java:2046
+#: build/trans_presets.java:2052 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 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:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2150
+#: build/trans_presets.java:2156 build/trans_presets.java:2162
+#: build/trans_presets.java:2169 build/trans_presets.java:2176
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2197 build/trans_presets.java:2203
+#: build/trans_presets.java:2209 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2229
+#: build/trans_presets.java:2236 build/trans_presets.java:2243
+#: build/trans_presets.java:2250 build/trans_presets.java:2258
+#: build/trans_presets.java:2290 build/trans_presets.java:2295
+#: build/trans_presets.java:2300 build/trans_presets.java:2305
+#: build/trans_presets.java:2311 build/trans_presets.java:2317
+#: build/trans_presets.java:2323 build/trans_presets.java:2331
+#: build/trans_presets.java:2337 build/trans_presets.java:2343
+#: build/trans_presets.java:2349 build/trans_presets.java:2355
+#: build/trans_presets.java:2365 build/trans_presets.java:2462
+#: build/trans_presets.java:2469 build/trans_presets.java:2483
+#: build/trans_presets.java:2489 build/trans_presets.java:2496
+#: build/trans_presets.java:2503 build/trans_presets.java:2509
+#: build/trans_presets.java:2515 build/trans_presets.java:2537
+#: build/trans_presets.java:2544 build/trans_presets.java:2551
+#: build/trans_presets.java:2557 build/trans_presets.java:2564
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2594 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2615
+#: build/trans_presets.java:2621 build/trans_presets.java:2627
+#: build/trans_presets.java:2633 build/trans_presets.java:2639
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2672 build/trans_presets.java:2678
+#: build/trans_presets.java:2688 build/trans_presets.java:2697
+#: build/trans_presets.java:2712 build/trans_presets.java:2718
+#: build/trans_presets.java:2726 build/trans_presets.java:2733
+#: build/trans_presets.java:2753 build/trans_presets.java:2764
+#: build/trans_presets.java:2770 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2788
+#: build/trans_presets.java:2795 build/trans_presets.java:2802
+#: build/trans_presets.java:2809 build/trans_presets.java:2815
+#: build/trans_presets.java:2821 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2912
+#: build/trans_presets.java:2922 build/trans_presets.java:2931
+#: build/trans_presets.java:2937 build/trans_presets.java:2943
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 build/trans_presets.java:2981
+#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:2999 build/trans_presets.java:3005
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3023 build/trans_presets.java:3030
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3066 build/trans_presets.java:3072
+#: build/trans_presets.java:3079 build/trans_presets.java:3085
+#: build/trans_presets.java:3092 build/trans_presets.java:3098
+#: build/trans_presets.java:3104 build/trans_presets.java:3110
+#: build/trans_presets.java:3116 build/trans_presets.java:3129
+#: build/trans_presets.java:3143 build/trans_presets.java:3157
 msgid "Name"
 msgstr "Názov"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:50
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by "
@@ -6761,5 +6899,5 @@
 msgstr ""
 "<html>Verzia <strong>{0}</strong> vytvorená na <strong>{1}</strong> s "
-"<strong>{2}</strong> v súbore zmien <strong>{3}</strong>"
+"<strong>{2}</strong> v zmenovej sade <strong>{3}</strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:118
@@ -6785,7 +6923,61 @@
 msgstr "Verzia"
 
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
+#, fuzzy
+msgid "Changeset id:"
+msgstr "Info súboru zmien"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
+#, fuzzy
+msgid "Created at:"
+msgstr "Vytvoriť plochy"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
+#, fuzzy
+msgid "Changeset comment:"
+msgstr "Info súboru zmien"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
+msgid "No open changeset"
+msgstr "Neotvárajte súbor zmien"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48
+#, fuzzy
+msgid "<html>Please select the changesets you want to close</html>"
+msgstr "Prosím vyberte, ktoré zmenené vlastnosti chcete použiť."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
+#, fuzzy
+msgid "Open changesets"
+msgstr "Neotvárajte súbor zmien"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101
+#, fuzzy
+msgid "Close changesets"
+msgstr "Zatváranie súboru zmien"
+
+#. putValue(SMALL_ICON, ImageProvider.get("cancel"));
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
+#, fuzzy
+msgid "Close the selected open changesets"
+msgstr "Zatváram aktuálny súbor zmien ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126
+#, fuzzy
+msgid "Cancel closeing of changesets"
+msgstr "Zatváranie súboru zmien"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37
+msgid "Closing changeset"
+msgstr "Zatváranie súboru zmien"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77
+#, fuzzy, java-format
+msgid "Closing changeset {0}"
+msgstr "Zatváranie súboru zmien {0}..."
+
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
 msgid "Launch a file chooser to select a file"
-msgstr ""
+msgstr "Založiť (Launch) súbor podľa vyberajúcej osoby pre výber súboru"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:148
@@ -6806,26 +6998,28 @@
 #, java-format
 msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
-msgstr ""
+msgstr "Vrstva ''{0}'' obsahuje zmeny ktoré, by mali byť nahraté na server."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50
-#, java-format
-msgid "Layer ''{0}'' has no modifications to be uploaded"
-msgstr ""
+#, fuzzy, java-format
+msgid "Layer ''{0}'' has no modifications to be uploaded."
+msgstr "Vrstva ''{0}'' neobsahuje zmeny ktoré, by mali byť nahraté"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:61
-#, java-format
-msgid ""
-"Layer ''{0}'' has modifications which should be saved to its assoicated file "
+#, fuzzy, java-format
+msgid ""
+"Layer ''{0}'' has modifications which should be saved to its associated file "
 "''{1}''."
 msgstr ""
+"Vrstva ''{0}'' obsahuje zmeny ktoré, by mali byť nahraté do ich pridruženého "
+"súboru ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63
-#, java-format
-msgid "Layer ''{0}'' has no modifications to be saved"
-msgstr ""
+#, fuzzy, java-format
+msgid "Layer ''{0}'' has no modifications to be saved."
+msgstr "Vrstva ''{0}'' neobsahuje zmeny ktoré, by mali byť uložené"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:81
 msgid "No file associated with this layer"
-msgstr ""
+msgstr "Žiadny súbor nie je pridružený k tejto vrstve"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:84
@@ -6841,5 +7035,5 @@
 #, java-format
 msgid "File ''{0}'' is not writable. Please enter another file name."
-msgstr ""
+msgstr "Súbor ''{0}'' nie je zapisovateľný. Prosím zvoľte iné meno súboru."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:110
@@ -6847,24 +7041,24 @@
 #, java-format
 msgid "Select to upload layer ''{0}'' to the server ''{1}''"
-msgstr ""
+msgstr "Výber pre nahratie vrstvy ''{0}'' na server ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java:49
 #, java-format
 msgid "Saving layer to ''{0}'' ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114
+msgstr "Uložiť vrstvu do ''{0}'' ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113
 msgid "Unsaved changes - Save/Upload before exiting?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120
+msgstr "Neuložené zmeny - Uložiť/Nahrať pred ukončením?"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119
 msgid "Unsaved changes - Save/Upload before deleting?"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140
+msgstr "Neuložené zmeny - Uložiť/Nahrať pred zmazaním?"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139
 msgid "Uploading and saving modified layers ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195
+msgstr "Nahrávam a ukladám zmenené vrstvy ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194
 #, java-format
 msgid ""
@@ -6875,12 +7069,18 @@
 "discard the modifications.<br>Layers with conflicts:</html>"
 msgstr[0] ""
+"<html>{0} vrstvy majú nevyriešené konflikty.<br>Najskôr ich vyriešte, alebo "
+"zrušte zmeny.<br>Vrstvy s konfliktami:</html>"
 msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
-#, fuzzy
+"<html>{0} vrstva má nevyriešené konflikty.<br>Najskôr ich vyriešte, alebo "
+"zrušte zmeny.<br>Vrstva s konfliktami:</html>"
+msgstr[2] ""
+"<html>{0} vrstiev má nevyriešené konflikty.<br>Najskôr ich vyriešte, alebo "
+"zrušte zmeny.<br>Vrstiev s konfliktami:</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205
 msgid "Unsaved data and conflicts"
-msgstr "Rozhodnutie konfliktov"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
+msgstr "Neuložené dáta a konflikty"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212
 #, java-format
 msgid ""
@@ -6892,11 +7092,21 @@
 "html>"
 msgstr[0] ""
+"<html>{0} vrstvy sa musia uložiť, pretože nemajú pričlenené súbory."
+"<br>Najskôr vyberte súbory pre tieto vrstvy, alebo zrušte zmeny.<br>Vrstvy "
+"bez súborov:</html>"
 msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
+"<html>{0} vrstva sa musí uložiť, pretože nemá  pričlenený súbor.<br>Najskôr "
+"vyberte súbor pre túto vrstvu, alebo zrušte zmeny.<br>Vrstva bez súboru:</"
+"html>"
+msgstr[2] ""
+"<html>{0} vrstiev sa musí uložiť, pretože nemajú pričlenené súbory."
+"<br>Najskôr vyberte súbory pre tieto vrstvy, alebo zrušte zmeny.<br>Vrstvy "
+"bez súborov:</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223
 msgid "Unsaved data and missing associated file"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
+msgstr "Neuložené dáta a stratený pričlenený súbor"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230
 #, java-format
 msgid ""
@@ -6909,53 +7119,64 @@
 "changes.<br>Layers with non-writable files:</html>"
 msgstr[0] ""
+"<html>{0} vrstvy potrebujú uloženie, ale majú pridružené súbory<br>ktoré nie "
+"sú zapisovateľné.<br>Najskôr vyberte iné súbory pre tieto vrstvy, alebo "
+"zrušte zmeny pre tieto vrstvy.<br>Vrstvy s nezapisovateľnými súbormi:</html>"
 msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
-#, fuzzy
+"<html>{0} vrstva potrebuje uloženie, ale má pridružený súbor<br>ktorý nie je "
+"zapisovateľný.<br>Najskôr vyberte iný súbor pre túto vrstvu, alebo zrušte "
+"zmeny pre túto vrstvu.<br>Vrstva s nezapisovateľným súborom:</html>"
+msgstr[2] ""
+"<html>{0} vrstiev potrebuje uloženie, ale majú pridružené súbory<br>ktoré "
+"nie sú zapisovateľné.<br>Najskôr vyberte iné súbory pre tieto vrstvy, alebo "
+"zrušte zmeny pre tieto vrstvy.<br>Vrstvy s nezapisovateľnými súbormi:</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243
 msgid "Unsaved data non-writable files"
-msgstr "Použite východzie značky ignorovaného súboru."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286
+msgstr "Neuložené dáta nezapisovateľných súborov"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
 msgid "Close this dialog and resume editing in JOSM"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318
+msgstr "Zavrieť tento dialóg a pokračovať v editácii v JOSMe"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
-msgstr ""
+msgstr "Ukončiť JOSM bez uloženia. Neuložené zmeny budú stratené."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322
+msgid "Discard and Delete"
+msgstr "Zrušiť a Vymazať"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
-msgid "Discard and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
 msgid "Delete layers without saving. Unsaved changes are lost."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350
+msgstr "Vymazať vrstvy bez uloženia. Neuložený zmeny budú staratené."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
-msgstr ""
+msgstr "Ukončiť JOSM s uložením. Neuložené zmeny budú nahrané a/alebo uložené"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354
+msgid "Save and Delete"
+msgstr "Uložiť a Vymazať"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
-msgid "Save and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
 msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403
+msgstr "Uložiť/Nahrať vrstvy pred vymazaním. Neuložené zmeny nebudú stratené."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402
 #, java-format
 msgid "Preparing layer ''{0}'' for upload ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482
+msgstr "Pripravujem vrstvu ''{0}'' pre nahrávanie ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
 "cancelled or has been failed.</html>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492
+"<html>Nejaká nahrávacia a/alebo ukladacia operácia s vrstvou s "
+"úpravami<br>bola zrušená, alebo bola neúspešná.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491
 msgid "Incomplete upload and/or save"
-msgstr ""
+msgstr "Neúplné nahratie a/alebo uloženie"
 
 #. item "Streets/Motorway" text "Name"
@@ -6993,21 +7214,21 @@
 #. item "Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:200
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:278
-#: build/trans_presets.java:311 build/trans_presets.java:357
-#: build/trans_presets.java:372 build/trans_presets.java:387
-#: build/trans_presets.java:409 build/trans_presets.java:429
-#: build/trans_presets.java:450 build/trans_presets.java:470
-#: build/trans_presets.java:489 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:549
-#: build/trans_presets.java:570 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:633
-#: build/trans_presets.java:664 build/trans_presets.java:1060
-#: build/trans_presets.java:1068 build/trans_presets.java:1076
-#: build/trans_presets.java:1086 build/trans_presets.java:1305
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:242
+#: build/trans_presets.java:260 build/trans_presets.java:279
+#: build/trans_presets.java:312 build/trans_presets.java:358
+#: build/trans_presets.java:373 build/trans_presets.java:388
+#: build/trans_presets.java:410 build/trans_presets.java:430
+#: build/trans_presets.java:451 build/trans_presets.java:471
+#: build/trans_presets.java:490 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:665 build/trans_presets.java:1062
+#: build/trans_presets.java:1070 build/trans_presets.java:1078
+#: build/trans_presets.java:1088 build/trans_presets.java:1308
 msgid "Layer"
 msgstr "Vrstva"
@@ -7015,84 +7236,43 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:29
 msgid "Should upload?"
-msgstr ""
+msgstr "Mali by ste nahrávať?"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:37
 msgid "Should save?"
-msgstr ""
+msgstr "Mali by ste uložiť?"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:45
 msgid "Filename"
-msgstr ""
+msgstr "Meno súboru"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:200
 msgid "Upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-msgid "Use a new changeset and close it"
-msgstr "Použite nový súbor zmien a zatvorte ho"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
-msgid ""
-"Select to upload the data using a new changeset and to close the changeset "
-"after the upload"
-msgstr ""
-"Výber pre nahrávanie dát použije nový súbor zmien a zatvorí súbor zmien po "
-"nahratí"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
-msgid "Use a new changeset and leave it open"
-msgstr "Použiť nový súbor zmien a nechať to otvoriť"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
-msgid ""
-"Select to upload the data using a new changeset and to leave the changeset "
-"open after the upload"
-msgstr ""
-"Vybrať pre nahratie používaných dát nový súbor zmien a nechať súbor zmien "
-"otvorený aj po nahratí"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
-msgid "Upload to a new or to an existing changeset?"
-msgstr "Nahrať do nového, alebo existujúceho súboru zmien?"
+msgstr "Nahrať"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
-msgid "upload all changes in one request"
-msgstr "nahrať všetky zmeny v jednej požiadavke"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
-msgid ""
-"Enable to upload all changes in one request, disable to use one request per "
-"changed primitive"
-msgstr ""
-"Umožniť nahranie všetkých zmien v jednej požiadavke, vypnúť použitie jednej "
-"požiadavky na zmenené pôvodné"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171
-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/gui/io/UploadDialog.java:216
 msgid "Settings"
 msgstr "Nastavenia"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908
 msgid "Tags of new changeset"
 msgstr "Značky pre nový súbor zmien"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:221
 msgid "Objects to add:"
 msgstr "Pridané objekty:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:227
 msgid "Objects to modify:"
 msgstr "Upravené objekty:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:233
 msgid "Objects to delete:"
 msgstr "Odstránené objekty:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
 #, java-format
 msgid "{0} object to add:"
@@ -7102,5 +7282,5 @@
 msgstr[2] "{0} pridaných objektov:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:277
 #, java-format
 msgid "{0} object to modifiy:"
@@ -7110,5 +7290,5 @@
 msgstr[2] "{0} upravených objektov:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:286
 #, java-format
 msgid "{0} object to delete:"
@@ -7118,63 +7298,99 @@
 msgstr[2] "{0} zmazaných objektov:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422
-#, java-format
-msgid "Use the existing changeset {0} and close it after upload"
-msgstr "Použite existujúci súbor zmien {0} a zavrite ho po nahratí"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:423
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to close the changeset "
-"after this upload"
-msgstr ""
-"Vybrať pre nahratie existujúci súbor zmien {0} a zavrite súbor zmien po "
-"tomto nahratí"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426
-#, java-format
-msgid "Use the existing changeset {0} and leave it open"
-msgstr "Použite existujúci súbor zmien {0} a nechajte ho otvorený"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:427
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to leave the changeset "
-"open for further uploads"
-msgstr ""
-"Vybrať nahratie do existujúceho súboru zmien {0} a ponechať súbor zmien "
-"otvorený pre ďalšie nahratia"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:470
+msgid "Upload Changes"
+msgstr "Nahrať zmeny"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472
+msgid "Upload the changed primitives"
+msgstr "Nahrať zmenené pôvodné"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
+msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+msgstr "Prosím zapíšte poznámku pre toto nahratie zmenovej sady (min. 3 znaky)"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:479
+msgid "Illegal upload comment"
+msgstr "Neplatná poznámka nahrávania"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
+msgid "Cancel the upload and resume editing"
+msgstr "Zrušiť nahrávanie a pokračovať v editácii"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606
+#, fuzzy
+msgid "Upload all changes in one request"
+msgstr "nahrať všetky zmeny v jednej požiadavke"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607
+msgid ""
+"Enable to upload all changes in one request, disable to use one request per "
+"changed primitive"
+msgstr ""
+"Umožniť nahranie všetkých zmien v jednej požiadavke, vypnúť použitie jednej "
+"požiadavky na zmenené pôvodné"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:617
+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/gui/io/UploadDialog.java:672
+#, fuzzy
+msgid "Open a new changeset"
+msgstr "Značky pre nový súbor zmien"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
+#, fuzzy
+msgid "Open a new changeset and use it in the next upload"
+msgstr "Použiť nový súbor zmien a nechať to otvoriť"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
+#, fuzzy
+msgid "Use an open changeset"
+msgstr "Neotvárajte súbor zmien"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
+#, fuzzy
+msgid "Upload data to an already opened changeset"
+msgstr "Nahrať do nového, alebo existujúceho súboru zmien?"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
+#, fuzzy
+msgid "Close changeset after upload"
+msgstr "Žiadne zmeny pre uloženie."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
+#, fuzzy
+msgid "Select to close the changeset after the next upload"
+msgstr ""
+"Výber pre nahrávanie dát použije nový súbor zmien a zatvorí súbor zmien po "
+"nahratí"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922
 #, java-format
 msgid "Tags of changeset {0}"
 msgstr "Značky zo súboru zmien {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584
-msgid "Upload Changes"
-msgstr "Nahrať zmeny"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
 #, fuzzy
-msgid "Upload the changed primitives"
-msgstr "Uložiť tieto úpravy?"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592
+msgid "Load the list of your open changesets from the server"
+msgstr "Načítať históriu zo serveru"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
 #, fuzzy
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "Prosím zadajte meno pre umiestnenie."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:593
-msgid "Illegal upload comment"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
-#, fuzzy
-msgid "Cancel the upload and resume editing"
-msgstr "Zrušiť(nepoužiť) aktualizácie a zavrieť dialógové okno"
+msgid "Close the currently selected open changeset"
+msgstr "Vymazať aktuálne vybrané značky"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
+#, fuzzy, java-format
+msgid "changeset id > 0 expected. Got {1}"
+msgstr "child.getId() >0 očakávaný. Got {1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63
 msgid "Preparing primitives to upload ..."
-msgstr ""
+msgstr "Pripravujem pôvodné na nahratie ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:277
@@ -7249,5 +7465,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
@@ -7285,5 +7501,5 @@
 msgstr "Zadaný čas nemôže byť rozparsovaný"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
@@ -7291,30 +7507,30 @@
 msgstr "gps poloha bodu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
 msgid "Customize line drawing"
 msgstr "Prispôsobiť kresliacu trasu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
 msgid "Use global settings."
 msgstr "Použíť globálne nastavenie."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Draw lines between points for this layer."
 msgstr "Kresliť spojnice medzi bodmi v tejto vrstve"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Do not draw lines between points for this layer."
 msgstr "Nekresliť spojnice mezi bodmi v tejto vrstve"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 msgid "Select line drawing options"
 msgstr "Výber nastavenia kreslenej čiary"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7322,5 +7538,5 @@
 msgstr "Prispôsobiť farbu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7329,5 +7545,5 @@
 msgstr "Predvolené"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7336,39 +7552,76 @@
 msgstr "Zvoľte farbu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
 msgid "Markers From Named Points"
 msgstr "Značky z pomenovaných bodov"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Pomenovanie trackpoints od {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
 msgid "Import Audio"
 msgstr "Importovať zvuk"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave Audiosúbory (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Zukové značky z {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
 msgid "Import images"
 msgstr "Importovať obrázky"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#, java-format
+msgid "Name: {0}"
+msgstr "Meno: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#, java-format
+msgid "Description: {0}"
+msgstr "Popis: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#, fuzzy, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
 msgstr[0] "{0} stopa(track), "
 msgstr[1] "{0} stopy(track), "
 msgstr[2] "{0} stôp(track), "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
+#: build/trans_presets.java:3160
+msgid "Description"
+msgstr "Popis"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#, fuzzy
+msgid "Timespan"
+msgstr "Časové rozpätie: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#, fuzzy
+msgid "Length"
+msgstr "Dĺžka: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
+msgid "URL"
+msgstr "URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+msgid "Length: "
+msgstr "Dĺžka: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
 #, java-format
 msgid "{0} route, "
@@ -7378,5 +7631,5 @@
 msgstr[2] "{0} trás, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 #, java-format
 msgid "{0} waypoint"
@@ -7386,29 +7639,10 @@
 msgstr[2] "{0} waypointov (bodov cesty)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
-#, java-format
-msgid "Name: {0}"
-msgstr "Meno: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
-#, java-format
-msgid "Description: {0}"
-msgstr "Popis: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
-msgid "Timespan: "
-msgstr "Časové rozpätie: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
-msgid "Length: "
-msgstr "Dĺžka: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Konvertovať do dátovej vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7418,10 +7652,10 @@
 "chcete nahrať stopy (traces), pozrite sem:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -7432,29 +7666,29 @@
 msgstr "Prevedené z: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
 msgid "Download from OSM along this track"
 msgstr "Stiahnuť z OSM okolie tejto stopy (track)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
 msgid "Download everything within:"
 msgstr "Stiahnuť všetko vo vnútry:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metrov"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 msgid "Maximum area per request:"
 msgstr "Maximálna plocha na požiadavku:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} štvorcových km"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
 #, java-format
 msgid ""
@@ -7465,13 +7699,13 @@
 "<br>Chcete pokračovať?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
 msgid "Download data"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+msgstr "Sťahujem dáta"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
 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:1143
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7481,5 +7715,5 @@
 "alebo za koncom, boli vynechané, alebo presunuté na začiatok."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7532,30 +7766,29 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
-#, fuzzy
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
 "<br>If you want to upload traces, look here:</html>"
 msgstr ""
-"<html>Nahrať nespracované GPS dáta, ako mapové dáta je nežiadúce.<br>K "
-"chcete nahrať stopy (traces), pozrite sem:"
+"<html>Nahrať z nerozdelených GPS dát ako mapových dát je nepremyslene "
+"závadné.<br>Ak chcete nahrať stopy, pozrite sem:</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "track"
 msgid_plural "tracks"
@@ -7702,4 +7935,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
@@ -7939,13 +8173,18 @@
 msgstr "Kresliť väčšie GPS body"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+msgid "Draw a circle form HDOP value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Rýchlosť (červená = pomaly, zelená = rýchlo)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "Hustota pozícií (červená = vysoká, zelená = nízka, ak je dostupná)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Jedna farba (môže byť prispôsobená pre pomenované vrstvy)"
@@ -7953,6 +8192,6 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1374
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:1377
 msgid "Car"
 msgstr "Vozidlo"
@@ -7973,14 +8212,14 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:324 build/trans_presets.java:650
-#: build/trans_presets.java:857 build/trans_presets.java:876
-#: build/trans_presets.java:890 build/trans_presets.java:912
-#: build/trans_presets.java:949 build/trans_presets.java:962
-#: build/trans_presets.java:974 build/trans_presets.java:986
-#: build/trans_presets.java:998 build/trans_presets.java:1010
-#: build/trans_presets.java:1020 build/trans_presets.java:1029
-#: build/trans_presets.java:1038 build/trans_presets.java:1437
-#: build/trans_presets.java:1510
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:325 build/trans_presets.java:651
+#: build/trans_presets.java:858 build/trans_presets.java:877
+#: build/trans_presets.java:891 build/trans_presets.java:913
+#: build/trans_presets.java:950 build/trans_presets.java:963
+#: build/trans_presets.java:975 build/trans_presets.java:987
+#: build/trans_presets.java:999 build/trans_presets.java:1011
+#: build/trans_presets.java:1021 build/trans_presets.java:1030
+#: build/trans_presets.java:1039 build/trans_presets.java:1440
+#: build/trans_presets.java:1513
 msgid "Bicycle"
 msgstr "Bicykel"
@@ -8013,62 +8252,62 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:325 build/trans_presets.java:649
-#: build/trans_presets.java:856 build/trans_presets.java:875
-#: build/trans_presets.java:889 build/trans_presets.java:911
-#: build/trans_presets.java:948 build/trans_presets.java:961
-#: build/trans_presets.java:973 build/trans_presets.java:985
-#: build/trans_presets.java:997 build/trans_presets.java:1009
-#: build/trans_presets.java:1019 build/trans_presets.java:1028
-#: build/trans_presets.java:1037
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:326 build/trans_presets.java:650
+#: build/trans_presets.java:857 build/trans_presets.java:876
+#: build/trans_presets.java:890 build/trans_presets.java:912
+#: build/trans_presets.java:949 build/trans_presets.java:962
+#: build/trans_presets.java:974 build/trans_presets.java:986
+#: build/trans_presets.java:998 build/trans_presets.java:1010
+#: build/trans_presets.java:1020 build/trans_presets.java:1029
+#: build/trans_presets.java:1038
 msgid "Foot"
 msgstr "Pešo"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Kresliť šípky v smere jazdy"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Rýchle vykresľovanie (vypadá nepekne)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Iba dôležité smery (napr. jednosmerka)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Only on the head of a way."
 msgstr "Iba na začiatku cesty."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Vykresliť segmenty s poradovými číslami"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Vykresliť ohraničujúci box stiahnutých dát"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Vykresľovať virtuálne body v mode výberu"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Vykresľovať neaktívne vrstvy v iných farbách"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Vyhladené mapy (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:82
 msgid "Draw lines between raw GPS points"
 msgstr "Kresliť čiary medzi raw GPS bodmi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -8078,9 +8317,9 @@
 "pre kresbu všetkých čiar."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
 msgid "Maximum length for local files (meters)"
 msgstr "Maximálna dĺžka pre lokálne súbory (v metroch)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
@@ -8089,10 +8328,10 @@
 "kreslenie všetkých línií."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length (meters)"
 msgstr "Maximálna dĺžka (metrov)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -8101,10 +8340,10 @@
 "čiarach."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:129
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Kresliť smerové šípky pre línie, ktoré spájajú GPS body."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:135
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -8113,5 +8352,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:141
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -8119,13 +8358,13 @@
 msgstr "Nekreslite šípky ak sa nezmestí do tohoto rozmedzia."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:144
 msgid "Minimum distance (pixels)"
 msgstr "Minimálna vzdialenosť (pixelov)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Draw larger dots for the GPS points."
 msgstr "Zobrazovať väčšie bodky pre GPS body."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -8135,9 +8374,9 @@
 "v  manažéri vrstiev."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Colors points and track segments by velocity."
 msgstr "Farby bodov traťových segmentov podľa rýchlosti."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -8147,5 +8386,5 @@
 "nahrávacie zariadenie potrebuje pre záznam túto informáciu."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
@@ -8153,23 +8392,23 @@
 "rýchlostí."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid "Track and Point Coloring"
 msgstr "Farebná trať a body"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202
 msgid "GPS Points"
 msgstr "GPS body"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "Draw direction hints for way segments."
 msgstr "Kresliť smer cestného segmentu"
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:237
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Kresliť poradové čísla všetkých segmentov v rámci cesty."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
@@ -8177,19 +8416,19 @@
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Zobrazovať hranice dát stiahnutých zo servera."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Kresliť virtuálne body v režme výberu, pre zjednodušenie modifikácie."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257
 msgid "Draw the inactive data layers in a different color."
 msgstr "Zobrazovať neaktívne vrstvy dát inou farbou."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "OSM Data"
 msgstr "OSM údaje"
@@ -8217,5 +8456,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:40
 msgid "Show localized name in selection lists"
-msgstr ""
+msgstr "Ukáž lokalizovaný názov vo vybratom zozname"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:41
@@ -8231,5 +8470,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:89
 msgid "Show localized name in selection lists, if available"
-msgstr ""
+msgstr "Ukáž lokalizovaný názov vo vybratom zozname, ak je dostupný"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/LafPreference.java:97
@@ -8268,45 +8507,46 @@
 msgstr "Použitý štýl"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Configure available plugins."
 msgstr "Nastavenie dostupných pluginov."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50
+#. buttons at the bottom
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
 msgid "Download List"
 msgstr "Stiahnuť zoznam"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:100
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 msgid "Update"
 msgstr "Aktualizovať"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Configure Sites..."
 msgstr "Konfigurovať zariadenie..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:125
 msgid "Add JOSM Plugin description URL."
 msgstr "Pridať JOSM Plugin popis URL."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:126
 msgid "Enter URL"
 msgstr "Zadať URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:162
 msgid "Please select an entry."
 msgstr "Vyber prosím nejakú položku."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:147
 msgid "Edit JOSM Plugin description URL."
 msgstr "Upraviť JOSM Plugin popis URL."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:148
 msgid "JOSM Plugin description URL"
 msgstr "JOSM Plugin description URL"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:175
 msgid "Configure Plugin Sites"
 msgstr "Konfigurovať umiestnenie pluginov"
@@ -8656,6 +8896,6 @@
 msgstr "<mnohonásobný>"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:369
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341
 #, java-format
 msgid "Remove old keys from up to {0} object"
@@ -8665,11 +8905,11 @@
 msgstr[2] "Odstrániť staré kľúče z {0} objektov"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135
 msgid "Add a new tag"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161
+msgstr "Pridať novú značku"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160
 msgid "Delete the selection in the tag table"
-msgstr ""
+msgstr "Zmazať výber v tabuľke značiek"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:427
@@ -8699,10 +8939,10 @@
 #, java-format
 msgid "Unknown type: {0}"
-msgstr "Neznány typ (druh): {0}"
+msgstr "Neznány type (druh): {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:68
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:75
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -8747,4 +8987,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24
+#, fuzzy, java-format
+msgid "Preset group ''{0}'' of group ''{1}''"
+msgstr "Použiť prednastavenie \"{0}\" zo skupiny \"{1}\""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
 #, java-format
 msgid "Preset group ''{0}''"
@@ -8765,4 +9010,10 @@
 msgstr "Sťahujem body {0} až {1}..."
 
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, fuzzy, java-format
+msgid "parameter ''{0}'' > 0 expected. Got {1}"
+msgstr "parameter ''{0}'' > 0 očakávaný, dostáva ''{1}''"
+
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8871,5 +9122,5 @@
 msgstr "Rozloženie súboru \"{0}\" neúspešné"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "Chyba parsovania: Chybná štruktúra GPX dokumentu"
@@ -8899,15 +9150,15 @@
 #, java-format
 msgid "Fetching node with id {0} from ''{1}''"
-msgstr ""
+msgstr "Priniesť(Fetching) bod s id {0} z ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:366
 #, java-format
 msgid "Fetching way with id {0} from ''{1}''"
-msgstr ""
+msgstr "Priniesť(Fetching) cestu s id {0} z ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:367
 #, java-format
 msgid "Fetching relation with id {0} from ''{1}''"
-msgstr ""
+msgstr "Priniesť(Fetching) reláciu s id {0} z ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:373
@@ -8920,15 +9171,15 @@
 #, java-format
 msgid "Fetching a package of nodes from ''{0}''"
-msgstr ""
+msgstr "Priniesť(Fetching) balíček bodov z {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:404
 #, java-format
 msgid "Fetching a package of ways from ''{0}''"
-msgstr ""
+msgstr "Priniesť(Fetching) balíček ciest z {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:405
 #, java-format
 msgid "Fetching a package of relations from ''{0}''"
-msgstr ""
+msgstr "Priniesť(Fetching) balíček relácií z {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:416
@@ -8998,10 +9249,11 @@
 msgstr "Komunikácia s {0} je ustálená, používa protokol verzie {1}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
 msgstr "neočakávaný formát z id odpovedi zo servera, dostáva ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -9011,78 +9263,80 @@
 "''{1}''"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315
 msgid "Creating changeset..."
 msgstr "Vytváranie súboru zmien..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
 #, java-format
 msgid "Successfully opened changeset {0}"
 msgstr "ˇUspešne otvorený súbor zmien {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#, fuzzy, java-format
+msgid "id of changeset > 0 required. Got {0}"
+msgstr "id parameter ''{0}'' > 0 požadovaný. Got {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
 msgstr "Aktualizácia súboru zmien..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
-#, java-format
-msgid "Changeset {0} is unchanged. Skipping update."
-msgstr "Súbor zmien {0} je nezmenený. Ukončujem aktualizáciu."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
 #, java-format
 msgid "Updating changeset {0}..."
 msgstr "Aktualizácia súboru zmien {0}..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
-msgid ""
-"Failed to update changeset. Either there is no current changeset or the id "
-"of the current changeset is 0"
-msgstr ""
-"Neúspešná aktualizácia súboru zmien. Nachádza sa tu neaktuálny súbor zmien, "
-"alebo id aktuálneho súboru zmien je 0"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
 msgid "Closing changeset..."
 msgstr "Zatváranie súboru zmien..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
-#, java-format
-msgid "Closing changeset {0}..."
-msgstr "Zatváranie súboru zmien {0}..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
-#, java-format
-msgid "Leaving changeset {0} open..."
-msgstr "Otváram povolený (leaving) súbor zmien {0}..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
 msgid "No changeset present for diff upload"
 msgstr "Nenachádza sa tu súbor zmien pre diff nahratie"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414
 msgid "Preparing..."
 msgstr "Pripravujem..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419
 msgid "Uploading..."
 msgstr "Nahrávam..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438
 msgid "Waiting 10 seconds ... "
 msgstr "Čakanie 10 sekúnd ... "
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
+msgstr "Začiatok opakovania {0} z {1} v {2} sekunde ..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449
 msgid "OK - trying again."
 msgstr "OK - skúšam znovu."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:485
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517
 #, java-format
 msgid "Starting retry {0} of {1}."
 msgstr "Spúšťam opakovanie {0} z {1}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
+msgid "current changeset is null. Can't upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
+#, java-format
+msgid "id of current changeset > required. Current id is {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, fuzzy, java-format
+msgid "Changeset id > 0 expected. Got {0}"
+msgstr "id > 0 očakávané. Got {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
+#, java-format
+msgid "Open changeset expected. Got closed changeset with id {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApiException.java:87
@@ -9107,33 +9361,93 @@
 msgstr "Poškodený bz2 súbor."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
+#, fuzzy, java-format
+msgid "missing mandatory attribute ''{0}''"
+msgstr "Chýba povinný atribút ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:128
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:134
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
+#, fuzzy, java-format
+msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgstr "Neplatná dlhá hodnota pre vlastnosť ''{0}''. Got ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
+#, fuzzy, java-format
+msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgstr "Neplatná dlhá hodnota pre vlastnosť ''{0}''. Got ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
+#, fuzzy, java-format
+msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgstr "Neplatná dlhá hodnota pre vlastnosť ''{0}''. Got ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#, java-format
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
+msgstr "Chýba povinná vlastnosť ''{0}'' z XML elementu {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''"
+msgstr "Chýba povinný atribút ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#, java-format
+msgid "Unsupported version: {0}"
+msgstr "Nepodporovaná verzia: {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:176
+#, fuzzy, java-format
+msgid "Undefined element ''{0}'' found in input stream. Aborting."
+msgstr ""
+"Varovanie: Nedefinovaný element ''{0}'' hľadám vo vstupnom toku. Vynechanie."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#, java-format
+msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgstr "Neplatná hodnota pre vlastnosť ''uid''. Got ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
+#, fuzzy
+msgid "Parsing list of changesets..."
+msgstr "Zatváranie súboru zmien..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
 msgid "Incorrect password or username."
 msgstr "Nesprávne heslo alebo meno."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:168
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Upozornenie: Heslo sa posiela nešifrované."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Save user and password (unencrypted)"
 msgstr "Uložiť meno a heslo (nešifrovane)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
 msgid "Enter Password"
 msgstr "Zadajte heslo"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 msgid "Login"
 msgstr "Prihlásenie"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:242
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Základná URL pre OSM server (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
 msgid "Login name (e-mail) to the OSM account."
 msgstr "Prihlasovacie meno (e-mail) pre OSM konto."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -9141,17 +9455,17 @@
 "Prihlasovacie heslo k OSM účtu. Nechajte prázdne, keď nechcete heslo ukladať."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
 msgid "Base Server URL"
 msgstr "Základná Serverová URL"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
 msgid "OSM username (e-mail)"
 msgstr "OSM užívateľské meno (e-mail)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
 msgid "OSM password"
 msgstr "OSM heslo"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -9163,8 +9477,8 @@
 "<br><b>Nepoužite vzácne Heslo.</b></html>"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:51
+#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #, java-format
 msgid "(at line {0}, column {1})"
-msgstr ""
+msgstr "(v rade {0}, stĺpec {1})"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:26
@@ -9263,20 +9577,5 @@
 msgstr "Chyba v priebehu parsovania"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124
-#, fuzzy, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr "povinný atribút ''{0}'' vynechaný"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
-#, fuzzy, java-format
-msgid "Missing mandatory attribute ''{0}''"
-msgstr "povinný atribút ''{0}'' vynechaný"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
-#, fuzzy, java-format
-msgid "Unsupported version: {0}"
-msgstr "Neznáma verzia: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:155
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -9284,72 +9583,73 @@
 "minlat=''{1}00,maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+"Chýbajú povinné atribúty v elementoch ''hranice''. Got mindĺžka=''{0}'',"
+"minšírka=''{1}00,maxdĺžka=''{3}'',maxšírka=''{4}'', origin=''{5}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
 msgid "found XML element <nd> element not as direct child of element <way>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183
-#, fuzzy, java-format
+"vytvoriť XML element <nd> element nie je ako priame dieťa z elementu <way>"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
-msgstr "povinný atribút ''{0}'' vynechaný"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
-#, fuzzy, java-format
+msgstr "Chýba povinná vlastnosť ''{0}'' na <nd> z cesty {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
-msgstr "Neplatné hodnota atribútu \"ref\" člena relácie  {0} (hodnota  {1})"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+msgstr "Neplatná hodnota vlastnosti ''ref'' z elementu <nd>. Got {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
 msgid "Found XML element <member> not as direct child of element <relation>"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212
-#, fuzzy, java-format
+"Vytvoriť XML element <člen> nie je ako priame dieťa z elementu <relácia>"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}"
-msgstr "Chýba atribút \"ref\" člena relácie  {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217
-#, fuzzy, java-format
+msgstr "Chýba vlastnosť ''ref'' pre člena v relácii {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
-msgstr "Neplatné hodnota atribútu \"ref\" člena relácie  {0} (hodnota  {1})"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
-#, fuzzy, java-format
+msgstr ""
+"Neplatná hodnota pre vlastnosť ''ref'' pre člena v relácii {0}. Got {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}"
-msgstr "Chýba atribút \"type\" člena {0} relácie  {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
-#, fuzzy, java-format
+msgstr "Chýba vlastnosť ''type'' pre člena {0} v relácii {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#, java-format
 msgid ""
 "Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}."
-msgstr "Neplatné hodnota atribútu \"ref\" člena relácie  {0} (hodnota  {1})"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
+msgstr ""
+"Neplatná hodnota vre vlastnosť ''type'' pre člena {0} v relácii {1}. Got {2}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Nekompletné <member> špecifikácie s ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
-#, java-format
-msgid "Warning: Undefined element ''{0}'' found in input stream. Skipping."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
 #, fuzzy, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
-msgstr ""
-"nedovolená hodnota pre povinný atribút ''{0}'' typu int, dostáva ''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+msgid "Undefined element ''{0}'' found in input stream. Skipping."
+msgstr ""
+"Varovanie: Nedefinovaný element ''{0}'' hľadám vo vstupnom toku. Vynechanie."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
 msgid "Illegal object with id=0"
 msgstr "Neplatný objekt s id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#, java-format
 msgid ""
 "Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
 msgstr ""
-"Neplatná hodnota atribútu \"version\" v OSM elemente s  id {0} (hodnota  {1})"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:303
+"Neplatná hodnota pre vlastnosť ''verzia'' na OSM pôvodné s id {0}. Got {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
 #, java-format
 msgid ""
@@ -9357,6 +9657,8 @@
 "version is ''0.6''. Got {1}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
+"VAROVANIE: štandardná hodnota vlastnosti ''verzia'' z elementu {0} pre 0, "
+"API verzia je ''0.6''. Got {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
 #, java-format
 msgid ""
@@ -9364,6 +9666,8 @@
 "version is ''0.5''. Got {1}"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+"VAROVANIE: štandardná hodnota vlastnosti ''verzia'' z elementu {0} pre 1, "
+"API verzia je ''0.5''. Got {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
@@ -9371,34 +9675,36 @@
 "version is ''0.5''. Got {1}"
 msgstr ""
+"VERZIA: štandardná hodnota vlastnosti ''verzia'' z elementu {0} pre 0, API "
+"verziu je ''0.5''. Got {1}"
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:316
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#, java-format
 msgid "Unknown or unsupported API version. Got {0}"
-msgstr "Neznáma verzia: {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
-#, fuzzy, java-format
+msgstr "Neznáma, alebo nepodporovaná API verzia. Got {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#, java-format
 msgid "Missing attribute ''version'' on OSM primitive with id {0}"
-msgstr "Chýba atribút \"version\" v OSM elemente s  id {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
-#, fuzzy, java-format
+msgstr "Chýba vlastnosť ''verzia'' na OSM pôvodných s id {0}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#, java-format
 msgid "Missing required attribute ''{0}''."
-msgstr "Chýba povinný atribút \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#, fuzzy, java-format
+msgstr "Chýba povinná vlastnosť ''{0}''."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
-msgstr ""
-"nedovolená hodnota pre povinný atribút ''{0}'' typu int, dostáva ''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
+msgstr "Neplatná dlhá hodnota pre vlastnosť ''{0}''. Got ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
 #, java-format
 msgid ""
 "way with external id ''{0}'' includes missing node with external id ''{1}''"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:381
+"cesta s externým id ''{0}'' obsahuje chýbajúci bod s externým id ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
 #, java-format
 msgid ""
@@ -9409,30 +9715,30 @@
 "vynechaný v nahratých dátach a je preto nekompletná tiež"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
+#, java-format
 msgid ""
 "Unknown relation member type ''{0}'' in relation with external id ''{1}''"
-msgstr "Neznámy typ člena relácie {0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
-#, fuzzy, java-format
+msgstr "Neznámy typ relačného člena ''{0}'' v relácii s eterným id ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#, java-format
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
 "id ''{1}''"
-msgstr "nemôžem porovnávať pôvodné s id ''{0}'' podľa pôvodných s id ''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+msgstr ""
+"Relácia s externým id ''{0}'' odkazuje na chýbajúce pôvodné s externým id "
+"''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
 msgid "Prepare OSM data..."
 msgstr "Pripravujem OSM údaje..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 msgid "Parsing OSM data..."
-msgstr "Rozloženie OSM history data ..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487
-#, fuzzy
+msgstr "Rozložiť OSM dáta..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
 msgid "Preparing data set..."
-msgstr "Pripravujem dáta..."
+msgstr "Pripravujem dátový súbor ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
@@ -9454,4 +9760,24 @@
 msgstr "Sťahovanie odkazovaných relácií ..."
 
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51
+#, fuzzy
+msgid "Reading changesets..."
+msgstr "Vytváranie súboru zmien..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
+#, fuzzy
+msgid "Downloading changesets ..."
+msgstr "Zatváranie súboru zmien..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85
+#, fuzzy, java-format
+msgid "Reading changeset {0} ..."
+msgstr "Otváram povolený (leaving) súbor zmien {0}..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91
+#, fuzzy, java-format
+msgid "Downloading changeset {0} ..."
+msgstr "Zatváranie súboru zmien {0}..."
+
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
 #, java-format
@@ -9467,10 +9793,14 @@
 msgstr "Kontaktujem server..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
 msgid "Failed to open connection to API {0}"
 msgstr "Neúspešné nadviazanie spojenia do API {0}"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
+msgid "Error: failed to add authentication credentials to the connection."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -9479,39 +9809,60 @@
 "internetu."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+msgid "XML tag <user> is missing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
+#, fuzzy, java-format
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgstr "Chýba povinná vlastnosť ''{0}'' z XML elementu {1}"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
+#, fuzzy, java-format
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgstr "Neplatná dlhá hodnota pre vlastnosť ''{0}''. Got ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
 msgid "Starting to upload with one request per primitive ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
+msgstr "Zahajujem nahrávanie so žiadosťou na pôvodné ..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
+msgstr "{0}% ({1}/{2}), {3} odchádza. Nahrávaný bod ''{4}'' (id: {5})"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
+msgstr "{0}% ({1}/{2}), {3} odchádza. Nahrávaná cesta ''{4}'' (id: {5})"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+msgstr "{0}% ({1}/{2}), {3} odchádza. Nahrávaná relácia ''{4}'' (id: {5})"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
 msgid "Starting to upload in one request ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:171
-#, fuzzy
+msgstr "Začínam nahrávať požiadavku ..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135
 msgid "Uploading data ..."
-msgstr "Nahrávam..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:178
+msgstr "Nahrávam dáta ..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
 msgid ""
 "WARNING: no API version defined for data to upload. Falling back to version "
 "0.6"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:183
+"VAROVANIE: žiadna API verzia vymedzená pre dáta na nahratie. Ustúpiť do "
+"verzie 0.6"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147
 #, java-format
 msgid ""
@@ -9519,12 +9870,15 @@
 "use diff uploads, but API is not able to handle them. Ignoring diff upload."
 msgstr ""
+"Varovanie: nastavenie ''{0}'' alebo api verzia ''{1}'' z dátovej sady "
+"požadujú použiť rozdielne nahratie , ale API nie je schopného ovládať."
+"Ignorujem rozdielne nahrávanie."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
 msgid "Update Plugins"
 msgstr "Aktualizácia pluginov"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 msgid "Download Plugins"
 msgstr "Stiahnuť pluginy"
@@ -9636,5 +9990,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:290
 msgid "<html>"
-msgstr ""
+msgstr "<html>"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:291
@@ -9685,5 +10039,5 @@
 msgstr "Viac detailov"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -9693,18 +10047,18 @@
 msgstr[2] "Informácie o pluginoch stiahnuté z {0} stránok"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
 msgid "No plugin information found."
 msgstr "Nenájdené informácie o plugine"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr "Plug-in {0} nie je dostupný. Aktualizácia preskočená."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:93
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
 msgid "All installed plugins are up to date."
 msgstr "Všetky nainštalované pluginy sú aktuálne."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
 #, java-format
 msgid ""
@@ -9717,9 +10071,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
 msgid "Download missing plugins"
 msgstr "Stiahnuť chýbajúca pluginy"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
 #, java-format
 msgid ""
@@ -9734,43 +10088,43 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
 msgid "unknown"
 msgstr "neznámy"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Verzie {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 msgid "Plugin bundled with JOSM"
 msgstr "Plugin je zahrnutý v JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:357
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -9907,8 +10261,7 @@
 #, java-format
 msgid "The OSM server ''{0}'' reported a bad request.<br>"
-msgstr ""
+msgstr "OSM server ''{0}'' hlási zlý príkaz.<br>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:165
-#, fuzzy
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -9916,12 +10269,12 @@
 "community."
 msgstr ""
-"Požiadavka na stiahnutie údajov bola príliš veľká, presiahla maximálny "
-"veľkosť oblasti bbox je 0.25. Vyžiadajte si menšiu oblasť, alebo použite "
-"planet.osm"
+"Plocha, ktorú sa snažíte nahrať je príliš veľká, alebo vaša požiadavka bola "
+"príliš zozľahlá.<br>Požadujte menšiu plochu, alebo použite nejaký exportný "
+"súbor poskytnutý OSM komunitou."
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:168
 #, java-format
 msgid "<br>Error message(untranslated): {0}"
-msgstr ""
+msgstr "<br>Chybná správa(nepreložený): {0}"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:192
@@ -10026,4 +10379,6 @@
 "geometry from preferences."
 msgstr ""
+"nastavenie s kľúčom ''{0}'' neobsahuje ''{1}''. Nemôžem obnoviť geometriu "
+"okna z nastavení."
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:110
@@ -10033,4 +10388,6 @@
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
+"nastavenie s kľúčom ''{0}'' nemôžem dodať vnútornú hodnotu pre ''{1}''. "
+"Dodaná {2}. Nemôžem obnoviť geometriu okna z nastavení."
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:112
@@ -10040,4 +10397,6 @@
 "{2}. Can''t restore window geometry from preferences."
 msgstr ""
+"neúspešné rozloženie poľa ''{1}'' v nastavení s kľúčom ''{0}''. Odchýlka "
+"bola: {2}. Nemôžem obnoviť geometriu okna z nastavení."
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:119
@@ -10047,4 +10406,6 @@
 "from preferences."
 msgstr ""
+"nastavenie s kľúčom ''{0}'' neexistuje. Nemôžem obnoviť geometriu okna z "
+"nastavení."
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:158
@@ -10054,4 +10415,6 @@
 "default geometry. Details: {1}"
 msgstr ""
+"Varovanie: neúspešná obnova geometrie okna z kľúča ''{0}''. Ustupujem pre "
+"východziu geometriu. Detaily: {1}"
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
@@ -10081,13 +10444,15 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:59
 msgid "Private (only shared as anonymous, unordered points)"
-msgstr ""
+msgstr "Súkromné (iba zdielané ako anonymné, neusporiadané body)"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:60
 msgid "Public (shown in trace list and as anonymous, unordered points)"
-msgstr ""
+msgstr "Verejné (ukázať v obsahu trasy a ako anonymné, neusporiadané body)"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:61
 msgid "Trackable (only shared as anonymous, ordered points with timestamps)"
 msgstr ""
+"Stopové(Trackable) (iba zdieľané ako anonymné, usporiadané body s časovou "
+"značkou)"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:62
@@ -10096,4 +10461,6 @@
 "timestamps)"
 msgstr ""
+"Identifikovateľný (uvádzať v obsahu stopy a ako identifikovateľné, "
+"usporiadané body s časovou značkou)"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
@@ -10109,23 +10476,17 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
 msgid "Visibility"
-msgstr ""
+msgstr "Viditeľnosť"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:136
 msgid "Defines the visibility of your trace for other OSM users."
-msgstr ""
+msgstr "Definovať viditeľnosť pre vašu stopu pre iných OSM používateľov."
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:140
 msgid "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
-msgstr ""
+msgstr "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:140
 msgid "(What does that mean?)"
-msgstr ""
-
-#. item "Relations/Route" text "Symbol description"
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3148
-msgid "Description"
-msgstr "Popis"
+msgstr "(Čo to má znamenať?)"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
@@ -10135,5 +10496,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:145
 msgid "Tags (comma delimited)"
-msgstr ""
+msgstr "Značky (vymezovacia čiarka)"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:146
@@ -10595,4 +10956,6 @@
 "or action canceled"
 msgstr ""
+"Mesto/miesto {0} sa nenašlo, alebo je nedostupné\n"
+"alebo ja akcia zrušená"
 
 #. this below is a temporary workaround to fix the "always on top" issue
@@ -10662,4 +11025,5 @@
 msgid "Disable image cropping during georeferencing."
 msgstr ""
+"Vypnuté orezávanie obrázkov pri určovaní zemepisnej polohy (georeferencingu)."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:50
@@ -10851,4 +11215,7 @@
 "projections and retry"
 msgstr ""
+"Zapnúť the cadastre WMS plugin, zmena\n"
+"aktuálnej projekcie na jednu z the cadastre\n"
+"projekcií a opakovať"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:47
@@ -10871,5 +11238,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:177
 msgid "Image cropping"
-msgstr ""
+msgstr "Orezávanie obrázkov"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:176
@@ -10888,9 +11255,11 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:216
 msgid "Image georeferencing"
-msgstr ""
+msgstr "Určovanie zemepisnej polohy obrázkov"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:215
 msgid "Click second Lambert crosspiece for georeferencing"
 msgstr ""
+"Zvoľte druhý Lambert priečnik(crosspiece) pre určovanie zemepisnej polohy"
+"(georeferencing)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:233
@@ -10899,4 +11268,6 @@
 "or just retry "
 msgstr ""
+"Chcete zrušiť kompletne\n"
+"alebo len opakovať "
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:249
@@ -10917,6 +11288,7 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
-msgid "Set "
-msgstr ""
+#, fuzzy, java-format
+msgid "Set {0} Lambert coordinates"
+msgstr "Zvoliť Lambert súradnice"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -11548,6 +11920,6 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 #: build/trans_style.java:990 build/trans_style.java:1007
-#: build/trans_style.java:1023 build/trans_style.java:3392
-#: build/trans_style.java:3400
+#: build/trans_style.java:1023 build/trans_style.java:3400
+#: build/trans_style.java:3408
 msgid "water"
 msgstr "voda"
@@ -11844,4 +12216,55 @@
 msgstr "Meranie"
 
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Michigan Left"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Adds no left turn for sets of 4 or 5 ways."
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45
+#, fuzzy
+msgid "Please select 4 or 5 ways to assign no left turns."
+msgstr "Prosím vyberte jednu alebo viac uzavretých ciest s najmenej 4 bodmi."
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61
+#, fuzzy, java-format
+msgid "{0} extrem nodes."
+msgstr "{0} bod"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69
+#, fuzzy, java-format
+msgid "Via node {0}, {1}"
+msgstr "Zmeniť {0} {1}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75
+#, fuzzy, java-format
+msgid "{0} via nodes."
+msgstr "{0} bod"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78
+msgid "Unable to find via nodes. Please check your selection"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98
+#, fuzzy, java-format
+msgid "MIddle way: {0}"
+msgstr "Pridať cestu {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121
+msgid "Create Michigan left turn restriction"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129
+#, fuzzy, java-format
+msgid "Processing {0}"
+msgstr "Verzia {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142
+#, fuzzy, java-format
+msgid "Relation: from {0} to {1} via {2}"
+msgstr "Verzia {0} vytvorená na {1} podľa {2}"
+
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
 msgid "OpenLayers"
@@ -11998,7 +12421,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
-#, fuzzy
 msgid "create new objects"
-msgstr "Vytvoriť nový bod."
+msgstr "vytvoriť nové objekty"
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
@@ -12062,7 +12484,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
-#, fuzzy
 msgid "Remote Control has been asked to create a new node."
-msgstr "Vzdialená kontrola požiadala o načítanie dát z API."
+msgstr "Vzdialená Správa s spýtala na vytvorenie nového bodu."
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
@@ -12324,5 +12745,5 @@
 msgstr "Otvoriť dialóg úpravy značiek"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:158
 msgid "JOSM Tag Editor Plugin"
 msgstr "JOSM Tag Editor Plugin (plugin pre úpravu značiek)"
@@ -12332,5 +12753,5 @@
 msgstr "Zvýrazniť"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:370
 #, java-format
 msgid "Updating properties of up to {0} object"
@@ -12340,21 +12761,4 @@
 msgstr[2] "Aktualizácia vlastností {0} objektov"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44
-msgid "INFO: entering compatibilty mode for JOSM with Main.ds"
-msgstr "INFORMÁCIA: zapísanie compatibilného režimu pre JOSM s Main.ds"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47
-msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
-msgstr ""
-"INFORMÁCIA: zapísanie compatibilného režimu pre JOSM s Main.getCurrentDataSet"
-"()"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49
-msgid ""
-"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-"found."
-msgstr ""
-"Nečakaná verzia  JOSMu. Žiadny Main.ds ani Main.getCurrentDataSet() found."
-
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
 msgid "Group"
@@ -12364,9 +12768,4 @@
 msgid "Item"
 msgstr "Položka"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-msgid "Filter"
-msgstr "Filter"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63
@@ -12454,5 +12853,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2272
 msgid "Street name"
 msgstr "Názov ulice"
@@ -12619,8 +13018,4 @@
 msgid "Zoom (in metres)"
 msgstr "Zväčšenie (v metroch)"
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
-msgid "URL"
-msgstr "URL"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -12822,17 +13217,15 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:460
-#, fuzzy
 msgid "Fixing errors ..."
-msgstr "Čakanie 10 sekúnd ... "
+msgstr "Určujem chyby(Fixing errors) ..."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:484
 #, java-format
 msgid "Fixing ({0}/{1}): ''{2}''"
-msgstr ""
+msgstr "Určovanie(Fixing) ({0}/{1}): ''{2}''"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501
-#, fuzzy
 msgid "Updating map ..."
-msgstr "Aktualizácia súboru zmien..."
+msgstr "Aktualizujem mapu ..."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69
@@ -12862,8 +13255,10 @@
 "the same layer, but are not connected by a node."
 msgstr ""
+"Tento test kontroluje či dve cesty, železnice, vodné cesty, alebo budovy sa "
+"križujú v rovnakej vrstve, ale nekrižujú sa v spoločnom bode."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
 msgid "Crossing buildings"
-msgstr ""
+msgstr "Krížené budovy"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:122
@@ -12882,5 +13277,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:84
 msgid "Nodes at same position"
-msgstr ""
+msgstr "Body s rovnakou pozíciou"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:143
@@ -12891,5 +13286,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:76
 msgid "Duplicated ways"
-msgstr ""
+msgstr "Zdvojené (duplikované) cesty"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
@@ -12898,8 +13293,10 @@
 "coordinates."
 msgstr ""
+"Tento test kontroluje, že tam nie sú cesty s rovnakými značkami a s "
+"rovnakými suradnicami bodov."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:141
 msgid "Delete duplicate ways"
-msgstr ""
+msgstr "Vymazať zdvojené (duplikované) cesty"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22
@@ -13328,7 +13725,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
-#: build/trans_style.java:4179
+#: build/trans_style.java:4159 build/trans_style.java:4166
+#: build/trans_style.java:4173 build/trans_style.java:4180
+#: build/trans_style.java:4187
 msgid "building"
 msgstr "budovy"
@@ -13342,5 +13739,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4186
+#: build/trans_style.java:4194
 msgid "area"
 msgstr "oblasť(plocha)"
@@ -13471,10 +13868,10 @@
 msgstr "Vybrať a spustiť body na konci cesty"
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:148
 msgid "Reached the end of the line"
 msgstr "Je dosiahnutý koniec línie"
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:155
 msgid "Reached a junction"
 msgstr "Je dosiahnuté spojenie"
@@ -13630,4 +14027,6 @@
 "or a trailing '?'."
 msgstr ""
+"Varovanie: Základ URL ''{0}'' pre a WMS service neobsahuje koncový '&' alebo "
+"koncový '?'."
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:112
@@ -13636,9 +14035,11 @@
 "settings."
 msgstr ""
+"Varovanie: Donesené WMS dlaždice majú pravdepodobne chybu. Prosím "
+"skontrolujte nastavenie."
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:113
 #, java-format
 msgid "Warning: The complete URL is ''{0}''."
-msgstr ""
+msgstr "Varovanie: Úplná URL je ''{0}''."
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:134
@@ -13660,8 +14061,9 @@
 msgid "Warning: WMS layer deactivated because of malformed base url ''{0}''"
 msgstr ""
+"Varovanie: WMS vrstva je deaktivovaná, pretože je chybný základ url ''{0}''"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:96
 msgid "(deactivated)"
-msgstr ""
+msgstr "(deaktivované)"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:143
@@ -13683,12 +14085,16 @@
 "tiles anyway?"
 msgstr ""
+"<html>Základ URL<br>''{0}''<br>pre túto WML vrstvu neobsahuje na konci "
+"žiadnu z ''&'' ani s ''?''.<br>Toto pravdepodobne vedie k chybnej WMS "
+"požiadavke. Mali by ste skontrolovať vaše<br>nastavenie preferencií."
+"<br>Chcete doniesť WMS dlaždice aj napriek tomu?"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:196
 msgid "Yes, fetch images"
-msgstr ""
+msgstr "Áno, dones obrázky"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:202
 msgid "Invalid URL?"
-msgstr ""
+msgstr "Chybná URL?"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:225
@@ -13779,9 +14185,9 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:112
 msgid "Copy Selected Default(s)"
-msgstr ""
+msgstr "Kopírovať vybrané vychodzie nastavenia"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:120
 msgid "Please select at least one row to copy."
-msgstr ""
+msgstr "Prisím vyberte aspoň jeden riadok pre kopírovanie."
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:164
@@ -13794,17 +14200,15 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
-#, fuzzy
 msgid "% of east:"
-msgstr "% lat:"
+msgstr "% z východu:"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
-#, fuzzy
 msgid "% of north:"
-msgstr "% lat:"
+msgstr "% zo severu:"
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerImporter.java:10
 msgid "WMS Files (*.wms)"
-msgstr ""
+msgstr "WMS Súbory (*.wms)"
 
 #. *
@@ -13969,6 +14373,11 @@
 "tiež môže byť importovaná z GPS vrstvy)"
 
+#. Plugin michigan_left
+#: build/trans_plugins.java:35
+msgid "Adds no left turn for sets of 4 or 5 ways"
+msgstr ""
+
 #. Plugin nearclick
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid ""
 "Simulates a click when you do a small and short drag. This is usefull for "
@@ -13981,15 +14390,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid "Displays an OpenLayers background image"
 msgstr "Zobrazenie OpenLayers obrázok pozadia"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Imports issues from OpenStreetBugs"
 msgstr "Importovať vydania z OpenStreetBugs"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13999,5 +14408,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -14006,5 +14415,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -14015,15 +14424,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Ohromný JGoodies Plastic Look and Feel."
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Let other applications send commands to JOSM."
 msgstr "Nechať ostatné aplikácie poslať príkaz do JOSMu."
 
 #. Plugin routes
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -14034,10 +14443,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Provides routing capabilities."
 msgstr "Určiť trasové schopnosti"
 
 #. Plugin slippymap
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -14048,15 +14457,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Povoliť pridávani značiek/bodov na aktuálnu gps pozíciu."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Určiť dialóg pre editáciu značiek v tabuľkovej mriežke."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -14069,10 +14478,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Make terraced houses out of single blocks."
 msgstr "Vytvárať radové domy mimo jednotlivých blokov."
 
 #. Plugin usertools
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -14084,5 +14493,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -14093,5 +14502,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -14103,5 +14512,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -14112,5 +14521,5 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
@@ -14118,5 +14527,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -14174,4 +14583,10 @@
 #. <annotations>
 #: build/trans_presets.java:57
+#, fuzzy
+msgid "Highways"
+msgstr "komunikácie"
+
+#. group "Highways"
+#: build/trans_presets.java:58
 msgid "Streets"
 msgstr "Komunikácie"
@@ -14182,5 +14597,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:58 build/trans_surveyor.java:72
+#: build/trans_presets.java:59 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Dialnica"
@@ -14189,5 +14604,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:61
+#: build/trans_presets.java:62
 msgid "Edit Motorway"
 msgstr "Upraviť diaľnicu"
@@ -14214,8 +14629,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:120 build/trans_presets.java:140
-#: build/trans_presets.java:177 build/trans_presets.java:197
-#: build/trans_presets.java:1557 build/trans_presets.java:3146
+#: build/trans_presets.java:65 build/trans_presets.java:101
+#: build/trans_presets.java:121 build/trans_presets.java:141
+#: build/trans_presets.java:178 build/trans_presets.java:198
+#: build/trans_presets.java:1560 build/trans_presets.java:3158
 msgid "Reference"
 msgstr "Ref. číslo"
@@ -14229,8 +14644,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:358
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:359
 msgid "Lanes"
 msgstr "Jazdné pruhy"
@@ -14247,15 +14662,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:224 build/trans_presets.java:280
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:373 build/trans_presets.java:388
-#: build/trans_presets.java:412 build/trans_presets.java:431
-#: build/trans_presets.java:452 build/trans_presets.java:472
-#: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1307
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:225 build/trans_presets.java:281
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:374 build/trans_presets.java:389
+#: build/trans_presets.java:413 build/trans_presets.java:432
+#: build/trans_presets.java:453 build/trans_presets.java:473
+#: build/trans_presets.java:511 build/trans_presets.java:667
+#: build/trans_presets.java:1310
 msgid "Max. speed (km/h)"
 msgstr "Max. rýchlosť (km/h)"
@@ -14292,16 +14707,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:293 build/trans_presets.java:306
-#: build/trans_presets.java:320 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:464
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:659 build/trans_presets.java:1300
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:294 build/trans_presets.java:307
+#: build/trans_presets.java:321 build/trans_presets.java:353
+#: build/trans_presets.java:405 build/trans_presets.java:425
+#: build/trans_presets.java:445 build/trans_presets.java:465
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:660 build/trans_presets.java:1303
 msgid "Oneway"
 msgstr "Jednosmerka"
@@ -14343,19 +14758,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:353
-#: build/trans_presets.java:362 build/trans_presets.java:405
-#: build/trans_presets.java:425 build/trans_presets.java:445
-#: build/trans_presets.java:465 build/trans_presets.java:485
-#: build/trans_presets.java:504 build/trans_presets.java:523
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:586 build/trans_presets.java:607
-#: build/trans_presets.java:628 build/trans_presets.java:660
-#: build/trans_presets.java:1301 build/trans_surveyor.java:12
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:354
+#: build/trans_presets.java:363 build/trans_presets.java:406
+#: build/trans_presets.java:426 build/trans_presets.java:446
+#: build/trans_presets.java:466 build/trans_presets.java:486
+#: build/trans_presets.java:505 build/trans_presets.java:524
+#: build/trans_presets.java:545 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629 build/trans_presets.java:661
+#: build/trans_presets.java:1304 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Most"
@@ -14391,19 +14806,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:354
-#: build/trans_presets.java:378 build/trans_presets.java:406
-#: build/trans_presets.java:426 build/trans_presets.java:446
-#: build/trans_presets.java:466 build/trans_presets.java:486
-#: build/trans_presets.java:505 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629 build/trans_presets.java:661
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:355
+#: build/trans_presets.java:379 build/trans_presets.java:407
+#: build/trans_presets.java:427 build/trans_presets.java:447
+#: build/trans_presets.java:467 build/trans_presets.java:487
+#: build/trans_presets.java:506 build/trans_presets.java:525
+#: build/trans_presets.java:546 build/trans_presets.java:567
+#: build/trans_presets.java:588 build/trans_presets.java:609
+#: build/trans_presets.java:630 build/trans_presets.java:662
+#: build/trans_presets.java:1305
 msgid "Tunnel"
 msgstr "Tunel"
@@ -14437,18 +14852,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:73 build/trans_presets.java:90
-#: build/trans_presets.java:110 build/trans_presets.java:129
-#: build/trans_presets.java:150 build/trans_presets.java:166
-#: build/trans_presets.java:186 build/trans_presets.java:205
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:355
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:467
-#: build/trans_presets.java:487 build/trans_presets.java:506
-#: build/trans_presets.java:525 build/trans_presets.java:546
-#: build/trans_presets.java:567 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:630
-#: build/trans_presets.java:662 build/trans_presets.java:1303
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:356
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:468
+#: build/trans_presets.java:488 build/trans_presets.java:507
+#: build/trans_presets.java:526 build/trans_presets.java:547
+#: build/trans_presets.java:568 build/trans_presets.java:589
+#: build/trans_presets.java:610 build/trans_presets.java:631
+#: build/trans_presets.java:663 build/trans_presets.java:1306
 msgid "Cutting"
 msgstr "Výkop"
@@ -14482,18 +14897,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:74 build/trans_presets.java:91
-#: build/trans_presets.java:111 build/trans_presets.java:130
-#: build/trans_presets.java:151 build/trans_presets.java:167
-#: build/trans_presets.java:187 build/trans_presets.java:206
-#: build/trans_presets.java:222 build/trans_presets.java:240
-#: build/trans_presets.java:258 build/trans_presets.java:277
-#: build/trans_presets.java:310 build/trans_presets.java:356
-#: build/trans_presets.java:408 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:468
-#: build/trans_presets.java:488 build/trans_presets.java:507
-#: build/trans_presets.java:526 build/trans_presets.java:547
-#: build/trans_presets.java:568 build/trans_presets.java:589
-#: build/trans_presets.java:610 build/trans_presets.java:631
-#: build/trans_presets.java:663 build/trans_presets.java:1304
+#: build/trans_presets.java:75 build/trans_presets.java:92
+#: build/trans_presets.java:112 build/trans_presets.java:131
+#: build/trans_presets.java:152 build/trans_presets.java:168
+#: build/trans_presets.java:188 build/trans_presets.java:207
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:357
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:469
+#: build/trans_presets.java:489 build/trans_presets.java:508
+#: build/trans_presets.java:527 build/trans_presets.java:548
+#: build/trans_presets.java:569 build/trans_presets.java:590
+#: build/trans_presets.java:611 build/trans_presets.java:632
+#: build/trans_presets.java:664 build/trans_presets.java:1307
 msgid "Embankment"
 msgstr "Násyp"
@@ -14501,5 +14916,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Motorway Link"
 msgstr "Dialničná prípojka"
@@ -14508,5 +14923,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:80
+#: build/trans_presets.java:81
 msgid "Edit Motorway Link"
 msgstr "Upraviť dialničnú prípojku"
@@ -14514,5 +14929,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:94
+#: build/trans_presets.java:95
 msgid "Trunk"
 msgstr "Cesta pre motorové vozidlá"
@@ -14521,5 +14936,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:97
+#: build/trans_presets.java:98
 msgid "Edit Trunk"
 msgstr "Upraviť cestu pre motorové vozidlá"
@@ -14529,6 +14944,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
 msgid "Motorroad"
 msgstr "Cesta pre motorové vozidlá"
@@ -14536,5 +14951,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:114
+#: build/trans_presets.java:115
 msgid "Trunk Link"
 msgstr "Prípojka cesty pre motorové vozidla"
@@ -14543,5 +14958,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:117
+#: build/trans_presets.java:118
 msgid "Edit Trunk Link"
 msgstr "Upraviť prípojku cesty pre motorové vozidla"
@@ -14554,5 +14969,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:134 build/trans_surveyor.java:76
+#: build/trans_presets.java:135 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Cesta I. triedy"
@@ -14561,5 +14976,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:137
+#: build/trans_presets.java:138
 msgid "Edit Primary Road"
 msgstr "Upraviť cestu I. triedy"
@@ -14567,10 +14982,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:154
+#: build/trans_presets.java:155
 msgid "Primary Link"
 msgstr "Prípojka cesty I. triedy"
 
 #. item
-#: build/trans_presets.java:155
+#: build/trans_presets.java:156
 msgid "Edit Primary Link"
 msgstr "Upraviť prípojku cesty I. triedy"
@@ -14582,5 +14997,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:170 build/trans_surveyor.java:80
+#: build/trans_presets.java:171 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Cesta II. triedy"
@@ -14590,5 +15005,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:174
+#: build/trans_presets.java:175
 msgid "Edit Secondary Road"
 msgstr "Upraviť cestu II. triedy"
@@ -14596,5 +15011,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:190
+#: build/trans_presets.java:191
 msgid "Tertiary"
 msgstr "Cesta III. triedy"
@@ -14604,5 +15019,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:194
+#: build/trans_presets.java:195
 msgid "Edit Tertiary Road"
 msgstr "Upraviť cestu III. triedy"
@@ -14614,5 +15029,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:209 build/trans_surveyor.java:84
+#: build/trans_presets.java:210 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Miestna cesta neklasifikovaná (Unclassified)"
@@ -14622,5 +15037,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:213
+#: build/trans_presets.java:214
 msgid "Edit Unclassified Road"
 msgstr "Upraviť Neklasifikovanú cestu"
@@ -14647,19 +15062,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:225 build/trans_presets.java:243
-#: build/trans_presets.java:261 build/trans_presets.java:281
-#: build/trans_presets.java:314 build/trans_presets.java:359
-#: build/trans_presets.java:375 build/trans_presets.java:389
-#: build/trans_presets.java:413 build/trans_presets.java:432
-#: build/trans_presets.java:453 build/trans_presets.java:473
-#: build/trans_presets.java:491 build/trans_presets.java:511
-#: build/trans_presets.java:532 build/trans_presets.java:553
-#: build/trans_presets.java:574 build/trans_presets.java:595
-#: build/trans_presets.java:616 build/trans_presets.java:637
-#: build/trans_presets.java:667 build/trans_presets.java:680
-#: build/trans_presets.java:693 build/trans_presets.java:706
-#: build/trans_presets.java:719 build/trans_presets.java:732
-#: build/trans_presets.java:745 build/trans_presets.java:1308
-#: build/trans_presets.java:1498 build/trans_presets.java:1540
+#: build/trans_presets.java:226 build/trans_presets.java:244
+#: build/trans_presets.java:262 build/trans_presets.java:282
+#: build/trans_presets.java:315 build/trans_presets.java:360
+#: build/trans_presets.java:376 build/trans_presets.java:390
+#: build/trans_presets.java:414 build/trans_presets.java:433
+#: build/trans_presets.java:454 build/trans_presets.java:474
+#: build/trans_presets.java:492 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:554
+#: build/trans_presets.java:575 build/trans_presets.java:596
+#: build/trans_presets.java:617 build/trans_presets.java:638
+#: build/trans_presets.java:668 build/trans_presets.java:681
+#: build/trans_presets.java:694 build/trans_presets.java:707
+#: build/trans_presets.java:720 build/trans_presets.java:733
+#: build/trans_presets.java:746 build/trans_presets.java:1311
+#: build/trans_presets.java:1501 build/trans_presets.java:1543
 msgid "Width (meters)"
 msgstr "Šírka (v metroch)"
@@ -14671,5 +15086,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:228 build/trans_surveyor.java:88
+#: build/trans_presets.java:229 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Ulica (miestna komunikácia)"
@@ -14678,5 +15093,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:231
+#: build/trans_presets.java:232
 msgid "Edit Residential Street"
 msgstr "Upraviť ulicu"
@@ -14701,14 +15116,14 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:611
-#: build/trans_presets.java:632 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "Surface"
 msgstr "Povrch"
@@ -14729,55 +15144,55 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paved"
 msgstr "spevnený"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "unpaved"
 msgstr "nespevnený"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "asphalt"
-msgstr ""
-
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+msgstr "asfalt"
+
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "concrete"
 msgstr "betón (concrete)"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
 msgid "metal"
-msgstr ""
+msgstr "kov"
 
 #. color heath
@@ -14789,100 +15204,100 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
-#: build/trans_style.java:3367
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
+#: build/trans_style.java:3375
 msgid "wood"
 msgstr "drevo (wood)"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paving_stones"
-msgstr ""
+msgstr "dlažobné kamene"
 
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "cobblestone"
 msgstr "dlažbová kocka (cobblestone)"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "gravel"
 msgstr "štrk (gravel)"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "pebblestone"
-msgstr ""
-
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+msgstr "riečne kamene"
+
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "compacted"
-msgstr ""
-
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+msgstr "zhutnená(valcovaná)"
+
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "grass_paver"
-msgstr ""
-
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+msgstr "trávový obkladač(grass_paver)"
+
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "grass"
 msgstr "tráva (grass)"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "sand"
 msgstr "piesok (sand)"
@@ -14890,13 +15305,13 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "ground"
 msgstr "zem (ground)"
@@ -14904,5 +15319,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:246
+#: build/trans_presets.java:247
 msgid "Living Street"
 msgstr "Obytná zóna"
@@ -14911,5 +15326,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:249
+#: build/trans_presets.java:250
 msgid "Edit Living Street"
 msgstr "Upraviť Obytnú zónu"
@@ -14917,5 +15332,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:264
+#: build/trans_presets.java:265
 msgid "Service"
 msgstr "Obslužná cesta (Service)"
@@ -14924,5 +15339,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:267
+#: build/trans_presets.java:268
 msgid "Edit Serviceway"
 msgstr "Upraviť obslužnú cestu (Service)"
@@ -14932,18 +15347,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "Serviceway type"
 msgstr "Typ obslužnej cesty (serviceway)"
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "alley"
 msgstr "ulička(bočna ulica)"
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "driveway"
 msgstr "príjazdová cesta"
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "parking_aisle"
 msgstr "parkovacia ulička(parking_aisle)"
@@ -14951,5 +15366,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:284
+#: build/trans_presets.java:285
 msgid "Parking Aisle"
 msgstr "Parkovacia ulička (Parking Aisle)"
@@ -14959,5 +15374,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:288
+#: build/trans_presets.java:289
 msgid "Edit Parking Aisle"
 msgstr "Upraviť parkovaciu uličku (Parking Aisle)"
@@ -14965,5 +15380,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:298
+#: build/trans_presets.java:299
 msgid "Road (Unknown Type)"
 msgstr "Cesta (neznámy typ)"
@@ -14972,5 +15387,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Edit Road of unknown type"
 msgstr "Upraviť cestu neznámeho typu"
@@ -14979,20 +15394,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:318
+#: build/trans_presets.java:319
 msgid "Road Restrictions"
 msgstr "Cestné obmedzenie"
 
 #. item
-#: build/trans_presets.java:319
+#: build/trans_presets.java:320
 msgid "Edit Road Restrictions"
 msgstr "Upraviť cestné obmedzenie"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:321
+#: build/trans_presets.java:322
 msgid "Toll"
 msgstr "Mýto (Toll)"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:322
+#: build/trans_presets.java:323
 msgid "No exit (cul-de-sac)"
 msgstr "Slepá ulica"
@@ -15005,8 +15420,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:323 build/trans_presets.java:529
-#: build/trans_presets.java:550 build/trans_presets.java:571
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:634
+#: build/trans_presets.java:324 build/trans_presets.java:530
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:593 build/trans_presets.java:614
+#: build/trans_presets.java:635
 msgid "Access"
 msgstr "Prístup"
@@ -15060,29 +15475,29 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1397
-#: build/trans_presets.java:1398 build/trans_presets.java:1399
-#: build/trans_presets.java:1763 build/trans_presets.java:1773
-#: build/trans_presets.java:2397 build/trans_presets.java:2433
-#: build/trans_presets.java:2442 build/trans_presets.java:2443
-#: build/trans_presets.java:2444 build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:1396
+#: build/trans_presets.java:1397 build/trans_presets.java:1400
+#: build/trans_presets.java:1401 build/trans_presets.java:1402
+#: build/trans_presets.java:1767 build/trans_presets.java:1777
+#: build/trans_presets.java:2408 build/trans_presets.java:2444
+#: build/trans_presets.java:2453 build/trans_presets.java:2454
+#: build/trans_presets.java:2455 build/trans_presets.java:2725
 msgid "yes"
 msgstr "áno"
@@ -15095,40 +15510,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:212
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:212
 msgid "private"
 msgstr "private (len pre vlastníka)"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655
 msgid "designated"
 msgstr "určený"
@@ -15141,19 +15556,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:219
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:219
 msgid "destination"
 msgstr "miesto určenia (cieľ)"
@@ -15176,71 +15591,71 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:205
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:205
 msgid "permissive"
 msgstr "permissive (súhlas vlastníka pozemku)"
 
-#: build/trans_presets.java:323 build/trans_presets.java:327
-#: build/trans_presets.java:330 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636
+#: build/trans_presets.java:324 build/trans_presets.java:328
+#: build/trans_presets.java:331 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637
 msgid "agricultural"
 msgstr "farmársky (agricultural)"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
-#: build/trans_presets.java:2433 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1396 build/trans_presets.java:1397
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
+#: build/trans_presets.java:2444 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
+#: build/trans_presets.java:2725
 msgid "no"
 msgstr "nie"
 
-#: build/trans_presets.java:326
+#: build/trans_presets.java:327
 msgid "Goods"
 msgstr "Malé nákladná autá a dodávky"
 
-#: build/trans_presets.java:327
+#: build/trans_presets.java:328
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Nákladné vozidlá"
@@ -15255,10 +15670,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:328 build/trans_presets.java:651
-#: build/trans_presets.java:858 build/trans_presets.java:891
-#: build/trans_presets.java:913 build/trans_presets.java:950
-#: build/trans_presets.java:963 build/trans_presets.java:975
-#: build/trans_presets.java:987 build/trans_presets.java:999
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:329 build/trans_presets.java:652
+#: build/trans_presets.java:859 build/trans_presets.java:892
+#: build/trans_presets.java:914 build/trans_presets.java:951
+#: build/trans_presets.java:964 build/trans_presets.java:976
+#: build/trans_presets.java:988 build/trans_presets.java:1000
+#: build/trans_presets.java:1040
 msgid "Horse"
 msgstr "Kôň"
@@ -15274,13 +15689,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:329 build/trans_presets.java:530
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:635 build/trans_presets.java:859
-#: build/trans_presets.java:877 build/trans_presets.java:892
-#: build/trans_presets.java:914 build/trans_presets.java:951
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:330 build/trans_presets.java:531
+#: build/trans_presets.java:552 build/trans_presets.java:573
+#: build/trans_presets.java:594 build/trans_presets.java:615
+#: build/trans_presets.java:636 build/trans_presets.java:860
+#: build/trans_presets.java:878 build/trans_presets.java:893
+#: build/trans_presets.java:915 build/trans_presets.java:952
+#: build/trans_presets.java:965 build/trans_presets.java:977
+#: build/trans_presets.java:989 build/trans_presets.java:1001
+#: build/trans_presets.java:1041
 msgid "Motorcycle"
 msgstr "Motocykel"
@@ -15295,30 +15710,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:330 build/trans_presets.java:531
-#: build/trans_presets.java:552 build/trans_presets.java:573
-#: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:636 build/trans_presets.java:654
-#: build/trans_presets.java:878 build/trans_presets.java:893
-#: build/trans_presets.java:915 build/trans_presets.java:952
-#: build/trans_presets.java:965 build/trans_presets.java:977
-#: build/trans_presets.java:989 build/trans_presets.java:1001
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:331 build/trans_presets.java:532
+#: build/trans_presets.java:553 build/trans_presets.java:574
+#: build/trans_presets.java:595 build/trans_presets.java:616
+#: build/trans_presets.java:637 build/trans_presets.java:655
+#: build/trans_presets.java:879 build/trans_presets.java:894
+#: build/trans_presets.java:916 build/trans_presets.java:953
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1042
 msgid "Motorcar"
 msgstr "Motorové vozidlo"
 
-#: build/trans_presets.java:331
+#: build/trans_presets.java:332
 msgid "Public Service Vehicles (psv)"
 msgstr "Dopravná obsluha"
 
-#: build/trans_presets.java:332
+#: build/trans_presets.java:333
 msgid "Motorboat"
 msgstr "Motorová loď"
 
-#: build/trans_presets.java:333
+#: build/trans_presets.java:334
 msgid "Boat"
 msgstr "Loď"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:336
 msgid "Min. speed (km/h)"
 msgstr "Min. rýchlosť (km/h)"
@@ -15326,25 +15741,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:336 build/trans_presets.java:374
+#: build/trans_presets.java:337 build/trans_presets.java:375
 msgid "Max. weight (tonnes)"
 msgstr "Max. hmotnosť (ton)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:337
+#: build/trans_presets.java:338
 msgid "Max. Height (meters)"
 msgstr "Max. Výška(v metroch)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Max. Width (meters)"
 msgstr "Max. Šírka (v metroch)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:339
+#: build/trans_presets.java:340
 msgid "Max. Length (meters)"
 msgstr "Max. Dĺžka (v metroch)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:341
+#: build/trans_presets.java:342
 msgid "Roundabout"
 msgstr "Kruhový objazd"
@@ -15355,5 +15770,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:346
+#: build/trans_presets.java:347
 msgid "Edit Junction"
 msgstr "Upraviť kruhový objazd"
@@ -15375,9 +15790,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:349 build/trans_presets.java:648
-#: build/trans_presets.java:788 build/trans_presets.java:1135
-#: build/trans_presets.java:1392 build/trans_presets.java:2353
-#: build/trans_presets.java:2901 build/trans_presets.java:2911
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:350 build/trans_presets.java:649
+#: build/trans_presets.java:789 build/trans_presets.java:1137
+#: build/trans_presets.java:1395 build/trans_presets.java:2364
+#: build/trans_presets.java:2913 build/trans_presets.java:2923
+#: build/trans_presets.java:2932
 msgid "Type"
 msgstr "Typ"
@@ -15397,10 +15812,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:547
+#: build/trans_presets.java:350 build/trans_style.java:547
 #: build/trans_style.java:555
 msgid "motorway"
 msgstr "dialnica (motorway)"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "motorway_link"
 msgstr "dialničná prípojka"
@@ -15422,10 +15837,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:563
+#: build/trans_presets.java:350 build/trans_style.java:563
 #: build/trans_style.java:571
 msgid "trunk"
 msgstr "cesta pre motorové vozidlá (trunk)"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "trunk_link"
 msgstr "prípojka cesty pre motorové vozidlá"
@@ -15447,10 +15862,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:579
+#: build/trans_presets.java:350 build/trans_style.java:579
 #: build/trans_style.java:587
 msgid "primary"
 msgstr "cesta prvej triedy"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "primary_link"
 msgstr "prípojka cesty I. triedy"
@@ -15472,5 +15887,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:595
+#: build/trans_presets.java:350 build/trans_style.java:595
 #: build/trans_style.java:603
 msgid "secondary"
@@ -15485,9 +15900,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:349 build/trans_style.java:611
+#: build/trans_presets.java:350 build/trans_style.java:611
 msgid "tertiary"
 msgstr "cesta tretej triedy"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "unclassified"
 msgstr "cesta bez klasifikácie (unclassified)"
@@ -15501,9 +15916,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:349 build/trans_style.java:3143
+#: build/trans_presets.java:350 build/trans_style.java:3151
 msgid "residential"
 msgstr "obytná (osídlená)"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "living_street"
 msgstr "obytná zóna"
@@ -15533,10 +15948,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:349 build/trans_style.java:667
-#: build/trans_style.java:4244
+#: build/trans_presets.java:350 build/trans_style.java:667
+#: build/trans_style.java:4252
 msgid "service"
 msgstr "obslužná (service)"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "bus_guideway"
 msgstr "autobusová linka"
@@ -15566,6 +15981,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:349 build/trans_style.java:877
-#: build/trans_style.java:3208 build/trans_style.java:3209
+#: build/trans_presets.java:350 build/trans_style.java:877
+#: build/trans_style.java:3216 build/trans_style.java:3217
 msgid "construction"
 msgstr "konštrukcia"
@@ -15576,10 +15991,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Edit Bridge"
 msgstr "Editácia mosta"
 
 #. item
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "Edit Tunnel"
 msgstr "Upraviť Tunel"
@@ -15587,19 +16002,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:393
+#: build/trans_presets.java:394
 msgid "Ways"
 msgstr "Cesty"
 
 #. group "Ways"
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Construction"
 msgstr "Stavba"
 
 #. item
-#: build/trans_presets.java:395
+#: build/trans_presets.java:396
 msgid "Edit Highway Under Construction"
 msgstr "Upraviť komunikáciu vo výstavbe"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "Junction"
 msgstr "Križovatka"
@@ -15615,5 +16030,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:411 build/trans_style.java:895
+#: build/trans_presets.java:412 build/trans_style.java:895
 msgid "roundabout"
 msgstr "kruhový objazd (roundabout)"
@@ -15622,5 +16037,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:417
+#: build/trans_presets.java:418
 msgid "Bridleway"
 msgstr "Cesta pre kone"
@@ -15628,5 +16043,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:419
+#: build/trans_presets.java:420
 msgid "Edit Bridleway"
 msgstr "Upraviť cestu pre kone"
@@ -15634,5 +16049,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:435
+#: build/trans_presets.java:436
 msgid "Cycleway"
 msgstr "Cesta pre cyklistov"
@@ -15642,16 +16057,16 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:439
+#: build/trans_presets.java:440
 msgid "Edit Cycleway"
 msgstr "Upraviť cyklistickú cestu"
 
 #. item "Ways/Cycleway" check "Embankment"
-#: build/trans_presets.java:449
+#: build/trans_presets.java:450
 msgid "Pedestrians"
-msgstr ""
+msgstr "Pešia"
 
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Footway"
 msgstr "Chodník"
@@ -15660,16 +16075,16 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Footway"
 msgstr "Upraviť chodník"
 
 #. item "Ways/Footway" check "Embankment"
-#: build/trans_presets.java:469
+#: build/trans_presets.java:470
 msgid "Bikes"
-msgstr ""
+msgstr "Bicykle"
 
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:476
+#: build/trans_presets.java:477
 msgid "Pedestrian"
 msgstr "Pešia zóna"
@@ -15678,5 +16093,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Edit Pedestrian Street"
 msgstr "Upraviť pešiu zónu"
@@ -15684,5 +16099,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:494
+#: build/trans_presets.java:495
 msgid "Steps"
 msgstr "Schody"
@@ -15692,5 +16107,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:498
+#: build/trans_presets.java:499
 msgid "Edit Flight of Steps"
 msgstr "Upraviť únikové schody"
@@ -15699,5 +16114,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:515
+#: build/trans_presets.java:516
 msgid "Track"
 msgstr "Poľná cesta (Track)"
@@ -15706,5 +16121,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:518
+#: build/trans_presets.java:519
 msgid "Edit Track"
 msgstr "Upraviť Stopu (Track)"
@@ -15712,5 +16127,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:535
+#: build/trans_presets.java:536
 msgid "Track Grade 1"
 msgstr "Kvalita stopy poľnej cesty 1"
@@ -15719,5 +16134,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:538
+#: build/trans_presets.java:539
 msgid "Edit Track of grade 1"
 msgstr "Upraviť kvalitu stopy poľnej cesty 1"
@@ -15725,5 +16140,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:556
+#: build/trans_presets.java:557
 msgid "Track Grade 2"
 msgstr "Kvalita stopy poľnej cesty 2"
@@ -15732,5 +16147,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:559
+#: build/trans_presets.java:560
 msgid "Edit Track of grade 2"
 msgstr "Upraviť kvalitu stopy poľnej cesty 2"
@@ -15738,5 +16153,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:577
+#: build/trans_presets.java:578
 msgid "Track Grade 3"
 msgstr "Kvalita stopy poľnej cesty 3"
@@ -15745,5 +16160,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:580
+#: build/trans_presets.java:581
 msgid "Edit Track of grade 3"
 msgstr "Upraviť kvalitu stopy poľnej cesty 3"
@@ -15751,5 +16166,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:598
+#: build/trans_presets.java:599
 msgid "Track Grade 4"
 msgstr "Kvalita stopy poľnej cesty 4"
@@ -15758,5 +16173,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:601
+#: build/trans_presets.java:602
 msgid "Edit Track of grade 4"
 msgstr "Upraviť kvalitu stopy poľnej cesty 4"
@@ -15764,5 +16179,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:619
+#: build/trans_presets.java:620
 msgid "Track Grade 5"
 msgstr "Kvalita stopy poľnej cesty 5"
@@ -15771,5 +16186,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:622
+#: build/trans_presets.java:623
 msgid "Edit Track of grade 5"
 msgstr "Upraviť kvalitu stopy poľnej cesty 5"
@@ -15778,5 +16193,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:641
+#: build/trans_presets.java:642
 msgid "Path"
 msgstr "Cesta (chodník)"
@@ -15785,13 +16200,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:644
+#: build/trans_presets.java:645
 msgid "Edit Path"
 msgstr "Upraviť cestu (chodník)"
 
-#: build/trans_presets.java:652
+#: build/trans_presets.java:653
 msgid "Ski"
 msgstr "Lyže"
 
-#: build/trans_presets.java:653
+#: build/trans_presets.java:654
 msgid "Snowmobile"
 msgstr "Snežný skúter"
@@ -15801,6 +16216,6 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:670 build/trans_presets.java:1725
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:671 build/trans_presets.java:1729
+#: build/trans_presets.java:1752
 msgid "Hiking"
 msgstr "Turistika"
@@ -15810,5 +16225,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:674
+#: build/trans_presets.java:675
 msgid "Edit Hiking"
 msgstr "Upraviť Turistiku"
@@ -15816,5 +16231,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:683
+#: build/trans_presets.java:684
 msgid "Mountain Hiking"
 msgstr "Horská turistika"
@@ -15824,5 +16239,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:687
+#: build/trans_presets.java:688
 msgid "Edit Mountain Hiking"
 msgstr "Upraviť horskú turistiku"
@@ -15830,5 +16245,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:696
+#: build/trans_presets.java:697
 msgid "Demanding Mountain Hiking"
 msgstr "Náročná horská turistika"
@@ -15838,5 +16253,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:700
+#: build/trans_presets.java:701
 msgid "Edit Demanding Mountain Hiking"
 msgstr "Upraviť náročnú horskú turistiku"
@@ -15844,5 +16259,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:709
+#: build/trans_presets.java:710
 msgid "Alpine Hiking"
 msgstr "Vysokohorská turistika"
@@ -15852,5 +16267,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:713
+#: build/trans_presets.java:714
 msgid "Edit Alpine Hiking"
 msgstr "Upraviť vysokohorskú turistiku"
@@ -15858,5 +16273,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:723
 msgid "Demanding Alpine Hiking"
 msgstr "Náročná vysokohorská turistika"
@@ -15866,5 +16281,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:726
+#: build/trans_presets.java:727
 msgid "Edit Demanding Alpine Hiking"
 msgstr "Upraviť náročnú vysokohorskú turistiku"
@@ -15872,5 +16287,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:735
+#: build/trans_presets.java:736
 msgid "Difficult Alpine Hiking"
 msgstr "Tažká vysokohorská turistika"
@@ -15880,5 +16295,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:739
+#: build/trans_presets.java:740
 msgid "Edit Difficult Alpine Hiking"
 msgstr "Upraviť ťažkú vysokohorskú turistiku"
@@ -15886,10 +16301,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:749
+#: build/trans_presets.java:750
 msgid "Waypoints"
 msgstr "Cestné objekty"
 
 #. group "Waypoints"
-#: build/trans_presets.java:750
+#: build/trans_presets.java:751
 msgid "Motorway Junction"
 msgstr "Ďialničná križovatka"
@@ -15897,15 +16312,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:752
+#: build/trans_presets.java:753
 msgid "Edit Motorway Junction"
 msgstr "Upraviť diaľničnú križovatku"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:757
 msgid "Number"
 msgstr "Číslo"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:759
 msgid "Services"
 msgstr "Služby"
@@ -15913,5 +16328,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:761
 msgid "Edit Service Station"
 msgstr "Upraviť servisnú stanicu (autoservis)"
@@ -15949,15 +16364,15 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:765 build/trans_presets.java:902
-#: build/trans_presets.java:1382 build/trans_presets.java:1406
-#: build/trans_presets.java:1413 build/trans_presets.java:1419
-#: build/trans_presets.java:1427 build/trans_presets.java:1434
-#: build/trans_presets.java:1761 build/trans_presets.java:1771
-#: build/trans_presets.java:2361 build/trans_presets.java:2368
-#: build/trans_presets.java:2384 build/trans_presets.java:2395
-#: build/trans_presets.java:2403 build/trans_presets.java:2410
-#: build/trans_presets.java:2464 build/trans_presets.java:2512
-#: build/trans_presets.java:2678 build/trans_presets.java:2693
-#: build/trans_presets.java:2732 build/trans_presets.java:3151
+#: build/trans_presets.java:766 build/trans_presets.java:903
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
+#: build/trans_presets.java:1416 build/trans_presets.java:1422
+#: build/trans_presets.java:1430 build/trans_presets.java:1437
+#: build/trans_presets.java:1765 build/trans_presets.java:1775
+#: build/trans_presets.java:2372 build/trans_presets.java:2379
+#: build/trans_presets.java:2395 build/trans_presets.java:2406
+#: build/trans_presets.java:2414 build/trans_presets.java:2421
+#: build/trans_presets.java:2475 build/trans_presets.java:2523
+#: build/trans_presets.java:2689 build/trans_presets.java:2704
+#: build/trans_presets.java:2743 build/trans_presets.java:3163
 msgid "Operator"
 msgstr "Operátor"
@@ -15966,5 +16381,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:769
+#: build/trans_presets.java:770
 msgid "Traffic Signal"
 msgstr "Semafor"
@@ -15974,5 +16389,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:774
 msgid "Pedestrian crossing type"
 msgstr "Typ prechodu pre chodcov"
@@ -15981,27 +16396,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "uncontrolled"
 msgstr "neriadený"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "traffic_signals"
 msgstr "semafor"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "island"
 msgstr "ostrovček"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "unmarked"
 msgstr "neoznačený"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:774 build/trans_presets.java:790
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:775 build/trans_presets.java:791
+#: build/trans_presets.java:1334
 msgid "Cross on horseback"
 msgstr "Prechod pre jazdcov na koňoch"
@@ -16009,6 +16424,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:775 build/trans_presets.java:789
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:776 build/trans_presets.java:790
+#: build/trans_presets.java:1335
 msgid "Cross by bicycle"
 msgstr "Prechod pre cyklistov"
@@ -16017,11 +16432,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:776 build/trans_presets.java:791
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:1336
 msgid "Crossing attendant"
 msgstr "Prechod cez cestu s obsluhou"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:778
 msgid "Crossing type name (UK)"
 msgstr "Typy prechodov pre chodcov (UK viď. en.wikipedia.org)"
@@ -16029,31 +16444,31 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "zebra"
 msgstr "prechod pre chodcov (zebra)"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pelican"
 msgstr "prechod pre chodcov (len čiarkované okraje)"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "toucan"
 msgstr "toucan (prechod pre chodcov a cyklistov, len čiarkované okraje)"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "puffin"
 msgstr "puffin (prechod pre chodcov a cyklistov, len čiarkované okraje)"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pegasus"
 msgstr ""
 "pegasus (prechod pre chodcov a jazdcov na koňoch, len čiarkované okraje)"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "tiger"
 msgstr "tiger (prechod pre chodcov a cyklistov žlté pruhy)"
 
 #. </optional>
-#: build/trans_presets.java:780
+#: build/trans_presets.java:781
 msgid "Stop"
 msgstr "Zastaviť (stop)"
@@ -16061,5 +16476,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:783
+#: build/trans_presets.java:784
 msgid "Pedestrian Crossing"
 msgstr "Prechod pre chodcov"
@@ -16068,14 +16483,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:786
+#: build/trans_presets.java:787
 msgid "Edit Crossing"
 msgstr "Upraviť križovanie"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:793
 msgid "Type name (UK)"
 msgstr "Typ mena (UK)"
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:795
 msgid "Mini-roundabout"
 msgstr "Malý kruhový objazd"
@@ -16086,14 +16501,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "Direction"
 msgstr "Smer"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "clockwise"
 msgstr "v smere hodinových ručičiek (pravotočivý)"
 
-#: build/trans_presets.java:801
+#: build/trans_presets.java:802
 msgid "Turning Circle"
 msgstr "Turning Circle (zaokrúhlený koniec cesty pre ľahšie otáčanie sa aut)"
@@ -16103,20 +16518,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:806
+#: build/trans_presets.java:807
 msgid "City Limit"
 msgstr "Hranica mesta/obce"
 
 #. item
-#: build/trans_presets.java:807
+#: build/trans_presets.java:808
 msgid "Edit City Limit Sign"
 msgstr "Upraviť označenie hranice mesta/obce"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:812
+#: build/trans_presets.java:813
 msgid "Second Name"
 msgstr "Druhé meno"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:814
+#: build/trans_presets.java:815
 msgid "Speed Camera"
 msgstr "Kamera na meranie rýchlosti"
@@ -16124,5 +16539,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:817
+#: build/trans_presets.java:818
 msgid "Emergency Phone"
 msgstr "Núdzový telefón"
@@ -16130,5 +16545,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:820
+#: build/trans_presets.java:821
 msgid "Incline"
 msgstr "Sklon"
@@ -16136,5 +16551,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:823
+#: build/trans_presets.java:824
 msgid "Incline Steep"
 msgstr "Prudký sklon"
@@ -16143,10 +16558,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:827
+#: build/trans_presets.java:828
 msgid "Ford"
 msgstr "Brod"
 
 #. item
-#: build/trans_presets.java:828
+#: build/trans_presets.java:829
 msgid "Edit Ford"
 msgstr "Upraviť brod"
@@ -16154,5 +16569,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:835
+#: build/trans_presets.java:836
 msgid "Mountain Pass"
 msgstr "Horský priesmyk"
@@ -16160,5 +16575,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:837
+#: build/trans_presets.java:838
 msgid "Edit Mountain Pass"
 msgstr "Upraviť horský priesmyk"
@@ -16170,7 +16585,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:842 build/trans_presets.java:1600
-#: build/trans_presets.java:1745 build/trans_presets.java:2845
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:843 build/trans_presets.java:1604
+#: build/trans_presets.java:1749 build/trans_presets.java:2857
+#: build/trans_presets.java:2864 build/trans_presets.java:2871
 msgid "Elevation"
 msgstr "Nadmorská výška"
@@ -16178,5 +16593,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:846
+#: build/trans_presets.java:847
 msgid "Barriers"
 msgstr "Prekážka (Barriers)"
@@ -16184,5 +16599,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:849
+#: build/trans_presets.java:850
 msgid "Bollard"
 msgstr "Stĺpik"
@@ -16190,5 +16605,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:852
 msgid "Edit Bollard"
 msgstr "Upraviť stĺpik"
@@ -16233,16 +16648,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:854 build/trans_presets.java:873
-#: build/trans_presets.java:887 build/trans_presets.java:909
-#: build/trans_presets.java:946 build/trans_presets.java:959
-#: build/trans_presets.java:971 build/trans_presets.java:983
-#: build/trans_presets.java:995 build/trans_presets.java:1007
-#: build/trans_presets.java:1017 build/trans_presets.java:1026
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:855 build/trans_presets.java:874
+#: build/trans_presets.java:888 build/trans_presets.java:910
+#: build/trans_presets.java:947 build/trans_presets.java:960
+#: build/trans_presets.java:972 build/trans_presets.java:984
+#: build/trans_presets.java:996 build/trans_presets.java:1008
+#: build/trans_presets.java:1018 build/trans_presets.java:1027
+#: build/trans_presets.java:1036
 msgid "Allowed traffic:"
 msgstr "Povolená prevádzka:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:861
+#: build/trans_presets.java:862
 msgid "Cycle Barrier"
 msgstr "Cyklo prekážka (Cycle Barrier)"
@@ -16251,5 +16666,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:865
+#: build/trans_presets.java:866
 msgid "Block"
 msgstr "Balvan (Block)"
@@ -16257,5 +16672,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:868
+#: build/trans_presets.java:869
 msgid "Cattle Grid"
 msgstr ""
@@ -16265,5 +16680,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:870
+#: build/trans_presets.java:871
 msgid "Edit Cattle Grid"
 msgstr ""
@@ -16272,5 +16687,5 @@
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:880
+#: build/trans_presets.java:881
 msgid "Bus Trap"
 msgstr "Bus trap (rohož cez cestu zabraňujúca vjazdu vozidiel okrem autobusov)"
@@ -16278,15 +16693,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:883
+#: build/trans_presets.java:884
 msgid "Spikes"
 msgstr "Špičky (hroty)"
 
 #. item
-#: build/trans_presets.java:884
+#: build/trans_presets.java:885
 msgid "Edit Spikes"
 msgstr "Upraviť Hroty"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:896
 msgid "Toll Booth"
 msgstr "Mýtna búdka"
@@ -16294,5 +16709,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:897
+#: build/trans_presets.java:898
 msgid "Edit Toll Booth"
 msgstr "Upraviť mýtnu búdku"
@@ -16300,10 +16715,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:905
+#: build/trans_presets.java:906
 msgid "Border Control"
 msgstr "Hraničná kontrola"
 
 #. item
-#: build/trans_presets.java:906
+#: build/trans_presets.java:907
 msgid "Edit Border Control"
 msgstr "Upraviť hraničnú kontrolu"
@@ -16313,5 +16728,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:920
+#: build/trans_presets.java:921
 msgid "Hedge"
 msgstr "Živý plot (Hedge)"
@@ -16320,5 +16735,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:925
 msgid "Fence"
 msgstr "Plot"
@@ -16327,5 +16742,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:929
 msgid "Wall"
 msgstr "Hradby"
@@ -16333,5 +16748,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:931
+#: build/trans_presets.java:932
 msgid "City Wall"
 msgstr "Mestské hradby"
@@ -16340,5 +16755,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:935
+#: build/trans_presets.java:936
 msgid "Retaining Wall"
 msgstr "Oporný múr"
@@ -16350,15 +16765,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:942
+#: build/trans_presets.java:943
 msgid "Entrance"
 msgstr "Vstup"
 
 #. item
-#: build/trans_presets.java:943
+#: build/trans_presets.java:944
 msgid "Edit Entrance"
 msgstr "Upraviť vstup"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:954
+#: build/trans_presets.java:955
 msgid "Gate"
 msgstr "Brána"
@@ -16366,50 +16781,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:956
+#: build/trans_presets.java:957
 msgid "Edit Gate"
 msgstr "Upraviť bránu"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:967
+#: build/trans_presets.java:968
 msgid "Lift Gate"
 msgstr "Závora (Lift Gate)"
 
 #. item
-#: build/trans_presets.java:968
+#: build/trans_presets.java:969
 msgid "Edit Lift Gate"
 msgstr "Upraviť závoru (Lift Gate)"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:979
+#: build/trans_presets.java:980
 msgid "Hampshire Gate"
 msgstr "Brána pre zvieratá (Hampshire)"
 
 #. item
-#: build/trans_presets.java:980
+#: build/trans_presets.java:981
 msgid "Edit Hampshire Gate"
 msgstr "Upraviť bránu pre zvieratá (hampshire)"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:991
+#: build/trans_presets.java:992
 msgid "Bump Gate"
 msgstr "Brána pre otváranie predkom auta (bump)"
 
 #. item
-#: build/trans_presets.java:992
+#: build/trans_presets.java:993
 msgid "Edit Bump Gate"
 msgstr "Upraviť bránu pre otváranie predkom auta (bump)"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:1003
+#: build/trans_presets.java:1004
 msgid "Kissing Gate"
 msgstr "Automatická brána pre hospodárske zvieratá (Kissing)"
 
 #. item
-#: build/trans_presets.java:1004
+#: build/trans_presets.java:1005
 msgid "Edit Kissing Gate"
 msgstr "Upraviť automatickú bránu pre hosp. zvieratá (kissing)"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1013
 msgid "Stile"
 msgstr "Turniket (Stile)"
@@ -16417,25 +16832,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1014
+#: build/trans_presets.java:1015
 msgid "Edit Stile"
 msgstr "Upraviť turniket"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1023
 msgid "Turnstile"
 msgstr "Turniket"
 
 #. item
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1024
 msgid "Edit Turnstile"
 msgstr "Upraviť Turniket"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1032
 msgid "Sally Port"
 msgstr "Sally port (vstupný portál do pevnosti s vonkajšou a vnútornou bránou)"
 
 #. item
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1033
 msgid "Edit Sally Port"
 msgstr ""
@@ -16445,13 +16860,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #.
-#. <separator/>
+#. group "Water"
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1046 build/trans_presets.java:1089
+#: build/trans_presets.java:1047 build/trans_presets.java:1048
+#: build/trans_presets.java:1091
 msgid "Water"
 msgstr "Voda"
 
 #. group "Water"
-#: build/trans_presets.java:1047
+#: build/trans_presets.java:1049
 msgid "Spring"
 msgstr "Prameň"
@@ -16459,5 +16875,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1049
+#: build/trans_presets.java:1051
 msgid "Edit Spring"
 msgstr "Upraviť prameň"
@@ -16465,5 +16881,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1056
 msgid "Drain"
 msgstr "Odvodňovací kanál, odtok"
@@ -16471,10 +16887,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1058
 msgid "Edit Drain"
 msgstr "Upraviť odvodňovací kanál, odtok"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1064
 msgid "Stream"
 msgstr "Potok"
@@ -16482,10 +16898,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1066
 msgid "Edit Stream"
 msgstr "Upraviť potok"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1072
 msgid "Canal"
 msgstr "Prieplav"
@@ -16493,10 +16909,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1074
 msgid "Edit Canal"
 msgstr "Upraviť prieplav"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1080
 msgid "River"
 msgstr "Rieka"
@@ -16506,5 +16922,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1084
 msgid "Edit River"
 msgstr "Upraviť rieku"
@@ -16512,15 +16928,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1093
 msgid "Edit Water"
 msgstr "Upraviť vodu"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1097
 msgid "Land"
 msgstr "Zem (Pevnina)"
 
 #. item
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1098
 msgid "Edit Land"
 msgstr "Upraviť Zem (Pevnina)"
@@ -16528,15 +16944,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1103
 msgid "Basin"
 msgstr "Basin (Kotvisko pre lode)"
 
 #. item
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1104
 msgid "Edit Basin Landuse"
 msgstr "Upraviť Basin (Kotvisko pre lode)"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1109
 msgid "Reservoir"
 msgstr "Nádrž"
@@ -16544,15 +16960,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1109
+#: build/trans_presets.java:1111
 msgid "Edit Reservoir Landuse"
 msgstr "Upraviť nádrž"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1116
 msgid "Covered Reservoir"
 msgstr "Krytá nádrž"
 
 #. item
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1117
 msgid "Edit Covered Reservoir"
 msgstr "Upraviť krytú nádrž"
@@ -16560,5 +16976,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1120
+#: build/trans_presets.java:1122
 msgid "Riverbank"
 msgstr "Riečny breh"
@@ -16567,10 +16983,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1125
 msgid "Edit Riverbank"
 msgstr "Upraviť riečny breh"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1127
+#: build/trans_presets.java:1129
 msgid "Wetland"
 msgstr "Mokraď"
@@ -16581,14 +16997,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1134
 msgid "Edit Wetland"
 msgstr "Upraviť mokraď"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "swamp"
 msgstr "Močiar"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "bog"
 msgstr "slatina"
@@ -16602,35 +17018,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1135 build/trans_style.java:3384
+#: build/trans_presets.java:1137 build/trans_style.java:3392
 msgid "marsh"
 msgstr "močiar (marsh)"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "reedbed"
 msgstr "mokraď´s rákosím"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "saltmarsh"
 msgstr "soľná bažina"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "tidalflat"
 msgstr "prílivová oblasť"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "mangrove"
 msgstr "mangrovová oblasť"
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1139
 msgid "Mud"
 msgstr "Blato"
 
 #. item
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1140
 msgid "Edit Mud"
 msgstr "Upraviť blato"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1144
 msgid "Beach"
 msgstr "Pláž"
@@ -16638,20 +17054,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1144
+#: build/trans_presets.java:1146
 msgid "Edit Beach"
 msgstr "Upraviť pláž"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1150
 msgid "Bay"
 msgstr "Záliv"
 
 #. item
-#: build/trans_presets.java:1149
+#: build/trans_presets.java:1151
 msgid "Edit Bay"
 msgstr "Upraviť záliv"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1155
 msgid "Cliff"
 msgstr "Útes"
@@ -16659,10 +17075,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1157
 msgid "Edit Cliff"
 msgstr "Upraviť útes"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1159
+#: build/trans_presets.java:1161
 msgid "Coastline"
 msgstr "Pobrežie"
@@ -16670,5 +17086,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1163
 msgid "Edit Coastline"
 msgstr "Upraviť pobrežie"
@@ -16676,5 +17092,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1168
 msgid "Ferry Route"
 msgstr "Prievoz, trajekt"
@@ -16682,5 +17098,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1170
 msgid "Edit Ferry"
 msgstr "Upraviť prievoz, trajekt"
@@ -16689,5 +17105,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1176
+#: build/trans_presets.java:1178
 msgid "Boatyard"
 msgstr "Lodenica"
@@ -16695,10 +17111,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:1180
 msgid "Edit Boatyard"
 msgstr "Upraviť lodenicu"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1185
 msgid "Dock"
 msgstr "Dok, prístavná hrádza"
@@ -16706,5 +17122,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1187
 msgid "Edit Dock"
 msgstr "Upraviť dok, prístavnú hrádzu"
@@ -16712,5 +17128,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1193
 msgid "Dam"
 msgstr "Priehrada, nádrž"
@@ -16718,15 +17134,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1195
 msgid "Edit Dam"
 msgstr "Upraviť priehradu, nádrž"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1199
+#: build/trans_presets.java:1201
 msgid "Waterway Point"
 msgstr "Vodné objekty"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1202
 msgid "Lock Gate"
 msgstr "Plavebná komora"
@@ -16735,5 +17151,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1206
 msgid "Weir"
 msgstr "Priehradzka"
@@ -16741,20 +17157,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1208
 msgid "Edit Weir"
 msgstr "Upraviť priehradzku"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1213
 msgid "Waterfall"
 msgstr "Vodopád"
 
 #. item
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1214
 msgid "Edit Waterfall"
 msgstr "Upraviť vodopád"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1219
 msgid "Turning Point"
 msgstr "Turning Point (koniec cesty)"
@@ -16763,15 +17179,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1221
+#: build/trans_presets.java:1223
 msgid "Marina"
 msgstr "Prístav (Marina)"
 
 #. item
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1224
 msgid "Edit Marina"
 msgstr "Upraviť Prístav (Marina)"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1228
 msgid "Pier"
 msgstr "Mólo"
@@ -16779,10 +17195,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1230
 msgid "Edit Pier"
 msgstr "Upraviť mólo"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1234
 msgid "Ferry Terminal"
 msgstr "Prístavisko prievozu, trajektu"
@@ -16790,10 +17206,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1236
 msgid "Edit Ferry Terminal"
 msgstr "Upraviť prístavisko prievozu, trajektu"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1240
 msgid "Slipway"
 msgstr "Slipway (rampa na vyzdvihnutie lode z vody na breh)"
@@ -16803,16 +17219,21 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1244
 msgid "Edit Slipway"
 msgstr "Upraviť slipway (rampa na vyzdvihnutie lode z vody na breh)"
 
 #. item "Waterway Point/Slipway" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1250
+#, fuzzy
+msgid "Transport"
+msgstr "Hromadná doprava"
+
+#. group "Transport"
+#: build/trans_presets.java:1251
 msgid "Railway"
 msgstr "Železnica"
 
 #. group "Railway"
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1252
 msgid "Rail"
 msgstr "Železnica (štandardná)"
@@ -16820,5 +17241,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:1254
 msgid "Edit Rail"
 msgstr "Upraviť železničnú koľaj"
@@ -16848,8 +17269,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "Optional Types"
 msgstr "Voliteľné typy"
@@ -16863,35 +17284,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "yard"
 msgstr "železničná vlečka v závode"
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "siding"
 msgstr "vedľajšia koľaj (napr: na stanici)"
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "spur"
 msgstr "železničná vlečka"
 
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1259
 msgid "Narrow Gauge Rail"
 msgstr "Úzkorozchodná železnica"
 
 #. item
-#: build/trans_presets.java:1257
+#: build/trans_presets.java:1260
 msgid "Edit Narrow Gauge Rail"
 msgstr "Upraviť úzkorozchodnú železnicu"
 
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1265
 msgid "Monorail"
 msgstr "Jednokoľajka, vysutá dráha"
@@ -16899,45 +17320,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1267
 msgid "Edit Monorail"
 msgstr "Upraviť jednokoľajku, vysutú dráhu"
 
-#: build/trans_presets.java:1269
+#: build/trans_presets.java:1272
 msgid "Preserved"
 msgstr "Historická železnica"
 
 #. item
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1273
 msgid "Edit Preserved Railway"
 msgstr "Upraviť zachovanú železnicu (v prevádzke)"
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1278
 msgid "Light Rail"
 msgstr "Rýchloelektrička"
 
 #. item
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1279
 msgid "Edit Light Rail"
 msgstr "Upraviť električku"
 
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1284
 msgid "Subway"
 msgstr "Metro"
 
 #. item
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1285
 msgid "Edit Subway"
 msgstr "Upraviť metro"
 
-#: build/trans_presets.java:1287
+#: build/trans_presets.java:1290
 msgid "Tram"
 msgstr "Električka"
 
 #. item
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1291
 msgid "Edit Tram"
 msgstr "Upraviť električku"
 
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1296
 msgid "Bus Guideway"
 msgstr "Autobusová linka"
@@ -16945,5 +17366,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1295
+#: build/trans_presets.java:1298
 msgid "Edit Bus Guideway"
 msgstr "Upraviť autobusovú linku"
@@ -16952,14 +17373,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1315
 msgid "Disused Rail"
 msgstr "Nepoužívaná železnica"
 
 #. item
-#: build/trans_presets.java:1313
+#: build/trans_presets.java:1316
 msgid "Edit Disused Railway"
 msgstr "Upraviť nepoužívanú železnicu"
 
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1321
 msgid "Abandoned Rail"
 msgstr "Opustená železnica"
@@ -16968,5 +17389,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1325
 msgid "Level Crossing"
 msgstr "Železničné priecestie"
@@ -16975,5 +17396,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1329
 msgid "Crossing"
 msgstr "Peší prechod cez železnicu"
@@ -16983,5 +17404,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1333
 msgid "Crossing type"
 msgstr "Typy prechodov cez cestu"
@@ -16989,5 +17410,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1339
 msgid "Turntable"
 msgstr "Točňa"
@@ -16996,10 +17417,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1344
 msgid "Aerialway"
 msgstr "Lanovka"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1345
 msgid "Chair Lift"
 msgstr "Sedačková lanovka"
@@ -17007,10 +17428,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1347
 msgid "Edit Chair Lift"
 msgstr "Upraviť sedačkovú lanovku"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1351
 msgid "Drag Lift"
 msgstr "Lyžiarsky vlek Drag_lift(nepoužíva sa, použite piste:lift=platter)"
@@ -17018,5 +17439,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1353
 msgid "Edit Drag Lift"
 msgstr ""
@@ -17024,5 +17445,5 @@
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1357
 msgid "Cable Car"
 msgstr "Kabínková lanovka"
@@ -17030,10 +17451,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1359
 msgid "Edit Cable Car"
 msgstr "Upraviť kabínkovú lanovku"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1360
+#: build/trans_presets.java:1363
 msgid "Gondola"
 msgstr "Gondola"
@@ -17041,5 +17462,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1365
 msgid "Edit Gondola"
 msgstr "Upraviť Gondolu"
@@ -17047,5 +17468,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1366 build/trans_presets.java:1461
+#: build/trans_presets.java:1369 build/trans_presets.java:1464
 msgid "Station"
 msgstr "Stanica"
@@ -17056,10 +17477,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1368 build/trans_presets.java:1464
+#: build/trans_presets.java:1371 build/trans_presets.java:1467
 msgid "Edit Station"
 msgstr "Upraviť stanicu"
 
 #. group "Car"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1378
 msgid "Fuel"
 msgstr "Čerpacia stanica"
@@ -17069,5 +17490,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1382
 msgid "Edit Fuel"
 msgstr "Upraviť čerpaciu stanicu"
@@ -17125,32 +17546,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1671 build/trans_presets.java:1678
-#: build/trans_presets.java:1686 build/trans_presets.java:1699
-#: build/trans_presets.java:1713 build/trans_presets.java:1810
-#: build/trans_presets.java:1818 build/trans_presets.java:1909
-#: build/trans_presets.java:1915 build/trans_presets.java:2226
-#: build/trans_presets.java:2250 build/trans_presets.java:2465
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1703
+#: build/trans_presets.java:1717 build/trans_presets.java:1814
+#: build/trans_presets.java:1822 build/trans_presets.java:1919
+#: build/trans_presets.java:1925 build/trans_presets.java:2237
+#: build/trans_presets.java:2261 build/trans_presets.java:2476
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Opening Hours"
 msgstr "Otváracia doba"
@@ -17209,93 +17630,93 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "24/7"
-msgstr ""
-
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+msgstr "24/7"
+
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Mo-Fr 08:30-20:00"
-msgstr ""
-
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+msgstr "Po-Pi 08:30-20:00"
+
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr ""
+msgstr "Ut-Ne 08:00-15:00; So 08:00-12:00"
 
 #. group "Bicycle"
@@ -17308,5 +17729,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1385 build/trans_presets.java:1438
+#: build/trans_presets.java:1388 build/trans_presets.java:1441
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -17316,5 +17737,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1391
 msgid "Edit Parking"
 msgstr "Upraviť parkovisko"
@@ -17325,64 +17746,64 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1391 build/trans_presets.java:1762
-#: build/trans_presets.java:1772 build/trans_presets.java:2396
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:1394 build/trans_presets.java:1766
+#: build/trans_presets.java:1776 build/trans_presets.java:2407
+#: build/trans_presets.java:2524
 msgid "Reference number"
 msgstr "Referenčné číslo"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "multi-storey"
 msgstr "mnohoposchodový"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "surface"
 msgstr "povrch"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "underground"
 msgstr "podzemie"
 
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1396
 msgid "Park and Ride"
-msgstr ""
+msgstr "P+R parkovisko"
 
 #. item "Tourism/Information Terminal" text "Reference number"
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1394 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
+#: build/trans_presets.java:1397 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
 msgid "Fee"
 msgstr "Poplatok"
 
 #. <space />
-#: build/trans_presets.java:1396
+#: build/trans_presets.java:1399
 msgid "Capacity (overall)"
-msgstr ""
+msgstr "Kapacita (celková)"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1400
 msgid "Spaces for Disabled"
 msgstr "Miesta pre vozíčkárov"
 
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1401
 msgid "Spaces for Women"
-msgstr ""
-
-#: build/trans_presets.java:1399
+msgstr "Priestory pre ženy"
+
+#: build/trans_presets.java:1402
 msgid "Spaces for Parents"
-msgstr ""
-
-#: build/trans_presets.java:1400
+msgstr "Priestory pre rodičov s detmi"
+
+#: build/trans_presets.java:1403
 msgid "See the Wiki for other capacity:[types]=*."
-msgstr ""
+msgstr "Pozrite Wiki pre iné typy capacity:[types]=*."
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1405
 msgid "Wash"
 msgstr "Umývačka"
 
 #. item
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1406
 msgid "Edit Car Wash"
 msgstr "Upraviť umývačku aut"
@@ -17390,5 +17811,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1408 build/trans_presets.java:1452
+#: build/trans_presets.java:1411 build/trans_presets.java:1455
 msgid "Shop"
 msgstr "Obchod"
@@ -17396,15 +17817,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1413
 msgid "Edit Car Shop"
 msgstr "Upraviť obchod s autami"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1418
 msgid "Repair"
 msgstr "Servis"
 
 #. item
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1419
 msgid "Edit Car Repair"
 msgstr "Upraviť autoservis"
@@ -17412,5 +17833,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1421 build/trans_presets.java:1445
+#: build/trans_presets.java:1424 build/trans_presets.java:1448
 msgid "Rental"
 msgstr "Požičovňa"
@@ -17419,10 +17840,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1427
 msgid "Edit Car Rental"
 msgstr "Upraviť autopožičovňu"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1432
 msgid "Sharing"
 msgstr "Autopožičovňa (aj pre krátkodobé požičanie auta aj 1 hod.)"
@@ -17430,5 +17851,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1434
 msgid "Edit Car Sharing"
 msgstr "Upraviť autopožičovňu (aj pre krátkodobé požičanie auta aj 1hod.)"
@@ -17436,10 +17857,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Parking"
 msgstr "Upraviť parkovisko bicyklov"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1446
 msgid "Capacity"
 msgstr "Kapacita"
@@ -17448,5 +17869,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1448
+#: build/trans_presets.java:1451
 msgid "Edit Bicycle Rental"
 msgstr "Upraviť požičovňu bicyklov"
@@ -17455,15 +17876,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1458
 msgid "Edit Bicycle Shop"
 msgstr "Upraviť bicyklový obchod"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1463
 msgid "Public Transport"
 msgstr "Hromadná doprava"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:1472
 msgid "UIC-Reference"
 msgstr "UIC-Reference"
@@ -17471,5 +17892,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1475
 msgid "Railway Halt"
 msgstr "Železničná zastávka"
@@ -17477,5 +17898,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1477
 msgid "Edit Halt"
 msgstr "Upraviť zastávku"
@@ -17483,5 +17904,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1484
 msgid "Tram Stop"
 msgstr "Zastávka električky"
@@ -17490,5 +17911,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1484
+#: build/trans_presets.java:1487
 msgid "Edit Tram Stop"
 msgstr "Upraviť zastávku električky"
@@ -17496,5 +17917,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1494
 msgid "Railway Platform"
 msgstr "Železničné nástupište"
@@ -17503,5 +17924,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1497
 msgid "Edit Railway Platform"
 msgstr "Upraviť železničné nástupište"
@@ -17513,5 +17934,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1497 build/trans_presets.java:1539
+#: build/trans_presets.java:1500 build/trans_presets.java:1542
 msgid "Reference (track number)"
 msgstr "Referencie (číslo stopy(track))"
@@ -17519,10 +17940,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1499 build/trans_presets.java:1541
+#: build/trans_presets.java:1502 build/trans_presets.java:1544
 msgid "Area"
 msgstr "Oblasť"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1504
 msgid "Subway Entrance"
 msgstr "Vchod do metra"
@@ -17531,10 +17952,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1507
 msgid "Edit Subway Entrance"
 msgstr "Upraviť vchod do metra"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1512
 msgid "Wheelchair"
 msgstr "Invalidný vozík"
@@ -17543,5 +17964,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1517
 msgid "Bus Station"
 msgstr "Autobusová stanica"
@@ -17550,5 +17971,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1520
 msgid "Edit Bus Station"
 msgstr "Upraviť autobusovú stanicu"
@@ -17556,5 +17977,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1526
 msgid "Bus Stop"
 msgstr "Autobusová zastávka"
@@ -17564,5 +17985,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1530
 msgid "Edit Bus Stop"
 msgstr "Upraviť autobusovú zastávku"
@@ -17571,6 +17992,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1532 build/trans_presets.java:1785
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:1535 build/trans_presets.java:1789
+#: build/trans_presets.java:2453
 msgid "Shelter"
 msgstr "Prístrešok"
@@ -17578,10 +17999,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1538
 msgid "Bus Platform"
 msgstr "Autobusové nástupište"
 
 #. item
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1539
 msgid "Edit Bus Platform"
 msgstr "Upraviť autobusové nástupište"
@@ -17589,5 +18010,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1547
 msgid "Taxi"
 msgstr "Taxi"
@@ -17595,5 +18016,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1549
 msgid "Edit Taxi station"
 msgstr "Upraviť stanicu taxíkov"
@@ -17601,5 +18022,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1554
 msgid "Airport"
 msgstr "Letisko"
@@ -17607,15 +18028,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1556
 msgid "Edit Airport"
 msgstr "Upraviť letisko"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1561
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1559
+#: build/trans_presets.java:1562
 msgid "ICAO"
 msgstr "ICAO"
@@ -17623,6 +18044,11 @@
 #. item "Public Transport/Airport" text "ICAO"
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1567
+#, fuzzy
+msgid "Travel"
+msgstr "štrk (gravel)"
+
+#. group "Travel"
+#: build/trans_presets.java:1568
 msgid "Accomodation"
 msgstr "Ubytovanie"
@@ -17634,5 +18060,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1565 build/trans_surveyor.java:43
+#: build/trans_presets.java:1569 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -17641,15 +18067,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:1568
+#: build/trans_presets.java:1572
 msgid "Edit Hotel"
 msgstr "Upraviť hotel"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1575
 msgid "Stars"
 msgstr "Hviezdičkový"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1577
 msgid "Motel"
 msgstr "Motel"
@@ -17657,20 +18083,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1579
 msgid "Edit Motel"
 msgstr "Upraviť motel"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1583
 msgid "Guest House"
 msgstr "Penzión"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1584
 msgid "Edit Guest House"
 msgstr "Upraviť penzión"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1588
 msgid "Chalet"
 msgstr "Chata"
@@ -17678,10 +18104,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1590
 msgid "Edit Chalet"
 msgstr "Upraviť chatu"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1594
 msgid "Hostel"
 msgstr "Ubytovňa"
@@ -17689,30 +18115,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1592
+#: build/trans_presets.java:1596
 msgid "Edit Hostel"
 msgstr "Upraviť ubytovňu"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1600
 msgid "Alpine Hut"
 msgstr "Horská chata"
 
 #. item
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1601
 msgid "Edit Alpine Hut"
 msgstr "Upraviť horskú chatu"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1606
 msgid "Caravan Site"
 msgstr "Kemping pre obytné prívesy"
 
 #. item
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1607
 msgid "Edit Caravan Site"
 msgstr "Upraviť kemping pre obytné prívesy"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1611
 msgid "Camping Site"
 msgstr "Stanový tábor"
@@ -17720,10 +18146,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1613
 msgid "Edit Camping Site"
 msgstr "Upraviť stanový tábor"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1618
 msgid "Food+Drinks"
 msgstr "Jedlo + Pitie"
@@ -17734,5 +18160,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1615 build/trans_surveyor.java:47
+#: build/trans_presets.java:1619 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Reštaurácia"
@@ -17740,5 +18166,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1621
 msgid "Edit Restaurant"
 msgstr "Upraviť reštauráciu"
@@ -17746,5 +18172,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "Cuisine"
 msgstr "Kuchyňa"
@@ -17752,61 +18178,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "italian"
 msgstr "talianska"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "chinese"
 msgstr "čínska"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "greek"
 msgstr "grécka"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "german"
 msgstr "nemecká"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "indian"
 msgstr "indická"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "regional"
 msgstr "regionálna"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "turkish"
 msgstr "turecká"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "asian"
 msgstr "ázijská"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "thai"
 msgstr "thajská"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "mexican"
 msgstr "mexická"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "japanese"
 msgstr "japonská"
 
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1627
 msgid "Fast Food"
 msgstr "Rýchle občerstvenie"
@@ -17814,9 +18240,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1629
 msgid "Edit Fast Food Restaurant"
 msgstr "Upraviť reštauráciu rýchleho občerstvenia"
 
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1635
 msgid "Cafe"
 msgstr "Kaviareň"
@@ -17824,9 +18250,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1633
+#: build/trans_presets.java:1637
 msgid "Edit Cafe"
 msgstr "Upraviť kaviareň"
 
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1642
 msgid "Pub"
 msgstr "Krčma"
@@ -17834,18 +18260,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1644
 msgid "Edit Pub"
 msgstr "Upraviť krčmu"
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1649
 msgid "Biergarten"
 msgstr "Záhradná reštaurácia"
 
 #. item
-#: build/trans_presets.java:1646
+#: build/trans_presets.java:1650
 msgid "Edit Biergarten"
 msgstr "Upraviť záhradnú reštauráciu"
 
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1655
 msgid "Bar"
 msgstr "Bar (výčap)"
@@ -17853,9 +18279,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1657
 msgid "Edit Bar"
 msgstr "Upraviť bar (výčap)"
 
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1662
 msgid "Nightclub"
 msgstr "Nočný klub"
@@ -17863,24 +18289,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1664
 msgid "Edit Nightclub"
 msgstr "Upraviť nočný klub"
 
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1670
 msgid "Tourism"
 msgstr "Turistika"
 
 #. group "Tourism"
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1671
 msgid "Attraction"
 msgstr "Atrakcia"
 
 #. item
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1672
 msgid "Edit Attraction"
 msgstr "Upraviť atrakciu"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1677
 msgid "Museum"
 msgstr "Múzeum"
@@ -17888,9 +18314,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1679
 msgid "Edit Museum"
 msgstr "Upraviť múzeum"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1684
 msgid "Zoo"
 msgstr "Zoo"
@@ -17899,9 +18325,9 @@
 #. <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:1683
+#: build/trans_presets.java:1687
 msgid "Edit Zoo"
 msgstr "Upraviť zoo"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1692
 msgid "Viewpoint"
 msgstr "Výhliadka"
@@ -17909,24 +18335,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1694
 msgid "Edit Viewpoint"
 msgstr "Upraviť výhliadku"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1697
 msgid "Look-Out Tower"
 msgstr "Výhliadková veža"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1699
 msgid "Theme Park"
 msgstr "Zábavný park"
 
 #. item
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1700
 msgid "Edit Theme Park"
 msgstr "Upraviť zábavný park"
 
-#: build/trans_presets.java:1701
+#: build/trans_presets.java:1705
 msgid "Artwork"
 msgstr "Umelecké dielo"
@@ -17934,5 +18360,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1707
 msgid "Edit Artwork"
 msgstr "Upraviť umelecké dielo"
@@ -17940,21 +18366,21 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1712
 msgid "Information Office"
 msgstr "Informačná kancelária"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1719
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "Detail Grade"
-msgstr ""
+msgstr "Popísať Kvalitu(Detail Grade)"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "topo"
-msgstr ""
+msgstr "topo"
 
 #. color tertiary
@@ -17990,5 +18416,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1720 build/trans_style.java:619
+#: build/trans_presets.java:1724 build/trans_style.java:619
 #: build/trans_style.java:635 build/trans_style.java:651
 #: build/trans_style.java:659
@@ -17996,28 +18422,28 @@
 msgstr "ulica"
 
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "scheme"
-msgstr ""
-
-#: build/trans_presets.java:1721
+msgstr "plán(scheme)"
+
+#: build/trans_presets.java:1725
 msgid "Shown Area"
-msgstr ""
+msgstr "Ukárať oblasť"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "site"
-msgstr ""
-
-#: build/trans_presets.java:1721
+msgstr "miesto(site)"
+
+#: build/trans_presets.java:1725
 msgid "city"
-msgstr ""
-
-#: build/trans_presets.java:1721
+msgstr "mesto(city)"
+
+#: build/trans_presets.java:1725
 msgid "region"
-msgstr ""
+msgstr "oblasť(region)"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1722 build/trans_presets.java:1738
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1726 build/trans_presets.java:1742
+#: build/trans_presets.java:1786
 msgid "Closer Description"
 msgstr "Bližší popis"
@@ -18027,12 +18453,12 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1724 build/trans_presets.java:1747
+#: build/trans_presets.java:1728 build/trans_presets.java:1751
 msgid "Routes shown for:"
-msgstr ""
+msgstr "Cesty ukázať pre:"
 
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1726 build/trans_presets.java:1749
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1965
 msgid "Cycling"
 msgstr "Cyklistika"
@@ -18040,12 +18466,12 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1727 build/trans_presets.java:1750
+#: build/trans_presets.java:1731 build/trans_presets.java:1754
 msgid "Mountainbiking"
-msgstr ""
+msgstr "Horský bicykel"
 
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1728 build/trans_presets.java:1751
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:1732 build/trans_presets.java:1755
+#: build/trans_presets.java:2019
 msgid "Skiing"
 msgstr "Lýžovanie"
@@ -18053,82 +18479,82 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1729 build/trans_presets.java:1752
+#: build/trans_presets.java:1733 build/trans_presets.java:1756
 msgid "Riding"
-msgstr ""
+msgstr "Jazdectvo"
 
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1734 build/trans_presets.java:1757
 msgid "... other transportation modes possible"
-msgstr ""
+msgstr "... iný prijateľný režim prepravy"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1736
 msgid "Information Board"
 msgstr "Informačná tabuľa"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "Board Content"
-msgstr ""
+msgstr "Informačný panel s radami (board content)"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "notice"
-msgstr ""
-
-#: build/trans_presets.java:1737
+msgstr "upozornenie"
+
+#: build/trans_presets.java:1741
 msgid "history"
 msgstr "história"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "nature"
 msgstr "príroda"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "wildlife"
 msgstr "divoká príroda"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "plants"
-msgstr ""
+msgstr "závod"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1744
 msgid "Guidepost"
-msgstr ""
+msgstr "Rázcestník (ukazovateľ smeru)"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1759
 msgid "Information Terminal"
-msgstr ""
+msgstr "Informačný terminál"
 
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1760 build/trans_presets.java:1770
+#: build/trans_presets.java:1764 build/trans_presets.java:1774
 msgid "Closer description"
-msgstr ""
-
-#: build/trans_presets.java:1765
+msgstr "Bližší popis"
+
+#: build/trans_presets.java:1769
 msgid "Audioguide"
-msgstr ""
+msgstr "Audiosprievodcovia"
 
 #. <space />
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1779
 msgid "Audioguide via mobile phone?"
-msgstr ""
+msgstr "Audiosprievodcovia cez mobilný telefón?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1780
 msgid "Phone number"
-msgstr ""
+msgstr "Číslo telefónu"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1778
+#: build/trans_presets.java:1782
 msgid "Other Information Points"
 msgstr "Ostatné(iné) informačné body(miesta)"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1790
 msgid "Edit Shelter"
 msgstr "Upraviť prístrešok"
@@ -18136,25 +18562,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1789 build/trans_presets.java:1795
+#: build/trans_presets.java:1793 build/trans_presets.java:1799
 msgid "Fireplace"
 msgstr "Ohnisko"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1791
+#: build/trans_presets.java:1795
 msgid "Picnic Site"
 msgstr "Výletné miesto"
 
 #. item
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1796
 msgid "Edit Picnic Site"
 msgstr "Upraviť výletné miesto"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1802
 msgid "Historic Places"
 msgstr "Historické miesta"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1799
+#: build/trans_presets.java:1803
 msgid "Castle"
 msgstr "Hrad"
@@ -18163,19 +18589,19 @@
 #. <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:1802
+#: build/trans_presets.java:1806
 msgid "Edit Castle"
 msgstr "Upraviť hrad"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1810
 msgid "Ruins"
 msgstr "Ruiny"
 
 #. item
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1811
 msgid "Edit Ruins"
 msgstr "Upraviť ruiny"
 
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1816
 msgid "Archaeological Site"
 msgstr "Archeologické nálezisko"
@@ -18184,9 +18610,9 @@
 #. <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:1815
+#: build/trans_presets.java:1819
 msgid "Edit Archaeological Site"
 msgstr "Upraviť archeologické nálezisko"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1824
 msgid "Battlefield"
 msgstr "Bojisko"
@@ -18194,5 +18620,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1826
 msgid "Edit Battlefield"
 msgstr "Upraviť bojisko"
@@ -18200,15 +18626,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1831
 msgid "Monument"
 msgstr "Pamätihodnosť, pamätník"
 
 #. item
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1832
 msgid "Edit Monument"
 msgstr "Upraviť pamätihodnosť, pamätník"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1836
 msgid "Memorial"
 msgstr "Pomník"
@@ -18216,45 +18642,57 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1838
 msgid "Edit Memorial"
 msgstr "Upraviť pomník"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1842
 msgid "Wayside Cross"
 msgstr "Kríž pri ceste"
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1843
 msgid "Edit Wayside Cross"
 msgstr "Upraviť kríž pri ceste"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1847
 msgid "Wayside Shrine"
 msgstr "Božia muka"
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1848
 msgid "Edit Wayside Shrine"
 msgstr "Upraviť božiu muku"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1852
+#, fuzzy
+msgid "Boundary Stone"
+msgstr "Hranice"
+
+#. item
+#: build/trans_presets.java:1853
+#, fuzzy
+msgid "Edit Boundary Stone"
+msgstr "Upraviť kníhkupectvo"
+
+#. item "Historic Places/Boundary Stone" text "Name"
+#: build/trans_presets.java:1858
 msgid "Leisure"
 msgstr "Oddych (Leisure)"
 
 #. group "Leisure"
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1859
 msgid "Water Park"
 msgstr "Vodný zábavný park"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1860
 msgid "Edit Water Park"
 msgstr "Upraviť vodný zábavný park"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1864
 msgid "Playground"
 msgstr "Ihrisko"
@@ -18262,31 +18700,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1866
 msgid "Edit Playground"
 msgstr "Upraviť ihrisko"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1870
 msgid "Fishing"
 msgstr "Rybolov"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1871
 msgid "Edit Fishing"
 msgstr "Upraviť rybolov"
 
 #. item "Leisure/Fishing" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1877 build/trans_presets.java:2669
+msgid "Sports"
+msgstr "Športy"
+
+#. group "Sports"
+#: build/trans_presets.java:1878
 msgid "Sport Facilities"
 msgstr "Športové zariadenie"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1879
 msgid "Stadium"
 msgstr "Štadión"
 
 #. item
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1880
 msgid "Edit Stadium"
 msgstr "Upraviť štadión"
@@ -18300,6 +18742,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1874 build/trans_presets.java:1883
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1902 build/trans_presets.java:1911
 msgid "select sport:"
 msgstr "vyberte šport:"
@@ -18691,30 +19133,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884 build/trans_style.java:3892
-#: build/trans_style.java:3900 build/trans_style.java:3908
-#: build/trans_style.java:3916 build/trans_style.java:3924
-#: build/trans_style.java:3932
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_style.java:3572 build/trans_style.java:3580
+#: build/trans_style.java:3588 build/trans_style.java:3596
+#: build/trans_style.java:3604 build/trans_style.java:3612
+#: build/trans_style.java:3620 build/trans_style.java:3628
+#: build/trans_style.java:3636 build/trans_style.java:3644
+#: build/trans_style.java:3652 build/trans_style.java:3660
+#: build/trans_style.java:3668 build/trans_style.java:3676
+#: build/trans_style.java:3684 build/trans_style.java:3692
+#: build/trans_style.java:3700 build/trans_style.java:3708
+#: build/trans_style.java:3716 build/trans_style.java:3724
+#: build/trans_style.java:3732 build/trans_style.java:3740
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3764 build/trans_style.java:3772
+#: build/trans_style.java:3780 build/trans_style.java:3788
+#: build/trans_style.java:3796 build/trans_style.java:3804
+#: build/trans_style.java:3812 build/trans_style.java:3820
+#: build/trans_style.java:3828 build/trans_style.java:3836
+#: build/trans_style.java:3844 build/trans_style.java:3852
+#: build/trans_style.java:3860 build/trans_style.java:3868
+#: build/trans_style.java:3876 build/trans_style.java:3884
+#: build/trans_style.java:3892 build/trans_style.java:3900
+#: build/trans_style.java:3908 build/trans_style.java:3916
+#: build/trans_style.java:3924 build/trans_style.java:3932
+#: build/trans_style.java:3940
 msgid "sport"
 msgstr "šport"
@@ -18724,68 +19166,68 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "archery"
 msgstr "lukostreľba"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "athletics"
 msgstr "atletika"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "australian_football"
 msgstr "australian_football"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "baseball"
 msgstr "bejzbal"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "basketball"
 msgstr "basketbal"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "boules"
 msgstr "boules (spoločný názov pre hry hrajuce sa s kovovými guľami)"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "bowls"
 msgstr ""
 "bowls (gúľanie šišatej gule po umelej,alebo prírodnej tráve k malej guľke)"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "canoe"
 msgstr "kanoe"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "climbing"
 msgstr "lezenie"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket"
 msgstr "kriket"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket_nets"
 msgstr ""
 "kriketová tréningová plocha s ochrannými sieťami (pre pálkára a nadhadzovača)"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "croquet"
 msgstr ""
@@ -18793,160 +19235,160 @@
 "trávnika)"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cycling"
 msgstr "bicyklovanie"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "dog_racing"
 msgstr "závody chrtov"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "equestrian"
 msgstr "jazdectvo"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "football"
 msgstr "americký futbal"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "gymnastics"
 msgstr "gymnastika"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "horse_racing"
 msgstr "konské dostihy"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "motor"
 msgstr "automobilový"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "racquet"
 msgstr "racquetbal (podobné ako squash, iné pravidlá)"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "rugby"
 msgstr "ragby"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "shooting"
 msgstr "streľba"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skating"
 msgstr "korčuľovanie"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skiing"
 msgstr "lyžovanie"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "soccer"
 msgstr "futbal (soccer)"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "swimming"
 msgstr "plávanie"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "table_tennis"
 msgstr "stolný tenis"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1888
 msgid "Sports Centre"
 msgstr "Športové centrum"
 
 #. item
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1889
 msgid "Edit Sports Centre"
 msgstr "Upraviť športové centrum"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1897
 msgid "Pitch"
 msgstr "Hracia plocha, ihrisko"
 
 #. item
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1898
 msgid "Edit Pitch"
 msgstr "Upraviť hraciu plochu, ihrisko"
 
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1906
 msgid "Racetrack"
 msgstr "Dostihová dráha"
 
 #. item
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1907
 msgid "Edit Racetrack"
 msgstr "Upraviť dostihovú dráhu"
 
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1915
 msgid "Golf Course"
 msgstr "Golfové ihrisko"
 
 #. item
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1916
 msgid "Edit Golf Course"
 msgstr "Upraviť golfové ihrisko"
 
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1921
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1922
 msgid "Edit Miniature Golf"
 msgstr "Upraviť minigolf"
 
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1928
 msgid "Sport"
 msgstr "Šport"
 
 #. group "Sport"
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1929
 msgid "Multi"
 msgstr "Multi"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1930
 msgid "Edit Multi"
 msgstr "Upraviť Multi"
@@ -18985,183 +19427,183 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "pitch"
 msgstr "hracia plocha, ihrisko"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "sports_centre"
 msgstr "športové centrum"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "stadium"
 msgstr "štadión"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1935
 msgid "10pin"
 msgstr "10pin (Kolok na hru s desiatimi kolkami)"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1936
 msgid "Edit 10pin"
 msgstr "Upraviť 10pin (kolok na hru s desiatimi kolkami)"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1941
 msgid "Athletics"
 msgstr "Atletika"
 
 #. item
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1942
 msgid "Edit Athletics"
 msgstr "Upraviť atletiku"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1947
 msgid "Archery"
 msgstr "Lukostreľba"
 
 #. item
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1948
 msgid "Edit Archery"
 msgstr "Upraviť lukostreľbu"
 
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1953
 msgid "Climbing"
 msgstr "Lezenie"
 
 #. item
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:1954
 msgid "Edit Climbing"
 msgstr "Upraviť lezenie"
 
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1959
 msgid "Canoeing"
 msgstr "Kanoistika"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1960
 msgid "Edit Canoeing"
 msgstr "Upraviť kanoistiku"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1966
 msgid "Edit Cycling"
 msgstr "Upraviť cyklistiku"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1971
 msgid "Dog Racing"
 msgstr "Preteky chrtov"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1972
 msgid "Edit Dog Racing"
 msgstr "Upraviť preteky chrtov"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1977
 msgid "Equestrian"
 msgstr "Jazdectvo"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1978
 msgid "Edit Equestrian"
 msgstr "Upraviť jazdectvo"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1983
 msgid "Horse Racing"
 msgstr "Konské dostihy"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1984
 msgid "Edit Horse Racing"
 msgstr "Upraviť konské dostihy"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1989
 msgid "Gymnastics"
 msgstr "Gymnastika"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1990
 msgid "Edit Gymnastics"
 msgstr "Upraviť turistiku"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1995
 msgid "Motor Sports"
 msgstr "Motošport"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1996
 msgid "Edit Motor Sports"
 msgstr "Upraviť motošport"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2001
 msgid "Skating"
 msgstr "Korčuľovanie"
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2002
 msgid "Edit Skating"
 msgstr "Upraviť korčuľovanie"
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2007
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2008
 msgid "Edit Skateboard"
 msgstr "Upraviť Skateboard"
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2013
 msgid "Swimming"
 msgstr "Plávanie"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2014
 msgid "Edit Swimming"
 msgstr "Upraviť plávanie"
@@ -19169,56 +19611,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2021
 msgid "Edit Skiing"
 msgstr "Upraviť lyžovanie"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "Piste type"
 msgstr "Typ lyžiarskej dráhy"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "downhill"
 msgstr "zjazdárska"
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "nordic"
 msgstr "beh nalyžiach hore kopcom (nordic)"
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "snow_park"
 msgstr "park zimných športov"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "Difficulty"
 msgstr "Obtiažnosť"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "novice"
 msgstr "pre začiatočníkov"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "easy"
 msgstr "ľahká"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "intermediate"
 msgstr "stredne pokročilý (intermediate)"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "advanced"
 msgstr "pokročilý (advanced)"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "expert"
 msgstr "pre skúsených"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "freeride"
 msgstr "freeride (zjazd na horských bicykloch cez prekážky)"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2028
 msgid "Shooting"
 msgstr "Streľba"
@@ -19226,178 +19668,183 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2030
 msgid "Edit Shooting"
 msgstr "Upraviť streľbu"
 
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2036
 msgid "Sport (Ball)"
 msgstr "Šport (loptový)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2037
 msgid "Soccer"
 msgstr "Futbal"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2038
 msgid "Edit Soccer"
 msgstr "Upraviť futbal"
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2043
 msgid "Football"
 msgstr "Americký futbal"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2044
 msgid "Edit Football"
 msgstr "Upraviť americký futbal"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2049
 msgid "Australian Football"
 msgstr "Australian Football"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2050
 msgid "Edit Australian Football"
 msgstr "Upraviť Australian Football"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2055
 msgid "Baseball"
 msgstr "Bejzbal"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2056
 msgid "Edit Baseball"
 msgstr "Upraviť bejzbal"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2061
 msgid "Basketball"
 msgstr "Basketbal"
 
 #. item
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2062
 msgid "Edit Basketball"
 msgstr "Upraviť basketbal"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2067
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2068
 msgid "Edit Golf"
 msgstr "Upraviť golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2071
 msgid "golf_course"
 msgstr "golfové ihrisko"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2073
 msgid "Boule"
 msgstr "Bowling na tráve"
 
 #. item
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2074
 msgid "Edit Boule"
 msgstr "Upraviť bowling na tráve"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2079
 msgid "Bowls"
 msgstr "Bowling"
 
 #. item
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2080
 msgid "Edit Bowls"
 msgstr "Upraviť bowling"
 
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2085
 msgid "Cricket"
 msgstr "Kriket"
 
 #. item
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2086
 msgid "Edit Cricket"
 msgstr "Upraviť kriket"
 
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2091
 msgid "Cricket Nets"
 msgstr "Cvičné ihrisko pre kriket so sieťou"
 
 #. item
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2092
 msgid "Edit Cricket Nets"
 msgstr "Upraviť cvičné ihrisko pre kriket so sieťou"
 
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2097
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2098
 msgid "Edit Croquet"
 msgstr "Upraviť kroquet"
 
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2103
 msgid "Hockey"
 msgstr "Hokej"
 
 #. item
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2104
 msgid "Edit Hockey"
 msgstr "Upraviť hokej"
 
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2109
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2110
 msgid "Edit Pelota"
 msgstr "Upraviť polotu"
 
-#: build/trans_presets.java:2105
+#: build/trans_presets.java:2115
 msgid "Racquet"
 msgstr "Racquetbal"
 
 #. item
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2116
 msgid "Edit Racquet"
 msgstr "Upraviť racquetbal"
 
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2121
 msgid "Rugby"
 msgstr "Ragby"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2122
 msgid "Edit Rugby"
 msgstr "Upraviť ragby"
 
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2127
 msgid "Table Tennis"
 msgstr "Stolný tenis"
 
 #. item
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2128
 msgid "Edit Table Tennis"
 msgstr "Upraviť stolný tenis"
 
-#: build/trans_presets.java:2123
+#: build/trans_presets.java:2133
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2134
 msgid "Edit Tennis"
 msgstr "Upraviť tenis"
 
-#. <separator/>
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2141
+#, fuzzy
+msgid "Man-Made"
+msgstr "Človekom vytvorené (Man made)"
+
+#. group "Man-Made"
+#: build/trans_presets.java:2142
 msgid "Buildings"
 msgstr "Budovy, stavby"
 
 #. group "Buildings"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2143
 msgid "Building"
 msgstr "Budova"
@@ -19405,5 +19852,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Public Building"
 msgstr "Verejná budova"
@@ -19411,10 +19858,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2148
 msgid "Edit Public Building"
 msgstr "Upraviť verejnú budovu"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2152
 msgid "Town hall"
 msgstr "Radnica (obecný úrad)"
@@ -19422,10 +19869,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2154
 msgid "Edit Town hall"
 msgstr "Upraviť radnicu (obecný úrad)"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:2158
 msgid "Embassy"
 msgstr "Veľvyslanectvo"
@@ -19433,10 +19880,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Edit Embassy"
 msgstr "Upraviť veľvyslanectvo"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2164
 msgid "Courthouse"
 msgstr "Súd"
@@ -19445,10 +19892,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:2156
+#: build/trans_presets.java:2167
 msgid "Edit Courthouse"
 msgstr "Upraviť súd"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2171
 msgid "Prison"
 msgstr "Vezenie"
@@ -19457,10 +19904,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:2163
+#: build/trans_presets.java:2174
 msgid "Edit Prison"
 msgstr "Upraviť súd"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2178
 msgid "Police"
 msgstr "Polícia"
@@ -19470,10 +19917,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:2171
+#: build/trans_presets.java:2182
 msgid "Edit Police"
 msgstr "Upraviť políciu"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2186
 msgid "Fire Station"
 msgstr "Hasičská stanica"
@@ -19482,10 +19929,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:2178
+#: build/trans_presets.java:2189
 msgid "Edit Fire Station"
 msgstr "Upraviť hasičskú stanicu"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "Post Office"
 msgstr "Pošta"
@@ -19493,5 +19940,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Edit Post Office"
 msgstr "Upraviť poštu"
@@ -19499,15 +19946,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2200
 msgid "Kindergarten"
 msgstr "Škôlka"
 
 #. item
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Kindergarten"
 msgstr "Upraviť škôlku"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2205
 msgid "School"
 msgstr "Škola"
@@ -19515,10 +19962,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Edit School"
 msgstr "Upraviť školu"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2211
 msgid "University"
 msgstr "Univerzita"
@@ -19526,10 +19973,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit University"
 msgstr "Upraviť Univerzitu"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "College"
 msgstr "Vysoká škola"
@@ -19537,5 +19984,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2219
 msgid "Edit College"
 msgstr "Upraviť vysokú školu"
@@ -19543,5 +19990,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2224
 msgid "Cinema"
 msgstr "Kino"
@@ -19550,10 +19997,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:2216
+#: build/trans_presets.java:2227
 msgid "Edit Cinema"
 msgstr "Upraviť kino"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2231
 msgid "Library"
 msgstr "Knižnica"
@@ -19562,9 +20009,9 @@
 #. <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:2223
+#: build/trans_presets.java:2234
 msgid "Edit Library"
 msgstr "Upraviť knižnicu"
 
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Arts Centre"
 msgstr "Kultúrne stredisko"
@@ -19572,10 +20019,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Arts Centre"
 msgstr "Upraviť kultúrne stredisko"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Theatre"
 msgstr "Divadlo"
@@ -19584,10 +20031,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:2237
+#: build/trans_presets.java:2248
 msgid "Edit Theatre"
 msgstr "Upraviť divadlo"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2252
 msgid "Place of Worship"
 msgstr "Kostol"
@@ -19597,5 +20044,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:2245
+#: build/trans_presets.java:2256
 msgid "Edit Place of Worship"
 msgstr "Upraviť kostol"
@@ -19604,6 +20051,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "Religion"
 msgstr "Náboženstvo"
@@ -19612,66 +20059,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "bahai"
 msgstr "baháisti"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "buddhist"
 msgstr "budhisti"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "christian"
 msgstr "kresťania"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "hindu"
 msgstr "hinduisti"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jain"
 msgstr "džinisti"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jewish"
 msgstr "judaisti"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "muslim"
 msgstr "moslimovia"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "spiritualist"
 msgstr "spiritualisti"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "taoist"
 msgstr "taoisti"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "unitarian"
 msgstr "unitársky"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "zoroastrian"
 msgstr "zoroastrian"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "Denomination"
 msgstr "Vyznanie (cirkevné)"
@@ -19680,81 +20127,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "anglican"
 msgstr "anglikánska"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "baptist"
 msgstr "baptistická"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "catholic"
 msgstr "katolícka"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "evangelical"
 msgstr "evanjelikánska"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "jehovahs_witness"
 msgstr "svedkovia jehovovi"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "lutheran"
 msgstr "lutheránska"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "methodist"
 msgstr "methodistická"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "mormon"
 msgstr "mormónska"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "orthodox"
 msgstr "orthodoxná"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "presbyterian"
 msgstr "presbiteriánska"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "protestant"
 msgstr "protestanská"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "quaker"
 msgstr "quakerská"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "shia"
 msgstr "šiítska"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "sunni"
 msgstr "sunnitská"
 
 #. <separator/>
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2264
 msgid "Addresses"
 msgstr "Adresy"
@@ -19763,5 +20210,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:2256
+#: build/trans_presets.java:2267
 msgid "Edit Address Information"
 msgstr "Upraviť informácie o adrese"
@@ -19769,5 +20216,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2269
 msgid "House number"
 msgstr "Číslo domu"
@@ -19775,20 +20222,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "House name"
 msgstr "Meno domu"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "City name"
 msgstr "Názov mesta"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2274
 msgid "Post code"
 msgstr "Poštové smerovacie číslo"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2275
 msgid "Country code"
 msgstr "Kód krajiny"
@@ -19796,5 +20243,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Address Interpolation"
 msgstr "Interpolácia adries"
@@ -19803,5 +20250,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:2270
+#: build/trans_presets.java:2281
 msgid "Edit Address Interpolation"
 msgstr "Upraviť interpoláciu adries"
@@ -19809,67 +20256,67 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "Numbering scheme"
 msgstr "Schéma číslovania"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "odd"
 msgstr "nepárne"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "even"
 msgstr "párne"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "alphabetic"
 msgstr "abecedný"
 
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2286
 msgid "Man Made"
 msgstr "Človekom vytvorené (Man made)"
 
 #. group "Man Made"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Works"
 msgstr "Závody (továrne)"
 
 #. item
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2288
 msgid "Edit Works"
 msgstr "Upraviť závody (továrne)"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2292
 msgid "Tower"
 msgstr "Veža"
 
 #. item
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2293
 msgid "Edit Tower"
 msgstr "Upraviť vežu"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Water Tower"
 msgstr "Vodojem"
 
 #. item
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2298
 msgid "Edit Water Tower"
 msgstr "Upraviť vodojem"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Gasometer"
 msgstr "Plynojem (Gasometer)"
 
 #. item
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2303
 msgid "Edit Gasometer"
 msgstr "Upraviť plynojem (gasometer)"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Lighthouse"
 msgstr "Maják"
@@ -19877,10 +20324,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2309
 msgid "Edit Lighthouse"
 msgstr "Upraviť maják"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Windmill"
 msgstr "Veterný mlyn"
@@ -19888,10 +20335,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2315
 msgid "Edit Windmill"
 msgstr "Upraviť veterný mlyn"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2319
 msgid "Pipeline"
 msgstr "Potrubie"
@@ -19899,10 +20346,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Edit Pipeline"
 msgstr "Upraviť potrubie"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2325
 msgid "Wastewater Plant"
 msgstr "Čistička odpadových vôd"
@@ -19912,10 +20359,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:2318
+#: build/trans_presets.java:2329
 msgid "Edit Wastewater Plant"
 msgstr "Upraviť čističku odpadových vôd"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2333
 msgid "Crane"
 msgstr "Žeriav"
@@ -19923,10 +20370,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2335
 msgid "Edit Crane"
 msgstr "Upraviť žeriav"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Beacon"
 msgstr "Signál (rádiomaják)"
@@ -19934,10 +20381,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2341
 msgid "Edit Beacon"
 msgstr "Upraviť signál (rádiomaják)"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2345
 msgid "Survey Point"
 msgstr "Meračský bod"
@@ -19945,10 +20392,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Edit Survey Point"
 msgstr "Upraviť meračský bod"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2351
 msgid "Surveillance"
 msgstr "Pozorovanie (ostraha)"
@@ -19956,5 +20403,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2353
 msgid "Edit Surveillance Camera"
 msgstr "Upraviť pozorovaciu kameru"
@@ -19962,5 +20409,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Power Generator"
 msgstr "Elektráreň (spôsob vyroby)"
@@ -19970,39 +20417,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:2351
+#: build/trans_presets.java:2362
 msgid "Edit Power Generator"
 msgstr "Upraviť elektráreň (spôsob vyroby)"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "wind"
 msgstr "veterná"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "hydro"
 msgstr "vodná"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "fossil"
 msgstr "fosílna"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "nuclear"
 msgstr "jadrová"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "coal"
 msgstr "uhoľná"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "photovoltaic"
 msgstr "fotovoltanická (slnečná články)"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "gas"
 msgstr "plynová"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2367
 msgid "Power Station"
 msgstr "Transformátorová stanica"
@@ -20011,10 +20458,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:2359
+#: build/trans_presets.java:2370
 msgid "Edit Power Station"
 msgstr "Upraviť trafostanicu"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2374
 msgid "Power Sub Station"
 msgstr "Malý transformátor"
@@ -20023,5 +20470,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:2366
+#: build/trans_presets.java:2377
 msgid "Edit Power Sub Station"
 msgstr "Upraviť malý transformátor"
@@ -20029,10 +20476,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2369 build/trans_presets.java:2385
+#: build/trans_presets.java:2380 build/trans_presets.java:2396
 msgid "Line reference"
 msgstr "Odkazová linka"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2382
 msgid "Power Tower"
 msgstr "Elektrický stožiar (vysoké napätie)"
@@ -20043,5 +20490,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:2376
+#: build/trans_presets.java:2387
 msgid "Edit Power Tower"
 msgstr "Upraviť elektrický stožiar"
@@ -20049,5 +20496,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2390
 msgid "Power Line"
 msgstr "Elektrické vedenie"
@@ -20056,40 +20503,40 @@
 #. <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:2382
+#: build/trans_presets.java:2393
 msgid "Edit Power Line"
 msgstr "Upraviť elektrické vedenie"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Voltage"
 msgstr "Napätie"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2398
 msgid "Amount of Wires"
 msgstr "Počet vodičov"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Amenities"
 msgstr "Vybavenosť (Amenities)"
 
 #. group "Amenities"
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2402
 msgid "Toilets"
 msgstr "Toalety"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2398 build/trans_presets.java:2514
+#: build/trans_presets.java:2409 build/trans_presets.java:2525
 msgid "Note"
 msgstr "Poznámka"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2411
 msgid "Post Box"
 msgstr "Poštová schránka"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2416
 msgid "Telephone"
 msgstr "Telefón"
@@ -20098,5 +20545,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:2408
+#: build/trans_presets.java:2419
 msgid "Edit Telephone"
 msgstr "Upraviť telefón"
@@ -20104,5 +20551,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2411 build/trans_presets.java:2515
+#: build/trans_presets.java:2422 build/trans_presets.java:2526
 msgid "Coins"
 msgstr "Mince"
@@ -20110,5 +20557,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2412 build/trans_presets.java:2516
+#: build/trans_presets.java:2423 build/trans_presets.java:2527
 msgid "Notes"
 msgstr "Bankovky"
@@ -20116,5 +20563,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2413 build/trans_presets.java:2517
+#: build/trans_presets.java:2424 build/trans_presets.java:2528
 msgid "Electronic purses and Charge cards"
 msgstr "Platobné karty a Kreditné karty"
@@ -20122,5 +20569,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2414 build/trans_presets.java:2518
+#: build/trans_presets.java:2425 build/trans_presets.java:2529
 msgid "Debit cards"
 msgstr "Debetné karty"
@@ -20128,15 +20575,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2415 build/trans_presets.java:2519
+#: build/trans_presets.java:2426 build/trans_presets.java:2530
 msgid "Credit cards"
 msgstr "Kreditné karty"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2427
 msgid "Telephone cards"
 msgstr "Telefónne karty"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2429
 msgid "Recycling"
 msgstr "Recyklácia"
@@ -20145,5 +20592,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:2421
+#: build/trans_presets.java:2432
 msgid "Edit Recycling station"
 msgstr "Upraviť recykláciu (zber)"
@@ -20151,35 +20598,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Batteries"
 msgstr "Batérie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2435
 msgid "Cans"
 msgstr "Plechovky"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Clothes"
 msgstr "Handry"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2437
 msgid "Glass"
 msgstr "Sklo"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2438
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2439
 msgid "Scrap Metal"
 msgstr "Železný šrot"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2441
 msgid "Bench"
 msgstr "Lavička"
@@ -20188,40 +20635,33 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2433
-#, fuzzy
+#: build/trans_presets.java:2444
 msgid "Backrest"
-msgstr "Späť"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr "Oreradlo chrbta (Backrest)"
+
+#: build/trans_presets.java:2445
 msgid "Material"
-msgstr "Pomník"
+msgstr "Materiál"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2434
-#, fuzzy
+#: build/trans_presets.java:2445
 msgid "stone"
-msgstr "žiadny"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr "kameň"
+
+#: build/trans_presets.java:2445
 msgid "plastic"
-msgstr "miesto"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr "plast"
+
+#: build/trans_presets.java:2446
 msgid "Colour"
 msgstr "Farba"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "black"
-msgstr "Späť"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr "čierna"
+
+#: build/trans_presets.java:2446
 msgid "brown"
-msgstr "dole"
+msgstr "hnedá"
 
 #. color historic
@@ -20290,39 +20730,35 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2435 build/trans_style.java:3055
-#: build/trans_style.java:3063 build/trans_style.java:3071
-#: build/trans_style.java:3079 build/trans_style.java:3127
-#: build/trans_style.java:3135 build/trans_style.java:3233
-#: build/trans_style.java:3241
+#: build/trans_presets.java:2446 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3135
+#: build/trans_style.java:3143 build/trans_style.java:3241
+#: build/trans_style.java:3249
 msgid "green"
 msgstr "zelená"
 
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "red"
-msgstr "koniec (end)"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr "červená"
+
+#: build/trans_presets.java:2446
 msgid "blue"
-msgstr "Hodnota"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr "modrá"
+
+#: build/trans_presets.java:2446
 msgid "white"
-msgstr "voda"
-
-#: build/trans_presets.java:2436
-#, fuzzy
+msgstr "biela"
+
+#: build/trans_presets.java:2447
 msgid "Amount of Seats"
-msgstr "Počet vodičov"
+msgstr "Počet sedadiel"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2449
 msgid "Hunting Stand"
 msgstr "Poľovnícky posed"
 
 #. item
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2450
 msgid "Edit Hunting Stand"
 msgstr "Upraviť poľovnícky posed"
@@ -20331,30 +20767,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2441 build/trans_presets.java:2902
+#: build/trans_presets.java:2452 build/trans_presets.java:2914
 msgid "Height"
 msgstr "Výška"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "low"
 msgstr "nízky"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "half"
 msgstr "polovičný"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "full"
 msgstr "úplný"
 
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2454
 msgid "Hide"
 msgstr "Skryť"
 
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2455
 msgid "Lock"
 msgstr "Zamknúť"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Fountain"
 msgstr "Fontána"
@@ -20363,10 +20799,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:2449
+#: build/trans_presets.java:2460
 msgid "Edit Fountain"
 msgstr "Upraviť fontánu"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2464
 msgid "Drinking Water"
 msgstr "Pitná voda"
@@ -20375,10 +20811,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:2456
+#: build/trans_presets.java:2467
 msgid "Edit Drinking Water"
 msgstr "Upraviť pitnú vodu"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2471
 msgid "Baby Hatch"
 msgstr "Hniezdo záchrany"
@@ -20386,33 +20822,33 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Baby Hatch"
 msgstr "Upraviť hniezdo záchrany"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2479
 msgid "Shops"
 msgstr "Obchody"
 
 #. group "Shops"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2480
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2481
 msgid "Edit Supermarket"
 msgstr "Upraviť supermarket"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2486
 msgid "Chemist"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2476
+msgstr "Lekáreň"
+
+#. item
+#: build/trans_presets.java:2487
 msgid "Edit Chemist"
-msgstr ""
-
-#: build/trans_presets.java:2481
+msgstr "Upraviť lekáreň"
+
+#: build/trans_presets.java:2492
 msgid "Convenience Store"
 msgstr "Obchod s polotovarmi"
@@ -20420,9 +20856,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Edit Convenience Store"
 msgstr "Upraviť obchod s polotovarmi"
 
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2499
 msgid "Kiosk"
 msgstr "Stánok"
@@ -20430,27 +20866,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Kiosk"
 msgstr "Upraviť stánok"
 
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Book Store"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2496
+msgstr "Kníhkupectvo"
+
+#. item
+#: build/trans_presets.java:2507
 msgid "Edit Book Store"
-msgstr ""
-
-#: build/trans_presets.java:2501
+msgstr "Upraviť kníhkupectvo"
+
+#: build/trans_presets.java:2512
 msgid "Travel Agency"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2502
+msgstr "Cestovná kancelária"
+
+#. item
+#: build/trans_presets.java:2513
 msgid "Edit Travel Agency"
-msgstr ""
-
-#: build/trans_presets.java:2507
+msgstr "Upraviť cestovnú kanceláciu"
+
+#: build/trans_presets.java:2518
 msgid "Vending machine"
 msgstr "Predajný automat"
@@ -20458,5 +20894,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Edit Vending machine"
 msgstr "Upraviť predajný automat"
@@ -20464,88 +20900,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "Vending products"
 msgstr "Predávané výrobky"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_tickets"
 msgstr "lístky MHD"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_plans"
 msgstr "plány MHD"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "parking_tickets"
 msgstr "parkovacie lístky"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "food"
 msgstr "jedlo"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "drinks"
 msgstr "pitie"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "sweets"
 msgstr "sladkosti"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "cigarettes"
 msgstr "cigarety"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "photos"
 msgstr "fotky"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "animal_food"
 msgstr "krmivo pre zvieratá"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "news_papers"
 msgstr "noviny"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "toys"
 msgstr "hračky"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "stamps"
 msgstr "známky"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "SIM-cards"
 msgstr "SIM-karty"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "telephone_vouchers"
 msgstr "telefónne kupóny (poukážky)"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "vouchers"
 msgstr "kupóny (poukážky)"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "condoms"
 msgstr "kondómy"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "tampons"
 msgstr "tampóny"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "excrement_bags"
 msgstr "sáčky na výkaly"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Account or loyalty cards"
 msgstr "Prístupové alebo vernostné karty"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Butcher"
 msgstr "Mäsiareň"
@@ -20553,9 +20989,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2535
 msgid "Edit Butcher"
 msgstr "Upraviť mäsiarstvo"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2540
 msgid "Baker"
 msgstr "Chlieb a pečivo"
@@ -20563,9 +20999,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2542
 msgid "Edit Baker"
 msgstr "Upraviť chlieb a pečivo"
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2547
 msgid "Florist"
 msgstr "Kvetinárstvo"
@@ -20573,18 +21009,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Florist"
 msgstr "Upraviť kvetinárstvo"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2554
 msgid "Organic"
 msgstr "Biopotraviny"
 
 #. item
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Edit Organic Shop"
 msgstr "Upraviť biopotraviny"
 
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2560
 msgid "Alcohol"
 msgstr "Alkohol"
@@ -20592,54 +21028,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2562
 msgid "Edit Alcohol Shop"
 msgstr "Upraviť Obchod s alkoholickými nápojmi"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2567
 msgid "Beverages"
 msgstr "Nápoje"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2568
 msgid "Edit Beverages Shop"
 msgstr "Upraviť Obchod s nápojmi."
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2573
 msgid "Computer"
 msgstr "Počítač"
 
 #. item
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2574
 msgid "Edit Computer Shop"
 msgstr "Upraviť počítačový obchod"
 
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Electronics"
 msgstr "Elektronika"
 
 #. item
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2580
 msgid "Edit Electronics Shop"
 msgstr "Upraviť obchod s elektronikou"
 
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2585
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2586
 msgid "Edit Hifi Shop"
 msgstr "Upraviť obchod s Hifi elektronikou"
 
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2591
 msgid "Furniture"
 msgstr "Nábytok"
 
 #. item
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Edit Furniture Shop"
 msgstr "Upraviť obchod s nábytkom"
 
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Garden Centre"
 msgstr "Záhradné centrum"
@@ -20647,9 +21083,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2599
 msgid "Edit Garden Centre"
 msgstr "Upraviť záhradné centrum"
 
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Hardware"
 msgstr "Železiarstvo"
@@ -20657,9 +21093,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2606
 msgid "Edit Hardware Store"
 msgstr "Upraviť železiarstvo"
 
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "Do-it-yourself-store"
 msgstr "Obchod Urob si sám"
@@ -20667,54 +21103,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2613
 msgid "Edit Do-it-yourself-store"
 msgstr "Upraviť obchod Urob si sám"
 
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2618
 msgid "Stationery"
 msgstr "Papierníctvo"
 
 #. item
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2619
 msgid "Edit Stationery Shop"
 msgstr "Upraviť papierníctvo"
 
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Hairdresser"
 msgstr "Kaderníctvo"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Hairdresser"
 msgstr "Upraviť kaderníctvo"
 
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Shoes"
 msgstr "Obuva"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Shoe Shop"
 msgstr "Upravit obchod s obuvou"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2636
 msgid "Toys"
 msgstr "Hračky"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit Toy Shop"
 msgstr "Upraviť obchod s hračkami"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Video"
 msgstr "Obchod s DVD"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Video Shop"
 msgstr "Upraviť obchod s DVD"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "Dry Cleaning"
 msgstr "Chemická čistiareň"
@@ -20722,9 +21158,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2650
 msgid "Edit Dry Cleaning"
 msgstr "Upraviť chemickú čistiareň"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "Laundry"
 msgstr "Práčovňa"
@@ -20732,9 +21168,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2657
 msgid "Edit Laundry"
 msgstr "Upraviť práčovňu"
 
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2662
 msgid "Outdoor"
 msgstr "Turistický (Outdoor)"
@@ -20742,32 +21178,28 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2664
 msgid "Edit Outdoor Shop"
 msgstr "Upraviť obchod s výchádzkovým (outdoor) tovarom"
 
-#: build/trans_presets.java:2658
-msgid "Sports"
-msgstr "Športy"
-
-#. item
-#: build/trans_presets.java:2659
+#. item
+#: build/trans_presets.java:2670
 msgid "Edit Sports Shop"
 msgstr "Upraviť športový obchod"
 
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Optician"
 msgstr "Optik"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Optician"
 msgstr "Upraviť očnú optiku"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2683
 msgid "Cash"
 msgstr "Hotovosť"
 
 #. group "Cash"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2684
 msgid "Bank"
 msgstr "Banka"
@@ -20775,14 +21207,14 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2686
 msgid "Edit Bank"
 msgstr "Upraviť banku"
 
-#: build/trans_presets.java:2680 build/trans_presets.java:2689
+#: build/trans_presets.java:2691 build/trans_presets.java:2700
 msgid "Automated Teller Machine"
 msgstr "Bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2693
 msgid "Money Exchange"
 msgstr "Zmenáreň"
@@ -20790,5 +21222,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Edit Money Exchange"
 msgstr "Upraviť zmenáreň"
@@ -20796,15 +21228,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2691
+#: build/trans_presets.java:2702
 msgid "Edit Automated Teller Machine"
 msgstr "Upraviť bankomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2707
 msgid "Health"
 msgstr "Zdravie"
 
 #. group "Health"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2708
 msgid "Doctors"
 msgstr "Lekári"
@@ -20812,18 +21244,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2710
 msgid "Edit Doctors"
 msgstr "Upraviť lekárov"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2715
 msgid "Dentist"
 msgstr "Zubný lekár"
 
 #. item
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Edit Dentist"
 msgstr "Upraviť zubného lekára"
 
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2721
 msgid "Pharmacy"
 msgstr "Lekáreň"
@@ -20831,5 +21263,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Edit Pharmacy"
 msgstr "Upraviť lekáreň"
@@ -20837,9 +21269,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Dispensing"
 msgstr "výdaj na recepty"
 
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2729
 msgid "Hospital"
 msgstr "Nemocnica"
@@ -20847,10 +21279,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Edit Hospital"
 msgstr "Upraviť nemocnicu"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2735
 msgid "Emergency Access Point"
 msgstr "Pohotovosť (Záchranná služba)"
@@ -20859,5 +21291,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:2727
+#: build/trans_presets.java:2738
 msgid "Edit Emergency Access Point"
 msgstr "Upraviť pohotovosť (záchrannú službu)"
@@ -20866,20 +21298,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2741
 msgid "Point Number"
 msgstr "Číslo bodu"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2742
 msgid "Point Name"
 msgstr "Meno bodu(miesta)"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Phone Number"
 msgstr "Telefónne číslo"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Použite medzinárodný kód, ako +12-345-67890)"
@@ -20887,5 +21319,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2748
 msgid "Veterinary"
 msgstr "Veterinár"
@@ -20894,55 +21326,60 @@
 #. <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:2740
+#: build/trans_presets.java:2751
 msgid "Edit Veterinary"
 msgstr "Upraviť veterinárnu ambulanciu"
 
+#: build/trans_presets.java:2758
+#, fuzzy
+msgid "Geography"
+msgstr "WGS84 Zemepisné"
+
 #. group "Places"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2760
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2761
 msgid "Edit Continent"
 msgstr "Upraviť kontinent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2766
 msgid "Country"
 msgstr "Krajina (štát)"
 
 #. item
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2767
 msgid "Edit Country"
 msgstr "Upraviť krajinu (štát)"
 
 #. item "Places/Country" text "Name"
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2772
 msgid "State"
 msgstr "Stav"
 
 #. item
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2773
 msgid "Edit State"
 msgstr "Upraviť štát"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2778
 msgid "Region"
 msgstr "Oblasť (región)"
 
 #. item
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2779
 msgid "Edit Region"
 msgstr "Upraviť oblasť (región)"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2784
 msgid "County"
 msgstr "kraj (okres)"
 
 #. item
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2785
 msgid "Edit County"
 msgstr "Upraviť kraj (okres)"
@@ -20950,15 +21387,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2791
 msgid "City"
 msgstr "Mesto (city)"
 
 #. item
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2792
 msgid "Edit City"
 msgstr "Upraviť mesto"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2797
 msgid "Town"
 msgstr "Mesto (town)"
@@ -20966,10 +21403,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2799
 msgid "Edit Town"
 msgstr "Upraviť mesto"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2804
 msgid "Suburb"
 msgstr "Štvrť"
@@ -20977,25 +21414,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2806
 msgid "Edit Suburb"
 msgstr "Upraviť štvrť"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2811
 msgid "Village"
 msgstr "Dedina"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2812
 msgid "Edit Village"
 msgstr "Upraviť dedinu"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2817
 msgid "Hamlet"
 msgstr "Malá dedina / osada / samota"
 
 #. item
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2818
 msgid "Edit Hamlet"
 msgstr "Upraviť malú dedinu"
@@ -21003,5 +21440,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2824
 msgid "Locality"
 msgstr "Oblasť (lokalita)"
@@ -21009,10 +21446,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2826
 msgid "Edit Locality"
 msgstr "Upraviť oblasť (lokalitu)"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2831
 msgid "Island"
 msgstr "Ostrov"
@@ -21020,22 +21457,22 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2833
 msgid "Edit Island"
 msgstr "Upraviť Ostrov"
 
 #. item "Places/Island" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2838
 msgid "Islet"
-msgstr ""
+msgstr "Ostrovček"
 
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2840
 msgid "Edit Islet"
-msgstr ""
+msgstr "Upraviť ostrovček"
 
 #. item "Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2846
 msgid "Cave Entrance"
 msgstr "Vstup do jaskyne"
@@ -21043,10 +21480,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2848
 msgid "Edit Cave Entrance"
 msgstr "Upraviť vstup do jaskyne"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2852
 msgid "Peak"
 msgstr "Vrchol"
@@ -21054,10 +21491,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2854
 msgid "Edit Peak"
 msgstr "Upraviť vrchol kopca"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2859
 msgid "Glacier"
 msgstr "Ľadovec"
@@ -21065,10 +21502,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2861
 msgid "Edit Glacier"
 msgstr "Upraviť ľadovec"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2854
+#: build/trans_presets.java:2866
 msgid "Volcano"
 msgstr "Sopka"
@@ -21076,70 +21513,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2868
 msgid "Edit Volcano"
 msgstr "Upraviť sopku"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2874
 msgid "Boundaries"
 msgstr "Hranice"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2875
 msgid "National"
 msgstr "Štátna"
 
 #. item
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2876
 msgid "Edit National Boundary"
 msgstr "Upraviť štátne hranice"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2881
 msgid "Administrative"
 msgstr "Administratívne"
 
 #. item
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2882
 msgid "Edit Administrative Boundary"
 msgstr "Upraviť administratívne hranice"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:2887
 msgid "Civil"
 msgstr "Občianske"
 
 #. item
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2888
 msgid "Edit Civil Boundary"
 msgstr "Upraviť občiansku hranicu"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2893
 msgid "Political"
 msgstr "Politická"
 
 #. item
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2894
 msgid "Edit Political Boundary"
 msgstr "Upraviť politickú hranicu"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2899
 msgid "National park"
 msgstr "Národný park"
 
 #. item
-#: build/trans_presets.java:2888
+#: build/trans_presets.java:2900
 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:2894
+#: build/trans_presets.java:2906
 msgid "Land use"
 msgstr "Využívanie oblasti (Land use)"
 
 #. group "Land use"
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2907
 msgid "Tree"
 msgstr "Strom"
@@ -21148,15 +21585,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:2898
+#: build/trans_presets.java:2910
 msgid "Edit Tree"
 msgstr "Upraviť strom"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2915
 msgid "Botanical Name"
 msgstr "Botanický názov"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2917
 msgid "Wood"
 msgstr "Drevo"
@@ -21165,5 +21602,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:2908
+#: build/trans_presets.java:2920
 msgid "Edit Wood"
 msgstr "Upraviť Drevo"
@@ -21171,17 +21608,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "coniferous"
 msgstr "ihličnatý"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "deciduous"
 msgstr "listnatý"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "mixed"
 msgstr "zmiešaný"
 
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2925
 msgid "Forest"
 msgstr "Les"
@@ -21190,14 +21627,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:2916
+#: build/trans_presets.java:2928
 msgid "Edit Forest Landuse"
 msgstr "Upraviť les"
 
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2934
 msgid "Nature Reserve"
 msgstr "Prírodná rezervácia"
 
 #. item
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2935
 msgid "Edit Nature Reserve"
 msgstr "Upraviť prírodnú rezerváciu"
@@ -21205,25 +21642,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2940
 msgid "Scree"
 msgstr "Sutina"
 
 #. item
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2941
 msgid "Edit Scree"
 msgstr "Upraviť sutinu"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2945
 msgid "Scrub"
 msgstr "Krovie"
 
 #. item
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2946
 msgid "Edit Scrub"
 msgstr "Upraviť krovie"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2950
 msgid "Fell"
 msgstr "Fell (typ horskej krajiny nad pásmom stromov (horská pastvina))"
@@ -21231,5 +21668,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2952
 msgid "Edit Fell"
 msgstr ""
@@ -21237,5 +21674,5 @@
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2956
 msgid "Heath"
 msgstr "Vresovisko"
@@ -21243,5 +21680,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2958
 msgid "Edit Heath"
 msgstr "Upraviť vresovisko"
@@ -21249,5 +21686,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2963
 msgid "Farmyard"
 msgstr "Farma"
@@ -21256,45 +21693,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:2954
+#: build/trans_presets.java:2966
 msgid "Edit Farmyard Landuse"
 msgstr "Upraviť farmu"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2971
 msgid "Farmland"
 msgstr "Poľnohospodárska pôda"
 
 #. item
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2972
 msgid "Edit Farmland Landuse"
 msgstr "Upraviť poľnohospodárske pôdu"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2977
 msgid "Meadow"
 msgstr "Lúka"
 
 #. item
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2978
 msgid "Edit Meadow Landuse"
 msgstr "Upraviť lúku"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2983
 msgid "Vineyard"
 msgstr "Vinica"
 
 #. item
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2984
 msgid "Edit Vineyard Landuse"
 msgstr "Upraviť vinicu"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:2989
 msgid "Allotments"
 msgstr "Ťažobný priestor"
 
 #. item
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2990
 msgid "Edit Allotments Landuse"
 msgstr "Upraviť ťažobný priestor"
@@ -21302,25 +21739,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2996
 msgid "Garden"
 msgstr "Záhrada"
 
 #. item
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2997
 msgid "Edit Garden"
 msgstr "Upraviť záhradu"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3001
 msgid "Grass"
 msgstr "Tráva"
 
 #. item
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3002
 msgid "Edit Grass Landuse"
 msgstr "Upraviť trávnatú plochu"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3007
 msgid "Village Green"
 msgstr "Obecná zeleň"
@@ -21328,10 +21765,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3009
 msgid "Edit Village Green Landuse"
 msgstr "Upraviť obecnú zeleň"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3014
 msgid "Common"
 msgstr "Spoločné, obecné"
@@ -21339,20 +21776,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3004
+#: build/trans_presets.java:3016
 msgid "Edit Common"
 msgstr "Upraviť spoločné, obecné"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3020
 msgid "Park"
 msgstr "Park"
 
 #. item
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3021
 msgid "Edit Park"
 msgstr "Upraviť park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3025
 msgid "Recreation Ground"
 msgstr "Rekreačná oblasť"
@@ -21360,5 +21797,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3027
 msgid "Edit Recreation Ground Landuse"
 msgstr "Upraviť rekreačnú oblasť"
@@ -21366,15 +21803,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3033
 msgid "Residential area"
 msgstr "Osídlená oblasť (Residential area)"
 
 #. item
-#: build/trans_presets.java:3022
+#: build/trans_presets.java:3034
 msgid "Edit Residential Landuse"
 msgstr "Upraviť osídlenú oblasť"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3039
 msgid "Graveyard"
 msgstr "Cintorín (malý, blizko kostola)"
@@ -21382,9 +21819,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3029
+#: build/trans_presets.java:3041
 msgid "Edit Graveyard"
 msgstr "Upraviť cintorín (malý, blizko kostola)"
 
-#: build/trans_presets.java:3035
+#: build/trans_presets.java:3047
 msgid "Cemetery"
 msgstr "Cintorín"
@@ -21392,39 +21829,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3049
 msgid "Edit Cemetery Landuse"
 msgstr "Upraviť cintorín"
 
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3056
 msgid "Retail"
 msgstr "Maloobchod"
 
 #. item
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3057
 msgid "Edit Retail Landuse"
 msgstr "Upraviť oblasť s maloobchodmi"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3062
 msgid "Commercial"
 msgstr "Obchodná (komerčná)"
 
 #. item
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3063
 msgid "Edit Commercial Landuse"
 msgstr "Upraviť obchodnú (komerčnú) oblasť"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3056
+#: build/trans_presets.java:3068
 msgid "Industrial"
 msgstr "Priemysel"
 
 #. item
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3069
 msgid "Edit Industrial Landuse"
 msgstr "Upraviť priemyselnú oblasť"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3074
 msgid "Railway land"
 msgstr "Železničný pozemok"
@@ -21432,15 +21869,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3076
 msgid "Edit Railway Landuse"
 msgstr "Upraviť železničný pozemok"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3081
 msgid "Military"
 msgstr "Armáda"
 
 #. item
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3082
 msgid "Edit Military Landuse"
 msgstr "Upraviť vojenskú oblasť"
@@ -21448,55 +21885,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3088
 msgid "Construction area"
 msgstr "Stavebná oblasť"
 
 #. item
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3089
 msgid "Edit Construction Landuse"
 msgstr "Upraviť stavebnú oblasť"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3094
 msgid "Brownfield"
 msgstr "Brownfield (opustený priemyselný objekt)"
 
 #. item
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3095
 msgid "Edit Brownfield Landuse"
 msgstr "Upraviť brownfield (opustený priemyselný objekt)"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3100
 msgid "Greenfield"
 msgstr "Greenfield (oblasť používaná pre poľnohospodárstvo)"
 
 #. item
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3101
 msgid "Edit Greenfield Landuse"
 msgstr "Upraviť greenfield (oblasť používaná pre poľnohospodárstvo)"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3106
 msgid "Landfill"
 msgstr "Skládka odpadov"
 
 #. item
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3107
 msgid "Edit Landfill Landuse"
 msgstr "Upraviť skládku odpadov"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3112
 msgid "Quarry"
 msgstr "Lom"
 
 #. item
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3113
 msgid "Edit Quarry Landuse"
 msgstr "Upraviť lom"
 
 #. group "Relations"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3122
 msgid "Multipolygon"
 msgstr "multipolygón"
@@ -21506,5 +21943,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:3114
+#: build/trans_presets.java:3126
 msgid "Edit Multipolygon"
 msgstr "Upraviť multipolygón"
@@ -21513,10 +21950,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3132
 msgid "outer segment"
 msgstr "obvodová časť (outer segment)"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3133
 msgid "inner segment"
 msgstr "vnútorná časť (inner segment)"
@@ -21524,5 +21961,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3136
 msgid "Turn restriction"
 msgstr "Prikázané smery jazdy (turn restriction)"
@@ -21531,5 +21968,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3139
 msgid "Edit Turn Restriction"
 msgstr "Upraviť prikázané smery jazdy (turn restriction)"
@@ -21537,34 +21974,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "Restriction"
 msgstr "Obmedzenie"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_left_turn"
 msgstr "zákaz zabočenia vľavo"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_right_turn"
 msgstr "zákaz zabočenia vpravo"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_straight_on"
 msgstr "zákaz jazdy priamo"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_u_turn"
 msgstr "zákaz otáčania sa"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_right_turn"
 msgstr "prikázané odbočenie vpravo"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_left_turn"
 msgstr "prikázané odbočenie vľavo"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_straight_on"
 msgstr "zákaz odbočenia"
@@ -21573,15 +22010,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3146
 msgid "from way"
 msgstr "z cesty"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3147
 msgid "via node or way"
 msgstr "cez bod alebo cestu"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3148
 msgid "to way"
 msgstr "k ceste"
@@ -21589,5 +22026,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3151
 msgid "Route"
 msgstr "Cesta (Route)"
@@ -21596,5 +22033,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3154
 msgid "Edit Route"
 msgstr "Upraviť Cestu (Route)"
@@ -21602,5 +22039,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "Route type"
 msgstr "Typ Cesty (Route)"
@@ -21672,5 +22109,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3144 build/trans_style.java:233
+#: build/trans_presets.java:3156 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -21679,17 +22116,17 @@
 msgstr "bicykel"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "bus"
 msgstr "autobus"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "road"
 msgstr "cesta (vozovka)"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ferry"
 msgstr "trajekt (prievoz)"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ski"
 msgstr "lyžovanie"
@@ -21742,5 +22179,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3144 build/trans_style.java:247
+#: build/trans_presets.java:3156 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -21749,13 +22186,13 @@
 msgstr "pešia (foot)"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "hiking"
 msgstr "turistika"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "tram"
 msgstr "električka"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "detour"
 msgstr "obchádzka"
@@ -21769,10 +22206,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3144 build/trans_style.java:1206
+#: build/trans_presets.java:3156 build/trans_style.java:1206
 msgid "subway"
 msgstr "metro (subway)"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3159
 msgid "Symbol description"
 msgstr "Popis značky"
@@ -21780,31 +22217,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3162
 msgid "Network"
 msgstr "Sieť"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "Route state"
 msgstr "Štátna cesta"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "proposed"
 msgstr "plánovaný"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "alternate"
 msgstr "náhradný"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "temporary"
 msgstr "dočasný"
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "connection"
 msgstr "spojenie"
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "Color (hex)"
 msgstr "Farba (hex)"
@@ -21813,30 +22250,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3168
 msgid "route segment"
 msgstr "cestný úsek"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3169
 msgid "forward segment"
 msgstr "predný segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3170
 msgid "backward segment"
 msgstr "zadný segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3171
 msgid "halt point"
 msgstr "bod prerušenia"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3172
 msgid "forward halt point"
 msgstr "predný bod prerušenia"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3173
 msgid "backward halt point"
 msgstr "zadný bod prerušenia"
@@ -22274,11 +22711,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3375 build/trans_style.java:3376
-#: build/trans_style.java:3946 build/trans_style.java:4254
-#: build/trans_style.java:4263 build/trans_style.java:4272
-#: build/trans_style.java:4281 build/trans_style.java:4290
-#: build/trans_style.java:4299 build/trans_style.java:4308
-#: build/trans_style.java:4309 build/trans_style.java:4318
-#: build/trans_style.java:4327
+#: build/trans_style.java:3383 build/trans_style.java:3384
+#: build/trans_style.java:3954 build/trans_style.java:4262
+#: build/trans_style.java:4271 build/trans_style.java:4280
+#: build/trans_style.java:4289 build/trans_style.java:4298
+#: build/trans_style.java:4307 build/trans_style.java:4316
+#: build/trans_style.java:4317 build/trans_style.java:4326
+#: build/trans_style.java:4335
 msgid "deprecated"
 msgstr "zastaralý"
@@ -24302,5 +24739,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3294
+#: build/trans_style.java:3302
 msgid "light_water"
 msgstr "osvetlená_voda (light_water)"
@@ -24982,8 +25419,17 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="boundary_stone"/>
+#. <icon annotate="true" src="historic/boundary_stone.png"/>
 #: build/trans_style.java:2990 build/trans_style.java:2998
 #: build/trans_style.java:3006 build/trans_style.java:3014
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
+#: build/trans_style.java:3054
 msgid "historic"
 msgstr "historické"
@@ -24997,5 +25443,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3095
 msgid "quarry"
 msgstr "lom"
@@ -25009,5 +25455,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "landfill"
 msgstr "skládka odpadov (landfill)"
@@ -25029,5 +25475,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3103 build/trans_style.java:3111
+#: build/trans_style.java:3111 build/trans_style.java:3119
 msgid "basin"
 msgstr "(basin) kotvisko pre lode s udržiavanou výškou hladiny vody"
@@ -25041,5 +25487,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3127
 msgid "forest"
 msgstr "les"
@@ -25053,5 +25499,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3159
 msgid "farmyard"
 msgstr "farmy"
@@ -25074,5 +25520,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3160 build/trans_style.java:3168
+#: build/trans_style.java:3168 build/trans_style.java:3176
 msgid "retail"
 msgstr "maloobchody"
@@ -25086,5 +25532,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3176
+#: build/trans_style.java:3184
 msgid "industrial"
 msgstr "závody"
@@ -25098,5 +25544,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "brownfield"
 msgstr "brownfield (opustený priemyselný objekt)"
@@ -25110,5 +25556,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "greenfield"
 msgstr "greenfield (oblasť používaná pre poľnohospodárstvo)"
@@ -25122,5 +25568,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "railland"
 msgstr "železničný pozemok"
@@ -25177,7 +25623,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3217 build/trans_style.java:3252
-#: build/trans_style.java:3260 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3225 build/trans_style.java:3260
+#: build/trans_style.java:3268 build/trans_style.java:3276
+#: build/trans_style.java:3284 build/trans_style.java:3292
 msgid "military"
 msgstr "armáda"
@@ -25191,5 +25637,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3225
+#: build/trans_style.java:3233
 msgid "cemetery"
 msgstr "cintorín (cemetery)"
@@ -25202,5 +25648,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3301
+#: build/trans_style.java:3309
 msgid "peak"
 msgstr "vrchol (peak)"
@@ -25215,5 +25661,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3310
+#: build/trans_style.java:3318
 msgid "glacier"
 msgstr "ľadovec (glacier)"
@@ -25227,5 +25673,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "volcano"
 msgstr "sopka"
@@ -25280,8 +25726,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3326 build/trans_style.java:3327
-#: build/trans_style.java:3335 build/trans_style.java:3351
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440
+#: build/trans_style.java:3334 build/trans_style.java:3335
+#: build/trans_style.java:3343 build/trans_style.java:3359
+#: build/trans_style.java:3432 build/trans_style.java:3440
+#: build/trans_style.java:3448
 msgid "natural"
 msgstr "prírodné (natural)"
@@ -25295,5 +25741,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3343
+#: build/trans_style.java:3351
 msgid "scrub"
 msgstr "oblasť pokrytá krovím"
@@ -25307,5 +25753,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3359
+#: build/trans_style.java:3367
 msgid "heath"
 msgstr "vresovisko"
@@ -25319,5 +25765,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3408
+#: build/trans_style.java:3416
 msgid "mud"
 msgstr "blato (mud)"
@@ -25331,5 +25777,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "beach"
 msgstr "pláž (beach)"
@@ -25407,8 +25853,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
-#: build/trans_style.java:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496 build/trans_style.java:3504
+#: build/trans_style.java:3512 build/trans_style.java:3520
 msgid "route"
 msgstr "trasa (route)"
@@ -25456,7 +25902,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3522 build/trans_style.java:3530
-#: build/trans_style.java:3538 build/trans_style.java:3546
-#: build/trans_style.java:3554
+#: build/trans_style.java:3530 build/trans_style.java:3538
+#: build/trans_style.java:3546 build/trans_style.java:3554
+#: build/trans_style.java:3562
 msgid "boundary"
 msgstr "hranica (boundary)"
@@ -25606,11 +26052,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090
+#: build/trans_style.java:4002 build/trans_style.java:4010
+#: build/trans_style.java:4018 build/trans_style.java:4026
+#: build/trans_style.java:4034 build/trans_style.java:4042
+#: build/trans_style.java:4050 build/trans_style.java:4058
+#: build/trans_style.java:4066 build/trans_style.java:4074
+#: build/trans_style.java:4082 build/trans_style.java:4090
+#: build/trans_style.java:4098
 msgid "place"
 msgstr "miesto"
@@ -25658,6 +26104,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4207 build/trans_style.java:4214
-#: build/trans_style.java:4221 build/trans_style.java:4228
+#: build/trans_style.java:4215 build/trans_style.java:4222
+#: build/trans_style.java:4229 build/trans_style.java:4236
 msgid "address"
 msgstr "adresa"
@@ -25872,5 +26318,5 @@
 #: build/trans_validator.java:73
 msgid "relation without type"
-msgstr "relácia bez typu"
+msgstr "relácia bez type"
 
 #. relation : E : type != *
@@ -25958,90 +26404,122 @@
 #: build/trans_wms.java:25
 msgid "Czech CUZK:KM"
-msgstr ""
+msgstr "Czech CUZK:KM"
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE&
 #: build/trans_wms.java:26
 msgid "Czech UHUL:ORTOFOTO"
-msgstr ""
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Všetky cesty boli prázdne"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Zlúčiť body s rôznymi členmi ?"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Aj tak zlúčiť"
+msgstr "Czech UHUL:ORTOFOTO"
+
+#~ msgid "Close current changeset"
+#~ msgstr "Zavrieť aktuálny súbor zmien"
+
+#~ msgid "There is currently no changeset open."
+#~ msgstr "Teraz tam nie je otvorený súbor zmien."
+
+#~ msgid "paramete''{0}'' must not be null"
+#~ msgstr "parameter''{0}'' nesmie byť nula"
+
+#~ msgid "unsupported value ''{0}'' or parameter ''{1}''"
+#~ msgstr "nepodporovaná hodnota ''{0}'' alebo parameter ''{1}''"
+
+#~ msgid "- running version is {0}"
+#~ msgstr "- teraz používaná verzia je {0}"
+
+#~ msgid "not yet decided"
+#~ msgstr "ešte žiadne rozhodnutie"
+
+#~ msgid "Use a new changeset and close it"
+#~ msgstr "Použite nový súbor zmien a zatvorte ho"
 
 #~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
+#~ "Select to upload the data using a new changeset and to leave the "
+#~ "changeset open after the upload"
 #~ msgstr ""
-#~ "Zvolené body majú rozdielne vzťahové(relation) členy. Napriek tomu ich "
-#~ "chcete zlúčiť ?"
-
-#~ msgid "No currently open changeset. Opening a new changeset..."
-#~ msgstr "Teraz nie je otvorený súbor zmien. Otváram nový súbor zmien..."
+#~ "Vybrať pre nahratie používaných dát nový súbor zmien a nechať súbor zmien "
+#~ "otvorený aj po nahratí"
+
+#~ msgid "Use the existing changeset {0} and close it after upload"
+#~ msgstr "Použite existujúci súbor zmien {0} a zavrite ho po nahratí"
 
 #~ msgid ""
-#~ "Warning: could not reuse an existing changeset as requested. Opening a "
-#~ "new one."
+#~ "Select to upload to the existing changeset {0} and to close the changeset "
+#~ "after this upload"
 #~ msgstr ""
-#~ "Varovanie: nemôžem znovu použiť nejaký existujúci súbor zmien pokiaľ bol "
-#~ "požadovaný. Otvátam nový.."
-
-#~ msgid "Reusing existing changeset {0}"
-#~ msgstr "Znovu použitý existujúci súbor zmien {0}"
+#~ "Vybrať pre nahratie existujúci súbor zmien {0} a zavrite súbor zmien po "
+#~ "tomto nahratí"
+
+#~ msgid "Use the existing changeset {0} and leave it open"
+#~ msgstr "Použite existujúci súbor zmien {0} a nechajte ho otvorený"
+
+#~ msgid ""
+#~ "Select to upload to the existing changeset {0} and to leave the changeset "
+#~ "open for further uploads"
+#~ msgstr ""
+#~ "Vybrať nahratie do existujúceho súboru zmien {0} a ponechať súbor zmien "
+#~ "otvorený pre ďalšie nahratia"
+
+#~ msgid "Changeset {0} is unchanged. Skipping update."
+#~ msgstr "Súbor zmien {0} je nezmenený. Ukončujem aktualizáciu."
+
+#~ msgid ""
+#~ "Failed to update changeset. Either there is no current changeset or the "
+#~ "id of the current changeset is 0"
+#~ msgstr ""
+#~ "Neúspešná aktualizácia súboru zmien. Nachádza sa tu neaktuálny súbor "
+#~ "zmien, alebo id aktuálneho súboru zmien je 0"
+
+#~ msgid "Set "
+#~ msgstr "Nastavenie(Set) "
+
+#~ msgid "INFO: entering compatibilty mode for JOSM with Main.ds"
+#~ msgstr "INFORMÁCIA: zapísanie compatibilného režimu pre JOSM s Main.ds"
+
+#~ msgid ""
+#~ "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
+#~ msgstr ""
+#~ "INFORMÁCIA: zapísanie compatibilného režimu pre JOSM s Main."
+#~ "getCurrentDataSet()"
+
+#~ msgid ""
+#~ "Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
+#~ "found."
+#~ msgstr ""
+#~ "Nečakaná verzia  JOSMu. Žiadny Main.ds ani Main.getCurrentDataSet() found."
+
+#~ msgid "Move"
+#~ msgstr "Presunúť"
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr "Nemám čo uložiť, pretože žiadny dokument nie je otvorený."
+
+#~ msgid "Email"
+#~ msgstr "E-mail"
+
+#~ msgid "Resolve Conflicts"
+#~ msgstr "Vyriešiť konflikty"
+
+#~ msgid "my version:"
+#~ msgstr "moja verzia:"
+
+#~ msgid "Object"
+#~ msgstr "Objekt"
 
 #~ msgid "Unknown version"
 #~ msgstr "Neznáma verzia"
 
-#~ msgid "Version number missing from OSM data"
-#~ msgstr "Chýba číslo verzie z OSM údajov"
+#~ msgid "Aborting..."
+#~ msgstr "Prerušujem..."
+
+#~ msgid "Change"
+#~ msgstr "Zmeniť"
+
+#~ msgid "unnamed"
+#~ msgstr "nepomenované"
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "Prenos pre chybu ukončený (budem čakať 5 sekúnd):"
 
 #~ msgid "Found <nd> element in non-way."
 #~ msgstr "Nájdený element <nd> mimo cesty."
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> má nulový ref"
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Nájdený <member> element mimo relácie."
-
-#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
-#~ msgstr "Neočakávaný \"type\" člena {0} relácie  {1} (hodnota {2})"
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Zle formulované id bodu"
-
-#~ msgid "Move"
-#~ msgstr "Presunúť"
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Nemám čo uložiť, pretože žiadny dokument nie je otvorený."
-
-#~ msgid "Email"
-#~ msgstr "E-mail"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Vyriešiť konflikty"
-
-#~ msgid "my version:"
-#~ msgstr "moja verzia:"
-
-#~ msgid "Object"
-#~ msgstr "Objekt"
-
-#~ msgid "Aborting..."
-#~ msgstr "Prerušujem..."
-
-#~ msgid "Change"
-#~ msgstr "Zmeniť"
-
-#~ msgid "unnamed"
-#~ msgstr "nepomenované"
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Prenos pre chybu ukončený (budem čakať 5 sekúnd):"
 
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
@@ -26055,4 +26533,7 @@
 #~ "zmenšiť oblasť."
 
+#~ msgid "<nd> has zero ref"
+#~ msgstr "<nd> má nulový ref"
+
 #~ msgid "Commit comment"
 #~ msgstr "Poslať komentár"
@@ -26064,7 +26545,4 @@
 #~ msgid "Add all currently selected objects as members"
 #~ msgstr "Pridať všetky zvolené objekty medzi členy"
-
-#~ msgid "Add Selected"
-#~ msgstr "Pridať vybrané"
 
 #~ msgid "Cannot connect to server."
@@ -26171,4 +26649,7 @@
 #~ msgid "Validate either current selection or complete dataset."
 #~ msgstr "Overovať konkrétny výber, alebo kompletnú dátovu sadu."
+
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "Nájdený <member> element mimo relácie."
 
 #~ msgid "viaduct"
@@ -26384,4 +26865,7 @@
 #~ msgstr "Uvedený plugin požaduje aktualizovať JOSM: {0}."
 
+#~ msgid "Ill-formed node id"
+#~ msgstr "Zle formulované id bodu"
+
 #~ msgid "Delete Layer"
 #~ msgstr "Vymazať vrstvu"
@@ -26499,4 +26983,20 @@
 #~ msgid "Some of the nodes are (almost) in the line"
 #~ msgstr "Niektoré z bodov sú (skoro) na priamke"
+
+#~ msgid "All the ways were empty"
+#~ msgstr "Všetky cesty boli prázdne"
+
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "Zlúčiť body s rôznymi členmi ?"
+
+#~ msgid ""
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
+#~ msgstr ""
+#~ "Zvolené body majú rozdielne vzťahové(relation) členy. Napriek tomu ich "
+#~ "chcete zlúčiť ?"
+
+#~ msgid "Merge Anyway"
+#~ msgstr "Aj tak zlúčiť"
 
 #~ msgid ""
@@ -26543,4 +27043,7 @@
 #~ msgstr "OSM používateľské meno (email)"
 
+#~ msgid "Version number missing from OSM data"
+#~ msgstr "Chýba číslo verzie z OSM údajov"
+
 #~ msgid ""
 #~ "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -26549,4 +27052,7 @@
 #~ "Doplnok nie je možné odstrániť. Prosím informujte o tomto probléme "
 #~ "vývojárov JOSM."
+
+#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
+#~ msgstr "Neočakávaný \"type\" člena {0} relácie  {1} (hodnota {2})"
 
 #~ msgid "Image with path {0} does not exist or is not readable."
@@ -26600,7 +27106,4 @@
 #~ "pôvodný stav.<br>Click <strong>{3}</strong> zrušiť.<br>"
 
-#~ msgid "Delete mine"
-#~ msgstr "Zmazať moje"
-
 #~ msgid ""
 #~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
@@ -26647,7 +27150,4 @@
 #~ msgstr "<html>Chybný priebeh nahrávania zo servera. Detaily:<br>{0}</html>"
 
-#~ msgid "Change {0} {1}"
-#~ msgstr "Zmeniť {0} {1}"
-
 #~ msgid "WGS84 Geographisch"
 #~ msgstr "WGS84 Geographisch"
@@ -26759,4 +27259,14 @@
 #~ "limitu servera. Výnimka bola: {1}"
 
-#~ msgid "Set Lambert coordinate"
-#~ msgstr "Zvoliť Lambert súradnice"
+#~ msgid "No currently open changeset. Opening a new changeset..."
+#~ msgstr "Teraz nie je otvorený súbor zmien. Otváram nový súbor zmien..."
+
+#~ msgid "Reusing existing changeset {0}"
+#~ msgstr "Znovu použitý existujúci súbor zmien {0}"
+
+#~ msgid ""
+#~ "Warning: could not reuse an existing changeset as requested. Opening a "
+#~ "new one."
+#~ msgstr ""
+#~ "Varovanie: nemôžem znovu použiť nejaký existujúci súbor zmien pokiaľ bol "
+#~ "požadovaný. Otvátam nový.."
Index: applications/editors/josm/i18n/po/sl.po
===================================================================
--- applications/editors/josm/i18n/po/sl.po	(revision 17655)
+++ applications/editors/josm/i18n/po/sl.po	(revision 17697)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-12 18:11+0200\n"
-"PO-Revision-Date: 2009-09-06 13:28+0000\n"
+"POT-Creation-Date: 2009-09-19 13:00+0200\n"
+"PO-Revision-Date: 2009-09-15 04:21+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-09-12 16:04+0000\n"
+"X-Launchpad-Export-Date: 2009-09-19 10:42+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -43,10 +43,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:543
 #: ../core/src/org/openstreetmap/josm/Main.java:551
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -71,5 +71,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -87,6 +87,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:358
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
@@ -102,6 +102,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
@@ -125,10 +125,10 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
 msgid "Save and Exit"
 msgstr "Shrani in končaj"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
 msgid "Discard and Exit"
 msgstr "Zavrzi in končaj"
@@ -139,4 +139,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
@@ -144,27 +145,28 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:296
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:258
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:613
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
@@ -172,5 +174,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -190,6 +192,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
@@ -206,17 +208,17 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:654
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1528
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -227,6 +229,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
@@ -279,9 +281,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:607
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:609
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -341,5 +343,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
 msgid "Plugins"
@@ -389,5 +391,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr ""
@@ -475,5 +477,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -486,4 +488,5 @@
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -519,6 +522,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
@@ -527,6 +530,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:346
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
@@ -634,4 +637,45 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#, fuzzy
+msgid "Close open changesets"
+msgstr "paketi sprememb"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#, fuzzy
+msgid "Closes open changesets"
+msgstr "paketi sprememb"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
+#: ../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:114
+#, java-format
+msgid "File: {0}"
+msgstr "Datoteka: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
+msgid "There are no open changesets"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
+#, fuzzy
+msgid "No open changesets"
+msgstr "paketi sprememb"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
+#, fuzzy
+msgid "Downloading open changesets ..."
+msgstr "Sprejemanje podatkov OSM..."
+
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
@@ -723,10 +767,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:123
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
@@ -769,31 +814,30 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
 msgid "Download from OSM..."
 msgstr "Sprejem iz OSM ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
 msgid "Download map data from the OSM server."
 msgstr "Sprejmi podatke zemljevida s strežnika OSM."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
-#, java-format
-msgid "File: {0}"
-msgstr "Datoteka: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
 msgid "Download"
 msgstr "Sprejemanje"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "V redu"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
 msgid "Please select at least one task to download"
 msgstr ""
@@ -814,5 +858,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1527
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307
@@ -832,6 +876,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:376
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1415
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
 msgid "Duplicate"
 msgstr "Podvoji"
@@ -903,10 +947,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
@@ -990,25 +1035,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 msgid "Merge Nodes"
 msgstr "Združi vozlišča"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
 msgid "Merge nodes into the oldest one."
 msgstr "Združi vozlišča v najstarejšega"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
 msgid "Please select at least two nodes to merge."
 msgstr "Izberite vsaj dve vozlišči za združitev"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:394
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
@@ -1024,8 +1070,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -1051,6 +1097,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
@@ -1059,9 +1109,9 @@
 msgstr "parameter ''{0}'' ne sme biti ničen"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr "Ne morem združiti vozlišč: Moral bi izbrisati pot, ki je še v rabi."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283
 #, java-format
 msgid "Merge {0} nodes"
@@ -1133,5 +1183,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "New"
 msgstr "Nova"
@@ -1402,14 +1452,15 @@
 msgstr "Pomoč: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
 msgid "Status Report"
 msgstr "Poročilo stanja"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 msgid "Copy to clipboard and close"
 msgstr "Kopiraj na odložišče in zapri"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
@@ -1492,25 +1543,4 @@
 msgstr "Razdeli pot {0} na {1} delov"
 
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24
-msgid "Close current changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-msgid "Close the current changeset ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41
-msgid "There is currently no changeset open."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42
-msgid "No open changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60
-msgid "Closing changeset"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
@@ -1670,14 +1700,14 @@
 msgstr "Izbor je prazen"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Pošlji v OSM ..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 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:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
 #, java-format
 msgid ""
@@ -1686,23 +1716,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
 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:166
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 msgid "No changes to upload."
 msgstr "Ni sprememb za pošiljanje."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
 msgid "Synchronize entire dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
 #, java-format
 msgid ""
@@ -1716,17 +1746,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
 msgid "Conflict detected"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:267
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
 #, java-format
 msgid ""
@@ -1737,28 +1767,40 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
+msgid ""
+"<html>Uploading <strong>failed</strong> because you've been "
+"using<br>changeset {0} which was already closed at {1}.<br>Please upload "
+"again with a new or an existing open changeset."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+#, fuzzy
+msgid "Changeset closed"
+msgstr "paketi sprememb"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
 msgid "Upload to OSM API failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1975,14 +2017,14 @@
 msgstr "Dodaj in poveži vozlišče v pot"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:930
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:932
 msgid "Create new node."
 msgstr "Ustvari novo vozlišče."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
 msgid "Select node under cursor."
 msgstr "Izberi vozlišče pod kazalcem miške."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939
 #, java-format
 msgid "Insert new node into way."
@@ -1993,14 +2035,14 @@
 msgstr[3] "Vstavi novo vozlišče v {0} poti."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
 msgid "Start new way from last node."
 msgstr "Začni novo pot od zadnjega vozlišča"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951
 msgid "Continue way from last node."
 msgstr "Nadaljuj pot od zadnjega vozlišča."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:972
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:974
 msgid "Finish drawing."
 msgstr "Zaključi risanje."
@@ -2115,60 +2157,70 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Išči..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Iskanje predmetov."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
 msgid "Can't search because there is no loaded data."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
+#, fuzzy
+msgid "Please enter a filter string."
+msgstr "Prosim, vnesite iskalni izraz."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
 msgid "Please enter a search string."
 msgstr "Prosim, vnesite iskalni izraz."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
 msgid "replace selection"
 msgstr "nadomesti izbor"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72
 msgid "add to selection"
 msgstr "dodaj v izbor"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73
 msgid "remove from selection"
 msgstr "odstrani iz izbora"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
+#, fuzzy
+msgid "find in selection"
+msgstr "dodaj v izbor"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81
 msgid "case sensitive"
 msgstr "upoštevaj velikost črk"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82
 msgid "regular expression"
 msgstr "regularni izraz"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid ""
 "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
@@ -2176,109 +2228,126 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
 msgid "<u>Special targets:</u>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 msgid "<b>nodes:</b>... - object with given number of nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
 msgid "<b>modified</b> - all changed objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
 msgid "<b>selected</b> - all selected objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "<b>untagged</b> - all untagged objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
+msgid "Filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Iskanje"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
+msgid "Submit filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "Start Search"
 msgstr "Začni iskanje"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Z iskanjem ''{0}'' ni bilo v izbor dodano ničesar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Z iskanjem ''{0}'' ni bilo iz izbora odstranjeno ničesar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#, fuzzy, java-format
+msgid "Nothing find in selection by searching for ''{0}''"
+msgstr "Z iskanjem ''{0}'' ni bilo v izbor dodano ničesar"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262
 #, java-format
 msgid "Found {0} matches"
 msgstr "Najdeno {0} zadetkov"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CS"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CI"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283
 msgid "RX"
 msgstr ""
@@ -2462,5 +2531,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
 msgid "Double conflict"
 msgstr ""
@@ -2700,4 +2769,5 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:134
 msgid "Old value"
 msgstr "Stara vrednost"
@@ -2861,27 +2931,56 @@
 
 #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
 msgid "E"
 msgstr "V"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:59
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:203
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
 msgid "Changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:323
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:325
-#, fuzzy, java-format
-msgid "paramete''{0}'' must not be null"
-msgstr "parameter ''{0}'' ne sme biti ničen"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331
-#, fuzzy, java-format
-msgid "unsupported value ''{0}'' or parameter ''{1}''"
-msgstr "Uporabi prednastavitev ''{0}'' iz skupine ''{1}''"
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "H"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "Text"
+msgstr "besedilo"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "C"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "I"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "M"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+msgid "R"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+msgid "A"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+msgid "D"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+msgid "F"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
@@ -2895,29 +2994,29 @@
 msgstr "Opozorilo: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
 #, java-format
 msgid "expected id >= 0. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:257
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
 msgid "a primitive with id=0 can't be invisible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:293
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
 #, java-format
 msgid "id > 0 expected. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
 msgid "version > 0 expected. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
 msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
 msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
@@ -2984,9 +3083,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:247
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:249
 msgid "Area style way is not closed."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:478
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:482
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
@@ -2995,118 +3094,118 @@
 #. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
 #. TODO Remove useless nullcheck when RelationMember.member is encalupsed
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:851
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855
 msgid "Empty member in relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:853
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:864
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Neznana vloga ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652
 msgid "No \"via\" node or way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:885
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:943
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1032
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1044
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1097
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1123
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1327
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331
 msgid "untagged"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1328
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332
 msgid "text"
 msgstr "besedilo"
@@ -3127,5 +3226,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
@@ -3150,5 +3249,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
@@ -3199,5 +3298,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
 msgid "Lambert Zone (Estonia)"
 msgstr ""
@@ -3239,9 +3338,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:38
 msgid "Do not show again"
 msgstr "Ne prikaži več"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
 #, java-format
@@ -3249,31 +3348,31 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:91
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:116
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154
 msgid "incomplete"
 msgstr "nepopoln"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
 msgid "highway"
 msgstr "cesta"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
-#: build/trans_presets.java:3144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: build/trans_presets.java:3156
 msgid "railway"
 msgstr "železnica"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
 msgid "waterway"
 msgstr "vodotok"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "landuse"
 msgstr "raba tal"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:474
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
@@ -3285,5 +3384,5 @@
 msgstr[3] "{0} točke"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
 #, java-format
 msgid "{0} member"
@@ -3330,10 +3429,5 @@
 msgstr "Sporočilo dneva ni na voljo"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67
-#, java-format
-msgid "- running version is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:95
 msgid "Downloading \"Message of the day\""
 msgstr ""
@@ -3399,10 +3493,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:162
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
 msgid "Username"
 msgstr "Uporabniško ime"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
 msgid "Password"
 msgstr "Geslo"
@@ -3523,5 +3617,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226
 msgid "Presets"
 msgstr "Prednastavitve"
@@ -3595,38 +3689,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Geografska dolžina pod kazalcem miške."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The name of the object at the mouse pointer."
 msgstr "Ime predmeta pod kazalcem miške."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Geografska širina pod kazalcem miške."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The angle between the previous and the current way segment."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The (compass) heading of the line segment being drawn."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The length of the new way segment being drawn."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199
+msgid ""
+"Middle click again to cycle through.<br>Hold CTRL to select directly from "
+"this list with the mouse.<hr>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290
 msgid "(no object)"
 msgstr "(ni predmeta)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:301
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418
+#, fuzzy
+msgid "User:"
+msgstr "Uporabniško ime"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
 msgid "layer not in list."
 msgstr "plasti ni na seznamu."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:488
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3696,7 +3801,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:224
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Tags"
 msgstr "Oznake"
@@ -3711,5 +3816,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
@@ -3890,4 +3995,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
 msgid "Up"
 msgstr "Gor"
@@ -3898,4 +4004,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Down"
 msgstr "Dol"
@@ -3908,5 +4015,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
@@ -4329,22 +4436,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:236
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239
 msgid "No conflicts to resolve"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:295
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254
 msgid "Cancel conflict resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:310
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269
 msgid "Apply resolved conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Apply"
 msgstr ""
@@ -4356,5 +4463,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "all"
 msgstr ""
@@ -4398,7 +4505,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
-msgid "not yet decided"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:213
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
@@ -4425,7 +4529,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
@@ -4435,7 +4539,7 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:152
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
@@ -4445,20 +4549,20 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "Paste ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "From ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:372
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "To ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:428
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
 #, java-format
 msgid "{0} tag"
@@ -4479,7 +4583,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-#, fuzzy
 msgid "Replace"
-msgstr "Resnično ime"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
@@ -4495,5 +4598,5 @@
 #. --- role editing
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:56
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510
 msgid "Role:"
 msgstr ""
@@ -4509,7 +4612,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70
-#, fuzzy
 msgid "Value:"
-msgstr "Vrednost"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86
@@ -4526,7 +4628,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
-#, fuzzy
 msgid "Decision"
-msgstr "Različica"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -4542,6 +4643,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
@@ -4630,173 +4732,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-msgid "History"
-msgstr "Zgodovina"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-msgid "Display the history of all selected items."
-msgstr "Prikaži zgodovino izbranih predmetov"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
-#, java-format
-msgid "index out of bounds Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
-msgid "History item"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
-msgid "Reload all currently selected objects and refresh the list."
-msgstr ""
-
-#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
-msgid "Show"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
-msgid "Dialog not created yet. Invoke createInstance() first"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
-msgid "Layers"
-msgstr "Plasti"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-msgid "Open a list of all loaded layers."
-msgstr "Odpri seznam vseh naloženih plasti."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:297
-msgid "Delete the selected layer."
-msgstr "Izbriši izbrano plast."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:367
-msgid "Show/Hide"
-msgstr "Prikaži/skrij"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:378
-msgid "Toggle visible state of the selected layer."
-msgstr "Preklopi vidljivost izbrane plasti."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:420
-msgid "Activate the selected layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:475
-msgid "Merge this layer into another layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:581
-msgid "Move the selected layer one row up."
-msgstr "Pomakni izbrano plast vrstico višje."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:600
-msgid "Move the selected layer one row down."
-msgstr "Pomakni izbrano plast vrstico nižje."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
-msgid "Information about layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
-#, java-format
-msgid "This will change up to {0} object."
-msgid_plural "This will change up to {0} objects."
-msgstr[0] "Spremenili boste do {0} predmetov."
-msgstr[1] "Spremenili boste do {0} predmet."
-msgstr[2] "Spremenili boste do {0} predmeta."
-msgstr[3] "Spremenili boste do {0} predmete."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
-msgid "An empty value deletes the key."
-msgstr "Prazna vrednost izbriše ključ"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
-msgid "<different>"
-msgstr "<različno>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
-msgid "Change values?"
-msgstr "Sprememba vrednosti?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
-#, java-format
-msgid "Change properties of up to {0} object"
-msgid_plural "Change properties of up to {0} objects"
-msgstr[0] "Spremeni lastnosti do {0} predmetov"
-msgstr[1] "Spremeni lastnosti do {0} predmeta"
-msgstr[2] "Spremeni lastnosti do {0} predmetov"
-msgstr[3] "Spremeni lastnosti do {0} predmetov"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
-msgid "Please select a key"
-msgstr "Izberite ključ"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
-msgid "Please select a value"
-msgstr "Izberite vrednost"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
-msgid "Please select the objects you want to change properties for."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
-msgid "Properties/Memberships"
-msgstr "Lastnosti/Članstva"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-msgid "Properties for selected objects."
-msgstr "Lastnosti izbranih predmetov"
-
-#. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-msgid "Member Of"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
-msgid "Add Properties"
-msgstr ""
-
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+msgid "Filter objects and hide/disable them."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
@@ -4810,4 +4752,216 @@
 msgstr "Dodaj"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#, fuzzy
+msgid "Add filter."
+msgstr "Dodaj izbrano"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
+#, fuzzy
+msgid "Edit filter."
+msgstr "Uredi pomol"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#, fuzzy
+msgid "Delete filter."
+msgstr "Izberite bodisi:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
+#, fuzzy
+msgid "Move filter up."
+msgstr "Premakni navzgor"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
+#, fuzzy
+msgid "Move filter down."
+msgstr "Premakni navzdol"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128
+msgid "Enable filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
+#, fuzzy
+msgid "Hide elements"
+msgstr "Posamezen element"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
+msgid "Apply also for children"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
+msgid "Inverse filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
+#, fuzzy
+msgid "Filter mode"
+msgstr "Način za brisanje"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
+msgid "History"
+msgstr "Zgodovina"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+msgid "Display the history of all selected items."
+msgstr "Prikaži zgodovino izbranih predmetov"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
+msgid "History item"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
+msgid "Reload all currently selected objects and refresh the list."
+msgstr ""
+
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
+msgid "Show"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
+msgid "Display the history of the selected primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84
+msgid "Dialog not created yet. Invoke createInstance() first"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
+msgid "Layers"
+msgstr "Plasti"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+msgid "Open a list of all loaded layers."
+msgstr "Odpri seznam vseh naloženih plasti."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294
+msgid "Delete the selected layer."
+msgstr "Izbriši izbrano plast."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364
+msgid "Show/Hide"
+msgstr "Prikaži/skrij"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375
+msgid "Toggle visible state of the selected layer."
+msgstr "Preklopi vidljivost izbrane plasti."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgid "Activate"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417
+msgid "Activate the selected layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472
+msgid "Merge this layer into another layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578
+msgid "Move the selected layer one row up."
+msgstr "Pomakni izbrano plast vrstico višje."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597
+msgid "Move the selected layer one row down."
+msgstr "Pomakni izbrano plast vrstico nižje."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+msgid "Information about layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+#, java-format
+msgid "This will change up to {0} object."
+msgid_plural "This will change up to {0} objects."
+msgstr[0] "Spremenili boste do {0} predmetov."
+msgstr[1] "Spremenili boste do {0} predmet."
+msgstr[2] "Spremenili boste do {0} predmeta."
+msgstr[3] "Spremenili boste do {0} predmete."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+msgid "An empty value deletes the key."
+msgstr "Prazna vrednost izbriše ključ"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+msgid "<different>"
+msgstr "<različno>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+msgid "Change values?"
+msgstr "Sprememba vrednosti?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#, java-format
+msgid "Change properties of up to {0} object"
+msgid_plural "Change properties of up to {0} objects"
+msgstr[0] "Spremeni lastnosti do {0} predmetov"
+msgstr[1] "Spremeni lastnosti do {0} predmeta"
+msgstr[2] "Spremeni lastnosti do {0} predmetov"
+msgstr[3] "Spremeni lastnosti do {0} predmetov"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+msgid "Please select a key"
+msgstr "Izberite ključ"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+msgid "Please select a value"
+msgstr "Izberite vrednost"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
+msgid "Please select the objects you want to change properties for."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
+msgid "Properties/Memberships"
+msgstr "Lastnosti/Članstva"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+msgid "Properties for selected objects."
+msgstr "Lastnosti izbranih predmetov"
+
+#. setting up the membership table
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+msgid "Member Of"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
+msgid "Add Properties"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574
 msgid "Add a new key/value pair to all objects"
@@ -4849,10 +5003,9 @@
 
 #. item "Land use/Quarry" text "Name"
-#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
-#: build/trans_presets.java:3109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168
+#: build/trans_presets.java:3121
 msgid "Relations"
 msgstr "Relacije"
@@ -4862,23 +5015,23 @@
 msgstr "Odpri seznam vseh relacij."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166
 #, java-format
 msgid "Relations: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276
 msgid "Open an editor for the selected relation"
 msgstr "Odpri urejevalnik za izbrano relacijo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
 msgid "Delete the selected relation"
 msgstr "Izbriši izbrano relacijo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349
 msgid "Create a new relation"
 msgstr "Ustvari novo relacijo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:373
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1412
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
@@ -4911,5 +5064,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4921,14 +5074,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441
 msgid "Undock the panel"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:457
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr ""
@@ -4989,5 +5142,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5011,5 +5164,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1502
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1370
 msgid "Download relation members"
 msgstr ""
@@ -5039,5 +5192,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -5045,18 +5198,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
 msgid "Tags and Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:167
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5065,14 +5218,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613
 #, java-format
 msgid ""
@@ -5082,9 +5235,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid ""
@@ -5094,15 +5247,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5110,5 +5263,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5116,20 +5269,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849
 #, java-format
 msgid ""
@@ -5138,57 +5291,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:961
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909
 msgid "Move the currently selected members up"
 msgstr "Pomakni izbranega člana vrstico višje."
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:979
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:912
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928
 msgid "Move the currently selected members down"
 msgstr "Pomakni izbranega člana vrstico nižje."
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:998
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:931
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5197,9 +5350,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1058
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
 #, java-format
 msgid ""
@@ -5208,56 +5361,41 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090
+msgid "Apply the current updates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123
+msgid "Apply the updates and close the dialog"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
-msgid "Apply the current updates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
-msgid "Apply the updates and close the dialog"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "V redu"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
-msgid "Delete the currently selected tags"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Sprejmi vse nepopolne poti in vozlišča v relaciji"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 msgid "Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1208
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1211
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1356
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 #, java-format
 msgid ""
@@ -5267,13 +5405,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1229
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1367
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
 msgid "Confirm empty role"
 msgstr ""
@@ -5360,37 +5498,37 @@
 msgstr "Zaznamki"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:82
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
 msgid "Please enter the desired coordinates first."
 msgstr "Prosim, vnesite želene koordinate."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
 msgid "Please enter a name for the location."
 msgstr "Prosim, vnesite ime kraja."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:107
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
 msgid "Select a bookmark first."
 msgstr "Najprej izberite zaznamek."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
 msgid "min lat"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
 msgid "min lon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid "max lat"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
 msgid "max lon"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5399,26 +5537,26 @@
 "Povezava na www.openstreetmap.org (za sprejem področja sem prilepite URL)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
 msgid "Bounding Box"
 msgstr "Pravokotno področje"
 
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
 msgid "Data Sources and Types"
 msgstr "Viri in vrste podatkov"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
 msgid "Download as new layer"
 msgstr "Sprejmi kot novo plast"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
 msgid "Download Area"
 msgstr "Sprejmi področje"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
 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:219
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
 msgid "Download area ok, size probably acceptable to server"
 msgstr ""
@@ -5444,7 +5582,7 @@
 msgstr "Vnesite ime kraja, ki ga želite poiskati:"
 
-#. <separator/>
+#. group "Geography"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2759
 msgid "Places"
 msgstr "Kraji"
@@ -5491,21 +5629,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "type"
 msgstr "vrsta"
@@ -5522,5 +5660,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-#, fuzzy
 msgid ""
 "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
@@ -5528,6 +5665,4 @@
 "Hold left mousebutton and draw a frame."
 msgstr ""
-"Povečava: Miškino kolesce ali dvojni klik. Premik: Desni miškin gumb in "
-"premik. Izbor: Kliknite z miško in povlecite"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
@@ -5988,4 +6123,6 @@
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
 #. <key key="historic" value="wayside_shrine" />
+#. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
+#. <key key="historic" value="boundary_stone" />
 #. item "Leisure/Water Park" label "Edit Water Park"
 #. <key key="leisure" value="water_park" />
@@ -6357,153 +6494,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/trans_presets.java:66 build/trans_presets.java:102
-#: build/trans_presets.java:142 build/trans_presets.java:179
-#: build/trans_presets.java:199 build/trans_presets.java:217
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:272 build/trans_presets.java:305
-#: build/trans_presets.java:351 build/trans_presets.java:371
-#: build/trans_presets.java:386 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:463 build/trans_presets.java:482
-#: build/trans_presets.java:502 build/trans_presets.java:522
-#: build/trans_presets.java:543 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627 build/trans_presets.java:658
-#: build/trans_presets.java:679 build/trans_presets.java:692
-#: build/trans_presets.java:705 build/trans_presets.java:718
-#: build/trans_presets.java:731 build/trans_presets.java:744
-#: build/trans_presets.java:755 build/trans_presets.java:764
-#: build/trans_presets.java:811 build/trans_presets.java:832
-#: build/trans_presets.java:841 build/trans_presets.java:901
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1067 build/trans_presets.java:1075
-#: build/trans_presets.java:1085 build/trans_presets.java:1093
-#: build/trans_presets.java:1098 build/trans_presets.java:1105
-#: build/trans_presets.java:1112 build/trans_presets.java:1117
-#: build/trans_presets.java:1125 build/trans_presets.java:1134
-#: build/trans_presets.java:1140 build/trans_presets.java:1146
-#: build/trans_presets.java:1151 build/trans_presets.java:1157
-#: build/trans_presets.java:1163 build/trans_presets.java:1172
-#: build/trans_presets.java:1181 build/trans_presets.java:1188
-#: build/trans_presets.java:1196 build/trans_presets.java:1209
-#: build/trans_presets.java:1215 build/trans_presets.java:1224
-#: build/trans_presets.java:1230 build/trans_presets.java:1236
-#: build/trans_presets.java:1244 build/trans_presets.java:1299
-#: build/trans_presets.java:1346 build/trans_presets.java:1352
-#: build/trans_presets.java:1358 build/trans_presets.java:1364
-#: build/trans_presets.java:1370 build/trans_presets.java:1381
-#: build/trans_presets.java:1390 build/trans_presets.java:1405
-#: build/trans_presets.java:1412 build/trans_presets.java:1418
-#: build/trans_presets.java:1426 build/trans_presets.java:1433
-#: build/trans_presets.java:1442 build/trans_presets.java:1450
-#: build/trans_presets.java:1457 build/trans_presets.java:1468
-#: build/trans_presets.java:1478 build/trans_presets.java:1488
-#: build/trans_presets.java:1508 build/trans_presets.java:1520
-#: build/trans_presets.java:1531 build/trans_presets.java:1548
-#: build/trans_presets.java:1555 build/trans_presets.java:1570
-#: build/trans_presets.java:1577 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1594
-#: build/trans_presets.java:1599 build/trans_presets.java:1605
-#: build/trans_presets.java:1611 build/trans_presets.java:1619
-#: build/trans_presets.java:1627 build/trans_presets.java:1635
-#: build/trans_presets.java:1642 build/trans_presets.java:1648
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1670 build/trans_presets.java:1677
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1712 build/trans_presets.java:1719
-#: build/trans_presets.java:1736 build/trans_presets.java:1744
-#: build/trans_presets.java:1759 build/trans_presets.java:1769
-#: build/trans_presets.java:1781 build/trans_presets.java:1788
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:1809 build/trans_presets.java:1817
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1841
-#: build/trans_presets.java:1846 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1864
-#: build/trans_presets.java:1872 build/trans_presets.java:1881
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1908 build/trans_presets.java:1914
-#: build/trans_presets.java:1922 build/trans_presets.java:1928
-#: build/trans_presets.java:1934 build/trans_presets.java:1940
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2013
-#: build/trans_presets.java:2022 build/trans_presets.java:2030
-#: build/trans_presets.java:2036 build/trans_presets.java:2042
-#: build/trans_presets.java:2048 build/trans_presets.java:2054
-#: build/trans_presets.java:2060 build/trans_presets.java:2066
-#: build/trans_presets.java:2072 build/trans_presets.java:2078
-#: build/trans_presets.java:2084 build/trans_presets.java:2090
-#: build/trans_presets.java:2096 build/trans_presets.java:2102
-#: build/trans_presets.java:2108 build/trans_presets.java:2114
-#: build/trans_presets.java:2120 build/trans_presets.java:2126
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2158
-#: build/trans_presets.java:2165 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2186
-#: build/trans_presets.java:2192 build/trans_presets.java:2198
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2218 build/trans_presets.java:2225
-#: build/trans_presets.java:2232 build/trans_presets.java:2239
-#: build/trans_presets.java:2247 build/trans_presets.java:2279
-#: build/trans_presets.java:2284 build/trans_presets.java:2289
-#: build/trans_presets.java:2294 build/trans_presets.java:2300
-#: build/trans_presets.java:2306 build/trans_presets.java:2312
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2354
-#: build/trans_presets.java:2451 build/trans_presets.java:2458
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2485 build/trans_presets.java:2492
-#: build/trans_presets.java:2498 build/trans_presets.java:2504
-#: build/trans_presets.java:2526 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2553 build/trans_presets.java:2559
-#: build/trans_presets.java:2565 build/trans_presets.java:2571
-#: build/trans_presets.java:2577 build/trans_presets.java:2583
-#: build/trans_presets.java:2590 build/trans_presets.java:2597
-#: build/trans_presets.java:2604 build/trans_presets.java:2610
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2661
-#: build/trans_presets.java:2667 build/trans_presets.java:2677
-#: build/trans_presets.java:2686 build/trans_presets.java:2701
-#: build/trans_presets.java:2707 build/trans_presets.java:2715
-#: build/trans_presets.java:2722 build/trans_presets.java:2742
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2783
-#: build/trans_presets.java:2790 build/trans_presets.java:2797
-#: build/trans_presets.java:2803 build/trans_presets.java:2809
-#: build/trans_presets.java:2817 build/trans_presets.java:2824
-#: build/trans_presets.java:2831 build/trans_presets.java:2838
-#: build/trans_presets.java:2844 build/trans_presets.java:2851
-#: build/trans_presets.java:2858 build/trans_presets.java:2867
-#: build/trans_presets.java:2873 build/trans_presets.java:2879
-#: build/trans_presets.java:2885 build/trans_presets.java:2891
-#: build/trans_presets.java:2900 build/trans_presets.java:2910
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2948
-#: build/trans_presets.java:2957 build/trans_presets.java:2963
-#: build/trans_presets.java:2969 build/trans_presets.java:2975
-#: build/trans_presets.java:2981 build/trans_presets.java:2987
-#: build/trans_presets.java:2993 build/trans_presets.java:3000
-#: build/trans_presets.java:3006 build/trans_presets.java:3011
-#: build/trans_presets.java:3018 build/trans_presets.java:3025
-#: build/trans_presets.java:3031 build/trans_presets.java:3040
-#: build/trans_presets.java:3048 build/trans_presets.java:3054
-#: build/trans_presets.java:3060 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3080
-#: build/trans_presets.java:3086 build/trans_presets.java:3092
-#: build/trans_presets.java:3098 build/trans_presets.java:3104
-#: build/trans_presets.java:3117 build/trans_presets.java:3131
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:67 build/trans_presets.java:103
+#: build/trans_presets.java:143 build/trans_presets.java:180
+#: build/trans_presets.java:200 build/trans_presets.java:218
+#: build/trans_presets.java:235 build/trans_presets.java:253
+#: build/trans_presets.java:273 build/trans_presets.java:306
+#: build/trans_presets.java:352 build/trans_presets.java:372
+#: build/trans_presets.java:387 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:503 build/trans_presets.java:523
+#: build/trans_presets.java:544 build/trans_presets.java:565
+#: build/trans_presets.java:586 build/trans_presets.java:607
+#: build/trans_presets.java:628 build/trans_presets.java:659
+#: build/trans_presets.java:680 build/trans_presets.java:693
+#: build/trans_presets.java:706 build/trans_presets.java:719
+#: build/trans_presets.java:732 build/trans_presets.java:745
+#: build/trans_presets.java:756 build/trans_presets.java:765
+#: build/trans_presets.java:812 build/trans_presets.java:833
+#: build/trans_presets.java:842 build/trans_presets.java:902
+#: build/trans_presets.java:1053 build/trans_presets.java:1061
+#: build/trans_presets.java:1069 build/trans_presets.java:1077
+#: build/trans_presets.java:1087 build/trans_presets.java:1095
+#: build/trans_presets.java:1100 build/trans_presets.java:1107
+#: build/trans_presets.java:1114 build/trans_presets.java:1119
+#: build/trans_presets.java:1127 build/trans_presets.java:1136
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1153 build/trans_presets.java:1159
+#: build/trans_presets.java:1165 build/trans_presets.java:1174
+#: build/trans_presets.java:1183 build/trans_presets.java:1190
+#: build/trans_presets.java:1198 build/trans_presets.java:1211
+#: build/trans_presets.java:1217 build/trans_presets.java:1226
+#: build/trans_presets.java:1232 build/trans_presets.java:1238
+#: build/trans_presets.java:1246 build/trans_presets.java:1302
+#: build/trans_presets.java:1349 build/trans_presets.java:1355
+#: build/trans_presets.java:1361 build/trans_presets.java:1367
+#: build/trans_presets.java:1373 build/trans_presets.java:1384
+#: build/trans_presets.java:1393 build/trans_presets.java:1408
+#: build/trans_presets.java:1415 build/trans_presets.java:1421
+#: build/trans_presets.java:1429 build/trans_presets.java:1436
+#: build/trans_presets.java:1445 build/trans_presets.java:1453
+#: build/trans_presets.java:1460 build/trans_presets.java:1471
+#: build/trans_presets.java:1481 build/trans_presets.java:1491
+#: build/trans_presets.java:1511 build/trans_presets.java:1523
+#: build/trans_presets.java:1534 build/trans_presets.java:1551
+#: build/trans_presets.java:1558 build/trans_presets.java:1574
+#: build/trans_presets.java:1581 build/trans_presets.java:1586
+#: build/trans_presets.java:1592 build/trans_presets.java:1598
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1646 build/trans_presets.java:1652
+#: build/trans_presets.java:1659 build/trans_presets.java:1666
+#: build/trans_presets.java:1674 build/trans_presets.java:1681
+#: build/trans_presets.java:1689 build/trans_presets.java:1696
+#: build/trans_presets.java:1702 build/trans_presets.java:1709
+#: build/trans_presets.java:1716 build/trans_presets.java:1723
+#: build/trans_presets.java:1740 build/trans_presets.java:1748
+#: build/trans_presets.java:1763 build/trans_presets.java:1773
+#: build/trans_presets.java:1785 build/trans_presets.java:1792
+#: build/trans_presets.java:1798 build/trans_presets.java:1808
+#: build/trans_presets.java:1813 build/trans_presets.java:1821
+#: build/trans_presets.java:1828 build/trans_presets.java:1834
+#: build/trans_presets.java:1840 build/trans_presets.java:1845
+#: build/trans_presets.java:1850 build/trans_presets.java:1855
+#: build/trans_presets.java:1862 build/trans_presets.java:1868
+#: build/trans_presets.java:1873 build/trans_presets.java:1882
+#: build/trans_presets.java:1891 build/trans_presets.java:1900
+#: build/trans_presets.java:1909 build/trans_presets.java:1918
+#: build/trans_presets.java:1924 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 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:2023 build/trans_presets.java:2032
+#: build/trans_presets.java:2040 build/trans_presets.java:2046
+#: build/trans_presets.java:2052 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 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:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2150
+#: build/trans_presets.java:2156 build/trans_presets.java:2162
+#: build/trans_presets.java:2169 build/trans_presets.java:2176
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2197 build/trans_presets.java:2203
+#: build/trans_presets.java:2209 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2229
+#: build/trans_presets.java:2236 build/trans_presets.java:2243
+#: build/trans_presets.java:2250 build/trans_presets.java:2258
+#: build/trans_presets.java:2290 build/trans_presets.java:2295
+#: build/trans_presets.java:2300 build/trans_presets.java:2305
+#: build/trans_presets.java:2311 build/trans_presets.java:2317
+#: build/trans_presets.java:2323 build/trans_presets.java:2331
+#: build/trans_presets.java:2337 build/trans_presets.java:2343
+#: build/trans_presets.java:2349 build/trans_presets.java:2355
+#: build/trans_presets.java:2365 build/trans_presets.java:2462
+#: build/trans_presets.java:2469 build/trans_presets.java:2483
+#: build/trans_presets.java:2489 build/trans_presets.java:2496
+#: build/trans_presets.java:2503 build/trans_presets.java:2509
+#: build/trans_presets.java:2515 build/trans_presets.java:2537
+#: build/trans_presets.java:2544 build/trans_presets.java:2551
+#: build/trans_presets.java:2557 build/trans_presets.java:2564
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2594 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2615
+#: build/trans_presets.java:2621 build/trans_presets.java:2627
+#: build/trans_presets.java:2633 build/trans_presets.java:2639
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2672 build/trans_presets.java:2678
+#: build/trans_presets.java:2688 build/trans_presets.java:2697
+#: build/trans_presets.java:2712 build/trans_presets.java:2718
+#: build/trans_presets.java:2726 build/trans_presets.java:2733
+#: build/trans_presets.java:2753 build/trans_presets.java:2764
+#: build/trans_presets.java:2770 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2788
+#: build/trans_presets.java:2795 build/trans_presets.java:2802
+#: build/trans_presets.java:2809 build/trans_presets.java:2815
+#: build/trans_presets.java:2821 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2912
+#: build/trans_presets.java:2922 build/trans_presets.java:2931
+#: build/trans_presets.java:2937 build/trans_presets.java:2943
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 build/trans_presets.java:2981
+#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:2999 build/trans_presets.java:3005
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3023 build/trans_presets.java:3030
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3066 build/trans_presets.java:3072
+#: build/trans_presets.java:3079 build/trans_presets.java:3085
+#: build/trans_presets.java:3092 build/trans_presets.java:3098
+#: build/trans_presets.java:3104 build/trans_presets.java:3110
+#: build/trans_presets.java:3116 build/trans_presets.java:3129
+#: build/trans_presets.java:3143 build/trans_presets.java:3157
 msgid "Name"
 msgstr "Naziv"
@@ -6537,4 +6675,57 @@
 msgid "Version"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
+#, fuzzy
+msgid "Changeset id:"
+msgstr "paketi sprememb"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
+#, fuzzy
+msgid "Created at:"
+msgstr "Ustvari površine"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
+#, fuzzy
+msgid "Changeset comment:"
+msgstr "Spremeni relacijo"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
+msgid "No open changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48
+#, fuzzy
+msgid "<html>Please select the changesets you want to close</html>"
+msgstr "Izberite vsaj eno pot, ki jo želite poenostaviti."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
+#, fuzzy
+msgid "Open changesets"
+msgstr "paketi sprememb"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101
+#, fuzzy
+msgid "Close changesets"
+msgstr "paketi sprememb"
+
+#. putValue(SMALL_ICON, ImageProvider.get("cancel"));
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
+#, fuzzy
+msgid "Close the selected open changesets"
+msgstr "Izbriši izbrane predmete."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126
+msgid "Cancel closeing of changesets"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37
+msgid "Closing changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77
+#, fuzzy, java-format
+msgid "Closing changeset {0}"
+msgstr "Zadnja sprememba {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
@@ -6563,5 +6754,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be uploaded"
+msgid "Layer ''{0}'' has no modifications to be uploaded."
 msgstr ""
 
@@ -6569,5 +6760,5 @@
 #, java-format
 msgid ""
-"Layer ''{0}'' has modifications which should be saved to its assoicated file "
+"Layer ''{0}'' has modifications which should be saved to its associated file "
 "''{1}''."
 msgstr ""
@@ -6575,5 +6766,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be saved"
+msgid "Layer ''{0}'' has no modifications to be saved."
 msgstr ""
 
@@ -6607,17 +6798,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113
 msgid "Unsaved changes - Save/Upload before exiting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194
 #, java-format
 msgid ""
@@ -6630,9 +6821,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205
 msgid "Unsaved data and conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212
 #, java-format
 msgid ""
@@ -6646,9 +6837,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223
 msgid "Unsaved data and missing associated file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230
 #, java-format
 msgid ""
@@ -6663,42 +6854,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243
 msgid "Unsaved data non-writable files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
 msgid "Close this dialog and resume editing in JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322
+msgid "Discard and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
-msgid "Discard and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354
+msgid "Save and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
-msgid "Save and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
 msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402
 #, java-format
 msgid "Preparing layer ''{0}'' for upload ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
@@ -6706,5 +6897,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491
 msgid "Incomplete upload and/or save"
 msgstr ""
@@ -6744,21 +6935,21 @@
 #. item "Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:200
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:278
-#: build/trans_presets.java:311 build/trans_presets.java:357
-#: build/trans_presets.java:372 build/trans_presets.java:387
-#: build/trans_presets.java:409 build/trans_presets.java:429
-#: build/trans_presets.java:450 build/trans_presets.java:470
-#: build/trans_presets.java:489 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:549
-#: build/trans_presets.java:570 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:633
-#: build/trans_presets.java:664 build/trans_presets.java:1060
-#: build/trans_presets.java:1068 build/trans_presets.java:1076
-#: build/trans_presets.java:1086 build/trans_presets.java:1305
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:242
+#: build/trans_presets.java:260 build/trans_presets.java:279
+#: build/trans_presets.java:312 build/trans_presets.java:358
+#: build/trans_presets.java:373 build/trans_presets.java:388
+#: build/trans_presets.java:410 build/trans_presets.java:430
+#: build/trans_presets.java:451 build/trans_presets.java:471
+#: build/trans_presets.java:490 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:665 build/trans_presets.java:1062
+#: build/trans_presets.java:1070 build/trans_presets.java:1078
+#: build/trans_presets.java:1088 build/trans_presets.java:1308
 msgid "Layer"
 msgstr "Plast"
@@ -6777,67 +6968,32 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:200
 msgid "Upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-msgid "Use a new changeset and close it"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
-msgid ""
-"Select to upload the data using a new changeset and to close the changeset "
-"after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
-msgid "Use a new changeset and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
-msgid ""
-"Select to upload the data using a new changeset and to leave the changeset "
-"open after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
-msgid "Upload to a new or to an existing changeset?"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
-msgid "upload all changes in one request"
+msgid "Settings"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
-msgid ""
-"Enable to upload all changes in one request, disable to use one request per "
-"changed primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171
-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/gui/io/UploadDialog.java:216
-msgid "Settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908
 msgid "Tags of new changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:221
 msgid "Objects to add:"
 msgstr "Novi predmeti:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:227
 msgid "Objects to modify:"
 msgstr "Spremenjeni predmeti:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:233
 msgid "Objects to delete:"
 msgstr "Izbrisani predmeti:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
 #, java-format
 msgid "{0} object to add:"
@@ -6846,5 +7002,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:277
 #, java-format
 msgid "{0} object to modifiy:"
@@ -6853,5 +7009,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:286
 #, java-format
 msgid "{0} object to delete:"
@@ -6860,53 +7016,87 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422
-#, java-format
-msgid "Use the existing changeset {0} and close it after upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:423
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to close the changeset "
-"after this upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426
-#, java-format
-msgid "Use the existing changeset {0} and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:427
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to leave the changeset "
-"open for further uploads"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:470
+msgid "Upload Changes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472
+msgid "Upload the changed primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
+msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:479
+msgid "Illegal upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
+msgid "Cancel the upload and resume editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606
+#, fuzzy
+msgid "Upload all changes in one request"
+msgstr "Pošlji vse spremembe na strežnik OSM."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607
+msgid ""
+"Enable to upload all changes in one request, disable to use one request per "
+"changed primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:617
+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/gui/io/UploadDialog.java:672
+#, fuzzy
+msgid "Open a new changeset"
+msgstr "paketi sprememb"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
+msgid "Open a new changeset and use it in the next upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
+#, fuzzy
+msgid "Use an open changeset"
+msgstr "Neshranjene spremembe"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
+msgid "Upload data to an already opened changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
+#, fuzzy
+msgid "Close changeset after upload"
+msgstr "Ni sprememb za pošiljanje."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
+msgid "Select to close the changeset after the next upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922
 #, java-format
 msgid "Tags of changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584
-msgid "Upload Changes"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
 #, fuzzy
-msgid "Upload the changed primitives"
-msgstr "Pošljem te spremembe?"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592
+msgid "Load the list of your open changesets from the server"
+msgstr "Prenos trenutnih nastavitev na strežnik"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
 #, fuzzy
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "Prosim, vnesite ime kraja."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:593
-msgid "Illegal upload comment"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
-msgid "Cancel the upload and resume editing"
+msgid "Close the currently selected open changeset"
+msgstr "Pomakni izbranega člana vrstico višje."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
+#, java-format
+msgid "changeset id > 0 expected. Got {1}"
 msgstr ""
 
@@ -6987,5 +7177,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
@@ -7023,5 +7213,5 @@
 msgstr "Vpisanega časa ni bilo mogoče razpoznati."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
@@ -7029,30 +7219,30 @@
 msgstr "točka GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
 msgid "Customize line drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
 msgid "Use global settings."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Draw lines between points for this layer."
 msgstr "Riši povezave med točkami na tej plasti."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Do not draw lines between points for this layer."
 msgstr "Ne riši povezav med točkami na tej plasti."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 msgid "Select line drawing options"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7060,5 +7250,5 @@
 msgstr "Prilagodi barvo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7067,5 +7257,5 @@
 msgstr "Privzeto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7074,38 +7264,76 @@
 msgstr "Izberite barvo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
 msgid "Import Audio"
 msgstr "Uvozi zvok"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
 msgid "Wave Audio files (*.wav)"
 msgstr "Zvočne datoteke (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #, java-format
 msgid "Audio markers from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
 msgid "Import images"
 msgstr "Uvozi slike"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#, java-format
+msgid "Name: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#, java-format
+msgid "Description: {0}"
+msgstr "Opis: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#, fuzzy, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
+msgstr[0] "sledi"
+msgstr[1] "sled"
+msgstr[2] "sledi"
+msgstr[3] "sledi"
+
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
+#: build/trans_presets.java:3160
+msgid "Description"
+msgstr "Opis"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+msgid "Timespan"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#, fuzzy
+msgid "Length"
+msgstr "Dolžina poti"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
+msgid "URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+msgid "Length: "
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
 #, java-format
 msgid "{0} route, "
@@ -7114,5 +7342,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 #, java-format
 msgid "{0} waypoint"
@@ -7121,29 +7349,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
-#, java-format
-msgid "Name: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
-#, java-format
-msgid "Description: {0}"
-msgstr "Opis: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
-msgid "Timespan: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
-msgid "Length: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Pretvori v podatkovno plast"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7151,10 +7360,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -7165,29 +7374,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
 msgid "Download from OSM along this track"
 msgstr "Sprejmi iz OSM vzdolž te sledi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
 msgid "Download everything within:"
 msgstr "Sprejmi vse znotraj:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
 #, java-format
 msgid "{0} meters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 msgid "Maximum area per request:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
 #, java-format
 msgid "{0} sq km"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
 #, java-format
 msgid ""
@@ -7198,13 +7407,13 @@
 "nadaljevati?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
 msgid "Download data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7212,5 +7421,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7267,21 +7476,21 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "track"
 msgid_plural "tracks"
@@ -7420,4 +7629,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
@@ -7644,13 +7854,18 @@
 msgstr "Riši velike točke GPS sledi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+msgid "Draw a circle form HDOP value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Hitrost (rdeče = počasi, zeleno = hitro)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "Enobarvno (barvo poimenovanih plasti je mogoče prilagoditi po meri)"
@@ -7658,6 +7873,6 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1374
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:1377
 msgid "Car"
 msgstr "Avtomobil"
@@ -7678,14 +7893,14 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:324 build/trans_presets.java:650
-#: build/trans_presets.java:857 build/trans_presets.java:876
-#: build/trans_presets.java:890 build/trans_presets.java:912
-#: build/trans_presets.java:949 build/trans_presets.java:962
-#: build/trans_presets.java:974 build/trans_presets.java:986
-#: build/trans_presets.java:998 build/trans_presets.java:1010
-#: build/trans_presets.java:1020 build/trans_presets.java:1029
-#: build/trans_presets.java:1038 build/trans_presets.java:1437
-#: build/trans_presets.java:1510
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:325 build/trans_presets.java:651
+#: build/trans_presets.java:858 build/trans_presets.java:877
+#: build/trans_presets.java:891 build/trans_presets.java:913
+#: build/trans_presets.java:950 build/trans_presets.java:963
+#: build/trans_presets.java:975 build/trans_presets.java:987
+#: build/trans_presets.java:999 build/trans_presets.java:1011
+#: build/trans_presets.java:1021 build/trans_presets.java:1030
+#: build/trans_presets.java:1039 build/trans_presets.java:1440
+#: build/trans_presets.java:1513
 msgid "Bicycle"
 msgstr "Kolo"
@@ -7718,62 +7933,62 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:325 build/trans_presets.java:649
-#: build/trans_presets.java:856 build/trans_presets.java:875
-#: build/trans_presets.java:889 build/trans_presets.java:911
-#: build/trans_presets.java:948 build/trans_presets.java:961
-#: build/trans_presets.java:973 build/trans_presets.java:985
-#: build/trans_presets.java:997 build/trans_presets.java:1009
-#: build/trans_presets.java:1019 build/trans_presets.java:1028
-#: build/trans_presets.java:1037
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:326 build/trans_presets.java:650
+#: build/trans_presets.java:857 build/trans_presets.java:876
+#: build/trans_presets.java:890 build/trans_presets.java:912
+#: build/trans_presets.java:949 build/trans_presets.java:962
+#: build/trans_presets.java:974 build/trans_presets.java:986
+#: build/trans_presets.java:998 build/trans_presets.java:1010
+#: build/trans_presets.java:1020 build/trans_presets.java:1029
+#: build/trans_presets.java:1038
 msgid "Foot"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Riši smerne puščice"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr ""
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Le zanimive smerne puščice (npr enosmerne ceste)"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Only on the head of a way."
 msgstr "Le na koncu poti."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Riši meje sprejetega področja"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Riši nedejavne plasti v drugi barvi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:82
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -7781,9 +7996,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
@@ -7792,25 +8007,25 @@
 "Nastavite '-1' za povezavo vseh točk."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length (meters)"
 msgstr "Največja dolžina (metrov)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:129
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr ""
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:135
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:141
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -7818,13 +8033,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:144
 msgid "Minimum distance (pixels)"
 msgstr "Najmanjša razdalja (slikovnih točk)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Draw larger dots for the GPS points."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -7832,9 +8047,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Colors points and track segments by velocity."
 msgstr "Barvaj točke in segmente sledi glede na hitrost."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -7842,46 +8057,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202
 msgid "GPS Points"
 msgstr "Točke GPS sledi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "Draw direction hints for way segments."
 msgstr ""
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:237
 msgid "Draw the order numbers of all segments within their way."
 msgstr ""
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr ""
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Draw the boundaries of data loaded from the server."
 msgstr ""
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257
 msgid "Draw the inactive data layers in a different color."
 msgstr "Riši nedejavne podatkovne plasti v drugi barvi."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "OSM Data"
 msgstr "Podatki OSM"
@@ -7960,45 +8175,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Configure available plugins."
 msgstr "Nastavi razpoložljive vstavke."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50
+#. buttons at the bottom
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
 msgid "Download List"
 msgstr "Sprejmi seznam"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:100
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 msgid "Update"
 msgstr "Posodobi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Configure Sites..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:125
 msgid "Add JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:126
 msgid "Enter URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:162
 msgid "Please select an entry."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:147
 msgid "Edit JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:148
 msgid "JOSM Plugin description URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:175
 msgid "Configure Plugin Sites"
 msgstr "Nastavi vire vstavkov"
@@ -8326,6 +8542,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:369
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341
 #, java-format
 msgid "Remove old keys from up to {0} object"
@@ -8334,9 +8550,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135
 msgid "Add a new tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160
 msgid "Delete the selection in the tag table"
 msgstr ""
@@ -8371,7 +8587,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:68
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:75
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -8417,4 +8633,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24
+#, fuzzy, java-format
+msgid "Preset group ''{0}'' of group ''{1}''"
+msgstr "Uporabi prednastavitev ''{0}'' iz skupine ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
 #, java-format
 msgid "Preset group ''{0}''"
@@ -8435,4 +8656,10 @@
 msgstr "Sprejem točk od {0} do {1}..."
 
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, fuzzy, java-format
+msgid "parameter ''{0}'' > 0 expected. Got {1}"
+msgstr "parameter ''{0}'' ne sme biti ničen"
+
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8541,5 +8768,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
 msgid "Parse error: invalid document structure for gpx document"
 msgstr ""
@@ -8659,10 +8886,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -8670,75 +8898,79 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315
 msgid "Creating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
 #, java-format
 msgid "Successfully opened changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#, java-format
+msgid "id of changeset > 0 required. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
-#, java-format
-msgid "Changeset {0} is unchanged. Skipping update."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
 #, java-format
 msgid "Updating changeset {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
-msgid ""
-"Failed to update changeset. Either there is no current changeset or the id "
-"of the current changeset is 0"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
 msgid "Closing changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
-#, java-format
-msgid "Closing changeset {0}..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
-#, java-format
-msgid "Leaving changeset {0} open..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
 msgid "No changeset present for diff upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414
 msgid "Preparing..."
 msgstr "Pripravljanje..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419
 msgid "Uploading..."
 msgstr "Pošiljanje ..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438
 msgid "Waiting 10 seconds ... "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449
 msgid "OK - trying again."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:485
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517
 #, java-format
 msgid "Starting retry {0} of {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
+msgid "current changeset is null. Can't upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
+#, java-format
+msgid "id of current changeset > required. Current id is {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
+#, java-format
+msgid "Open changeset expected. Got closed changeset with id {0}"
 msgstr ""
 
@@ -8764,50 +8996,108 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
+#, java-format
+msgid "missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:128
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:134
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
+#, java-format
+msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
+#, java-format
+msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
+#, java-format
+msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#, java-format
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#, java-format
+msgid "Unsupported version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:176
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Aborting."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#, java-format
+msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
+msgid "Parsing list of changesets..."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
 msgid "Incorrect password or username."
 msgstr "Napačno uporabniško ime ali geslo."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:168
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Pozor: Geslo se prenaša nekriptirano"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Save user and password (unencrypted)"
 msgstr "Shrani uporabniško ime in geslo (nekriptirano)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
 msgid "Enter Password"
 msgstr "Vnesite geslo"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 msgid "Login"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:242
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
 msgid "The base URL for the OSM server (REST API)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr "Geslo vašega računa pri OSM. Pustite prazno da se geslo ne shranjuje."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
 msgid "Base Server URL"
 msgstr "Osnovni URL naslov strežnika"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
 msgid "OSM password"
 msgstr "OSM geslo"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -8816,5 +9106,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:51
+#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #, java-format
 msgid "(at line {0}, column {1})"
@@ -8904,20 +9194,5 @@
 msgstr "Napaka med razčlenjevanjem."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124
-#, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
-#, java-format
-msgid "Missing mandatory attribute ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
-#, fuzzy, java-format
-msgid "Unsupported version: {0}"
-msgstr "končna različica:"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:155
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -8926,38 +9201,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
 msgid "found XML element <nd> element not as direct child of element <way>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
 msgid "Found XML element <member> not as direct child of element <relation>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
 #, java-format
 msgid ""
@@ -8965,24 +9240,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
 msgid "Incomplete <member> specification with ref=0"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
-#, java-format
-msgid "Warning: Undefined element ''{0}'' found in input stream. Skipping."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
-#, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Skipping."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
 msgid "Illegal object with id=0"
 msgstr "predmet z id=0 ni dovoljen"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #, java-format
 msgid ""
@@ -8990,5 +9260,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:303
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
 #, java-format
 msgid ""
@@ -8997,5 +9267,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
 #, java-format
 msgid ""
@@ -9004,5 +9274,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
@@ -9012,25 +9282,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:316
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with id {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
 #, java-format
 msgid ""
@@ -9038,5 +9308,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
 #, java-format
 msgid ""
@@ -9045,5 +9315,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
 #, java-format
 msgid ""
@@ -9051,5 +9321,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
 #, java-format
 msgid ""
@@ -9058,17 +9328,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
 msgid "Prepare OSM data..."
 msgstr "Priprava podatkov OSM..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 msgid "Parsing OSM data..."
-msgstr "Priprava podatkov OSM..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
 msgid "Preparing data set..."
-msgstr "Pripravljam podatke..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
@@ -9089,4 +9357,24 @@
 msgid "Downloading referring relations ..."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51
+#, fuzzy
+msgid "Reading changesets..."
+msgstr "paketi sprememb"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
+#, fuzzy
+msgid "Downloading changesets ..."
+msgstr "Sprejemanje..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85
+#, fuzzy, java-format
+msgid "Reading changeset {0} ..."
+msgstr "Berem {0}..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91
+#, fuzzy, java-format
+msgid "Downloading changeset {0} ..."
+msgstr "Sprejem točk od {0} do {1}..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
@@ -9103,10 +9391,14 @@
 msgstr "Vzpostavljanje povezave s strežnikom..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
 msgid "Failed to open connection to API {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
+msgid "Error: failed to add authentication credentials to the connection."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -9115,33 +9407,52 @@
 "internetom."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+msgid "XML tag <user> is missing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
+#, fuzzy, java-format
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgstr "Uporabi prednastavitev ''{0}'' iz skupine ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
+#, java-format
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
 msgid "Starting to upload with one request per primitive ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
 msgid "Starting to upload in one request ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:171
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135
 msgid "Uploading data ..."
-msgstr "Pošiljanje ..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:178
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
 msgid ""
 "WARNING: no API version defined for data to upload. Falling back to version "
@@ -9149,5 +9460,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147
 #, java-format
 msgid ""
@@ -9157,10 +9468,10 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
 msgid "Update Plugins"
 msgstr "Posodobitev vstavkov"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 msgid "Download Plugins"
 msgstr ""
@@ -9319,5 +9630,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -9328,18 +9639,18 @@
 msgstr[3] "Sprejeti podatki o vstavkih z  {0} strežnikov"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
 msgid "No plugin information found."
 msgstr "Informacij o vsavku ni bilo mogoče najti."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:93
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
 msgid "All installed plugins are up to date."
 msgstr "Vsi nameščeni vstavki so posodobljeni."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
 #, java-format
 msgid ""
@@ -9352,9 +9663,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
 msgid "Download missing plugins"
 msgstr "Sprejem manjkajočih vstavkov"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
 #, java-format
 msgid ""
@@ -9369,43 +9680,43 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
 msgid "unknown"
 msgstr "neznan"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Različica {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 msgid "Plugin bundled with JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:357
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -9712,10 +10023,4 @@
 msgid "(What does that mean?)"
 msgstr ""
-
-#. item "Relations/Route" text "Symbol description"
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3148
-msgid "Description"
-msgstr "Opis"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
@@ -10465,5 +10770,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
-msgid "Set "
+#, java-format
+msgid "Set {0} Lambert coordinates"
 msgstr ""
 
@@ -11082,6 +11388,6 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 #: build/trans_style.java:990 build/trans_style.java:1007
-#: build/trans_style.java:1023 build/trans_style.java:3392
-#: build/trans_style.java:3400
+#: build/trans_style.java:1023 build/trans_style.java:3400
+#: build/trans_style.java:3408
 msgid "water"
 msgstr ""
@@ -11368,4 +11674,55 @@
 msgstr ""
 
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Michigan Left"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Adds no left turn for sets of 4 or 5 ways."
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45
+#, fuzzy
+msgid "Please select 4 or 5 ways to assign no left turns."
+msgstr "Izberite vsaj eno pot, ki jo želite poenostaviti."
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61
+#, fuzzy, java-format
+msgid "{0} extrem nodes."
+msgstr "{0} točk"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69
+#, java-format
+msgid "Via node {0}, {1}"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75
+#, fuzzy, java-format
+msgid "{0} via nodes."
+msgstr "{0} točk"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78
+msgid "Unable to find via nodes. Please check your selection"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98
+#, fuzzy, java-format
+msgid "MIddle way: {0}"
+msgstr "Način: {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121
+msgid "Create Michigan left turn restriction"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129
+#, fuzzy, java-format
+msgid "Processing {0}"
+msgstr "Različica {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142
+#, java-format
+msgid "Relation: from {0} to {1} via {2}"
+msgstr ""
+
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
 msgid "OpenLayers"
@@ -11511,7 +11868,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
-#, fuzzy
 msgid "create new objects"
-msgstr "Ustvari novo vozlišče."
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
@@ -11831,5 +12187,5 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:158
 msgid "JOSM Tag Editor Plugin"
 msgstr ""
@@ -11839,5 +12195,5 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:370
 #, java-format
 msgid "Updating properties of up to {0} object"
@@ -11846,18 +12202,4 @@
 msgstr[1] ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44
-msgid "INFO: entering compatibilty mode for JOSM with Main.ds"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47
-msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49
-msgid ""
-"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-"found."
-msgstr ""
-
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
 msgid "Group"
@@ -11866,9 +12208,4 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
 msgid "Item"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-msgid "Filter"
 msgstr ""
 
@@ -11955,5 +12292,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2272
 msgid "Street name"
 msgstr "Ime ceste"
@@ -12114,8 +12451,4 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88
 msgid "Zoom (in metres)"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
-msgid "URL"
 msgstr ""
 
@@ -12319,7 +12652,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501
-#, fuzzy
 msgid "Updating map ..."
-msgstr "Pošiljanje ..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69
@@ -12803,7 +13135,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
-#: build/trans_style.java:4179
+#: build/trans_style.java:4159 build/trans_style.java:4166
+#: build/trans_style.java:4173 build/trans_style.java:4180
+#: build/trans_style.java:4187
 msgid "building"
 msgstr "zgradba"
@@ -12817,5 +13149,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4186
+#: build/trans_style.java:4194
 msgid "area"
 msgstr ""
@@ -12942,10 +13274,10 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:148
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:155
 msgid "Reached a junction"
 msgstr ""
@@ -13233,7 +13565,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
-#, fuzzy
 msgid "Overlap tiles"
-msgstr "Prekrivajoče površine"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
@@ -13386,6 +13717,11 @@
 msgstr ""
 
+#. Plugin michigan_left
+#: build/trans_plugins.java:35
+msgid "Adds no left turn for sets of 4 or 5 ways"
+msgstr ""
+
 #. Plugin nearclick
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid ""
 "Simulates a click when you do a small and short drag. This is usefull for "
@@ -13395,15 +13731,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13411,5 +13747,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13417,5 +13753,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13424,15 +13760,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13441,10 +13777,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13453,15 +13789,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -13471,10 +13807,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin usertools
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -13483,5 +13819,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -13490,5 +13826,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -13497,5 +13833,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -13504,10 +13840,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -13563,4 +13899,10 @@
 #. <annotations>
 #: build/trans_presets.java:57
+#, fuzzy
+msgid "Highways"
+msgstr "cesta"
+
+#. group "Highways"
+#: build/trans_presets.java:58
 msgid "Streets"
 msgstr "Ceste"
@@ -13571,5 +13913,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:58 build/trans_surveyor.java:72
+#: build/trans_presets.java:59 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Avtocesta"
@@ -13578,5 +13920,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:61
+#: build/trans_presets.java:62
 msgid "Edit Motorway"
 msgstr "Uredi avtocesto"
@@ -13603,8 +13945,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:120 build/trans_presets.java:140
-#: build/trans_presets.java:177 build/trans_presets.java:197
-#: build/trans_presets.java:1557 build/trans_presets.java:3146
+#: build/trans_presets.java:65 build/trans_presets.java:101
+#: build/trans_presets.java:121 build/trans_presets.java:141
+#: build/trans_presets.java:178 build/trans_presets.java:198
+#: build/trans_presets.java:1560 build/trans_presets.java:3158
 msgid "Reference"
 msgstr ""
@@ -13618,8 +13960,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:358
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:359
 msgid "Lanes"
 msgstr "Voznih pasov"
@@ -13636,15 +13978,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:224 build/trans_presets.java:280
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:373 build/trans_presets.java:388
-#: build/trans_presets.java:412 build/trans_presets.java:431
-#: build/trans_presets.java:452 build/trans_presets.java:472
-#: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1307
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:225 build/trans_presets.java:281
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:374 build/trans_presets.java:389
+#: build/trans_presets.java:413 build/trans_presets.java:432
+#: build/trans_presets.java:453 build/trans_presets.java:473
+#: build/trans_presets.java:511 build/trans_presets.java:667
+#: build/trans_presets.java:1310
 msgid "Max. speed (km/h)"
 msgstr "Najvišja hitrost (km/h)"
@@ -13681,16 +14023,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:293 build/trans_presets.java:306
-#: build/trans_presets.java:320 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:464
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:659 build/trans_presets.java:1300
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:294 build/trans_presets.java:307
+#: build/trans_presets.java:321 build/trans_presets.java:353
+#: build/trans_presets.java:405 build/trans_presets.java:425
+#: build/trans_presets.java:445 build/trans_presets.java:465
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:660 build/trans_presets.java:1303
 msgid "Oneway"
 msgstr "Enosmerna"
@@ -13732,19 +14074,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:353
-#: build/trans_presets.java:362 build/trans_presets.java:405
-#: build/trans_presets.java:425 build/trans_presets.java:445
-#: build/trans_presets.java:465 build/trans_presets.java:485
-#: build/trans_presets.java:504 build/trans_presets.java:523
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:586 build/trans_presets.java:607
-#: build/trans_presets.java:628 build/trans_presets.java:660
-#: build/trans_presets.java:1301 build/trans_surveyor.java:12
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:354
+#: build/trans_presets.java:363 build/trans_presets.java:406
+#: build/trans_presets.java:426 build/trans_presets.java:446
+#: build/trans_presets.java:466 build/trans_presets.java:486
+#: build/trans_presets.java:505 build/trans_presets.java:524
+#: build/trans_presets.java:545 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629 build/trans_presets.java:661
+#: build/trans_presets.java:1304 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Most"
@@ -13780,19 +14122,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:354
-#: build/trans_presets.java:378 build/trans_presets.java:406
-#: build/trans_presets.java:426 build/trans_presets.java:446
-#: build/trans_presets.java:466 build/trans_presets.java:486
-#: build/trans_presets.java:505 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629 build/trans_presets.java:661
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:355
+#: build/trans_presets.java:379 build/trans_presets.java:407
+#: build/trans_presets.java:427 build/trans_presets.java:447
+#: build/trans_presets.java:467 build/trans_presets.java:487
+#: build/trans_presets.java:506 build/trans_presets.java:525
+#: build/trans_presets.java:546 build/trans_presets.java:567
+#: build/trans_presets.java:588 build/trans_presets.java:609
+#: build/trans_presets.java:630 build/trans_presets.java:662
+#: build/trans_presets.java:1305
 msgid "Tunnel"
 msgstr "Predor"
@@ -13826,18 +14168,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:73 build/trans_presets.java:90
-#: build/trans_presets.java:110 build/trans_presets.java:129
-#: build/trans_presets.java:150 build/trans_presets.java:166
-#: build/trans_presets.java:186 build/trans_presets.java:205
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:355
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:467
-#: build/trans_presets.java:487 build/trans_presets.java:506
-#: build/trans_presets.java:525 build/trans_presets.java:546
-#: build/trans_presets.java:567 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:630
-#: build/trans_presets.java:662 build/trans_presets.java:1303
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:356
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:468
+#: build/trans_presets.java:488 build/trans_presets.java:507
+#: build/trans_presets.java:526 build/trans_presets.java:547
+#: build/trans_presets.java:568 build/trans_presets.java:589
+#: build/trans_presets.java:610 build/trans_presets.java:631
+#: build/trans_presets.java:663 build/trans_presets.java:1306
 msgid "Cutting"
 msgstr "Usek"
@@ -13871,18 +14213,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:74 build/trans_presets.java:91
-#: build/trans_presets.java:111 build/trans_presets.java:130
-#: build/trans_presets.java:151 build/trans_presets.java:167
-#: build/trans_presets.java:187 build/trans_presets.java:206
-#: build/trans_presets.java:222 build/trans_presets.java:240
-#: build/trans_presets.java:258 build/trans_presets.java:277
-#: build/trans_presets.java:310 build/trans_presets.java:356
-#: build/trans_presets.java:408 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:468
-#: build/trans_presets.java:488 build/trans_presets.java:507
-#: build/trans_presets.java:526 build/trans_presets.java:547
-#: build/trans_presets.java:568 build/trans_presets.java:589
-#: build/trans_presets.java:610 build/trans_presets.java:631
-#: build/trans_presets.java:663 build/trans_presets.java:1304
+#: build/trans_presets.java:75 build/trans_presets.java:92
+#: build/trans_presets.java:112 build/trans_presets.java:131
+#: build/trans_presets.java:152 build/trans_presets.java:168
+#: build/trans_presets.java:188 build/trans_presets.java:207
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:357
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:469
+#: build/trans_presets.java:489 build/trans_presets.java:508
+#: build/trans_presets.java:527 build/trans_presets.java:548
+#: build/trans_presets.java:569 build/trans_presets.java:590
+#: build/trans_presets.java:611 build/trans_presets.java:632
+#: build/trans_presets.java:664 build/trans_presets.java:1307
 msgid "Embankment"
 msgstr "Nasip"
@@ -13890,5 +14232,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Motorway Link"
 msgstr "Avtocestni priključek"
@@ -13897,5 +14239,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:80
+#: build/trans_presets.java:81
 msgid "Edit Motorway Link"
 msgstr "Uredi avtocestni priključek"
@@ -13903,5 +14245,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:94
+#: build/trans_presets.java:95
 msgid "Trunk"
 msgstr "Hitra cesta"
@@ -13910,5 +14252,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:97
+#: build/trans_presets.java:98
 msgid "Edit Trunk"
 msgstr "Uredi hitro cesto"
@@ -13918,6 +14260,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
 msgid "Motorroad"
 msgstr ""
@@ -13925,5 +14267,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:114
+#: build/trans_presets.java:115
 msgid "Trunk Link"
 msgstr "Priključek hitre ceste"
@@ -13932,5 +14274,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:117
+#: build/trans_presets.java:118
 msgid "Edit Trunk Link"
 msgstr "Uredi priključek hitre ceste"
@@ -13943,5 +14285,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:134 build/trans_surveyor.java:76
+#: build/trans_presets.java:135 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Glavna cesta (1.,2. reda)"
@@ -13950,5 +14292,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:137
+#: build/trans_presets.java:138
 msgid "Edit Primary Road"
 msgstr "Uredi glavna cesta (1.,2. reda)"
@@ -13956,10 +14298,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:154
+#: build/trans_presets.java:155
 msgid "Primary Link"
 msgstr "Priključek glavne ceste"
 
 #. item
-#: build/trans_presets.java:155
+#: build/trans_presets.java:156
 msgid "Edit Primary Link"
 msgstr "Uredi priključek glavne ceste"
@@ -13971,5 +14313,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:170 build/trans_surveyor.java:80
+#: build/trans_presets.java:171 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Regionalna cesta (1.,2. reda)"
@@ -13979,5 +14321,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:174
+#: build/trans_presets.java:175
 msgid "Edit Secondary Road"
 msgstr "Uredi regionalno cesto (1.,2. reda)"
@@ -13985,5 +14327,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:190
+#: build/trans_presets.java:191
 msgid "Tertiary"
 msgstr "Regionalna cesta (3. reda, turistična)"
@@ -13993,5 +14335,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:194
+#: build/trans_presets.java:195
 msgid "Edit Tertiary Road"
 msgstr "Uredi regionalno cesto (3. reda, turistična)"
@@ -14003,5 +14345,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:209 build/trans_surveyor.java:84
+#: build/trans_presets.java:210 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr ""
@@ -14011,5 +14353,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:213
+#: build/trans_presets.java:214
 msgid "Edit Unclassified Road"
 msgstr ""
@@ -14036,19 +14378,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:225 build/trans_presets.java:243
-#: build/trans_presets.java:261 build/trans_presets.java:281
-#: build/trans_presets.java:314 build/trans_presets.java:359
-#: build/trans_presets.java:375 build/trans_presets.java:389
-#: build/trans_presets.java:413 build/trans_presets.java:432
-#: build/trans_presets.java:453 build/trans_presets.java:473
-#: build/trans_presets.java:491 build/trans_presets.java:511
-#: build/trans_presets.java:532 build/trans_presets.java:553
-#: build/trans_presets.java:574 build/trans_presets.java:595
-#: build/trans_presets.java:616 build/trans_presets.java:637
-#: build/trans_presets.java:667 build/trans_presets.java:680
-#: build/trans_presets.java:693 build/trans_presets.java:706
-#: build/trans_presets.java:719 build/trans_presets.java:732
-#: build/trans_presets.java:745 build/trans_presets.java:1308
-#: build/trans_presets.java:1498 build/trans_presets.java:1540
+#: build/trans_presets.java:226 build/trans_presets.java:244
+#: build/trans_presets.java:262 build/trans_presets.java:282
+#: build/trans_presets.java:315 build/trans_presets.java:360
+#: build/trans_presets.java:376 build/trans_presets.java:390
+#: build/trans_presets.java:414 build/trans_presets.java:433
+#: build/trans_presets.java:454 build/trans_presets.java:474
+#: build/trans_presets.java:492 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:554
+#: build/trans_presets.java:575 build/trans_presets.java:596
+#: build/trans_presets.java:617 build/trans_presets.java:638
+#: build/trans_presets.java:668 build/trans_presets.java:681
+#: build/trans_presets.java:694 build/trans_presets.java:707
+#: build/trans_presets.java:720 build/trans_presets.java:733
+#: build/trans_presets.java:746 build/trans_presets.java:1311
+#: build/trans_presets.java:1501 build/trans_presets.java:1543
 msgid "Width (meters)"
 msgstr ""
@@ -14060,5 +14402,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:228 build/trans_surveyor.java:88
+#: build/trans_presets.java:229 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr ""
@@ -14067,5 +14409,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:231
+#: build/trans_presets.java:232
 msgid "Edit Residential Street"
 msgstr ""
@@ -14090,14 +14432,14 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:611
-#: build/trans_presets.java:632 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "Surface"
 msgstr "Površina"
@@ -14118,53 +14460,53 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paved"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "unpaved"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
 msgid "metal"
 msgstr ""
@@ -14178,22 +14520,22 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
-#: build/trans_style.java:3367
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
+#: build/trans_style.java:3375
 msgid "wood"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paving_stones"
 msgstr ""
@@ -14201,77 +14543,77 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "cobblestone"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "gravel"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "grass"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "sand"
 msgstr ""
@@ -14279,13 +14621,13 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "ground"
 msgstr ""
@@ -14293,5 +14635,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:246
+#: build/trans_presets.java:247
 msgid "Living Street"
 msgstr ""
@@ -14300,5 +14642,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:249
+#: build/trans_presets.java:250
 msgid "Edit Living Street"
 msgstr ""
@@ -14306,5 +14648,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:264
+#: build/trans_presets.java:265
 msgid "Service"
 msgstr ""
@@ -14313,5 +14655,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:267
+#: build/trans_presets.java:268
 msgid "Edit Serviceway"
 msgstr ""
@@ -14321,18 +14663,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "parking_aisle"
 msgstr ""
@@ -14340,5 +14682,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:284
+#: build/trans_presets.java:285
 msgid "Parking Aisle"
 msgstr ""
@@ -14348,5 +14690,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:288
+#: build/trans_presets.java:289
 msgid "Edit Parking Aisle"
 msgstr ""
@@ -14354,5 +14696,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:298
+#: build/trans_presets.java:299
 msgid "Road (Unknown Type)"
 msgstr "Cesta (neznana kategorija)"
@@ -14361,5 +14703,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Edit Road of unknown type"
 msgstr "Uredi cesto neznane kategorije"
@@ -14368,20 +14710,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:318
+#: build/trans_presets.java:319
 msgid "Road Restrictions"
 msgstr "Cestne omejitve"
 
 #. item
-#: build/trans_presets.java:319
+#: build/trans_presets.java:320
 msgid "Edit Road Restrictions"
 msgstr "Uredi cestne omejitve"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:321
+#: build/trans_presets.java:322
 msgid "Toll"
 msgstr "Cestnina"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:322
+#: build/trans_presets.java:323
 msgid "No exit (cul-de-sac)"
 msgstr "Brez izhoda (slepa ulica)"
@@ -14394,8 +14736,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:323 build/trans_presets.java:529
-#: build/trans_presets.java:550 build/trans_presets.java:571
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:634
+#: build/trans_presets.java:324 build/trans_presets.java:530
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:593 build/trans_presets.java:614
+#: build/trans_presets.java:635
 msgid "Access"
 msgstr "Dostop"
@@ -14449,29 +14791,29 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1397
-#: build/trans_presets.java:1398 build/trans_presets.java:1399
-#: build/trans_presets.java:1763 build/trans_presets.java:1773
-#: build/trans_presets.java:2397 build/trans_presets.java:2433
-#: build/trans_presets.java:2442 build/trans_presets.java:2443
-#: build/trans_presets.java:2444 build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:1396
+#: build/trans_presets.java:1397 build/trans_presets.java:1400
+#: build/trans_presets.java:1401 build/trans_presets.java:1402
+#: build/trans_presets.java:1767 build/trans_presets.java:1777
+#: build/trans_presets.java:2408 build/trans_presets.java:2444
+#: build/trans_presets.java:2453 build/trans_presets.java:2454
+#: build/trans_presets.java:2455 build/trans_presets.java:2725
 msgid "yes"
 msgstr "da"
@@ -14484,40 +14826,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:212
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:212
 msgid "private"
 msgstr ""
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655
 msgid "designated"
 msgstr ""
@@ -14530,19 +14872,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:219
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:219
 msgid "destination"
 msgstr ""
@@ -14565,71 +14907,71 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:205
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:205
 msgid "permissive"
 msgstr ""
 
-#: build/trans_presets.java:323 build/trans_presets.java:327
-#: build/trans_presets.java:330 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636
+#: build/trans_presets.java:324 build/trans_presets.java:328
+#: build/trans_presets.java:331 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637
 msgid "agricultural"
 msgstr ""
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
-#: build/trans_presets.java:2433 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1396 build/trans_presets.java:1397
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
+#: build/trans_presets.java:2444 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
+#: build/trans_presets.java:2725
 msgid "no"
 msgstr ""
 
-#: build/trans_presets.java:326
+#: build/trans_presets.java:327
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:327
+#: build/trans_presets.java:328
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -14644,10 +14986,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:328 build/trans_presets.java:651
-#: build/trans_presets.java:858 build/trans_presets.java:891
-#: build/trans_presets.java:913 build/trans_presets.java:950
-#: build/trans_presets.java:963 build/trans_presets.java:975
-#: build/trans_presets.java:987 build/trans_presets.java:999
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:329 build/trans_presets.java:652
+#: build/trans_presets.java:859 build/trans_presets.java:892
+#: build/trans_presets.java:914 build/trans_presets.java:951
+#: build/trans_presets.java:964 build/trans_presets.java:976
+#: build/trans_presets.java:988 build/trans_presets.java:1000
+#: build/trans_presets.java:1040
 msgid "Horse"
 msgstr ""
@@ -14663,13 +15005,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:329 build/trans_presets.java:530
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:635 build/trans_presets.java:859
-#: build/trans_presets.java:877 build/trans_presets.java:892
-#: build/trans_presets.java:914 build/trans_presets.java:951
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:330 build/trans_presets.java:531
+#: build/trans_presets.java:552 build/trans_presets.java:573
+#: build/trans_presets.java:594 build/trans_presets.java:615
+#: build/trans_presets.java:636 build/trans_presets.java:860
+#: build/trans_presets.java:878 build/trans_presets.java:893
+#: build/trans_presets.java:915 build/trans_presets.java:952
+#: build/trans_presets.java:965 build/trans_presets.java:977
+#: build/trans_presets.java:989 build/trans_presets.java:1001
+#: build/trans_presets.java:1041
 msgid "Motorcycle"
 msgstr ""
@@ -14684,30 +15026,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:330 build/trans_presets.java:531
-#: build/trans_presets.java:552 build/trans_presets.java:573
-#: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:636 build/trans_presets.java:654
-#: build/trans_presets.java:878 build/trans_presets.java:893
-#: build/trans_presets.java:915 build/trans_presets.java:952
-#: build/trans_presets.java:965 build/trans_presets.java:977
-#: build/trans_presets.java:989 build/trans_presets.java:1001
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:331 build/trans_presets.java:532
+#: build/trans_presets.java:553 build/trans_presets.java:574
+#: build/trans_presets.java:595 build/trans_presets.java:616
+#: build/trans_presets.java:637 build/trans_presets.java:655
+#: build/trans_presets.java:879 build/trans_presets.java:894
+#: build/trans_presets.java:916 build/trans_presets.java:953
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1042
 msgid "Motorcar"
 msgstr ""
 
-#: build/trans_presets.java:331
+#: build/trans_presets.java:332
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
-#: build/trans_presets.java:332
+#: build/trans_presets.java:333
 msgid "Motorboat"
 msgstr ""
 
-#: build/trans_presets.java:333
+#: build/trans_presets.java:334
 msgid "Boat"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:336
 msgid "Min. speed (km/h)"
 msgstr "Najnižja hitrost (km/h)"
@@ -14715,25 +15057,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:336 build/trans_presets.java:374
+#: build/trans_presets.java:337 build/trans_presets.java:375
 msgid "Max. weight (tonnes)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:337
+#: build/trans_presets.java:338
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:339
+#: build/trans_presets.java:340
 msgid "Max. Length (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:341
+#: build/trans_presets.java:342
 msgid "Roundabout"
 msgstr "Krožišče"
@@ -14744,5 +15086,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:346
+#: build/trans_presets.java:347
 msgid "Edit Junction"
 msgstr ""
@@ -14764,9 +15106,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:349 build/trans_presets.java:648
-#: build/trans_presets.java:788 build/trans_presets.java:1135
-#: build/trans_presets.java:1392 build/trans_presets.java:2353
-#: build/trans_presets.java:2901 build/trans_presets.java:2911
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:350 build/trans_presets.java:649
+#: build/trans_presets.java:789 build/trans_presets.java:1137
+#: build/trans_presets.java:1395 build/trans_presets.java:2364
+#: build/trans_presets.java:2913 build/trans_presets.java:2923
+#: build/trans_presets.java:2932
 msgid "Type"
 msgstr "Vrsta"
@@ -14786,10 +15128,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:547
+#: build/trans_presets.java:350 build/trans_style.java:547
 #: build/trans_style.java:555
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "motorway_link"
 msgstr ""
@@ -14811,10 +15153,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:563
+#: build/trans_presets.java:350 build/trans_style.java:563
 #: build/trans_style.java:571
 msgid "trunk"
 msgstr "hitra cesta"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "trunk_link"
 msgstr ""
@@ -14836,10 +15178,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:579
+#: build/trans_presets.java:350 build/trans_style.java:579
 #: build/trans_style.java:587
 msgid "primary"
 msgstr "glavna"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "primary_link"
 msgstr ""
@@ -14861,5 +15203,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:595
+#: build/trans_presets.java:350 build/trans_style.java:595
 #: build/trans_style.java:603
 msgid "secondary"
@@ -14874,9 +15216,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:349 build/trans_style.java:611
+#: build/trans_presets.java:350 build/trans_style.java:611
 msgid "tertiary"
 msgstr "regionalna (turistična)"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "unclassified"
 msgstr ""
@@ -14890,9 +15232,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:349 build/trans_style.java:3143
+#: build/trans_presets.java:350 build/trans_style.java:3151
 msgid "residential"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "living_street"
 msgstr ""
@@ -14922,10 +15264,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:349 build/trans_style.java:667
-#: build/trans_style.java:4244
+#: build/trans_presets.java:350 build/trans_style.java:667
+#: build/trans_style.java:4252
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "bus_guideway"
 msgstr ""
@@ -14955,6 +15297,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:349 build/trans_style.java:877
-#: build/trans_style.java:3208 build/trans_style.java:3209
+#: build/trans_presets.java:350 build/trans_style.java:877
+#: build/trans_style.java:3216 build/trans_style.java:3217
 msgid "construction"
 msgstr ""
@@ -14965,10 +15307,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Edit Bridge"
 msgstr "Uredi most"
 
 #. item
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "Edit Tunnel"
 msgstr ""
@@ -14976,19 +15318,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:393
+#: build/trans_presets.java:394
 msgid "Ways"
 msgstr "Poti"
 
 #. group "Ways"
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Construction"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:395
+#: build/trans_presets.java:396
 msgid "Edit Highway Under Construction"
 msgstr ""
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "Junction"
 msgstr ""
@@ -15004,5 +15346,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:411 build/trans_style.java:895
+#: build/trans_presets.java:412 build/trans_style.java:895
 msgid "roundabout"
 msgstr "krožišče"
@@ -15011,5 +15353,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:417
+#: build/trans_presets.java:418
 msgid "Bridleway"
 msgstr ""
@@ -15017,5 +15359,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:419
+#: build/trans_presets.java:420
 msgid "Edit Bridleway"
 msgstr ""
@@ -15023,5 +15365,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:435
+#: build/trans_presets.java:436
 msgid "Cycleway"
 msgstr "Kolesarska steza"
@@ -15031,10 +15373,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:439
+#: build/trans_presets.java:440
 msgid "Edit Cycleway"
 msgstr "Uredi kolesarsko stezo"
 
 #. item "Ways/Cycleway" check "Embankment"
-#: build/trans_presets.java:449
+#: build/trans_presets.java:450
 msgid "Pedestrians"
 msgstr ""
@@ -15042,5 +15384,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Footway"
 msgstr "Pešpot"
@@ -15049,10 +15391,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Footway"
 msgstr "Uredi pešpot"
 
 #. item "Ways/Footway" check "Embankment"
-#: build/trans_presets.java:469
+#: build/trans_presets.java:470
 msgid "Bikes"
 msgstr ""
@@ -15060,5 +15402,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:476
+#: build/trans_presets.java:477
 msgid "Pedestrian"
 msgstr ""
@@ -15067,5 +15409,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Edit Pedestrian Street"
 msgstr ""
@@ -15073,5 +15415,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:494
+#: build/trans_presets.java:495
 msgid "Steps"
 msgstr "Stopnice"
@@ -15081,5 +15423,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:498
+#: build/trans_presets.java:499
 msgid "Edit Flight of Steps"
 msgstr "Uredi stopnice"
@@ -15088,5 +15430,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:515
+#: build/trans_presets.java:516
 msgid "Track"
 msgstr ""
@@ -15095,5 +15437,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:518
+#: build/trans_presets.java:519
 msgid "Edit Track"
 msgstr ""
@@ -15101,5 +15443,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:535
+#: build/trans_presets.java:536
 msgid "Track Grade 1"
 msgstr ""
@@ -15108,5 +15450,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:538
+#: build/trans_presets.java:539
 msgid "Edit Track of grade 1"
 msgstr ""
@@ -15114,5 +15456,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:556
+#: build/trans_presets.java:557
 msgid "Track Grade 2"
 msgstr ""
@@ -15121,5 +15463,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:559
+#: build/trans_presets.java:560
 msgid "Edit Track of grade 2"
 msgstr ""
@@ -15127,5 +15469,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:577
+#: build/trans_presets.java:578
 msgid "Track Grade 3"
 msgstr ""
@@ -15134,5 +15476,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:580
+#: build/trans_presets.java:581
 msgid "Edit Track of grade 3"
 msgstr ""
@@ -15140,5 +15482,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:598
+#: build/trans_presets.java:599
 msgid "Track Grade 4"
 msgstr ""
@@ -15147,5 +15489,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:601
+#: build/trans_presets.java:602
 msgid "Edit Track of grade 4"
 msgstr ""
@@ -15153,5 +15495,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:619
+#: build/trans_presets.java:620
 msgid "Track Grade 5"
 msgstr ""
@@ -15160,5 +15502,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:622
+#: build/trans_presets.java:623
 msgid "Edit Track of grade 5"
 msgstr ""
@@ -15167,5 +15509,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:641
+#: build/trans_presets.java:642
 msgid "Path"
 msgstr "Steza"
@@ -15174,13 +15516,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:644
+#: build/trans_presets.java:645
 msgid "Edit Path"
 msgstr "Uredi stezo"
 
-#: build/trans_presets.java:652
+#: build/trans_presets.java:653
 msgid "Ski"
 msgstr ""
 
-#: build/trans_presets.java:653
+#: build/trans_presets.java:654
 msgid "Snowmobile"
 msgstr ""
@@ -15190,6 +15532,6 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:670 build/trans_presets.java:1725
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:671 build/trans_presets.java:1729
+#: build/trans_presets.java:1752
 msgid "Hiking"
 msgstr ""
@@ -15199,5 +15541,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:674
+#: build/trans_presets.java:675
 msgid "Edit Hiking"
 msgstr ""
@@ -15205,5 +15547,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:683
+#: build/trans_presets.java:684
 msgid "Mountain Hiking"
 msgstr ""
@@ -15213,5 +15555,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:687
+#: build/trans_presets.java:688
 msgid "Edit Mountain Hiking"
 msgstr ""
@@ -15219,5 +15561,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:696
+#: build/trans_presets.java:697
 msgid "Demanding Mountain Hiking"
 msgstr ""
@@ -15227,5 +15569,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:700
+#: build/trans_presets.java:701
 msgid "Edit Demanding Mountain Hiking"
 msgstr ""
@@ -15233,5 +15575,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:709
+#: build/trans_presets.java:710
 msgid "Alpine Hiking"
 msgstr ""
@@ -15241,5 +15583,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:713
+#: build/trans_presets.java:714
 msgid "Edit Alpine Hiking"
 msgstr ""
@@ -15247,5 +15589,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:723
 msgid "Demanding Alpine Hiking"
 msgstr ""
@@ -15255,5 +15597,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:726
+#: build/trans_presets.java:727
 msgid "Edit Demanding Alpine Hiking"
 msgstr ""
@@ -15261,5 +15603,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:735
+#: build/trans_presets.java:736
 msgid "Difficult Alpine Hiking"
 msgstr ""
@@ -15269,5 +15611,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:739
+#: build/trans_presets.java:740
 msgid "Edit Difficult Alpine Hiking"
 msgstr ""
@@ -15275,10 +15617,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:749
+#: build/trans_presets.java:750
 msgid "Waypoints"
 msgstr ""
 
 #. group "Waypoints"
-#: build/trans_presets.java:750
+#: build/trans_presets.java:751
 msgid "Motorway Junction"
 msgstr "Avtocestno križišče"
@@ -15286,15 +15628,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:752
+#: build/trans_presets.java:753
 msgid "Edit Motorway Junction"
 msgstr "Uredi avtocestno križišče"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:757
 msgid "Number"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:759
 msgid "Services"
 msgstr ""
@@ -15302,5 +15644,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:761
 msgid "Edit Service Station"
 msgstr ""
@@ -15338,15 +15680,15 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:765 build/trans_presets.java:902
-#: build/trans_presets.java:1382 build/trans_presets.java:1406
-#: build/trans_presets.java:1413 build/trans_presets.java:1419
-#: build/trans_presets.java:1427 build/trans_presets.java:1434
-#: build/trans_presets.java:1761 build/trans_presets.java:1771
-#: build/trans_presets.java:2361 build/trans_presets.java:2368
-#: build/trans_presets.java:2384 build/trans_presets.java:2395
-#: build/trans_presets.java:2403 build/trans_presets.java:2410
-#: build/trans_presets.java:2464 build/trans_presets.java:2512
-#: build/trans_presets.java:2678 build/trans_presets.java:2693
-#: build/trans_presets.java:2732 build/trans_presets.java:3151
+#: build/trans_presets.java:766 build/trans_presets.java:903
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
+#: build/trans_presets.java:1416 build/trans_presets.java:1422
+#: build/trans_presets.java:1430 build/trans_presets.java:1437
+#: build/trans_presets.java:1765 build/trans_presets.java:1775
+#: build/trans_presets.java:2372 build/trans_presets.java:2379
+#: build/trans_presets.java:2395 build/trans_presets.java:2406
+#: build/trans_presets.java:2414 build/trans_presets.java:2421
+#: build/trans_presets.java:2475 build/trans_presets.java:2523
+#: build/trans_presets.java:2689 build/trans_presets.java:2704
+#: build/trans_presets.java:2743 build/trans_presets.java:3163
 msgid "Operator"
 msgstr ""
@@ -15355,5 +15697,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:769
+#: build/trans_presets.java:770
 msgid "Traffic Signal"
 msgstr "Semafor"
@@ -15363,5 +15705,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:774
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -15370,27 +15712,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "island"
 msgstr ""
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:774 build/trans_presets.java:790
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:775 build/trans_presets.java:791
+#: build/trans_presets.java:1334
 msgid "Cross on horseback"
 msgstr ""
@@ -15398,6 +15740,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:775 build/trans_presets.java:789
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:776 build/trans_presets.java:790
+#: build/trans_presets.java:1335
 msgid "Cross by bicycle"
 msgstr ""
@@ -15406,11 +15748,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:776 build/trans_presets.java:791
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:1336
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:778
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -15418,30 +15760,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:780
+#: build/trans_presets.java:781
 msgid "Stop"
 msgstr "Stop znak"
@@ -15449,5 +15791,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:783
+#: build/trans_presets.java:784
 msgid "Pedestrian Crossing"
 msgstr ""
@@ -15456,14 +15798,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:786
+#: build/trans_presets.java:787
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:793
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:795
 msgid "Mini-roundabout"
 msgstr ""
@@ -15474,14 +15816,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:801
+#: build/trans_presets.java:802
 msgid "Turning Circle"
 msgstr "Obračališče"
@@ -15491,20 +15833,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:806
+#: build/trans_presets.java:807
 msgid "City Limit"
 msgstr "Znak za naselje"
 
 #. item
-#: build/trans_presets.java:807
+#: build/trans_presets.java:808
 msgid "Edit City Limit Sign"
 msgstr "Uredi znak za naselje"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:812
+#: build/trans_presets.java:813
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:814
+#: build/trans_presets.java:815
 msgid "Speed Camera"
 msgstr ""
@@ -15512,5 +15854,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:817
+#: build/trans_presets.java:818
 msgid "Emergency Phone"
 msgstr ""
@@ -15518,5 +15860,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:820
+#: build/trans_presets.java:821
 msgid "Incline"
 msgstr ""
@@ -15524,5 +15866,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:823
+#: build/trans_presets.java:824
 msgid "Incline Steep"
 msgstr ""
@@ -15531,10 +15873,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:827
+#: build/trans_presets.java:828
 msgid "Ford"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:828
+#: build/trans_presets.java:829
 msgid "Edit Ford"
 msgstr ""
@@ -15542,5 +15884,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:835
+#: build/trans_presets.java:836
 msgid "Mountain Pass"
 msgstr "Gorski prelaz"
@@ -15548,5 +15890,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:837
+#: build/trans_presets.java:838
 msgid "Edit Mountain Pass"
 msgstr "Uredi gorski prelaz"
@@ -15558,7 +15900,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:842 build/trans_presets.java:1600
-#: build/trans_presets.java:1745 build/trans_presets.java:2845
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:843 build/trans_presets.java:1604
+#: build/trans_presets.java:1749 build/trans_presets.java:2857
+#: build/trans_presets.java:2864 build/trans_presets.java:2871
 msgid "Elevation"
 msgstr ""
@@ -15566,5 +15908,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:846
+#: build/trans_presets.java:847
 msgid "Barriers"
 msgstr "Ovire"
@@ -15572,5 +15914,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:849
+#: build/trans_presets.java:850
 msgid "Bollard"
 msgstr "Stebriček"
@@ -15578,5 +15920,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:852
 msgid "Edit Bollard"
 msgstr ""
@@ -15621,16 +15963,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:854 build/trans_presets.java:873
-#: build/trans_presets.java:887 build/trans_presets.java:909
-#: build/trans_presets.java:946 build/trans_presets.java:959
-#: build/trans_presets.java:971 build/trans_presets.java:983
-#: build/trans_presets.java:995 build/trans_presets.java:1007
-#: build/trans_presets.java:1017 build/trans_presets.java:1026
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:855 build/trans_presets.java:874
+#: build/trans_presets.java:888 build/trans_presets.java:910
+#: build/trans_presets.java:947 build/trans_presets.java:960
+#: build/trans_presets.java:972 build/trans_presets.java:984
+#: build/trans_presets.java:996 build/trans_presets.java:1008
+#: build/trans_presets.java:1018 build/trans_presets.java:1027
+#: build/trans_presets.java:1036
 msgid "Allowed traffic:"
 msgstr ""
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:861
+#: build/trans_presets.java:862
 msgid "Cycle Barrier"
 msgstr ""
@@ -15639,5 +15981,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:865
+#: build/trans_presets.java:866
 msgid "Block"
 msgstr ""
@@ -15645,5 +15987,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:868
+#: build/trans_presets.java:869
 msgid "Cattle Grid"
 msgstr "Rešetka za živino"
@@ -15651,10 +15993,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:870
+#: build/trans_presets.java:871
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:880
+#: build/trans_presets.java:881
 msgid "Bus Trap"
 msgstr ""
@@ -15662,15 +16004,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:883
+#: build/trans_presets.java:884
 msgid "Spikes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:884
+#: build/trans_presets.java:885
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:896
 msgid "Toll Booth"
 msgstr "Cestninska postaja"
@@ -15678,5 +16020,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:897
+#: build/trans_presets.java:898
 msgid "Edit Toll Booth"
 msgstr "Uredi cestninsko postajo"
@@ -15684,10 +16026,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:905
+#: build/trans_presets.java:906
 msgid "Border Control"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:906
+#: build/trans_presets.java:907
 msgid "Edit Border Control"
 msgstr ""
@@ -15697,5 +16039,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:920
+#: build/trans_presets.java:921
 msgid "Hedge"
 msgstr ""
@@ -15704,5 +16046,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:925
 msgid "Fence"
 msgstr ""
@@ -15711,5 +16053,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:929
 msgid "Wall"
 msgstr ""
@@ -15717,5 +16059,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:931
+#: build/trans_presets.java:932
 msgid "City Wall"
 msgstr ""
@@ -15724,5 +16066,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:935
+#: build/trans_presets.java:936
 msgid "Retaining Wall"
 msgstr ""
@@ -15734,15 +16076,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:942
+#: build/trans_presets.java:943
 msgid "Entrance"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:943
+#: build/trans_presets.java:944
 msgid "Edit Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:954
+#: build/trans_presets.java:955
 msgid "Gate"
 msgstr "Vrata"
@@ -15750,50 +16092,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:956
+#: build/trans_presets.java:957
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:967
+#: build/trans_presets.java:968
 msgid "Lift Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:968
+#: build/trans_presets.java:969
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:979
+#: build/trans_presets.java:980
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:980
+#: build/trans_presets.java:981
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:991
+#: build/trans_presets.java:992
 msgid "Bump Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:992
+#: build/trans_presets.java:993
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:1003
+#: build/trans_presets.java:1004
 msgid "Kissing Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1004
+#: build/trans_presets.java:1005
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1013
 msgid "Stile"
 msgstr ""
@@ -15801,25 +16143,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1014
+#: build/trans_presets.java:1015
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1023
 msgid "Turnstile"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1024
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1032
 msgid "Sally Port"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1033
 msgid "Edit Sally Port"
 msgstr ""
@@ -15827,13 +16169,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #.
-#. <separator/>
+#. group "Water"
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1046 build/trans_presets.java:1089
+#: build/trans_presets.java:1047 build/trans_presets.java:1048
+#: build/trans_presets.java:1091
 msgid "Water"
 msgstr "Voda"
 
 #. group "Water"
-#: build/trans_presets.java:1047
+#: build/trans_presets.java:1049
 msgid "Spring"
 msgstr "Izvir"
@@ -15841,5 +16184,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1049
+#: build/trans_presets.java:1051
 msgid "Edit Spring"
 msgstr "Uredi izvir"
@@ -15847,5 +16190,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1056
 msgid "Drain"
 msgstr ""
@@ -15853,10 +16196,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1058
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1064
 msgid "Stream"
 msgstr "Potok"
@@ -15864,10 +16207,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1066
 msgid "Edit Stream"
 msgstr "Uredi potok"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1072
 msgid "Canal"
 msgstr "Kanal"
@@ -15875,10 +16218,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1074
 msgid "Edit Canal"
 msgstr "Uredi kanal"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1080
 msgid "River"
 msgstr "Reka"
@@ -15888,5 +16231,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1084
 msgid "Edit River"
 msgstr "Uredi reko"
@@ -15894,15 +16237,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1093
 msgid "Edit Water"
 msgstr "Uredi vodo"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1097
 msgid "Land"
 msgstr "Kopno"
 
 #. item
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1098
 msgid "Edit Land"
 msgstr "Uredi kopno"
@@ -15910,15 +16253,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1103
 msgid "Basin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1104
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1109
 msgid "Reservoir"
 msgstr ""
@@ -15926,15 +16269,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1109
+#: build/trans_presets.java:1111
 msgid "Edit Reservoir Landuse"
 msgstr ""
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1116
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1117
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -15942,5 +16285,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1120
+#: build/trans_presets.java:1122
 msgid "Riverbank"
 msgstr ""
@@ -15949,10 +16292,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1125
 msgid "Edit Riverbank"
 msgstr ""
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1127
+#: build/trans_presets.java:1129
 msgid "Wetland"
 msgstr ""
@@ -15963,14 +16306,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1134
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "swamp"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "bog"
 msgstr ""
@@ -15984,35 +16327,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1135 build/trans_style.java:3384
+#: build/trans_presets.java:1137 build/trans_style.java:3392
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1139
 msgid "Mud"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1140
 msgid "Edit Mud"
 msgstr ""
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1144
 msgid "Beach"
 msgstr ""
@@ -16020,20 +16363,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1144
+#: build/trans_presets.java:1146
 msgid "Edit Beach"
 msgstr ""
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1150
 msgid "Bay"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1149
+#: build/trans_presets.java:1151
 msgid "Edit Bay"
 msgstr ""
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1155
 msgid "Cliff"
 msgstr ""
@@ -16041,10 +16384,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1157
 msgid "Edit Cliff"
 msgstr ""
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1159
+#: build/trans_presets.java:1161
 msgid "Coastline"
 msgstr ""
@@ -16052,5 +16395,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1163
 msgid "Edit Coastline"
 msgstr ""
@@ -16058,5 +16401,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1168
 msgid "Ferry Route"
 msgstr "Pot trajekta"
@@ -16064,5 +16407,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1170
 msgid "Edit Ferry"
 msgstr ""
@@ -16071,5 +16414,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1176
+#: build/trans_presets.java:1178
 msgid "Boatyard"
 msgstr "Ladjedelnica"
@@ -16077,10 +16420,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:1180
 msgid "Edit Boatyard"
 msgstr "Uredi ladjedelnico"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1185
 msgid "Dock"
 msgstr "Dók"
@@ -16088,5 +16431,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1187
 msgid "Edit Dock"
 msgstr "Uredi dók"
@@ -16094,5 +16437,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1193
 msgid "Dam"
 msgstr "Jez"
@@ -16100,15 +16443,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1195
 msgid "Edit Dam"
 msgstr "Uredi jez"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1199
+#: build/trans_presets.java:1201
 msgid "Waterway Point"
 msgstr "Vodna točka"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1202
 msgid "Lock Gate"
 msgstr "Vodna zapornica"
@@ -16117,5 +16460,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1206
 msgid "Weir"
 msgstr ""
@@ -16123,20 +16466,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1208
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1213
 msgid "Waterfall"
 msgstr "Slap"
 
 #. item
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1214
 msgid "Edit Waterfall"
 msgstr "Uredi slap"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1219
 msgid "Turning Point"
 msgstr "Obračališče"
@@ -16145,15 +16488,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1221
+#: build/trans_presets.java:1223
 msgid "Marina"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1224
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1228
 msgid "Pier"
 msgstr "Pomol"
@@ -16161,10 +16504,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1230
 msgid "Edit Pier"
 msgstr "Uredi pomol"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1234
 msgid "Ferry Terminal"
 msgstr ""
@@ -16172,10 +16515,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1236
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1240
 msgid "Slipway"
 msgstr ""
@@ -16185,16 +16528,21 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1244
 msgid "Edit Slipway"
 msgstr ""
 
 #. item "Waterway Point/Slipway" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1250
+#, fuzzy
+msgid "Transport"
+msgstr "Javni prevoz"
+
+#. group "Transport"
+#: build/trans_presets.java:1251
 msgid "Railway"
 msgstr "Železnica"
 
 #. group "Railway"
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1252
 msgid "Rail"
 msgstr "Železniški tir"
@@ -16202,5 +16550,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:1254
 msgid "Edit Rail"
 msgstr "Uredi železniški tir"
@@ -16230,8 +16578,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "Optional Types"
 msgstr "Vrsta (neobvezno)"
@@ -16245,35 +16593,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1259
 msgid "Narrow Gauge Rail"
 msgstr "Tir ozkotirne železnice"
 
 #. item
-#: build/trans_presets.java:1257
+#: build/trans_presets.java:1260
 msgid "Edit Narrow Gauge Rail"
 msgstr "Uredi tir ozkotirne železnice"
 
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1265
 msgid "Monorail"
 msgstr ""
@@ -16281,45 +16629,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1267
 msgid "Edit Monorail"
 msgstr ""
 
-#: build/trans_presets.java:1269
+#: build/trans_presets.java:1272
 msgid "Preserved"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1273
 msgid "Edit Preserved Railway"
 msgstr ""
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1278
 msgid "Light Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1279
 msgid "Edit Light Rail"
 msgstr ""
 
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1284
 msgid "Subway"
 msgstr "Podzemna"
 
 #. item
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1285
 msgid "Edit Subway"
 msgstr "Uredi podzemno"
 
-#: build/trans_presets.java:1287
+#: build/trans_presets.java:1290
 msgid "Tram"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1291
 msgid "Edit Tram"
 msgstr ""
 
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1296
 msgid "Bus Guideway"
 msgstr ""
@@ -16327,5 +16675,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1295
+#: build/trans_presets.java:1298
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -16334,14 +16682,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1315
 msgid "Disused Rail"
 msgstr "Nerabljen tir"
 
 #. item
-#: build/trans_presets.java:1313
+#: build/trans_presets.java:1316
 msgid "Edit Disused Railway"
 msgstr "Uredi nerabljen tir"
 
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1321
 msgid "Abandoned Rail"
 msgstr "Zapuščeni tir"
@@ -16350,5 +16698,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1325
 msgid "Level Crossing"
 msgstr ""
@@ -16357,5 +16705,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1329
 msgid "Crossing"
 msgstr ""
@@ -16365,5 +16713,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1333
 msgid "Crossing type"
 msgstr ""
@@ -16371,5 +16719,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1339
 msgid "Turntable"
 msgstr "Okretnica"
@@ -16378,10 +16726,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1344
 msgid "Aerialway"
 msgstr "Žičnica"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1345
 msgid "Chair Lift"
 msgstr "Sedežnica"
@@ -16389,10 +16737,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1347
 msgid "Edit Chair Lift"
 msgstr "Uredi sedežnico"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1351
 msgid "Drag Lift"
 msgstr "Vlečnica"
@@ -16400,10 +16748,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1353
 msgid "Edit Drag Lift"
 msgstr "Uredi vlečnico"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1357
 msgid "Cable Car"
 msgstr "Kabinska žičnica"
@@ -16411,10 +16759,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1359
 msgid "Edit Cable Car"
 msgstr "Uredi kabinsko žičnico"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1360
+#: build/trans_presets.java:1363
 msgid "Gondola"
 msgstr ""
@@ -16422,5 +16770,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1365
 msgid "Edit Gondola"
 msgstr ""
@@ -16428,5 +16776,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1366 build/trans_presets.java:1461
+#: build/trans_presets.java:1369 build/trans_presets.java:1464
 msgid "Station"
 msgstr "Postaja"
@@ -16437,10 +16785,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1368 build/trans_presets.java:1464
+#: build/trans_presets.java:1371 build/trans_presets.java:1467
 msgid "Edit Station"
 msgstr "Uredi postajo"
 
 #. group "Car"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1378
 msgid "Fuel"
 msgstr "Gorivo"
@@ -16450,5 +16798,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1382
 msgid "Edit Fuel"
 msgstr "Uredi gorivo"
@@ -16506,32 +16854,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1671 build/trans_presets.java:1678
-#: build/trans_presets.java:1686 build/trans_presets.java:1699
-#: build/trans_presets.java:1713 build/trans_presets.java:1810
-#: build/trans_presets.java:1818 build/trans_presets.java:1909
-#: build/trans_presets.java:1915 build/trans_presets.java:2226
-#: build/trans_presets.java:2250 build/trans_presets.java:2465
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1703
+#: build/trans_presets.java:1717 build/trans_presets.java:1814
+#: build/trans_presets.java:1822 build/trans_presets.java:1919
+#: build/trans_presets.java:1925 build/trans_presets.java:2237
+#: build/trans_presets.java:2261 build/trans_presets.java:2476
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Opening Hours"
 msgstr ""
@@ -16590,91 +16938,91 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -16689,5 +17037,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1385 build/trans_presets.java:1438
+#: build/trans_presets.java:1388 build/trans_presets.java:1441
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -16697,5 +17045,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1391
 msgid "Edit Parking"
 msgstr "Uredi parkirišče"
@@ -16706,24 +17054,24 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1391 build/trans_presets.java:1762
-#: build/trans_presets.java:1772 build/trans_presets.java:2396
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:1394 build/trans_presets.java:1766
+#: build/trans_presets.java:1776 build/trans_presets.java:2407
+#: build/trans_presets.java:2524
 msgid "Reference number"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "surface"
 msgstr ""
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1396
 msgid "Park and Ride"
 msgstr ""
@@ -16732,38 +17080,38 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1394 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
+#: build/trans_presets.java:1397 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
 msgid "Fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1396
+#: build/trans_presets.java:1399
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1400
 msgid "Spaces for Disabled"
 msgstr ""
 
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1401
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1402
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1403
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1405
 msgid "Wash"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1406
 msgid "Edit Car Wash"
 msgstr ""
@@ -16771,5 +17119,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1408 build/trans_presets.java:1452
+#: build/trans_presets.java:1411 build/trans_presets.java:1455
 msgid "Shop"
 msgstr ""
@@ -16777,15 +17125,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1413
 msgid "Edit Car Shop"
 msgstr ""
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1418
 msgid "Repair"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1419
 msgid "Edit Car Repair"
 msgstr ""
@@ -16793,5 +17141,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1421 build/trans_presets.java:1445
+#: build/trans_presets.java:1424 build/trans_presets.java:1448
 msgid "Rental"
 msgstr "Izposojevalnica"
@@ -16800,10 +17148,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1427
 msgid "Edit Car Rental"
 msgstr "Uredi izposojevalnico avtomobilov"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1432
 msgid "Sharing"
 msgstr ""
@@ -16811,5 +17159,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1434
 msgid "Edit Car Sharing"
 msgstr ""
@@ -16817,10 +17165,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Parking"
 msgstr ""
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1446
 msgid "Capacity"
 msgstr ""
@@ -16829,5 +17177,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1448
+#: build/trans_presets.java:1451
 msgid "Edit Bicycle Rental"
 msgstr "Uredi izposojevalnico koles"
@@ -16836,15 +17184,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1458
 msgid "Edit Bicycle Shop"
 msgstr ""
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1463
 msgid "Public Transport"
 msgstr "Javni prevoz"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:1472
 msgid "UIC-Reference"
 msgstr ""
@@ -16852,5 +17200,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1475
 msgid "Railway Halt"
 msgstr "Železniško postajališče"
@@ -16858,5 +17206,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1477
 msgid "Edit Halt"
 msgstr ""
@@ -16864,5 +17212,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1484
 msgid "Tram Stop"
 msgstr ""
@@ -16871,5 +17219,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1484
+#: build/trans_presets.java:1487
 msgid "Edit Tram Stop"
 msgstr ""
@@ -16877,5 +17225,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1494
 msgid "Railway Platform"
 msgstr "Železniški peron"
@@ -16884,5 +17232,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1497
 msgid "Edit Railway Platform"
 msgstr "Uredi železniški peron"
@@ -16894,5 +17242,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1497 build/trans_presets.java:1539
+#: build/trans_presets.java:1500 build/trans_presets.java:1542
 msgid "Reference (track number)"
 msgstr ""
@@ -16900,10 +17248,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1499 build/trans_presets.java:1541
+#: build/trans_presets.java:1502 build/trans_presets.java:1544
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1504
 msgid "Subway Entrance"
 msgstr "Vhod v podzemno"
@@ -16912,10 +17260,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1507
 msgid "Edit Subway Entrance"
 msgstr "Uredi vhod v podzemno"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1512
 msgid "Wheelchair"
 msgstr ""
@@ -16924,5 +17272,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1517
 msgid "Bus Station"
 msgstr "Avtobusna postaja"
@@ -16931,5 +17279,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1520
 msgid "Edit Bus Station"
 msgstr "Uredi avtobusno postajo"
@@ -16937,5 +17285,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1526
 msgid "Bus Stop"
 msgstr "Avtobusno postajališče"
@@ -16945,5 +17293,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1530
 msgid "Edit Bus Stop"
 msgstr "Uredu avtobusno postajališče"
@@ -16952,6 +17300,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1532 build/trans_presets.java:1785
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:1535 build/trans_presets.java:1789
+#: build/trans_presets.java:2453
 msgid "Shelter"
 msgstr ""
@@ -16959,10 +17307,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1538
 msgid "Bus Platform"
 msgstr "Avtobusni peron"
 
 #. item
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1539
 msgid "Edit Bus Platform"
 msgstr "Uredi avtobusni peron"
@@ -16970,5 +17318,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1547
 msgid "Taxi"
 msgstr "Taksi"
@@ -16976,5 +17324,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1549
 msgid "Edit Taxi station"
 msgstr "Uredi postajališče taksijev"
@@ -16982,5 +17330,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1554
 msgid "Airport"
 msgstr "Letališče"
@@ -16988,15 +17336,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1556
 msgid "Edit Airport"
 msgstr ""
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1561
 msgid "IATA"
 msgstr ""
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1559
+#: build/trans_presets.java:1562
 msgid "ICAO"
 msgstr ""
@@ -17004,6 +17352,11 @@
 #. item "Public Transport/Airport" text "ICAO"
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1567
+#, fuzzy
+msgid "Travel"
+msgstr "Shrani"
+
+#. group "Travel"
+#: build/trans_presets.java:1568
 msgid "Accomodation"
 msgstr "Nastanitev"
@@ -17015,5 +17368,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1565 build/trans_surveyor.java:43
+#: build/trans_presets.java:1569 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr ""
@@ -17022,15 +17375,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:1568
+#: build/trans_presets.java:1572
 msgid "Edit Hotel"
 msgstr ""
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1575
 msgid "Stars"
 msgstr ""
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1577
 msgid "Motel"
 msgstr ""
@@ -17038,20 +17391,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1579
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1583
 msgid "Guest House"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1584
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1588
 msgid "Chalet"
 msgstr ""
@@ -17059,10 +17412,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1590
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1594
 msgid "Hostel"
 msgstr ""
@@ -17070,30 +17423,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1592
+#: build/trans_presets.java:1596
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1600
 msgid "Alpine Hut"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1601
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1606
 msgid "Caravan Site"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1607
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1611
 msgid "Camping Site"
 msgstr ""
@@ -17101,10 +17454,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1613
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1618
 msgid "Food+Drinks"
 msgstr "Hrana in pijača"
@@ -17115,5 +17468,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1615 build/trans_surveyor.java:47
+#: build/trans_presets.java:1619 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr ""
@@ -17121,5 +17474,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1621
 msgid "Edit Restaurant"
 msgstr ""
@@ -17127,5 +17480,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "Cuisine"
 msgstr ""
@@ -17133,61 +17486,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "turkish"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "asian"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "thai"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "mexican"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "japanese"
 msgstr ""
 
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1627
 msgid "Fast Food"
 msgstr ""
@@ -17195,9 +17548,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1629
 msgid "Edit Fast Food Restaurant"
 msgstr ""
 
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1635
 msgid "Cafe"
 msgstr ""
@@ -17205,9 +17558,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1633
+#: build/trans_presets.java:1637
 msgid "Edit Cafe"
 msgstr ""
 
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1642
 msgid "Pub"
 msgstr "Pivnica"
@@ -17215,18 +17568,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1644
 msgid "Edit Pub"
 msgstr "Uredi pivnico"
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1649
 msgid "Biergarten"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1646
+#: build/trans_presets.java:1650
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1655
 msgid "Bar"
 msgstr ""
@@ -17234,9 +17587,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1657
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1662
 msgid "Nightclub"
 msgstr ""
@@ -17244,24 +17597,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1664
 msgid "Edit Nightclub"
 msgstr ""
 
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1670
 msgid "Tourism"
 msgstr "Turizem"
 
 #. group "Tourism"
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1671
 msgid "Attraction"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1672
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1677
 msgid "Museum"
 msgstr "Muzej"
@@ -17269,9 +17622,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1679
 msgid "Edit Museum"
 msgstr "Uredi muzej"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1684
 msgid "Zoo"
 msgstr "Živalski vrt"
@@ -17280,9 +17633,9 @@
 #. <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:1683
+#: build/trans_presets.java:1687
 msgid "Edit Zoo"
 msgstr "Uredi živalski vrt"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1692
 msgid "Viewpoint"
 msgstr "Razgledišče"
@@ -17290,24 +17643,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1694
 msgid "Edit Viewpoint"
 msgstr "Uredi razgledišče"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1697
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1699
 msgid "Theme Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1700
 msgid "Edit Theme Park"
 msgstr ""
 
-#: build/trans_presets.java:1701
+#: build/trans_presets.java:1705
 msgid "Artwork"
 msgstr "Umetnina"
@@ -17315,5 +17668,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1707
 msgid "Edit Artwork"
 msgstr "Uredi umetnino"
@@ -17321,19 +17674,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1712
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1719
 msgid "Map"
 msgstr "Zemljevid"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "topo"
 msgstr ""
@@ -17371,5 +17724,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1720 build/trans_style.java:619
+#: build/trans_presets.java:1724 build/trans_style.java:619
 #: build/trans_style.java:635 build/trans_style.java:651
 #: build/trans_style.java:659
@@ -17377,28 +17730,28 @@
 msgstr ""
 
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1722 build/trans_presets.java:1738
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1726 build/trans_presets.java:1742
+#: build/trans_presets.java:1786
 msgid "Closer Description"
 msgstr ""
@@ -17408,5 +17761,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1724 build/trans_presets.java:1747
+#: build/trans_presets.java:1728 build/trans_presets.java:1751
 msgid "Routes shown for:"
 msgstr ""
@@ -17414,6 +17767,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1726 build/trans_presets.java:1749
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1965
 msgid "Cycling"
 msgstr "Kolesarjenje"
@@ -17421,5 +17774,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1727 build/trans_presets.java:1750
+#: build/trans_presets.java:1731 build/trans_presets.java:1754
 msgid "Mountainbiking"
 msgstr ""
@@ -17427,6 +17780,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1728 build/trans_presets.java:1751
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:1732 build/trans_presets.java:1755
+#: build/trans_presets.java:2019
 msgid "Skiing"
 msgstr "Smučanje"
@@ -17434,5 +17787,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1729 build/trans_presets.java:1752
+#: build/trans_presets.java:1733 build/trans_presets.java:1756
 msgid "Riding"
 msgstr ""
@@ -17440,46 +17793,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1734 build/trans_presets.java:1757
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1736
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "history"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1744
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1759
 msgid "Information Terminal"
 msgstr ""
@@ -17487,29 +17840,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1760 build/trans_presets.java:1770
+#: build/trans_presets.java:1764 build/trans_presets.java:1774
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1769
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1779
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1780
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1778
+#: build/trans_presets.java:1782
 msgid "Other Information Points"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1790
 msgid "Edit Shelter"
 msgstr ""
@@ -17517,25 +17870,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1789 build/trans_presets.java:1795
+#: build/trans_presets.java:1793 build/trans_presets.java:1799
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1791
+#: build/trans_presets.java:1795
 msgid "Picnic Site"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1796
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1802
 msgid "Historic Places"
 msgstr "Zgodovinski kraji"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1799
+#: build/trans_presets.java:1803
 msgid "Castle"
 msgstr "Grad"
@@ -17544,19 +17897,19 @@
 #. <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:1802
+#: build/trans_presets.java:1806
 msgid "Edit Castle"
 msgstr "Uredi grad"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1810
 msgid "Ruins"
 msgstr "Ruševine"
 
 #. item
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1811
 msgid "Edit Ruins"
 msgstr "Uredi ruševine"
 
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1816
 msgid "Archaeological Site"
 msgstr "Arheološko najdišče"
@@ -17565,9 +17918,9 @@
 #. <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:1815
+#: build/trans_presets.java:1819
 msgid "Edit Archaeological Site"
 msgstr "Uredi arheološko najdišče"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1824
 msgid "Battlefield"
 msgstr ""
@@ -17575,5 +17928,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1826
 msgid "Edit Battlefield"
 msgstr ""
@@ -17581,15 +17934,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1831
 msgid "Monument"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1832
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1836
 msgid "Memorial"
 msgstr ""
@@ -17597,45 +17950,57 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1838
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1842
 msgid "Wayside Cross"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1843
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1847
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1848
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1852
+#, fuzzy
+msgid "Boundary Stone"
+msgstr "Meje"
+
+#. item
+#: build/trans_presets.java:1853
+#, fuzzy
+msgid "Edit Boundary Stone"
+msgstr "Uredu avtobusno postajališče"
+
+#. item "Historic Places/Boundary Stone" text "Name"
+#: build/trans_presets.java:1858
 msgid "Leisure"
 msgstr "Prosti čas"
 
 #. group "Leisure"
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1859
 msgid "Water Park"
 msgstr "Vodni park"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1860
 msgid "Edit Water Park"
 msgstr "Uredi vodni park"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1864
 msgid "Playground"
 msgstr "Igrišče"
@@ -17643,31 +18008,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1866
 msgid "Edit Playground"
 msgstr "Uredi igrišče"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1870
 msgid "Fishing"
 msgstr "Ribarjenje"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1871
 msgid "Edit Fishing"
 msgstr "Uredi ribarjenje"
 
 #. item "Leisure/Fishing" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1877 build/trans_presets.java:2669
+msgid "Sports"
+msgstr ""
+
+#. group "Sports"
+#: build/trans_presets.java:1878
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1879
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1880
 msgid "Edit Stadium"
 msgstr "Uredi stadion"
@@ -17681,6 +18050,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1874 build/trans_presets.java:1883
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1902 build/trans_presets.java:1911
 msgid "select sport:"
 msgstr "izberite šport:"
@@ -18072,30 +18441,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884 build/trans_style.java:3892
-#: build/trans_style.java:3900 build/trans_style.java:3908
-#: build/trans_style.java:3916 build/trans_style.java:3924
-#: build/trans_style.java:3932
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_style.java:3572 build/trans_style.java:3580
+#: build/trans_style.java:3588 build/trans_style.java:3596
+#: build/trans_style.java:3604 build/trans_style.java:3612
+#: build/trans_style.java:3620 build/trans_style.java:3628
+#: build/trans_style.java:3636 build/trans_style.java:3644
+#: build/trans_style.java:3652 build/trans_style.java:3660
+#: build/trans_style.java:3668 build/trans_style.java:3676
+#: build/trans_style.java:3684 build/trans_style.java:3692
+#: build/trans_style.java:3700 build/trans_style.java:3708
+#: build/trans_style.java:3716 build/trans_style.java:3724
+#: build/trans_style.java:3732 build/trans_style.java:3740
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3764 build/trans_style.java:3772
+#: build/trans_style.java:3780 build/trans_style.java:3788
+#: build/trans_style.java:3796 build/trans_style.java:3804
+#: build/trans_style.java:3812 build/trans_style.java:3820
+#: build/trans_style.java:3828 build/trans_style.java:3836
+#: build/trans_style.java:3844 build/trans_style.java:3852
+#: build/trans_style.java:3860 build/trans_style.java:3868
+#: build/trans_style.java:3876 build/trans_style.java:3884
+#: build/trans_style.java:3892 build/trans_style.java:3900
+#: build/trans_style.java:3908 build/trans_style.java:3916
+#: build/trans_style.java:3924 build/trans_style.java:3932
+#: build/trans_style.java:3940
 msgid "sport"
 msgstr "šport"
@@ -18105,225 +18474,225 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "archery"
 msgstr "lokostrelstvo"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "baseball"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "basketball"
 msgstr "košarka"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "climbing"
 msgstr "plezanje"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cycling"
 msgstr "kolesarjenje"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "football"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "gymnastics"
 msgstr "gimnastika"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "rugby"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "shooting"
 msgstr "strelišče"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skiing"
 msgstr "smučanje"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "soccer"
 msgstr "nogomet"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "swimming"
 msgstr "plavanje"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "table_tennis"
 msgstr "namizni_tenis"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1888
 msgid "Sports Centre"
 msgstr "Športno središče"
 
 #. item
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1889
 msgid "Edit Sports Centre"
 msgstr "Uredi športno središče"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1897
 msgid "Pitch"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1898
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1906
 msgid "Racetrack"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1907
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1915
 msgid "Golf Course"
 msgstr "Golf igrišče"
 
 #. item
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1916
 msgid "Edit Golf Course"
 msgstr "Uredi golf igrišče"
 
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1921
 msgid "Miniature Golf"
 msgstr "Mini golf"
 
 #. item
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1922
 msgid "Edit Miniature Golf"
 msgstr "Uredi mini golf"
 
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1928
 msgid "Sport"
 msgstr "Šport"
 
 #. group "Sport"
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1929
 msgid "Multi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1930
 msgid "Edit Multi"
 msgstr ""
@@ -18362,183 +18731,183 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1935
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1936
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1941
 msgid "Athletics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1942
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1947
 msgid "Archery"
 msgstr "Lokostrelstvo"
 
 #. item
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1948
 msgid "Edit Archery"
 msgstr "Uredi lokostrelstvo"
 
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1953
 msgid "Climbing"
 msgstr "Plezanje"
 
 #. item
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:1954
 msgid "Edit Climbing"
 msgstr "Uredi plezanje"
 
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1959
 msgid "Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1960
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1966
 msgid "Edit Cycling"
 msgstr "Uredi kolesarjenje"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1971
 msgid "Dog Racing"
 msgstr "Pasje dirke"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1972
 msgid "Edit Dog Racing"
 msgstr "Uredi pasje dirke"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1977
 msgid "Equestrian"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1978
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1983
 msgid "Horse Racing"
 msgstr "Konjske dirke"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1984
 msgid "Edit Horse Racing"
 msgstr "Uredi konjske dirke"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1989
 msgid "Gymnastics"
 msgstr "Gimnastika"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1990
 msgid "Edit Gymnastics"
 msgstr "Uredi gimnastiko"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1995
 msgid "Motor Sports"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1996
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2001
 msgid "Skating"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2002
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2007
 msgid "Skateboard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2008
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2013
 msgid "Swimming"
 msgstr "Plavanje"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2014
 msgid "Edit Swimming"
 msgstr "Uredi plavanje"
@@ -18546,56 +18915,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2021
 msgid "Edit Skiing"
 msgstr "Uredi smučanje"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2028
 msgid "Shooting"
 msgstr "Strelišče"
@@ -18603,178 +18972,182 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2030
 msgid "Edit Shooting"
 msgstr "Uredi strelišče"
 
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2036
 msgid "Sport (Ball)"
 msgstr "Šport (z žogo)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2037
 msgid "Soccer"
 msgstr "Nogomet"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2038
 msgid "Edit Soccer"
 msgstr "Uredi nogomet"
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2043
 msgid "Football"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2044
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2049
 msgid "Australian Football"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2050
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2055
 msgid "Baseball"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2056
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2061
 msgid "Basketball"
 msgstr "Košarka"
 
 #. item
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2062
 msgid "Edit Basketball"
 msgstr "Uredi košarko"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2067
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2068
 msgid "Edit Golf"
 msgstr "Uredi golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2071
 msgid "golf_course"
 msgstr "golf_igrišče"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2073
 msgid "Boule"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2074
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2079
 msgid "Bowls"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2080
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2085
 msgid "Cricket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2086
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2091
 msgid "Cricket Nets"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2092
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2097
 msgid "Croquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2098
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2103
 msgid "Hockey"
 msgstr "Hokej"
 
 #. item
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2104
 msgid "Edit Hockey"
 msgstr "Uredi hokej"
 
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2109
 msgid "Pelota"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2110
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:2105
+#: build/trans_presets.java:2115
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2116
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2121
 msgid "Rugby"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2122
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2127
 msgid "Table Tennis"
 msgstr "Namizni tenis"
 
 #. item
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2128
 msgid "Edit Table Tennis"
 msgstr "Uredi namizni tenis"
 
-#: build/trans_presets.java:2123
+#: build/trans_presets.java:2133
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2134
 msgid "Edit Tennis"
 msgstr "Uredi tenis"
 
-#. <separator/>
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2141
+msgid "Man-Made"
+msgstr ""
+
+#. group "Man-Made"
+#: build/trans_presets.java:2142
 msgid "Buildings"
 msgstr "Zgradbe"
 
 #. group "Buildings"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2143
 msgid "Building"
 msgstr "Zgradba"
@@ -18782,5 +19155,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Public Building"
 msgstr "Javne zgradbe"
@@ -18788,10 +19161,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2148
 msgid "Edit Public Building"
 msgstr "Uredi javno zgradbo"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2152
 msgid "Town hall"
 msgstr "Mestna hiša"
@@ -18799,10 +19172,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2154
 msgid "Edit Town hall"
 msgstr "Uredi mestno hišo"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:2158
 msgid "Embassy"
 msgstr "Veleposlaništvo"
@@ -18810,10 +19183,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Edit Embassy"
 msgstr "Uredi veleposlaništvo"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2164
 msgid "Courthouse"
 msgstr "Sodišče"
@@ -18822,10 +19195,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:2156
+#: build/trans_presets.java:2167
 msgid "Edit Courthouse"
 msgstr "Uredi sodišče"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2171
 msgid "Prison"
 msgstr "Zapor"
@@ -18834,10 +19207,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:2163
+#: build/trans_presets.java:2174
 msgid "Edit Prison"
 msgstr "Uredi zapor"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2178
 msgid "Police"
 msgstr "Policijska postaja"
@@ -18847,10 +19220,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:2171
+#: build/trans_presets.java:2182
 msgid "Edit Police"
 msgstr "Uredi policijsko postajo"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2186
 msgid "Fire Station"
 msgstr "Gasilski dom"
@@ -18859,10 +19232,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:2178
+#: build/trans_presets.java:2189
 msgid "Edit Fire Station"
 msgstr "Uredi gasilski dom"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "Post Office"
 msgstr "Pošta"
@@ -18870,5 +19243,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Edit Post Office"
 msgstr "Uredi pošto"
@@ -18876,15 +19249,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2200
 msgid "Kindergarten"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Kindergarten"
 msgstr ""
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2205
 msgid "School"
 msgstr "Šola"
@@ -18892,10 +19265,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Edit School"
 msgstr "Uredi šolo"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2211
 msgid "University"
 msgstr ""
@@ -18903,10 +19276,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit University"
 msgstr ""
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "College"
 msgstr ""
@@ -18914,5 +19287,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2219
 msgid "Edit College"
 msgstr ""
@@ -18920,5 +19293,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2224
 msgid "Cinema"
 msgstr "Kinematograf"
@@ -18927,10 +19300,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:2216
+#: build/trans_presets.java:2227
 msgid "Edit Cinema"
 msgstr "Uredi kinematograf"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2231
 msgid "Library"
 msgstr "Knjižnica"
@@ -18939,9 +19312,9 @@
 #. <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:2223
+#: build/trans_presets.java:2234
 msgid "Edit Library"
 msgstr "Uredi knjižnico"
 
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Arts Centre"
 msgstr ""
@@ -18949,10 +19322,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Theatre"
 msgstr "Gledališče"
@@ -18961,10 +19334,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:2237
+#: build/trans_presets.java:2248
 msgid "Edit Theatre"
 msgstr "Uredi gledališče"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2252
 msgid "Place of Worship"
 msgstr "Kraj čaščenja"
@@ -18974,5 +19347,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:2245
+#: build/trans_presets.java:2256
 msgid "Edit Place of Worship"
 msgstr "Uredi kraj čaščenja"
@@ -18981,6 +19354,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "Religion"
 msgstr "Vera"
@@ -18989,66 +19362,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "Denomination"
 msgstr ""
@@ -19057,81 +19430,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2264
 msgid "Addresses"
 msgstr "Naslovi"
@@ -19140,5 +19513,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:2256
+#: build/trans_presets.java:2267
 msgid "Edit Address Information"
 msgstr "Urejanje podatkov o naslovu"
@@ -19146,5 +19519,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2269
 msgid "House number"
 msgstr ""
@@ -19152,20 +19525,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "House name"
 msgstr ""
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "City name"
 msgstr ""
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2274
 msgid "Post code"
 msgstr "Poštna številka"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2275
 msgid "Country code"
 msgstr ""
@@ -19173,5 +19546,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Address Interpolation"
 msgstr "Interpolacija naslovov"
@@ -19180,5 +19553,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:2270
+#: build/trans_presets.java:2281
 msgid "Edit Address Interpolation"
 msgstr "Uredi interpolacijo naslovov"
@@ -19186,67 +19559,67 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "odd"
 msgstr ""
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "even"
 msgstr ""
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2286
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Works"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2288
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2292
 msgid "Tower"
 msgstr "Stolp"
 
 #. item
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2293
 msgid "Edit Tower"
 msgstr "Uredi stolp"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Water Tower"
 msgstr "Vodni stolp"
 
 #. item
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2298
 msgid "Edit Water Tower"
 msgstr "Uredi vodni stolp"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Gasometer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2303
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Lighthouse"
 msgstr "Svetilnik"
@@ -19254,10 +19627,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2309
 msgid "Edit Lighthouse"
 msgstr "Uredi svetilnik"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Windmill"
 msgstr "Mlin na veter"
@@ -19265,10 +19638,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2315
 msgid "Edit Windmill"
 msgstr "Uredi mlin na veter"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2319
 msgid "Pipeline"
 msgstr "Cevovod"
@@ -19276,10 +19649,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Edit Pipeline"
 msgstr "Uredi cevovod"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2325
 msgid "Wastewater Plant"
 msgstr "Čistilna naprava"
@@ -19289,10 +19662,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:2318
+#: build/trans_presets.java:2329
 msgid "Edit Wastewater Plant"
 msgstr "Uredi čistilno napravo"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2333
 msgid "Crane"
 msgstr "Žerjav"
@@ -19300,10 +19673,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2335
 msgid "Edit Crane"
 msgstr "Uredi žerjav"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Beacon"
 msgstr ""
@@ -19311,10 +19684,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2341
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2345
 msgid "Survey Point"
 msgstr "Geodetska točka"
@@ -19322,10 +19695,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Edit Survey Point"
 msgstr "Uredi geodetsko točko"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2351
 msgid "Surveillance"
 msgstr "Video nadzor"
@@ -19333,5 +19706,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2353
 msgid "Edit Surveillance Camera"
 msgstr "Uredi video nadzorno kamero"
@@ -19339,5 +19712,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Power Generator"
 msgstr ""
@@ -19347,39 +19720,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:2351
+#: build/trans_presets.java:2362
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "photovoltaic"
 msgstr ""
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "gas"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2367
 msgid "Power Station"
 msgstr ""
@@ -19388,10 +19761,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:2359
+#: build/trans_presets.java:2370
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2374
 msgid "Power Sub Station"
 msgstr ""
@@ -19400,5 +19773,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:2366
+#: build/trans_presets.java:2377
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -19406,10 +19779,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2369 build/trans_presets.java:2385
+#: build/trans_presets.java:2380 build/trans_presets.java:2396
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2382
 msgid "Power Tower"
 msgstr "Steber daljnovoda"
@@ -19420,5 +19793,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:2376
+#: build/trans_presets.java:2387
 msgid "Edit Power Tower"
 msgstr "Uredi steber daljnovoda"
@@ -19426,5 +19799,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2390
 msgid "Power Line"
 msgstr ""
@@ -19433,40 +19806,40 @@
 #. <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:2382
+#: build/trans_presets.java:2393
 msgid "Edit Power Line"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Voltage"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2398
 msgid "Amount of Wires"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2402
 msgid "Toilets"
 msgstr "Stranišča"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2398 build/trans_presets.java:2514
+#: build/trans_presets.java:2409 build/trans_presets.java:2525
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2411
 msgid "Post Box"
 msgstr "Poštni nabiralnik"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2416
 msgid "Telephone"
 msgstr "Telefon"
@@ -19475,5 +19848,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:2408
+#: build/trans_presets.java:2419
 msgid "Edit Telephone"
 msgstr "Uredi telefon"
@@ -19481,5 +19854,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2411 build/trans_presets.java:2515
+#: build/trans_presets.java:2422 build/trans_presets.java:2526
 msgid "Coins"
 msgstr "Kovanci"
@@ -19487,5 +19860,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2412 build/trans_presets.java:2516
+#: build/trans_presets.java:2423 build/trans_presets.java:2527
 msgid "Notes"
 msgstr "Bankovci"
@@ -19493,5 +19866,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2413 build/trans_presets.java:2517
+#: build/trans_presets.java:2424 build/trans_presets.java:2528
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -19499,5 +19872,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2414 build/trans_presets.java:2518
+#: build/trans_presets.java:2425 build/trans_presets.java:2529
 msgid "Debit cards"
 msgstr "Debetne kartice"
@@ -19505,15 +19878,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2415 build/trans_presets.java:2519
+#: build/trans_presets.java:2426 build/trans_presets.java:2530
 msgid "Credit cards"
 msgstr "Kreditne kartice"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2427
 msgid "Telephone cards"
 msgstr "Telefonske kartice"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2429
 msgid "Recycling"
 msgstr "Recikliranje"
@@ -19522,5 +19895,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:2421
+#: build/trans_presets.java:2432
 msgid "Edit Recycling station"
 msgstr "Uredi raciklažno točko"
@@ -19528,35 +19901,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Batteries"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2435
 msgid "Cans"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Clothes"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2437
 msgid "Glass"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2438
 msgid "Paper"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2439
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2441
 msgid "Bench"
 msgstr "Klopca"
@@ -19565,40 +19938,33 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2433
-#, fuzzy
+#: build/trans_presets.java:2444
 msgid "Backrest"
-msgstr "Nazaj"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "Material"
-msgstr "Slap"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2434
-#, fuzzy
+#: build/trans_presets.java:2445
 msgid "stone"
-msgstr "brez"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "plastic"
-msgstr "Osnovno"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "Colour"
-msgstr "Barva"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "black"
-msgstr "Nazaj"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "brown"
-msgstr "dol"
+msgstr ""
 
 #. color historic
@@ -19667,36 +20033,35 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2435 build/trans_style.java:3055
-#: build/trans_style.java:3063 build/trans_style.java:3071
-#: build/trans_style.java:3079 build/trans_style.java:3127
-#: build/trans_style.java:3135 build/trans_style.java:3233
-#: build/trans_style.java:3241
+#: build/trans_presets.java:2446 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3135
+#: build/trans_style.java:3143 build/trans_style.java:3241
+#: build/trans_style.java:3249
 msgid "green"
 msgstr ""
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2446
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "blue"
-msgstr "Vrednost"
-
-#: build/trans_presets.java:2435
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2447
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2449
 msgid "Hunting Stand"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2450
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -19705,30 +20070,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2441 build/trans_presets.java:2902
+#: build/trans_presets.java:2452 build/trans_presets.java:2914
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2454
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2455
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Fountain"
 msgstr ""
@@ -19737,10 +20102,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:2449
+#: build/trans_presets.java:2460
 msgid "Edit Fountain"
 msgstr ""
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2464
 msgid "Drinking Water"
 msgstr "Pitna voda"
@@ -19749,10 +20114,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:2456
+#: build/trans_presets.java:2467
 msgid "Edit Drinking Water"
 msgstr "Uredi pitno vodo"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2471
 msgid "Baby Hatch"
 msgstr ""
@@ -19760,33 +20125,33 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2479
 msgid "Shops"
 msgstr "Trgovine"
 
 #. group "Shops"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2480
 msgid "Supermarket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2481
 msgid "Edit Supermarket"
 msgstr ""
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2486
 msgid "Chemist"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2487
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2492
 msgid "Convenience Store"
 msgstr ""
@@ -19794,9 +20159,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2499
 msgid "Kiosk"
 msgstr ""
@@ -19804,27 +20169,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Kiosk"
 msgstr ""
 
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Book Store"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2507
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2512
 msgid "Travel Agency"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2513
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2518
 msgid "Vending machine"
 msgstr "Prodajni avtomat"
@@ -19832,5 +20197,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Edit Vending machine"
 msgstr "Uredi prodajni avtomat"
@@ -19838,88 +20203,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "Vending products"
 msgstr "Prodajani izdelki"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "drinks"
 msgstr "pijača"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "SIM-cards"
 msgstr "SIM kartice"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Butcher"
 msgstr "Mesar"
@@ -19927,9 +20292,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2535
 msgid "Edit Butcher"
 msgstr "Uredi mesarja"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2540
 msgid "Baker"
 msgstr "Pekarna"
@@ -19937,9 +20302,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2542
 msgid "Edit Baker"
 msgstr "Uredi pekarno"
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2547
 msgid "Florist"
 msgstr ""
@@ -19947,18 +20312,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Florist"
 msgstr ""
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2554
 msgid "Organic"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Edit Organic Shop"
 msgstr ""
 
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2560
 msgid "Alcohol"
 msgstr ""
@@ -19966,54 +20331,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2562
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2567
 msgid "Beverages"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2568
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2573
 msgid "Computer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2574
 msgid "Edit Computer Shop"
 msgstr ""
 
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Electronics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2580
 msgid "Edit Electronics Shop"
 msgstr ""
 
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2585
 msgid "Hifi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2586
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2591
 msgid "Furniture"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Edit Furniture Shop"
 msgstr ""
 
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Garden Centre"
 msgstr ""
@@ -20021,9 +20386,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2599
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Hardware"
 msgstr ""
@@ -20031,9 +20396,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2606
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "Do-it-yourself-store"
 msgstr "Sam svoj mojster"
@@ -20041,54 +20406,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2613
 msgid "Edit Do-it-yourself-store"
 msgstr "Uredi sam svoj mojster trgovino"
 
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2618
 msgid "Stationery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2619
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Hairdresser"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Hairdresser"
 msgstr ""
 
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Shoes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Shoe Shop"
 msgstr ""
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2636
 msgid "Toys"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit Toy Shop"
 msgstr ""
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "Dry Cleaning"
 msgstr "Čistilnica"
@@ -20096,9 +20461,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2650
 msgid "Edit Dry Cleaning"
 msgstr "Uredi čistilnico"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "Laundry"
 msgstr "Pralnica"
@@ -20106,9 +20471,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2657
 msgid "Edit Laundry"
 msgstr "Uredi pralnico"
 
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2662
 msgid "Outdoor"
 msgstr ""
@@ -20116,32 +20481,28 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2664
 msgid "Edit Outdoor Shop"
 msgstr ""
 
-#: build/trans_presets.java:2658
-msgid "Sports"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2659
+#. item
+#: build/trans_presets.java:2670
 msgid "Edit Sports Shop"
 msgstr ""
 
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Optician"
 msgstr ""
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2683
 msgid "Cash"
 msgstr "Denar"
 
 #. group "Cash"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2684
 msgid "Bank"
 msgstr "Banka"
@@ -20149,14 +20510,14 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2686
 msgid "Edit Bank"
 msgstr "Uredi banko"
 
-#: build/trans_presets.java:2680 build/trans_presets.java:2689
+#: build/trans_presets.java:2691 build/trans_presets.java:2700
 msgid "Automated Teller Machine"
 msgstr "Bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2693
 msgid "Money Exchange"
 msgstr "Menjalnica"
@@ -20164,5 +20525,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Edit Money Exchange"
 msgstr "Uredi menjalnico"
@@ -20170,15 +20531,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2691
+#: build/trans_presets.java:2702
 msgid "Edit Automated Teller Machine"
 msgstr "Uredi bankomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2707
 msgid "Health"
 msgstr "Zdravje"
 
 #. group "Health"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2708
 msgid "Doctors"
 msgstr ""
@@ -20186,18 +20547,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2710
 msgid "Edit Doctors"
 msgstr ""
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2715
 msgid "Dentist"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Edit Dentist"
 msgstr ""
 
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2721
 msgid "Pharmacy"
 msgstr "Lekarna"
@@ -20205,5 +20566,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Edit Pharmacy"
 msgstr "Uredi lekarno"
@@ -20211,9 +20572,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2729
 msgid "Hospital"
 msgstr "Bolnišnica"
@@ -20221,10 +20582,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Edit Hospital"
 msgstr "Uredi bolnišnico"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2735
 msgid "Emergency Access Point"
 msgstr ""
@@ -20233,5 +20594,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:2727
+#: build/trans_presets.java:2738
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -20240,20 +20601,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2741
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2742
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Phone Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -20261,5 +20622,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2748
 msgid "Veterinary"
 msgstr ""
@@ -20268,55 +20629,59 @@
 #. <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:2740
+#: build/trans_presets.java:2751
 msgid "Edit Veterinary"
 msgstr ""
 
+#: build/trans_presets.java:2758
+msgid "Geography"
+msgstr ""
+
 #. group "Places"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2760
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2761
 msgid "Edit Continent"
 msgstr "Uredi kontinent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2766
 msgid "Country"
 msgstr "Država"
 
 #. item
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2767
 msgid "Edit Country"
 msgstr "Uredi državo"
 
 #. item "Places/Country" text "Name"
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2772
 msgid "State"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2773
 msgid "Edit State"
 msgstr ""
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2778
 msgid "Region"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2779
 msgid "Edit Region"
 msgstr ""
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2784
 msgid "County"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2785
 msgid "Edit County"
 msgstr ""
@@ -20324,15 +20689,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2791
 msgid "City"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2792
 msgid "Edit City"
 msgstr ""
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2797
 msgid "Town"
 msgstr ""
@@ -20340,10 +20705,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2799
 msgid "Edit Town"
 msgstr ""
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2804
 msgid "Suburb"
 msgstr ""
@@ -20351,25 +20716,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2806
 msgid "Edit Suburb"
 msgstr ""
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2811
 msgid "Village"
 msgstr "Vas"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2812
 msgid "Edit Village"
 msgstr "Uredi vas"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2817
 msgid "Hamlet"
 msgstr "Zaselek"
 
 #. item
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2818
 msgid "Edit Hamlet"
 msgstr "Uredi zaselek"
@@ -20377,5 +20742,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2824
 msgid "Locality"
 msgstr ""
@@ -20383,10 +20748,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2826
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2831
 msgid "Island"
 msgstr "Otok"
@@ -20394,10 +20759,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2833
 msgid "Edit Island"
 msgstr "Uredi otok"
 
 #. item "Places/Island" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2838
 msgid "Islet"
 msgstr ""
@@ -20405,5 +20770,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2840
 msgid "Edit Islet"
 msgstr ""
@@ -20411,5 +20776,5 @@
 #. item "Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2846
 msgid "Cave Entrance"
 msgstr ""
@@ -20417,10 +20782,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2848
 msgid "Edit Cave Entrance"
 msgstr ""
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2852
 msgid "Peak"
 msgstr "Vrh"
@@ -20428,10 +20793,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2854
 msgid "Edit Peak"
 msgstr "Uredi vrh"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2859
 msgid "Glacier"
 msgstr ""
@@ -20439,10 +20804,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2861
 msgid "Edit Glacier"
 msgstr ""
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2854
+#: build/trans_presets.java:2866
 msgid "Volcano"
 msgstr ""
@@ -20450,70 +20815,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2868
 msgid "Edit Volcano"
 msgstr ""
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2874
 msgid "Boundaries"
 msgstr "Meje"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2875
 msgid "National"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2876
 msgid "Edit National Boundary"
 msgstr ""
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2881
 msgid "Administrative"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2882
 msgid "Edit Administrative Boundary"
 msgstr ""
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:2887
 msgid "Civil"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2888
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2893
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2894
 msgid "Edit Political Boundary"
 msgstr ""
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2899
 msgid "National park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2888
+#: build/trans_presets.java:2900
 msgid "Edit National Park Boundary"
 msgstr ""
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2906
 msgid "Land use"
 msgstr "Raba tal"
 
 #. group "Land use"
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2907
 msgid "Tree"
 msgstr "Drevo"
@@ -20522,15 +20887,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:2898
+#: build/trans_presets.java:2910
 msgid "Edit Tree"
 msgstr "Uredi drevo"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2915
 msgid "Botanical Name"
 msgstr ""
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2917
 msgid "Wood"
 msgstr ""
@@ -20539,5 +20904,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:2908
+#: build/trans_presets.java:2920
 msgid "Edit Wood"
 msgstr ""
@@ -20545,17 +20910,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "coniferous"
 msgstr ""
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "mixed"
 msgstr ""
 
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2925
 msgid "Forest"
 msgstr "Gozd"
@@ -20564,14 +20929,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:2916
+#: build/trans_presets.java:2928
 msgid "Edit Forest Landuse"
 msgstr "Uredi gozdnata tla"
 
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2934
 msgid "Nature Reserve"
 msgstr "Naravni rezervat"
 
 #. item
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2935
 msgid "Edit Nature Reserve"
 msgstr "Uredi naravni rezervat"
@@ -20579,25 +20944,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2940
 msgid "Scree"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2941
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2945
 msgid "Scrub"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2946
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2950
 msgid "Fell"
 msgstr ""
@@ -20605,10 +20970,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2952
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2956
 msgid "Heath"
 msgstr ""
@@ -20616,5 +20981,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2958
 msgid "Edit Heath"
 msgstr ""
@@ -20622,5 +20987,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2963
 msgid "Farmyard"
 msgstr ""
@@ -20629,45 +20994,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:2954
+#: build/trans_presets.java:2966
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2971
 msgid "Farmland"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2972
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2977
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2978
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2983
 msgid "Vineyard"
 msgstr "Vinograd"
 
 #. item
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2984
 msgid "Edit Vineyard Landuse"
 msgstr "Uredi vinograd"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:2989
 msgid "Allotments"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2990
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -20675,25 +21040,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2996
 msgid "Garden"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2997
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3001
 msgid "Grass"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3002
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3007
 msgid "Village Green"
 msgstr ""
@@ -20701,10 +21066,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3009
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3014
 msgid "Common"
 msgstr ""
@@ -20712,20 +21077,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3004
+#: build/trans_presets.java:3016
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3020
 msgid "Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3021
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3025
 msgid "Recreation Ground"
 msgstr ""
@@ -20733,5 +21098,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3027
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -20739,15 +21104,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3033
 msgid "Residential area"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3022
+#: build/trans_presets.java:3034
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3039
 msgid "Graveyard"
 msgstr "Pokopališče"
@@ -20755,9 +21120,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3029
+#: build/trans_presets.java:3041
 msgid "Edit Graveyard"
 msgstr "Uredi pokopališče"
 
-#: build/trans_presets.java:3035
+#: build/trans_presets.java:3047
 msgid "Cemetery"
 msgstr ""
@@ -20765,39 +21130,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3049
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3056
 msgid "Retail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3057
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3062
 msgid "Commercial"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3063
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3056
+#: build/trans_presets.java:3068
 msgid "Industrial"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3069
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3074
 msgid "Railway land"
 msgstr "Ozemlje železnice"
@@ -20805,15 +21170,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3076
 msgid "Edit Railway Landuse"
 msgstr "Uredi ozemlje železnice"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3081
 msgid "Military"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3082
 msgid "Edit Military Landuse"
 msgstr ""
@@ -20821,55 +21186,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3088
 msgid "Construction area"
 msgstr "Gradbišče"
 
 #. item
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3089
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3094
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3095
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3100
 msgid "Greenfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3101
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3106
 msgid "Landfill"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3107
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3112
 msgid "Quarry"
 msgstr "Kamnolom"
 
 #. item
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3113
 msgid "Edit Quarry Landuse"
 msgstr "Uredi kamnolom"
 
 #. group "Relations"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3122
 msgid "Multipolygon"
 msgstr ""
@@ -20879,5 +21244,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:3114
+#: build/trans_presets.java:3126
 msgid "Edit Multipolygon"
 msgstr ""
@@ -20886,10 +21251,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3132
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3133
 msgid "inner segment"
 msgstr ""
@@ -20897,5 +21262,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3136
 msgid "Turn restriction"
 msgstr ""
@@ -20904,5 +21269,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3139
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -20910,34 +21275,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_straight_on"
 msgstr ""
@@ -20946,15 +21311,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3146
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3147
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3148
 msgid "to way"
 msgstr ""
@@ -20962,5 +21327,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3151
 msgid "Route"
 msgstr ""
@@ -20969,5 +21334,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3154
 msgid "Edit Route"
 msgstr ""
@@ -20975,5 +21340,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "Route type"
 msgstr ""
@@ -21045,5 +21410,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3144 build/trans_style.java:233
+#: build/trans_presets.java:3156 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -21052,17 +21417,17 @@
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ski"
 msgstr ""
@@ -21115,5 +21480,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3144 build/trans_style.java:247
+#: build/trans_presets.java:3156 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -21122,13 +21487,13 @@
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "detour"
 msgstr ""
@@ -21142,10 +21507,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3144 build/trans_style.java:1206
+#: build/trans_presets.java:3156 build/trans_style.java:1206
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3159
 msgid "Symbol description"
 msgstr ""
@@ -21153,31 +21518,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3162
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "Color (hex)"
 msgstr ""
@@ -21186,30 +21551,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3168
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3169
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3170
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3171
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3172
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3173
 msgid "backward halt point"
 msgstr ""
@@ -21647,11 +22012,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3375 build/trans_style.java:3376
-#: build/trans_style.java:3946 build/trans_style.java:4254
-#: build/trans_style.java:4263 build/trans_style.java:4272
-#: build/trans_style.java:4281 build/trans_style.java:4290
-#: build/trans_style.java:4299 build/trans_style.java:4308
-#: build/trans_style.java:4309 build/trans_style.java:4318
-#: build/trans_style.java:4327
+#: build/trans_style.java:3383 build/trans_style.java:3384
+#: build/trans_style.java:3954 build/trans_style.java:4262
+#: build/trans_style.java:4271 build/trans_style.java:4280
+#: build/trans_style.java:4289 build/trans_style.java:4298
+#: build/trans_style.java:4307 build/trans_style.java:4316
+#: build/trans_style.java:4317 build/trans_style.java:4326
+#: build/trans_style.java:4335
 msgid "deprecated"
 msgstr ""
@@ -23675,5 +24040,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3294
+#: build/trans_style.java:3302
 msgid "light_water"
 msgstr ""
@@ -24355,8 +24720,17 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="boundary_stone"/>
+#. <icon annotate="true" src="historic/boundary_stone.png"/>
 #: build/trans_style.java:2990 build/trans_style.java:2998
 #: build/trans_style.java:3006 build/trans_style.java:3014
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
+#: build/trans_style.java:3054
 msgid "historic"
 msgstr ""
@@ -24370,5 +24744,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3095
 msgid "quarry"
 msgstr ""
@@ -24382,5 +24756,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "landfill"
 msgstr ""
@@ -24402,5 +24776,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3103 build/trans_style.java:3111
+#: build/trans_style.java:3111 build/trans_style.java:3119
 msgid "basin"
 msgstr ""
@@ -24414,5 +24788,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3127
 msgid "forest"
 msgstr ""
@@ -24426,5 +24800,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3159
 msgid "farmyard"
 msgstr ""
@@ -24447,5 +24821,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3160 build/trans_style.java:3168
+#: build/trans_style.java:3168 build/trans_style.java:3176
 msgid "retail"
 msgstr ""
@@ -24459,5 +24833,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3176
+#: build/trans_style.java:3184
 msgid "industrial"
 msgstr ""
@@ -24471,5 +24845,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "brownfield"
 msgstr ""
@@ -24483,5 +24857,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "greenfield"
 msgstr ""
@@ -24495,5 +24869,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "railland"
 msgstr ""
@@ -24550,7 +24924,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3217 build/trans_style.java:3252
-#: build/trans_style.java:3260 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3225 build/trans_style.java:3260
+#: build/trans_style.java:3268 build/trans_style.java:3276
+#: build/trans_style.java:3284 build/trans_style.java:3292
 msgid "military"
 msgstr ""
@@ -24564,5 +24938,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3225
+#: build/trans_style.java:3233
 msgid "cemetery"
 msgstr ""
@@ -24575,5 +24949,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3301
+#: build/trans_style.java:3309
 msgid "peak"
 msgstr ""
@@ -24588,5 +24962,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3310
+#: build/trans_style.java:3318
 msgid "glacier"
 msgstr ""
@@ -24600,5 +24974,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "volcano"
 msgstr ""
@@ -24653,8 +25027,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3326 build/trans_style.java:3327
-#: build/trans_style.java:3335 build/trans_style.java:3351
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440
+#: build/trans_style.java:3334 build/trans_style.java:3335
+#: build/trans_style.java:3343 build/trans_style.java:3359
+#: build/trans_style.java:3432 build/trans_style.java:3440
+#: build/trans_style.java:3448
 msgid "natural"
 msgstr ""
@@ -24668,5 +25042,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3343
+#: build/trans_style.java:3351
 msgid "scrub"
 msgstr ""
@@ -24680,5 +25054,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3359
+#: build/trans_style.java:3367
 msgid "heath"
 msgstr ""
@@ -24692,5 +25066,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3408
+#: build/trans_style.java:3416
 msgid "mud"
 msgstr ""
@@ -24704,5 +25078,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "beach"
 msgstr ""
@@ -24780,8 +25154,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
-#: build/trans_style.java:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496 build/trans_style.java:3504
+#: build/trans_style.java:3512 build/trans_style.java:3520
 msgid "route"
 msgstr ""
@@ -24829,7 +25203,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3522 build/trans_style.java:3530
-#: build/trans_style.java:3538 build/trans_style.java:3546
-#: build/trans_style.java:3554
+#: build/trans_style.java:3530 build/trans_style.java:3538
+#: build/trans_style.java:3546 build/trans_style.java:3554
+#: build/trans_style.java:3562
 msgid "boundary"
 msgstr ""
@@ -24979,11 +25353,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090
+#: build/trans_style.java:4002 build/trans_style.java:4010
+#: build/trans_style.java:4018 build/trans_style.java:4026
+#: build/trans_style.java:4034 build/trans_style.java:4042
+#: build/trans_style.java:4050 build/trans_style.java:4058
+#: build/trans_style.java:4066 build/trans_style.java:4074
+#: build/trans_style.java:4082 build/trans_style.java:4090
+#: build/trans_style.java:4098
 msgid "place"
 msgstr ""
@@ -25031,6 +25405,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4207 build/trans_style.java:4214
-#: build/trans_style.java:4221 build/trans_style.java:4228
+#: build/trans_style.java:4215 build/trans_style.java:4222
+#: build/trans_style.java:4229 build/trans_style.java:4236
 msgid "address"
 msgstr ""
@@ -25338,16 +25712,4 @@
 msgstr ""
 
-#~ msgid "All the ways were empty"
-#~ msgstr "Vse poti so bile prazne"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Vseeno združi"
-
-#~ msgid "Unknown version"
-#~ msgstr "Neznana različica"
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Neveljaven id točke"
-
 #~ msgid "Move"
 #~ msgstr "Premakni"
@@ -25441,4 +25803,10 @@
 #~ msgid "Validate"
 #~ msgstr "Preveri"
+
+#~ msgid "Unknown version"
+#~ msgstr "Neznana različica"
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "Neveljaven id točke"
 
 #~ msgid ""
@@ -25490,7 +25858,4 @@
 #~ msgstr "Viri prednastavljenih oznak"
 
-#~ msgid "Add Selected"
-#~ msgstr "Dodaj izbrano"
-
 #~ msgid "Remove Selected"
 #~ msgstr "Odstrani izbrano"
@@ -25505,4 +25870,10 @@
 #~ msgstr "Uredi dók"
 
+#~ msgid "All the ways were empty"
+#~ msgstr "Vse poti so bile prazne"
+
+#~ msgid "Merge Anyway"
+#~ msgstr "Vseeno združi"
+
 #~ msgid "No data"
 #~ msgstr "Ni podatkov"
@@ -25519,5 +25890,2 @@
 #~ msgid "relations"
 #~ msgstr "relacije"
-
-#~ msgid "changesets"
-#~ msgstr "paketi sprememb"
Index: applications/editors/josm/i18n/po/sv.po
===================================================================
--- applications/editors/josm/i18n/po/sv.po	(revision 17655)
+++ applications/editors/josm/i18n/po/sv.po	(revision 17697)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-12 18:11+0200\n"
-"PO-Revision-Date: 2009-09-09 10:16+0000\n"
+"POT-Creation-Date: 2009-09-19 13:00+0200\n"
+"PO-Revision-Date: 2009-09-15 02:22+0000\n"
 "Last-Translator: Mattias Dalkvist <dalkvist@gmail.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2009-09-12 16:04+0000\n"
+"X-Launchpad-Export-Date: 2009-09-19 10:40+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -42,10 +42,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:543
 #: ../core/src/org/openstreetmap/josm/Main.java:551
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -70,5 +70,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -86,6 +86,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:358
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
@@ -101,6 +101,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
@@ -126,10 +126,10 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
 msgid "Save and Exit"
 msgstr "Spara och avsluta"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
 msgid "Discard and Exit"
 msgstr "Kassera och avsluta"
@@ -140,4 +140,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
@@ -145,27 +146,28 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:296
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:258
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:613
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
@@ -173,5 +175,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -191,6 +193,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
@@ -207,17 +209,17 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:654
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1528
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -228,6 +230,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
@@ -280,9 +282,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:607
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:609
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -342,5 +344,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
 msgid "Plugins"
@@ -392,5 +394,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Sammanfoga"
@@ -480,5 +482,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -491,4 +493,5 @@
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -524,6 +527,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
@@ -532,6 +535,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:346
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
@@ -646,4 +649,46 @@
 msgstr "Det finns inte några konflikter att zooma till"
 
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#, fuzzy
+msgid "Close open changesets"
+msgstr "Stänger ändringssamling..."
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#, fuzzy
+msgid "Closes open changesets"
+msgstr "Stänger ändringssamling..."
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
+#: ../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:114
+#, java-format
+msgid "File: {0}"
+msgstr "Arkiv: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
+#, fuzzy
+msgid "There are no open changesets"
+msgstr "Servern har inte stöd för ändringssamlingar"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
+#, fuzzy
+msgid "No open changesets"
+msgstr "Stänger ändringssamling..."
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
+#, fuzzy
+msgid "Downloading open changesets ..."
+msgstr "Stänger ändringssamling..."
+
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
@@ -742,10 +787,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:123
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
@@ -788,31 +834,30 @@
 msgstr "Distribuera de valda noderna på jämna avstånd längs en linje."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
 msgid "Download from OSM..."
 msgstr "Hämta från OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
 msgid "Download map data from the OSM server."
 msgstr "Hämta kartdata från OSM-servern."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
-#, java-format
-msgid "File: {0}"
-msgstr "Arkiv: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
 msgid "Download"
 msgstr "Hämta"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
 msgid "Please select at least one task to download"
 msgstr "Välj åtminstone en uppgift att hämta"
@@ -834,5 +879,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1527
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307
@@ -852,6 +897,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:376
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1415
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
 msgid "Duplicate"
 msgstr "Duplicera"
@@ -923,10 +968,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
@@ -1012,25 +1058,26 @@
 msgstr "Sammafoga det nuvarande lagret med ett annat"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 msgid "Merge Nodes"
 msgstr "Slå ihop noder"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
 msgid "Merge nodes into the oldest one."
 msgstr "Slå ihop noder med den äldsta."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
 msgid "Please select at least two nodes to merge."
 msgstr "Välj åtminstone två noder att slå ihop."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:394
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
@@ -1046,8 +1093,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -1073,6 +1120,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
@@ -1081,5 +1132,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
@@ -1087,5 +1138,5 @@
 "behöva tas bort."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283
 #, java-format
 msgid "Merge {0} nodes"
@@ -1157,5 +1208,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "New"
 msgstr "Ny"
@@ -1435,14 +1486,15 @@
 msgstr "Hjälp: {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
 msgid "Status Report"
 msgstr "Statusrapport"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 msgid "Copy to clipboard and close"
 msgstr "Kopiera till urklipp och stäng"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
@@ -1523,25 +1575,4 @@
 msgstr "Dela sträcka {0} i {1} delar"
 
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24
-msgid "Close current changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-msgid "Close the current changeset ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41
-msgid "There is currently no changeset open."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42
-msgid "No open changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60
-msgid "Closing changeset"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
@@ -1711,39 +1742,39 @@
 msgstr "Tom markering"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "Skicka in till OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 msgid "Upload all changes to the OSM server."
 msgstr "Skicka in alla ändringar till OSM-servern."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
+#, java-format
 msgid ""
 "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
 "resolve them first.</html>"
-msgstr "<html>Konflikter i lager ''{0}''.<br>Du måste lösa dem först.<html>"
-
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
 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:166
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 msgid "No changes to upload."
 msgstr "Det finns inte några ändringar att skicka in."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "Synkronisera enbart {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
 msgid "Synchronize entire dataset"
 msgstr "Synkronisera hela datasetet"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
 #, java-format
 msgid ""
@@ -1757,17 +1788,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
 msgid "Conflict detected"
 msgstr "Konflikt upptäkt"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr "oförväntat returvärde. Erhöll {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:267
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
 #, java-format
 msgid ""
@@ -1783,5 +1814,17 @@
 "<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
+msgid ""
+"<html>Uploading <strong>failed</strong> because you've been "
+"using<br>changeset {0} which was already closed at {1}.<br>Please upload "
+"again with a new or an existing open changeset."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+#, fuzzy
+msgid "Changeset closed"
+msgstr "Ändra värden?"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
@@ -1789,23 +1832,23 @@
 "Varning: felaktigt huvud \"{0}\" matchade inte förväntat mönster \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr "<html>Uppladdning <strong>misslyckades</strong>.<br>{0}</html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
 msgid "Upload to OSM API failed"
 msgstr "Uppladningen till OSM API misslyckades"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
 msgid "Updating primitive"
 msgstr "Uppdaterar primitiv"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -2029,14 +2072,14 @@
 msgstr "Lägg till en nod i en sträcka och bind ihop"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:930
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:932
 msgid "Create new node."
 msgstr "Skapa ny nod"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
 msgid "Select node under cursor."
 msgstr "Markera nod under pekare."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939
 #, java-format
 msgid "Insert new node into way."
@@ -2045,14 +2088,14 @@
 msgstr[1] "Infoga ny nod i {0} vägar."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
 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:949
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951
 msgid "Continue way from last node."
 msgstr "Fortsätt väg från senaste nod."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:972
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:974
 msgid "Finish drawing."
 msgstr "Avsluta ritning."
@@ -2173,44 +2216,54 @@
 "ned, höger; flytta karta med högerknappen"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Sök..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Sök efter objekt."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
 msgid "Can't search because there is no loaded data."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
+#, fuzzy
+msgid "Please enter a filter string."
+msgstr "Ange en söksträng."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
 msgid "Please enter a search string."
 msgstr "Ange en söksträng."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
 msgid "replace selection"
 msgstr "ersätt urval"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72
 msgid "add to selection"
 msgstr "utöka urval"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73
 msgid "remove from selection"
 msgstr "ta bort från urval"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
+#, fuzzy
+msgid "find in selection"
+msgstr "utöka urval"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81
 msgid "case sensitive"
 msgstr "gör skillnad på gemener/VERSALER"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82
 msgid "regular expression"
 msgstr "reguljärt uttryck"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
 msgstr ""
@@ -2218,5 +2271,5 @@
 "värde som helst."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
 msgstr ""
@@ -2224,13 +2277,13 @@
 "som helst."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
 msgstr "<b>name:Bak</b> - 'Bak' var som helst i nyckeln name."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid ""
 "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
@@ -2238,17 +2291,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
 msgstr "<b>-name:Bak</b> - som inte har 'Bak'  i nyckeln name."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - som innehåller nyckeln foot oavsett dess värde."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
 msgid "<u>Special targets:</u>"
 msgstr "<u>Särskilda mål:</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
@@ -2257,47 +2310,47 @@
 "<b>relation</b> för relation)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>user:</b>... - alla objekt som ändrats av användare..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 msgid "<b>nodes:</b>... - object with given number of nodes"
 msgstr "<b>nodes:</b>... - objekt med givent antal noder"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>modified</b> - alla ändrade objekt"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>selected</b> - alla valda objekt"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>incomplete</b> - alla ofullständiga objekt"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>otaggade</b> - alla otaggede objekt"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "Använd <b>|</b> eller <b>OR</b> för att kombinera med logiskt ELLER"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
@@ -2305,46 +2358,63 @@
 "innehåller :)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "Använd <b>(</b> och <b>)</b> för att gruppera uttryck"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
+msgid "Filter"
+msgstr "Filter"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Sök"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
+msgid "Submit filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "Start Search"
 msgstr "Påbörja sökning"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "Inga sökträffar för ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "Urvalet utökades inte genom att söka efter ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "Urvalet begränsades inte genom att söka efter ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#, fuzzy, java-format
+msgid "Nothing find in selection by searching for ''{0}''"
+msgstr "Urvalet utökades inte genom att söka efter ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262
 #, java-format
 msgid "Found {0} matches"
 msgstr "{0} sökträffar"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CS"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CI"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283
 msgid "RX"
 msgstr "RX"
@@ -2530,5 +2600,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
 msgid "Double conflict"
 msgstr ""
@@ -2775,4 +2845,5 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:134
 msgid "Old value"
 msgstr "Gammalt värde"
@@ -2936,27 +3007,58 @@
 
 #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
 msgid "E"
 msgstr "Ö"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:59
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:203
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
 msgid "Changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:323
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
 msgstr "parameter {0} > 0 krävs. Erhöll {1}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:325
-#, fuzzy, java-format
-msgid "paramete''{0}'' must not be null"
-msgstr "parametern ''{0}'' får inte vara null"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331
-#, fuzzy, java-format
-msgid "unsupported value ''{0}'' or parameter ''{1}''"
-msgstr "Ingen användbar roll ''{0}'' för sträckan ''{1}''."
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "H"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "Text"
+msgstr "text"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "C"
+msgstr "WC"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "I"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "M"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#, fuzzy
+msgid "R"
+msgstr "RX"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+msgid "A"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+msgid "D"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+msgid "F"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
@@ -2970,29 +3072,29 @@
 msgstr "Varning: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
+#, java-format
 msgid "expected id >= 0. Got {0}"
-msgstr "oförväntat returvärde. Erhöll {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:257
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
 msgid "a primitive with id=0 can't be invisible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:293
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
+#, java-format
 msgid "id > 0 expected. Got {0}"
-msgstr "oförväntat returvärde. Erhöll {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
 msgid "version > 0 expected. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
 msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
 msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
@@ -3059,9 +3161,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:247
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:249
 msgid "Area style way is not closed."
 msgstr "En sträcka för en yta är inte sluten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:478
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:482
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
@@ -3070,118 +3172,118 @@
 #. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
 #. TODO Remove useless nullcheck when RelationMember.member is encalupsed
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:851
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855
 msgid "Empty member in relation."
 msgstr "Tom medlem i relationen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:853
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "Tog bort medlemmen ''{0}'' i relationen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:864
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Sträcka \"{0} med mindre än två punkter."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "More than one \"from\" way found."
 msgstr "Det finns mer än en \"från\"-sträcka."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "More than one \"to\" way found."
 msgstr "Det finns mer än en \"till\"-sträcka."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "More than one \"via\" found."
 msgstr "Mer än en \"via\" hittades."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "Okänd roll ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "Okänd medlemstyp för ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"from\" way found."
 msgstr "Det finns inte någon \"från\"-sträcka."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"to\" way found."
 msgstr "Det finns inte någon \"till\"-sträcka."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652
 msgid "No \"via\" node or way found."
 msgstr "Ingen nod eller sträcka för \"via\" hittades."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "\"Från\"-sträckan startar eller slutar inte i en \"via\"-nod."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "Sträckan \"till\" börjar eller slutar inte i en \"via\"-nod."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "Sträckan \"från\" börjar eller slutar inte i en \"via\"-nod."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "Sträckan \"till\" börjar eller slutar inte i \"via\"-sträckan."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "Stil för restriktion {0} kunde inte hittas."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Ingen användbar roll ''{0}'' för sträckan ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:885
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Icke-sträcka ''{0}'' i multipolygon."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:943
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Multipolygonen ''{0}'' saknar yttre sträcka."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1032
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Intersektionen mellan sträckorna ''{0}'' och ''{1}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1044
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "Den inre sträckan ''{0}'' befinner sig utanför."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1097
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "Stil för inre väg ''{0}'' är samma som multipolygonen."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1123
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Stil för yttre väg ''{0}'' passar inte."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1327
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331
 msgid "untagged"
 msgstr "otaggade"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1328
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332
 msgid "text"
 msgstr "text"
@@ -3202,5 +3304,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
@@ -3221,5 +3323,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
@@ -3273,5 +3375,5 @@
 msgstr "Lambertzon (Frankrike)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambertzon (Estland)"
@@ -3313,9 +3415,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:38
 msgid "Do not show again"
 msgstr "Visa inte igen"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
 #, java-format
@@ -3323,31 +3425,31 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:91
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:116
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154
 msgid "incomplete"
 msgstr "ofullständig"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
 msgid "highway"
 msgstr "landsväg"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
-#: build/trans_presets.java:3144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: build/trans_presets.java:3156
 msgid "railway"
 msgstr "järnväg"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
 msgid "waterway"
 msgstr "vattendrag"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "landuse"
 msgstr "markanvändning"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:474
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
@@ -3357,5 +3459,5 @@
 msgstr[1] "{0} noder"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
 #, java-format
 msgid "{0} member"
@@ -3385,7 +3487,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
-#, fuzzy
 msgid "Bad Request"
-msgstr "Redigera rackets"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144
@@ -3401,10 +3502,5 @@
 msgstr "Dagens meddelande är inte tillgängligt"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67
-#, java-format
-msgid "- running version is {0}"
-msgstr "- nuvarande version är {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:95
 msgid "Downloading \"Message of the day\""
 msgstr "Hämtar \"Dagens meddelande\""
@@ -3476,10 +3572,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:162
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
 msgid "Username"
 msgstr "Användarnamn"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
 msgid "Password"
 msgstr "Lösenord"
@@ -3602,5 +3698,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226
 msgid "Presets"
 msgstr "Snabbval"
@@ -3674,38 +3770,49 @@
 msgstr "skala"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Den geografiska longituden vid muspekaren."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The name of the object at the mouse pointer."
 msgstr "Namnet på objektet vid muspekaren."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Den geografiska latituden vid muspekaren."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The angle between the previous and the current way segment."
 msgstr "Vinkeln mellan föregående och pågående delsträcka."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "Kompassriktning för den delsträcka som ritas."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The length of the new way segment being drawn."
 msgstr "Längden hos den nya delsträcka som håller på att ritas."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199
+msgid ""
+"Middle click again to cycle through.<br>Hold CTRL to select directly from "
+"this list with the mouse.<hr>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290
 msgid "(no object)"
 msgstr "(inget objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:301
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418
+#, fuzzy
+msgid "User:"
+msgstr "Användare"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
 msgid "layer not in list."
 msgstr "lagret finns inte i listan."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:488
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3775,7 +3882,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:224
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Tags"
 msgstr "Taggar"
@@ -3790,5 +3897,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
@@ -3969,4 +4076,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
 msgid "Up"
 msgstr ""
@@ -3977,4 +4085,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Down"
 msgstr ""
@@ -3987,5 +4096,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
@@ -4410,23 +4519,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:236
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239
 msgid "No conflicts to resolve"
-msgstr "Det finns inte några konflikter att zooma till"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:295
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254
 msgid "Cancel conflict resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:310
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269
 msgid "Apply resolved conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Apply"
 msgstr ""
@@ -4438,5 +4546,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "all"
 msgstr "alla"
@@ -4480,7 +4588,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
-msgid "not yet decided"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:213
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
@@ -4507,7 +4612,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
@@ -4517,7 +4622,7 @@
 msgstr[1] "{0} sträckor"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:152
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
@@ -4527,20 +4632,20 @@
 msgstr[1] "{0} relationer"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "Paste ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "From ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:372
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "To ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:428
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
 #, java-format
 msgid "{0} tag"
@@ -4556,13 +4661,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
-#, fuzzy
 msgid "Remove this relation member from the relation"
-msgstr "Ta bort medlemmen på den nuvarande tabellraden från denna relation"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-#, fuzzy
 msgid "Replace"
-msgstr "plats"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
@@ -4578,5 +4681,5 @@
 #. --- role editing
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:56
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510
 msgid "Role:"
 msgstr ""
@@ -4592,7 +4695,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70
-#, fuzzy
 msgid "Value:"
-msgstr "Värde"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86
@@ -4605,12 +4707,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51
-#, fuzzy
 msgid "Orig. Way"
-msgstr "Enkelriktat"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
-#, fuzzy
 msgid "Decision"
-msgstr "Utgåva"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -4626,6 +4726,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
@@ -4715,169 +4816,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-msgid "History"
-msgstr "Historik"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-msgid "Display the history of all selected items."
-msgstr "Visa historik för alla valda poster."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
-#, java-format
-msgid "index out of bounds Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
-msgid "History item"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Läs om alla de nu valda objekten och uppdatera listan."
-
-#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
-msgid "Show"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
-msgid "Dialog not created yet. Invoke createInstance() first"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
-msgid "Layers"
-msgstr "Lager"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-msgid "Open a list of all loaded layers."
-msgstr "Öppna en lista av alla inlästa lager."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:297
-msgid "Delete the selected layer."
-msgstr "Ta bort valt lager."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:367
-msgid "Show/Hide"
-msgstr "Visa/Dölj"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:378
-msgid "Toggle visible state of the selected layer."
-msgstr "Alternera visning av det valda lagret."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:420
-msgid "Activate the selected layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:475
-msgid "Merge this layer into another layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:581
-msgid "Move the selected layer one row up."
-msgstr "Flytta det valda lagret en rad upp."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:600
-msgid "Move the selected layer one row down."
-msgstr "Flytta det valda lagret en rad ner."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
-msgid "Information about layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
-#, java-format
-msgid "This will change up to {0} object."
-msgid_plural "This will change up to {0} objects."
-msgstr[0] "Detta kommer att ändra upp till {0} objekt."
-msgstr[1] "Detta kommer att ändra upp till {0} objekt."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
-msgid "An empty value deletes the key."
-msgstr "Om värdet är tomt tas nyckeln bort."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
-msgid "<different>"
-msgstr "<olika>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
-msgid "Change values?"
-msgstr "Ändra värden?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
-#, java-format
-msgid "Change properties of up to {0} object"
-msgid_plural "Change properties of up to {0} objects"
-msgstr[0] "Ändra egenskaper för upp till {0} objekt."
-msgstr[1] "Ändra egenskaper för upp till {0} objekt."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
-msgid "Please select a key"
-msgstr "Välj en nyckel"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
-msgid "Please select a value"
-msgstr "Välj ett värde"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
-msgid "Please select the objects you want to change properties for."
-msgstr "Välj de objekt vars egenskaper du vill ändra."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
-msgid "Properties/Memberships"
-msgstr "Egenskaper/Roller"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-msgid "Properties for selected objects."
-msgstr "Egenskaper för valda objekt."
-
-#. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-msgid "Member Of"
-msgstr "Medlem av"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
-msgid "Add Properties"
-msgstr "Lägg till egenskaper"
-
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+msgid "Filter objects and hide/disable them."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
@@ -4891,4 +4836,212 @@
 msgstr "Lägg till"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#, fuzzy
+msgid "Add filter."
+msgstr "Lägg till vald"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
+#, fuzzy
+msgid "Edit filter."
+msgstr "Redigera pir"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#, fuzzy
+msgid "Delete filter."
+msgstr "Radera mina"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
+#, fuzzy
+msgid "Move filter up."
+msgstr "Flytta uppåt"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
+#, fuzzy
+msgid "Move filter down."
+msgstr "Flytta nedåt"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128
+msgid "Enable filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
+#, fuzzy
+msgid "Hide elements"
+msgstr "Enstaka poster"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
+msgid "Apply also for children"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
+msgid "Inverse filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
+#, fuzzy
+msgid "Filter mode"
+msgstr "Filter"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
+msgid "History"
+msgstr "Historik"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+msgid "Display the history of all selected items."
+msgstr "Visa historik för alla valda poster."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
+msgid "History item"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
+msgid "Reload all currently selected objects and refresh the list."
+msgstr "Läs om alla de nu valda objekten och uppdatera listan."
+
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
+msgid "Show"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
+msgid "Display the history of the selected primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84
+msgid "Dialog not created yet. Invoke createInstance() first"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
+msgid "Layers"
+msgstr "Lager"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+msgid "Open a list of all loaded layers."
+msgstr "Öppna en lista av alla inlästa lager."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294
+msgid "Delete the selected layer."
+msgstr "Ta bort valt lager."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364
+msgid "Show/Hide"
+msgstr "Visa/Dölj"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375
+msgid "Toggle visible state of the selected layer."
+msgstr "Alternera visning av det valda lagret."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgid "Activate"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417
+msgid "Activate the selected layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472
+msgid "Merge this layer into another layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578
+msgid "Move the selected layer one row up."
+msgstr "Flytta det valda lagret en rad upp."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597
+msgid "Move the selected layer one row down."
+msgstr "Flytta det valda lagret en rad ner."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+msgid "Information about layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+#, java-format
+msgid "This will change up to {0} object."
+msgid_plural "This will change up to {0} objects."
+msgstr[0] "Detta kommer att ändra upp till {0} objekt."
+msgstr[1] "Detta kommer att ändra upp till {0} objekt."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+msgid "An empty value deletes the key."
+msgstr "Om värdet är tomt tas nyckeln bort."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+msgid "<different>"
+msgstr "<olika>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+msgid "Change values?"
+msgstr "Ändra värden?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#, java-format
+msgid "Change properties of up to {0} object"
+msgid_plural "Change properties of up to {0} objects"
+msgstr[0] "Ändra egenskaper för upp till {0} objekt."
+msgstr[1] "Ändra egenskaper för upp till {0} objekt."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+msgid "Please select a key"
+msgstr "Välj en nyckel"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+msgid "Please select a value"
+msgstr "Välj ett värde"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
+msgid "Please select the objects you want to change properties for."
+msgstr "Välj de objekt vars egenskaper du vill ändra."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
+msgid "Properties/Memberships"
+msgstr "Egenskaper/Roller"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+msgid "Properties for selected objects."
+msgstr "Egenskaper för valda objekt."
+
+#. setting up the membership table
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+msgid "Member Of"
+msgstr "Medlem av"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
+msgid "Add Properties"
+msgstr "Lägg till egenskaper"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574
 msgid "Add a new key/value pair to all objects"
@@ -4930,10 +5083,9 @@
 
 #. item "Land use/Quarry" text "Name"
-#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
-#: build/trans_presets.java:3109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168
+#: build/trans_presets.java:3121
 msgid "Relations"
 msgstr "Relationer"
@@ -4943,23 +5095,23 @@
 msgstr "Öppna en lista över alla relationer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relationer: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276
 msgid "Open an editor for the selected relation"
 msgstr "Öppna en redigerare för den valda relationen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
 msgid "Delete the selected relation"
 msgstr "Ta bort den valda relationen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349
 msgid "Create a new relation"
 msgstr "Skapa en ny relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:373
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1412
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
@@ -4992,5 +5144,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -5002,9 +5154,9 @@
 msgstr "Urval: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441
 msgid "Undock the panel"
 msgstr "Lossa panelen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5013,5 +5165,5 @@
 "vänstra verktygraden."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:457
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "Klicka för att minimera/maximera panelens innehåll"
@@ -5072,5 +5224,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5094,5 +5246,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1502
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1370
 msgid "Download relation members"
 msgstr ""
@@ -5122,5 +5274,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -5128,18 +5280,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
 msgid "Tags and Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:167
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5148,14 +5300,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613
 #, java-format
 msgid ""
@@ -5165,9 +5317,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid ""
@@ -5177,15 +5329,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5193,5 +5345,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5199,20 +5351,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849
 #, java-format
 msgid ""
@@ -5221,57 +5373,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:961
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909
 msgid "Move the currently selected members up"
 msgstr "Flytta vald medlem/valda medlemmar uppåt"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:979
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:912
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928
 msgid "Move the currently selected members down"
 msgstr "Flytta vald medlem/valda medlemmar nedåt"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:998
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:931
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5280,9 +5432,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1058
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
 #, java-format
 msgid ""
@@ -5291,56 +5443,41 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090
+msgid "Apply the current updates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123
+msgid "Apply the updates and close the dialog"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
-msgid "Apply the current updates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
-msgid "Apply the updates and close the dialog"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
-msgid "Delete the currently selected tags"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Hämta alla ofullständiga sträckor och noder i relationen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 msgid "Download Members"
 msgstr "Hämta medlemmar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1208
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1211
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1356
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 #, java-format
 msgid ""
@@ -5350,13 +5487,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1229
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1367
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
 msgid "Confirm empty role"
 msgstr ""
@@ -5443,37 +5580,37 @@
 msgstr "Bokmärken"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:82
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
 msgid "Please enter the desired coordinates first."
 msgstr "Ange först önskade koordinater."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
 msgid "Please enter a name for the location."
 msgstr "Ange platsens namn."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:107
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
 msgid "Select a bookmark first."
 msgstr "Välj ett bokmärke först."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
 msgid "min lat"
 msgstr "min lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
 msgid "min lon"
 msgstr "min lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid "max lat"
 msgstr "max lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
 msgid "max lon"
 msgstr "max lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5483,26 +5620,26 @@
 "hem området)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
 msgid "Bounding Box"
 msgstr "Gränsvärden"
 
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
 msgid "Data Sources and Types"
 msgstr "Datakällor och -typer"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
 msgid "Download as new layer"
 msgstr "Hämta som ett nytt lager"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
 msgid "Download Area"
 msgstr "Hämta område"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
 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:219
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
 msgid "Download area ok, size probably acceptable to server"
 msgstr ""
@@ -5528,7 +5665,7 @@
 msgstr "Ange ett platsnamn att söka efter:"
 
-#. <separator/>
+#. group "Geography"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2759
 msgid "Places"
 msgstr "Platser"
@@ -5575,21 +5712,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "type"
 msgstr "typ"
@@ -5606,5 +5743,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-#, fuzzy
 msgid ""
 "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
@@ -5612,6 +5748,4 @@
 "Hold left mousebutton and draw a frame."
 msgstr ""
-"Zooma: Mushjul eller dubbelklickning. Flytta karta: Håll nere höger musknapp "
-"och flytta musen. Välj: Klicka"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
@@ -6072,4 +6206,6 @@
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
 #. <key key="historic" value="wayside_shrine" />
+#. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
+#. <key key="historic" value="boundary_stone" />
 #. item "Leisure/Water Park" label "Edit Water Park"
 #. <key key="leisure" value="water_park" />
@@ -6441,153 +6577,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/trans_presets.java:66 build/trans_presets.java:102
-#: build/trans_presets.java:142 build/trans_presets.java:179
-#: build/trans_presets.java:199 build/trans_presets.java:217
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:272 build/trans_presets.java:305
-#: build/trans_presets.java:351 build/trans_presets.java:371
-#: build/trans_presets.java:386 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:463 build/trans_presets.java:482
-#: build/trans_presets.java:502 build/trans_presets.java:522
-#: build/trans_presets.java:543 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627 build/trans_presets.java:658
-#: build/trans_presets.java:679 build/trans_presets.java:692
-#: build/trans_presets.java:705 build/trans_presets.java:718
-#: build/trans_presets.java:731 build/trans_presets.java:744
-#: build/trans_presets.java:755 build/trans_presets.java:764
-#: build/trans_presets.java:811 build/trans_presets.java:832
-#: build/trans_presets.java:841 build/trans_presets.java:901
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1067 build/trans_presets.java:1075
-#: build/trans_presets.java:1085 build/trans_presets.java:1093
-#: build/trans_presets.java:1098 build/trans_presets.java:1105
-#: build/trans_presets.java:1112 build/trans_presets.java:1117
-#: build/trans_presets.java:1125 build/trans_presets.java:1134
-#: build/trans_presets.java:1140 build/trans_presets.java:1146
-#: build/trans_presets.java:1151 build/trans_presets.java:1157
-#: build/trans_presets.java:1163 build/trans_presets.java:1172
-#: build/trans_presets.java:1181 build/trans_presets.java:1188
-#: build/trans_presets.java:1196 build/trans_presets.java:1209
-#: build/trans_presets.java:1215 build/trans_presets.java:1224
-#: build/trans_presets.java:1230 build/trans_presets.java:1236
-#: build/trans_presets.java:1244 build/trans_presets.java:1299
-#: build/trans_presets.java:1346 build/trans_presets.java:1352
-#: build/trans_presets.java:1358 build/trans_presets.java:1364
-#: build/trans_presets.java:1370 build/trans_presets.java:1381
-#: build/trans_presets.java:1390 build/trans_presets.java:1405
-#: build/trans_presets.java:1412 build/trans_presets.java:1418
-#: build/trans_presets.java:1426 build/trans_presets.java:1433
-#: build/trans_presets.java:1442 build/trans_presets.java:1450
-#: build/trans_presets.java:1457 build/trans_presets.java:1468
-#: build/trans_presets.java:1478 build/trans_presets.java:1488
-#: build/trans_presets.java:1508 build/trans_presets.java:1520
-#: build/trans_presets.java:1531 build/trans_presets.java:1548
-#: build/trans_presets.java:1555 build/trans_presets.java:1570
-#: build/trans_presets.java:1577 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1594
-#: build/trans_presets.java:1599 build/trans_presets.java:1605
-#: build/trans_presets.java:1611 build/trans_presets.java:1619
-#: build/trans_presets.java:1627 build/trans_presets.java:1635
-#: build/trans_presets.java:1642 build/trans_presets.java:1648
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1670 build/trans_presets.java:1677
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1712 build/trans_presets.java:1719
-#: build/trans_presets.java:1736 build/trans_presets.java:1744
-#: build/trans_presets.java:1759 build/trans_presets.java:1769
-#: build/trans_presets.java:1781 build/trans_presets.java:1788
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:1809 build/trans_presets.java:1817
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1841
-#: build/trans_presets.java:1846 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1864
-#: build/trans_presets.java:1872 build/trans_presets.java:1881
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1908 build/trans_presets.java:1914
-#: build/trans_presets.java:1922 build/trans_presets.java:1928
-#: build/trans_presets.java:1934 build/trans_presets.java:1940
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2013
-#: build/trans_presets.java:2022 build/trans_presets.java:2030
-#: build/trans_presets.java:2036 build/trans_presets.java:2042
-#: build/trans_presets.java:2048 build/trans_presets.java:2054
-#: build/trans_presets.java:2060 build/trans_presets.java:2066
-#: build/trans_presets.java:2072 build/trans_presets.java:2078
-#: build/trans_presets.java:2084 build/trans_presets.java:2090
-#: build/trans_presets.java:2096 build/trans_presets.java:2102
-#: build/trans_presets.java:2108 build/trans_presets.java:2114
-#: build/trans_presets.java:2120 build/trans_presets.java:2126
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2158
-#: build/trans_presets.java:2165 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2186
-#: build/trans_presets.java:2192 build/trans_presets.java:2198
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2218 build/trans_presets.java:2225
-#: build/trans_presets.java:2232 build/trans_presets.java:2239
-#: build/trans_presets.java:2247 build/trans_presets.java:2279
-#: build/trans_presets.java:2284 build/trans_presets.java:2289
-#: build/trans_presets.java:2294 build/trans_presets.java:2300
-#: build/trans_presets.java:2306 build/trans_presets.java:2312
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2354
-#: build/trans_presets.java:2451 build/trans_presets.java:2458
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2485 build/trans_presets.java:2492
-#: build/trans_presets.java:2498 build/trans_presets.java:2504
-#: build/trans_presets.java:2526 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2553 build/trans_presets.java:2559
-#: build/trans_presets.java:2565 build/trans_presets.java:2571
-#: build/trans_presets.java:2577 build/trans_presets.java:2583
-#: build/trans_presets.java:2590 build/trans_presets.java:2597
-#: build/trans_presets.java:2604 build/trans_presets.java:2610
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2661
-#: build/trans_presets.java:2667 build/trans_presets.java:2677
-#: build/trans_presets.java:2686 build/trans_presets.java:2701
-#: build/trans_presets.java:2707 build/trans_presets.java:2715
-#: build/trans_presets.java:2722 build/trans_presets.java:2742
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2783
-#: build/trans_presets.java:2790 build/trans_presets.java:2797
-#: build/trans_presets.java:2803 build/trans_presets.java:2809
-#: build/trans_presets.java:2817 build/trans_presets.java:2824
-#: build/trans_presets.java:2831 build/trans_presets.java:2838
-#: build/trans_presets.java:2844 build/trans_presets.java:2851
-#: build/trans_presets.java:2858 build/trans_presets.java:2867
-#: build/trans_presets.java:2873 build/trans_presets.java:2879
-#: build/trans_presets.java:2885 build/trans_presets.java:2891
-#: build/trans_presets.java:2900 build/trans_presets.java:2910
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2948
-#: build/trans_presets.java:2957 build/trans_presets.java:2963
-#: build/trans_presets.java:2969 build/trans_presets.java:2975
-#: build/trans_presets.java:2981 build/trans_presets.java:2987
-#: build/trans_presets.java:2993 build/trans_presets.java:3000
-#: build/trans_presets.java:3006 build/trans_presets.java:3011
-#: build/trans_presets.java:3018 build/trans_presets.java:3025
-#: build/trans_presets.java:3031 build/trans_presets.java:3040
-#: build/trans_presets.java:3048 build/trans_presets.java:3054
-#: build/trans_presets.java:3060 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3080
-#: build/trans_presets.java:3086 build/trans_presets.java:3092
-#: build/trans_presets.java:3098 build/trans_presets.java:3104
-#: build/trans_presets.java:3117 build/trans_presets.java:3131
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:67 build/trans_presets.java:103
+#: build/trans_presets.java:143 build/trans_presets.java:180
+#: build/trans_presets.java:200 build/trans_presets.java:218
+#: build/trans_presets.java:235 build/trans_presets.java:253
+#: build/trans_presets.java:273 build/trans_presets.java:306
+#: build/trans_presets.java:352 build/trans_presets.java:372
+#: build/trans_presets.java:387 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:503 build/trans_presets.java:523
+#: build/trans_presets.java:544 build/trans_presets.java:565
+#: build/trans_presets.java:586 build/trans_presets.java:607
+#: build/trans_presets.java:628 build/trans_presets.java:659
+#: build/trans_presets.java:680 build/trans_presets.java:693
+#: build/trans_presets.java:706 build/trans_presets.java:719
+#: build/trans_presets.java:732 build/trans_presets.java:745
+#: build/trans_presets.java:756 build/trans_presets.java:765
+#: build/trans_presets.java:812 build/trans_presets.java:833
+#: build/trans_presets.java:842 build/trans_presets.java:902
+#: build/trans_presets.java:1053 build/trans_presets.java:1061
+#: build/trans_presets.java:1069 build/trans_presets.java:1077
+#: build/trans_presets.java:1087 build/trans_presets.java:1095
+#: build/trans_presets.java:1100 build/trans_presets.java:1107
+#: build/trans_presets.java:1114 build/trans_presets.java:1119
+#: build/trans_presets.java:1127 build/trans_presets.java:1136
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1153 build/trans_presets.java:1159
+#: build/trans_presets.java:1165 build/trans_presets.java:1174
+#: build/trans_presets.java:1183 build/trans_presets.java:1190
+#: build/trans_presets.java:1198 build/trans_presets.java:1211
+#: build/trans_presets.java:1217 build/trans_presets.java:1226
+#: build/trans_presets.java:1232 build/trans_presets.java:1238
+#: build/trans_presets.java:1246 build/trans_presets.java:1302
+#: build/trans_presets.java:1349 build/trans_presets.java:1355
+#: build/trans_presets.java:1361 build/trans_presets.java:1367
+#: build/trans_presets.java:1373 build/trans_presets.java:1384
+#: build/trans_presets.java:1393 build/trans_presets.java:1408
+#: build/trans_presets.java:1415 build/trans_presets.java:1421
+#: build/trans_presets.java:1429 build/trans_presets.java:1436
+#: build/trans_presets.java:1445 build/trans_presets.java:1453
+#: build/trans_presets.java:1460 build/trans_presets.java:1471
+#: build/trans_presets.java:1481 build/trans_presets.java:1491
+#: build/trans_presets.java:1511 build/trans_presets.java:1523
+#: build/trans_presets.java:1534 build/trans_presets.java:1551
+#: build/trans_presets.java:1558 build/trans_presets.java:1574
+#: build/trans_presets.java:1581 build/trans_presets.java:1586
+#: build/trans_presets.java:1592 build/trans_presets.java:1598
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1646 build/trans_presets.java:1652
+#: build/trans_presets.java:1659 build/trans_presets.java:1666
+#: build/trans_presets.java:1674 build/trans_presets.java:1681
+#: build/trans_presets.java:1689 build/trans_presets.java:1696
+#: build/trans_presets.java:1702 build/trans_presets.java:1709
+#: build/trans_presets.java:1716 build/trans_presets.java:1723
+#: build/trans_presets.java:1740 build/trans_presets.java:1748
+#: build/trans_presets.java:1763 build/trans_presets.java:1773
+#: build/trans_presets.java:1785 build/trans_presets.java:1792
+#: build/trans_presets.java:1798 build/trans_presets.java:1808
+#: build/trans_presets.java:1813 build/trans_presets.java:1821
+#: build/trans_presets.java:1828 build/trans_presets.java:1834
+#: build/trans_presets.java:1840 build/trans_presets.java:1845
+#: build/trans_presets.java:1850 build/trans_presets.java:1855
+#: build/trans_presets.java:1862 build/trans_presets.java:1868
+#: build/trans_presets.java:1873 build/trans_presets.java:1882
+#: build/trans_presets.java:1891 build/trans_presets.java:1900
+#: build/trans_presets.java:1909 build/trans_presets.java:1918
+#: build/trans_presets.java:1924 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 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:2023 build/trans_presets.java:2032
+#: build/trans_presets.java:2040 build/trans_presets.java:2046
+#: build/trans_presets.java:2052 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 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:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2150
+#: build/trans_presets.java:2156 build/trans_presets.java:2162
+#: build/trans_presets.java:2169 build/trans_presets.java:2176
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2197 build/trans_presets.java:2203
+#: build/trans_presets.java:2209 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2229
+#: build/trans_presets.java:2236 build/trans_presets.java:2243
+#: build/trans_presets.java:2250 build/trans_presets.java:2258
+#: build/trans_presets.java:2290 build/trans_presets.java:2295
+#: build/trans_presets.java:2300 build/trans_presets.java:2305
+#: build/trans_presets.java:2311 build/trans_presets.java:2317
+#: build/trans_presets.java:2323 build/trans_presets.java:2331
+#: build/trans_presets.java:2337 build/trans_presets.java:2343
+#: build/trans_presets.java:2349 build/trans_presets.java:2355
+#: build/trans_presets.java:2365 build/trans_presets.java:2462
+#: build/trans_presets.java:2469 build/trans_presets.java:2483
+#: build/trans_presets.java:2489 build/trans_presets.java:2496
+#: build/trans_presets.java:2503 build/trans_presets.java:2509
+#: build/trans_presets.java:2515 build/trans_presets.java:2537
+#: build/trans_presets.java:2544 build/trans_presets.java:2551
+#: build/trans_presets.java:2557 build/trans_presets.java:2564
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2594 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2615
+#: build/trans_presets.java:2621 build/trans_presets.java:2627
+#: build/trans_presets.java:2633 build/trans_presets.java:2639
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2672 build/trans_presets.java:2678
+#: build/trans_presets.java:2688 build/trans_presets.java:2697
+#: build/trans_presets.java:2712 build/trans_presets.java:2718
+#: build/trans_presets.java:2726 build/trans_presets.java:2733
+#: build/trans_presets.java:2753 build/trans_presets.java:2764
+#: build/trans_presets.java:2770 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2788
+#: build/trans_presets.java:2795 build/trans_presets.java:2802
+#: build/trans_presets.java:2809 build/trans_presets.java:2815
+#: build/trans_presets.java:2821 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2912
+#: build/trans_presets.java:2922 build/trans_presets.java:2931
+#: build/trans_presets.java:2937 build/trans_presets.java:2943
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 build/trans_presets.java:2981
+#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:2999 build/trans_presets.java:3005
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3023 build/trans_presets.java:3030
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3066 build/trans_presets.java:3072
+#: build/trans_presets.java:3079 build/trans_presets.java:3085
+#: build/trans_presets.java:3092 build/trans_presets.java:3098
+#: build/trans_presets.java:3104 build/trans_presets.java:3110
+#: build/trans_presets.java:3116 build/trans_presets.java:3129
+#: build/trans_presets.java:3143 build/trans_presets.java:3157
 msgid "Name"
 msgstr "Namn"
@@ -6621,4 +6758,58 @@
 msgid "Version"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
+#, fuzzy
+msgid "Changeset id:"
+msgstr "Ändra relation"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
+#, fuzzy
+msgid "Created at:"
+msgstr "Skapa ytor"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
+#, fuzzy
+msgid "Changeset comment:"
+msgstr "Bidragskommentar"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
+msgid "No open changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48
+#, fuzzy
+msgid "<html>Please select the changesets you want to close</html>"
+msgstr "Välj vilka ändringar av egenskaper som du vill genomföra."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
+#, fuzzy
+msgid "Open changesets"
+msgstr "Stänger ändringssamling..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101
+#, fuzzy
+msgid "Close changesets"
+msgstr "Stänger ändringssamling..."
+
+#. putValue(SMALL_ICON, ImageProvider.get("cancel"));
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
+#, fuzzy
+msgid "Close the selected open changesets"
+msgstr "Ta bort valda objekt."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126
+#, fuzzy
+msgid "Cancel closeing of changesets"
+msgstr "Stänger ändringssamling..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37
+msgid "Closing changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77
+#, fuzzy, java-format
+msgid "Closing changeset {0}"
+msgstr "Stänger ändringssamling..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
@@ -6647,5 +6838,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be uploaded"
+msgid "Layer ''{0}'' has no modifications to be uploaded."
 msgstr ""
 
@@ -6653,5 +6844,5 @@
 #, java-format
 msgid ""
-"Layer ''{0}'' has modifications which should be saved to its assoicated file "
+"Layer ''{0}'' has modifications which should be saved to its associated file "
 "''{1}''."
 msgstr ""
@@ -6659,5 +6850,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be saved"
+msgid "Layer ''{0}'' has no modifications to be saved."
 msgstr ""
 
@@ -6691,17 +6882,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113
 msgid "Unsaved changes - Save/Upload before exiting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194
 #, java-format
 msgid ""
@@ -6714,10 +6905,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205
 msgid "Unsaved data and conflicts"
-msgstr "Korrigera taggkonflikter"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212
 #, java-format
 msgid ""
@@ -6731,9 +6921,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223
 msgid "Unsaved data and missing associated file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230
 #, java-format
 msgid ""
@@ -6748,42 +6938,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243
 msgid "Unsaved data non-writable files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
 msgid "Close this dialog and resume editing in JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322
+msgid "Discard and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
-msgid "Discard and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354
+msgid "Save and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
-msgid "Save and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
 msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402
 #, java-format
 msgid "Preparing layer ''{0}'' for upload ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
@@ -6791,5 +6981,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491
 msgid "Incomplete upload and/or save"
 msgstr ""
@@ -6829,21 +7019,21 @@
 #. item "Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:200
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:278
-#: build/trans_presets.java:311 build/trans_presets.java:357
-#: build/trans_presets.java:372 build/trans_presets.java:387
-#: build/trans_presets.java:409 build/trans_presets.java:429
-#: build/trans_presets.java:450 build/trans_presets.java:470
-#: build/trans_presets.java:489 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:549
-#: build/trans_presets.java:570 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:633
-#: build/trans_presets.java:664 build/trans_presets.java:1060
-#: build/trans_presets.java:1068 build/trans_presets.java:1076
-#: build/trans_presets.java:1086 build/trans_presets.java:1305
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:242
+#: build/trans_presets.java:260 build/trans_presets.java:279
+#: build/trans_presets.java:312 build/trans_presets.java:358
+#: build/trans_presets.java:373 build/trans_presets.java:388
+#: build/trans_presets.java:410 build/trans_presets.java:430
+#: build/trans_presets.java:451 build/trans_presets.java:471
+#: build/trans_presets.java:490 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:665 build/trans_presets.java:1062
+#: build/trans_presets.java:1070 build/trans_presets.java:1078
+#: build/trans_presets.java:1088 build/trans_presets.java:1308
 msgid "Layer"
 msgstr "Lager"
@@ -6862,67 +7052,32 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:200
 msgid "Upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-msgid "Use a new changeset and close it"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
-msgid ""
-"Select to upload the data using a new changeset and to close the changeset "
-"after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
-msgid "Use a new changeset and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
-msgid ""
-"Select to upload the data using a new changeset and to leave the changeset "
-"open after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
-msgid "Upload to a new or to an existing changeset?"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
-msgid "upload all changes in one request"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
-msgid ""
-"Enable to upload all changes in one request, disable to use one request per "
-"changed primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171
-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/gui/io/UploadDialog.java:216
 msgid "Settings"
 msgstr "Inställningar"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908
 msgid "Tags of new changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:221
 msgid "Objects to add:"
 msgstr "Nya objekt:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:227
 msgid "Objects to modify:"
 msgstr "Ändrade objekt:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:233
 msgid "Objects to delete:"
 msgstr "Borttagna objekt:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
 #, java-format
 msgid "{0} object to add:"
@@ -6931,5 +7086,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:277
 #, java-format
 msgid "{0} object to modifiy:"
@@ -6938,5 +7093,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:286
 #, java-format
 msgid "{0} object to delete:"
@@ -6945,54 +7100,87 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422
-#, java-format
-msgid "Use the existing changeset {0} and close it after upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:423
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to close the changeset "
-"after this upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426
-#, java-format
-msgid "Use the existing changeset {0} and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:427
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to leave the changeset "
-"open for further uploads"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
-#, java-format
-msgid "Tags of changeset {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:470
 msgid "Upload Changes"
 msgstr "Skicka in ändringar"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472
+msgid "Upload the changed primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
+msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:479
+msgid "Illegal upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
+msgid "Cancel the upload and resume editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606
 #, fuzzy
-msgid "Upload the changed primitives"
-msgstr "Skicka in dessa ändringar?"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592
+msgid "Upload all changes in one request"
+msgstr "Skicka in alla ändringar till OSM-servern."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607
+msgid ""
+"Enable to upload all changes in one request, disable to use one request per "
+"changed primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:617
+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/gui/io/UploadDialog.java:672
+msgid "Open a new changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
+msgid "Open a new changeset and use it in the next upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
 #, fuzzy
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "Ange platsens namn."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:593
-msgid "Illegal upload comment"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
-msgid "Cancel the upload and resume editing"
-msgstr ""
+msgid "Use an open changeset"
+msgstr "Osparade ändringar"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
+msgid "Upload data to an already opened changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
+#, fuzzy
+msgid "Close changeset after upload"
+msgstr "Det finns inte några ändringar att skicka in."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
+msgid "Select to close the changeset after the next upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922
+#, java-format
+msgid "Tags of changeset {0}"
+msgstr ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
+#, fuzzy
+msgid "Load the list of your open changesets from the server"
+msgstr "Skicka in inställningar till servern"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
+#, fuzzy
+msgid "Close the currently selected open changeset"
+msgstr "Flytta vald medlem/valda medlemmar uppåt"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
+#, fuzzy, java-format
+msgid "changeset id > 0 expected. Got {1}"
+msgstr "parameter {0} > 0 krävs. Erhöll {1}."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63
@@ -7070,5 +7258,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
@@ -7106,5 +7294,5 @@
 msgstr "Angiven tid kunde inte tolkas."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
@@ -7112,30 +7300,30 @@
 msgstr "gps-punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
 msgid "Customize line drawing"
 msgstr "Anpassa linjeritning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
 msgid "Use global settings."
 msgstr "Använd globala inställningar"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Draw lines between points for this layer."
 msgstr "Rita linjer mellan punkter i detta lager."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Do not draw lines between points for this layer."
 msgstr "Rita inte linjer mellan punkter i detta lager."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 msgid "Select line drawing options"
 msgstr "Välj alternativ för linjeritning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7143,5 +7331,5 @@
 msgstr "Anpassa färger"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7150,5 +7338,5 @@
 msgstr "Standard"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7157,38 +7345,75 @@
 msgstr "Välj en färg"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
 msgid "Markers From Named Points"
 msgstr "Markörer från namngivna punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Namngivna spårpunkter från {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
 msgid "Import Audio"
 msgstr "Importera ljud"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave-ljudfiler (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Ljudmarkörer från {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
 msgid "Import images"
 msgstr "Importera bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#, java-format
+msgid "Name: {0}"
+msgstr "Namn: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#, java-format
+msgid "Description: {0}"
+msgstr "Beskrivning: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#, fuzzy, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
 msgstr[0] "{0} spår, "
 msgstr[1] "{0} spår, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
+#: build/trans_presets.java:3160
+msgid "Description"
+msgstr "Beskrivning"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#, fuzzy
+msgid "Timespan"
+msgstr "Tidsomfång: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#, fuzzy
+msgid "Length"
+msgstr "Längd: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
+msgid "URL"
+msgstr "URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+msgid "Length: "
+msgstr "Längd: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
 #, java-format
 msgid "{0} route, "
@@ -7197,5 +7422,5 @@
 msgstr[1] "{0} rutter, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 #, java-format
 msgid "{0} waypoint"
@@ -7204,29 +7429,10 @@
 msgstr[1] "{0} sträckpunkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
-#, java-format
-msgid "Name: {0}"
-msgstr "Namn: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
-#, java-format
-msgid "Description: {0}"
-msgstr "Beskrivning: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
-msgid "Timespan: "
-msgstr "Tidsomfång: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
-msgid "Length: "
-msgstr "Längd: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Omvandla till datalager"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7236,10 +7442,10 @@
 "skicka in spår, se här:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -7250,29 +7456,29 @@
 msgstr "Omvandlad från:{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
 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:769
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
 msgid "Download everything within:"
 msgstr "Hämta allting inom:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
 #, java-format
 msgid "{0} meters"
 msgstr "{0} meter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 msgid "Maximum area per request:"
 msgstr "Största tillåtna område per begäran:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
 #, java-format
 msgid ""
@@ -7283,13 +7489,13 @@
 "Önskar du<br>fortsätta?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
 msgid "Download data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
 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:1143
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7299,5 +7505,5 @@
 "än dess slut uteslöts eller flyttades till början."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7350,30 +7556,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
-#, fuzzy
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
 "<br>If you want to upload traces, look here:</html>"
 msgstr ""
-"<html>Det anses skadligt att skicka in obehandlad GPS-data.<br>Om du vill "
-"skicka in spår, se här:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "track"
 msgid_plural "tracks"
@@ -7508,4 +7711,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
@@ -7746,13 +7950,18 @@
 msgstr "Rita stora GPS-punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+msgid "Draw a circle form HDOP value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "Hastighet (röd = långsam, grön = snabb)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "En enda färg (kan anpassas för namngivna lager)"
@@ -7760,6 +7969,6 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1374
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:1377
 msgid "Car"
 msgstr "Bil"
@@ -7780,14 +7989,14 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:324 build/trans_presets.java:650
-#: build/trans_presets.java:857 build/trans_presets.java:876
-#: build/trans_presets.java:890 build/trans_presets.java:912
-#: build/trans_presets.java:949 build/trans_presets.java:962
-#: build/trans_presets.java:974 build/trans_presets.java:986
-#: build/trans_presets.java:998 build/trans_presets.java:1010
-#: build/trans_presets.java:1020 build/trans_presets.java:1029
-#: build/trans_presets.java:1038 build/trans_presets.java:1437
-#: build/trans_presets.java:1510
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:325 build/trans_presets.java:651
+#: build/trans_presets.java:858 build/trans_presets.java:877
+#: build/trans_presets.java:891 build/trans_presets.java:913
+#: build/trans_presets.java:950 build/trans_presets.java:963
+#: build/trans_presets.java:975 build/trans_presets.java:987
+#: build/trans_presets.java:999 build/trans_presets.java:1011
+#: build/trans_presets.java:1021 build/trans_presets.java:1030
+#: build/trans_presets.java:1039 build/trans_presets.java:1440
+#: build/trans_presets.java:1513
 msgid "Bicycle"
 msgstr "Cykel"
@@ -7820,28 +8029,28 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:325 build/trans_presets.java:649
-#: build/trans_presets.java:856 build/trans_presets.java:875
-#: build/trans_presets.java:889 build/trans_presets.java:911
-#: build/trans_presets.java:948 build/trans_presets.java:961
-#: build/trans_presets.java:973 build/trans_presets.java:985
-#: build/trans_presets.java:997 build/trans_presets.java:1009
-#: build/trans_presets.java:1019 build/trans_presets.java:1028
-#: build/trans_presets.java:1037
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:326 build/trans_presets.java:650
+#: build/trans_presets.java:857 build/trans_presets.java:876
+#: build/trans_presets.java:890 build/trans_presets.java:912
+#: build/trans_presets.java:949 build/trans_presets.java:962
+#: build/trans_presets.java:974 build/trans_presets.java:986
+#: build/trans_presets.java:998 build/trans_presets.java:1010
+#: build/trans_presets.java:1020 build/trans_presets.java:1029
+#: build/trans_presets.java:1038
 msgid "Foot"
 msgstr "Fotgängare"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Rita riktningspilar"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Snabb ritning (ser sämre ut)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr ""
@@ -7850,34 +8059,34 @@
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Only on the head of a way."
 msgstr "Enbart på en sträckas huvud."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Rita ut segmentens ordningsnummer"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "Rita gränser för hämtade data"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Rita virtuella noder i urvalsläge"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Rita inaktiva lager i avvikande färg"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Mjuk kartgrafik (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:82
 msgid "Draw lines between raw GPS points"
 msgstr "Rita linjer mellan råa GPS-punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -7885,9 +8094,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
@@ -7896,10 +8105,10 @@
 "längd."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length (meters)"
 msgstr "Maxlängd (meter)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
@@ -7908,10 +8117,10 @@
 "linjeinformation."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:129
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "Rita riktningspilar för linjer, som förbinder GPS-punkter"
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:135
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr ""
@@ -7920,5 +8129,5 @@
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:141
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -7928,13 +8137,13 @@
 "senast ritade pil."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:144
 msgid "Minimum distance (pixels)"
 msgstr "Minimiavstånd (pixlar)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Draw larger dots for the GPS points."
 msgstr "Rita större punkter för GPS-punkter."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -7944,9 +8153,9 @@
 "hjälp av lagerhanteraren."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Colors points and track segments by velocity."
 msgstr "Färglägg punkter och spåravsnitt baserat på hastighet."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -7954,37 +8163,37 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Tillåter att spårets färg justeras efter olika genomsnittshastigheter."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid "Track and Point Coloring"
 msgstr "Spår- och punktfärgläggning"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202
 msgid "GPS Points"
 msgstr "GPS-punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "Draw direction hints for way segments."
 msgstr "Rita riktningsanvisningar för delsträckor."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:237
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Rita ordningsnummer för alla delsträckor inom deras sträcka."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Använd antialiasing för att ge kartan ett jämnare utseende."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Rita gränser för data hämtade från servern."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr ""
@@ -7992,9 +8201,9 @@
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257
 msgid "Draw the inactive data layers in a different color."
 msgstr "Rita de inaktiva datalagren i avvikande färg."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "OSM Data"
 msgstr "OSM-data"
@@ -8073,45 +8282,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Configure available plugins."
 msgstr "Ställ in tillgängliga insticksmoduler."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50
+#. buttons at the bottom
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
 msgid "Download List"
 msgstr "Hämta lista"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:100
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 msgid "Update"
 msgstr "Uppdatera"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Configure Sites..."
 msgstr "Konfigurera hämtställen..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:125
 msgid "Add JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:126
 msgid "Enter URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:162
 msgid "Please select an entry."
 msgstr "Välj en post."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:147
 msgid "Edit JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:148
 msgid "JOSM Plugin description URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:175
 msgid "Configure Plugin Sites"
 msgstr "Konfigurera hämtställen för insticksmoduler"
@@ -8469,6 +8679,6 @@
 msgstr "<flera>"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:369
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341
 #, java-format
 msgid "Remove old keys from up to {0} object"
@@ -8477,9 +8687,9 @@
 msgstr[1] "Ta bort gamla nycklar för upp till {0} objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135
 msgid "Add a new tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160
 msgid "Delete the selection in the tag table"
 msgstr ""
@@ -8514,7 +8724,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:68
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:75
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -8558,4 +8768,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24
+#, fuzzy, java-format
+msgid "Preset group ''{0}'' of group ''{1}''"
+msgstr "Använd snabbvalet ''{0}'' i gruppen ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
 #, java-format
 msgid "Preset group ''{0}''"
@@ -8576,4 +8791,10 @@
 msgstr "Hämtar punkter {0} till {1}..."
 
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, fuzzy, java-format
+msgid "parameter ''{0}'' > 0 expected. Got {1}"
+msgstr "parameter {0} > 0 krävs. Erhöll {1}."
+
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8682,5 +8903,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "Tolkningsfel: ogiltig dokumentstruktur för gpx-dokument"
@@ -8800,10 +9021,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -8811,75 +9033,79 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315
 msgid "Creating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
 #, java-format
 msgid "Successfully opened changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#, fuzzy, java-format
+msgid "id of changeset > 0 required. Got {0}"
+msgstr "parameter {0} > 0 krävs. Erhöll {1}."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
-#, java-format
-msgid "Changeset {0} is unchanged. Skipping update."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
 #, java-format
 msgid "Updating changeset {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
-msgid ""
-"Failed to update changeset. Either there is no current changeset or the id "
-"of the current changeset is 0"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
 msgid "Closing changeset..."
 msgstr "Stänger ändringssamling..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
-#, java-format
-msgid "Closing changeset {0}..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
-#, java-format
-msgid "Leaving changeset {0} open..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
 msgid "No changeset present for diff upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414
 msgid "Preparing..."
 msgstr "Förbereder..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419
 msgid "Uploading..."
 msgstr "Skickar in..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438
 msgid "Waiting 10 seconds ... "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449
 msgid "OK - trying again."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:485
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517
 #, java-format
 msgid "Starting retry {0} of {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
+msgid "current changeset is null. Can't upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
+#, java-format
+msgid "id of current changeset > required. Current id is {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
+#, java-format
+msgid "Open changeset expected. Got closed changeset with id {0}"
 msgstr ""
 
@@ -8905,33 +9131,92 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
+#, java-format
+msgid "missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:128
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:134
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
+#, java-format
+msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
+#, java-format
+msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
+#, java-format
+msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#, java-format
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#, java-format
+msgid "Unsupported version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:176
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Aborting."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#, java-format
+msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
+#, fuzzy
+msgid "Parsing list of changesets..."
+msgstr "Stänger ändringssamling..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
 msgid "Incorrect password or username."
 msgstr "Felaktigt lösenord eller användarnamn."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:168
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Varning: Lösenordet skickas okrypterat."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Save user and password (unencrypted)"
 msgstr "Spara användare och lösenord (okrypterat)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
 msgid "Enter Password"
 msgstr "Ange lösenord"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 msgid "Login"
 msgstr "Logga in"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:242
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
 msgid "The base URL for the OSM server (REST API)"
 msgstr "Bas-URL för OSM-servern (REST API)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
@@ -8939,17 +9224,17 @@
 "Lösenord för OSM-kontot. Lämna blankt för att inte spara något lösenord."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
 msgid "Base Server URL"
 msgstr "Bas-URL för servern"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
 msgid "OSM password"
 msgstr "OSM-lösenord"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -8958,5 +9243,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:51
+#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #, java-format
 msgid "(at line {0}, column {1})"
@@ -9046,20 +9331,5 @@
 msgstr "Fel vid tolkning."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124
-#, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
-#, fuzzy, java-format
-msgid "Missing mandatory attribute ''{0}''"
-msgstr "Det nödvändiga attributet \"{0}\" saknas."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
-#, fuzzy, java-format
-msgid "Unsupported version: {0}"
-msgstr "jämkad version:"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:155
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -9068,38 +9338,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
 msgid "found XML element <nd> element not as direct child of element <way>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
 msgid "Found XML element <member> not as direct child of element <relation>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
 #, java-format
 msgid ""
@@ -9107,24 +9377,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Ofullständig <roll>-specifikation med ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
-#, java-format
-msgid "Warning: Undefined element ''{0}'' found in input stream. Skipping."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
-#, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Skipping."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
 msgid "Illegal object with id=0"
 msgstr "Ogiltigt objekt med id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #, java-format
 msgid ""
@@ -9132,5 +9397,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:303
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
 #, java-format
 msgid ""
@@ -9139,5 +9404,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
 #, java-format
 msgid ""
@@ -9146,5 +9411,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
@@ -9154,25 +9419,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:316
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with id {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#, java-format
 msgid "Missing required attribute ''{0}''."
-msgstr "Det nödvändiga attributet \"{0}\" saknas."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
 #, java-format
 msgid ""
@@ -9180,5 +9445,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
 #, java-format
 msgid ""
@@ -9187,5 +9452,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
 #, java-format
 msgid ""
@@ -9193,24 +9458,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
+#, java-format
 msgid ""
 "Relation with external id ''{0}'' refers to missing primitive with external "
 "id ''{1}''"
-msgstr "kan inte jämföra primitiv id ''{0}'' med primitiv id ''{1}''"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
 msgid "Prepare OSM data..."
 msgstr "Förbereder OSM-data..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 msgid "Parsing OSM data..."
-msgstr "Förbereder OSM-data..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
 msgid "Preparing data set..."
-msgstr "Förbereder data..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
@@ -9231,4 +9494,24 @@
 msgid "Downloading referring relations ..."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51
+#, fuzzy
+msgid "Reading changesets..."
+msgstr "Stänger ändringssamling..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
+#, fuzzy
+msgid "Downloading changesets ..."
+msgstr "Stänger ändringssamling..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85
+#, fuzzy, java-format
+msgid "Reading changeset {0} ..."
+msgstr "Läser {0}..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91
+#, fuzzy, java-format
+msgid "Downloading changeset {0} ..."
+msgstr "Stänger ändringssamling..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
@@ -9245,10 +9528,14 @@
 msgstr "Tar kontakt med servern..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
 msgid "Failed to open connection to API {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
+msgid "Error: failed to add authentication credentials to the connection."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -9256,33 +9543,52 @@
 "Kunde inte ansluta till osm-servern. Kontrollera din internetanslutning."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+msgid "XML tag <user> is missing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
+#, fuzzy, java-format
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgstr "Använd snabbvalet ''{0}'' i gruppen ''{1}''"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
+#, java-format
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
 msgid "Starting to upload with one request per primitive ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
 msgid "Starting to upload in one request ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:171
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135
 msgid "Uploading data ..."
-msgstr "Skickar in..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:178
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
 msgid ""
 "WARNING: no API version defined for data to upload. Falling back to version "
@@ -9290,5 +9596,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147
 #, java-format
 msgid ""
@@ -9298,10 +9604,10 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
 msgid "Update Plugins"
 msgstr "Uppdatera insticksmoduler"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 msgid "Download Plugins"
 msgstr "Hämta insticksprogram"
@@ -9466,5 +9772,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -9473,18 +9779,18 @@
 msgstr[1] "Hämtade information om insticksmoduler från {0} ställen"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
 msgid "No plugin information found."
 msgstr "Kunde inte hitta någon information om insticksmoduler."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:93
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
 msgid "All installed plugins are up to date."
 msgstr "Alla installerade insticksmoduler är av senaste version."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
 #, java-format
 msgid ""
@@ -9497,9 +9803,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
 msgid "Download missing plugins"
 msgstr "Hämta saknade insticksmoduler"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
 #, java-format
 msgid ""
@@ -9514,43 +9820,43 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
 msgid "unknown"
 msgstr "okänd"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Version {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 msgid "Plugin bundled with JOSM"
 msgstr "Insticksmodul som medföljer JOSM"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:357
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -9875,10 +10181,4 @@
 msgid "(What does that mean?)"
 msgstr ""
-
-#. item "Relations/Route" text "Symbol description"
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3148
-msgid "Description"
-msgstr "Beskrivning"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
@@ -10650,6 +10950,7 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
-msgid "Set "
-msgstr ""
+#, fuzzy, java-format
+msgid "Set {0} Lambert coordinates"
+msgstr "Nollkoordinater: "
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -11272,6 +11573,6 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 #: build/trans_style.java:990 build/trans_style.java:1007
-#: build/trans_style.java:1023 build/trans_style.java:3392
-#: build/trans_style.java:3400
+#: build/trans_style.java:1023 build/trans_style.java:3400
+#: build/trans_style.java:3408
 msgid "water"
 msgstr "vatten"
@@ -11568,4 +11869,55 @@
 msgstr "Mätningar"
 
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Michigan Left"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Adds no left turn for sets of 4 or 5 ways."
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45
+#, fuzzy
+msgid "Please select 4 or 5 ways to assign no left turns."
+msgstr "Välj en eller flera slutna sträckor med åtminstone fyra noder."
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61
+#, fuzzy, java-format
+msgid "{0} extrem nodes."
+msgstr "{0} nod"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69
+#, java-format
+msgid "Via node {0}, {1}"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75
+#, fuzzy, java-format
+msgid "{0} via nodes."
+msgstr "{0} nod"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78
+msgid "Unable to find via nodes. Please check your selection"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98
+#, fuzzy, java-format
+msgid "MIddle way: {0}"
+msgstr "Läge: {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121
+msgid "Create Michigan left turn restriction"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129
+#, fuzzy, java-format
+msgid "Processing {0}"
+msgstr "Version {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142
+#, java-format
+msgid "Relation: from {0} to {1} via {2}"
+msgstr ""
+
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
 msgid "OpenLayers"
@@ -11718,7 +12070,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
-#, fuzzy
 msgid "create new objects"
-msgstr "Skapa ny nod"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
@@ -11782,7 +12133,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
-#, fuzzy
 msgid "Remote Control has been asked to create a new node."
-msgstr "Fjärrstyrning har begärts för att hämta data från API"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
@@ -12044,5 +12394,5 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:158
 msgid "JOSM Tag Editor Plugin"
 msgstr ""
@@ -12052,5 +12402,5 @@
 msgstr "Färgmarkera"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:370
 #, java-format
 msgid "Updating properties of up to {0} object"
@@ -12059,18 +12409,4 @@
 msgstr[1] "Uppdatera egenskaper för upp till {0} objekt"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44
-msgid "INFO: entering compatibilty mode for JOSM with Main.ds"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47
-msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49
-msgid ""
-"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-"found."
-msgstr ""
-
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
 msgid "Group"
@@ -12080,9 +12416,4 @@
 msgid "Item"
 msgstr "Objekt"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-msgid "Filter"
-msgstr "Filter"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63
@@ -12171,5 +12502,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2272
 msgid "Street name"
 msgstr "Gatunamn"
@@ -12337,8 +12668,4 @@
 msgid "Zoom (in metres)"
 msgstr "Zoomnivå (meter)"
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
-msgid "URL"
-msgstr "URL"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -12549,7 +12876,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501
-#, fuzzy
 msgid "Updating map ..."
-msgstr "Laddar up data"
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69
@@ -13047,7 +13373,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
-#: build/trans_style.java:4179
+#: build/trans_style.java:4159 build/trans_style.java:4166
+#: build/trans_style.java:4173 build/trans_style.java:4180
+#: build/trans_style.java:4187
 msgid "building"
 msgstr "byggnad (building)"
@@ -13061,5 +13387,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4186
+#: build/trans_style.java:4194
 msgid "area"
 msgstr "yta (area)"
@@ -13194,10 +13520,10 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:148
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:155
 msgid "Reached a junction"
 msgstr ""
@@ -13486,7 +13812,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
-#, fuzzy
 msgid "Overlap tiles"
-msgstr "Överlappande ytor."
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
@@ -13495,7 +13820,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
-#, fuzzy
 msgid "% of north:"
-msgstr "norr"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -13644,6 +13968,11 @@
 msgstr ""
 
+#. Plugin michigan_left
+#: build/trans_plugins.java:35
+msgid "Adds no left turn for sets of 4 or 5 ways"
+msgstr ""
+
 #. Plugin nearclick
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid ""
 "Simulates a click when you do a small and short drag. This is usefull for "
@@ -13653,15 +13982,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13669,5 +13998,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13675,5 +14004,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13682,15 +14011,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13699,10 +14028,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13711,15 +14040,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -13729,10 +14058,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin usertools
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -13741,5 +14070,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -13748,5 +14077,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -13755,5 +14084,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -13762,10 +14091,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -13821,4 +14150,10 @@
 #. <annotations>
 #: build/trans_presets.java:57
+#, fuzzy
+msgid "Highways"
+msgstr "landsväg"
+
+#. group "Highways"
+#: build/trans_presets.java:58
 msgid "Streets"
 msgstr "Vägar"
@@ -13829,5 +14164,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:58 build/trans_surveyor.java:72
+#: build/trans_presets.java:59 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Motorväg"
@@ -13836,5 +14171,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:61
+#: build/trans_presets.java:62
 msgid "Edit Motorway"
 msgstr "Redigera en motorväg"
@@ -13861,8 +14196,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:120 build/trans_presets.java:140
-#: build/trans_presets.java:177 build/trans_presets.java:197
-#: build/trans_presets.java:1557 build/trans_presets.java:3146
+#: build/trans_presets.java:65 build/trans_presets.java:101
+#: build/trans_presets.java:121 build/trans_presets.java:141
+#: build/trans_presets.java:178 build/trans_presets.java:198
+#: build/trans_presets.java:1560 build/trans_presets.java:3158
 msgid "Reference"
 msgstr "Referens"
@@ -13876,8 +14211,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:358
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:359
 msgid "Lanes"
 msgstr "Filer"
@@ -13894,15 +14229,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:224 build/trans_presets.java:280
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:373 build/trans_presets.java:388
-#: build/trans_presets.java:412 build/trans_presets.java:431
-#: build/trans_presets.java:452 build/trans_presets.java:472
-#: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1307
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:225 build/trans_presets.java:281
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:374 build/trans_presets.java:389
+#: build/trans_presets.java:413 build/trans_presets.java:432
+#: build/trans_presets.java:453 build/trans_presets.java:473
+#: build/trans_presets.java:511 build/trans_presets.java:667
+#: build/trans_presets.java:1310
 msgid "Max. speed (km/h)"
 msgstr "Största tillåtna hastighet (km/h)"
@@ -13939,16 +14274,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:293 build/trans_presets.java:306
-#: build/trans_presets.java:320 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:464
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:659 build/trans_presets.java:1300
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:294 build/trans_presets.java:307
+#: build/trans_presets.java:321 build/trans_presets.java:353
+#: build/trans_presets.java:405 build/trans_presets.java:425
+#: build/trans_presets.java:445 build/trans_presets.java:465
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:660 build/trans_presets.java:1303
 msgid "Oneway"
 msgstr "Enkelriktat"
@@ -13990,19 +14325,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:353
-#: build/trans_presets.java:362 build/trans_presets.java:405
-#: build/trans_presets.java:425 build/trans_presets.java:445
-#: build/trans_presets.java:465 build/trans_presets.java:485
-#: build/trans_presets.java:504 build/trans_presets.java:523
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:586 build/trans_presets.java:607
-#: build/trans_presets.java:628 build/trans_presets.java:660
-#: build/trans_presets.java:1301 build/trans_surveyor.java:12
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:354
+#: build/trans_presets.java:363 build/trans_presets.java:406
+#: build/trans_presets.java:426 build/trans_presets.java:446
+#: build/trans_presets.java:466 build/trans_presets.java:486
+#: build/trans_presets.java:505 build/trans_presets.java:524
+#: build/trans_presets.java:545 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629 build/trans_presets.java:661
+#: build/trans_presets.java:1304 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "Bro"
@@ -14038,19 +14373,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:354
-#: build/trans_presets.java:378 build/trans_presets.java:406
-#: build/trans_presets.java:426 build/trans_presets.java:446
-#: build/trans_presets.java:466 build/trans_presets.java:486
-#: build/trans_presets.java:505 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629 build/trans_presets.java:661
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:355
+#: build/trans_presets.java:379 build/trans_presets.java:407
+#: build/trans_presets.java:427 build/trans_presets.java:447
+#: build/trans_presets.java:467 build/trans_presets.java:487
+#: build/trans_presets.java:506 build/trans_presets.java:525
+#: build/trans_presets.java:546 build/trans_presets.java:567
+#: build/trans_presets.java:588 build/trans_presets.java:609
+#: build/trans_presets.java:630 build/trans_presets.java:662
+#: build/trans_presets.java:1305
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -14084,18 +14419,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:73 build/trans_presets.java:90
-#: build/trans_presets.java:110 build/trans_presets.java:129
-#: build/trans_presets.java:150 build/trans_presets.java:166
-#: build/trans_presets.java:186 build/trans_presets.java:205
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:355
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:467
-#: build/trans_presets.java:487 build/trans_presets.java:506
-#: build/trans_presets.java:525 build/trans_presets.java:546
-#: build/trans_presets.java:567 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:630
-#: build/trans_presets.java:662 build/trans_presets.java:1303
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:356
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:468
+#: build/trans_presets.java:488 build/trans_presets.java:507
+#: build/trans_presets.java:526 build/trans_presets.java:547
+#: build/trans_presets.java:568 build/trans_presets.java:589
+#: build/trans_presets.java:610 build/trans_presets.java:631
+#: build/trans_presets.java:663 build/trans_presets.java:1306
 msgid "Cutting"
 msgstr "Skärning"
@@ -14129,18 +14464,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:74 build/trans_presets.java:91
-#: build/trans_presets.java:111 build/trans_presets.java:130
-#: build/trans_presets.java:151 build/trans_presets.java:167
-#: build/trans_presets.java:187 build/trans_presets.java:206
-#: build/trans_presets.java:222 build/trans_presets.java:240
-#: build/trans_presets.java:258 build/trans_presets.java:277
-#: build/trans_presets.java:310 build/trans_presets.java:356
-#: build/trans_presets.java:408 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:468
-#: build/trans_presets.java:488 build/trans_presets.java:507
-#: build/trans_presets.java:526 build/trans_presets.java:547
-#: build/trans_presets.java:568 build/trans_presets.java:589
-#: build/trans_presets.java:610 build/trans_presets.java:631
-#: build/trans_presets.java:663 build/trans_presets.java:1304
+#: build/trans_presets.java:75 build/trans_presets.java:92
+#: build/trans_presets.java:112 build/trans_presets.java:131
+#: build/trans_presets.java:152 build/trans_presets.java:168
+#: build/trans_presets.java:188 build/trans_presets.java:207
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:357
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:469
+#: build/trans_presets.java:489 build/trans_presets.java:508
+#: build/trans_presets.java:527 build/trans_presets.java:548
+#: build/trans_presets.java:569 build/trans_presets.java:590
+#: build/trans_presets.java:611 build/trans_presets.java:632
+#: build/trans_presets.java:664 build/trans_presets.java:1307
 msgid "Embankment"
 msgstr "Bank"
@@ -14148,5 +14483,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Motorway Link"
 msgstr "Motorvägslänk"
@@ -14155,5 +14490,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:80
+#: build/trans_presets.java:81
 msgid "Edit Motorway Link"
 msgstr "Redigera en motorvägslänk"
@@ -14161,5 +14496,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:94
+#: build/trans_presets.java:95
 msgid "Trunk"
 msgstr "Stamväg"
@@ -14168,5 +14503,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:97
+#: build/trans_presets.java:98
 msgid "Edit Trunk"
 msgstr "Redigera en stamväg"
@@ -14176,6 +14511,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
 msgid "Motorroad"
 msgstr ""
@@ -14183,5 +14518,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:114
+#: build/trans_presets.java:115
 msgid "Trunk Link"
 msgstr "Stamvägslänk"
@@ -14190,5 +14525,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:117
+#: build/trans_presets.java:118
 msgid "Edit Trunk Link"
 msgstr "Redigera en stamvägslänk"
@@ -14201,5 +14536,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:134 build/trans_surveyor.java:76
+#: build/trans_presets.java:135 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Primär"
@@ -14208,5 +14543,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:137
+#: build/trans_presets.java:138
 msgid "Edit Primary Road"
 msgstr "Redigera en primär väg"
@@ -14214,10 +14549,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:154
+#: build/trans_presets.java:155
 msgid "Primary Link"
 msgstr "Primärvägslänk"
 
 #. item
-#: build/trans_presets.java:155
+#: build/trans_presets.java:156
 msgid "Edit Primary Link"
 msgstr "Redigera en primärvägslänk"
@@ -14229,5 +14564,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:170 build/trans_surveyor.java:80
+#: build/trans_presets.java:171 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "Sekundär"
@@ -14237,5 +14572,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:174
+#: build/trans_presets.java:175
 msgid "Edit Secondary Road"
 msgstr "Redigera en sekundär väg"
@@ -14243,5 +14578,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:190
+#: build/trans_presets.java:191
 msgid "Tertiary"
 msgstr "Tertiär"
@@ -14251,5 +14586,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:194
+#: build/trans_presets.java:195
 msgid "Edit Tertiary Road"
 msgstr "Redigera en tertiär väg"
@@ -14261,5 +14596,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:209 build/trans_surveyor.java:84
+#: build/trans_presets.java:210 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "Oklassificerad"
@@ -14269,5 +14604,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:213
+#: build/trans_presets.java:214
 msgid "Edit Unclassified Road"
 msgstr "Redigera en oklassificerad väg"
@@ -14294,19 +14629,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:225 build/trans_presets.java:243
-#: build/trans_presets.java:261 build/trans_presets.java:281
-#: build/trans_presets.java:314 build/trans_presets.java:359
-#: build/trans_presets.java:375 build/trans_presets.java:389
-#: build/trans_presets.java:413 build/trans_presets.java:432
-#: build/trans_presets.java:453 build/trans_presets.java:473
-#: build/trans_presets.java:491 build/trans_presets.java:511
-#: build/trans_presets.java:532 build/trans_presets.java:553
-#: build/trans_presets.java:574 build/trans_presets.java:595
-#: build/trans_presets.java:616 build/trans_presets.java:637
-#: build/trans_presets.java:667 build/trans_presets.java:680
-#: build/trans_presets.java:693 build/trans_presets.java:706
-#: build/trans_presets.java:719 build/trans_presets.java:732
-#: build/trans_presets.java:745 build/trans_presets.java:1308
-#: build/trans_presets.java:1498 build/trans_presets.java:1540
+#: build/trans_presets.java:226 build/trans_presets.java:244
+#: build/trans_presets.java:262 build/trans_presets.java:282
+#: build/trans_presets.java:315 build/trans_presets.java:360
+#: build/trans_presets.java:376 build/trans_presets.java:390
+#: build/trans_presets.java:414 build/trans_presets.java:433
+#: build/trans_presets.java:454 build/trans_presets.java:474
+#: build/trans_presets.java:492 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:554
+#: build/trans_presets.java:575 build/trans_presets.java:596
+#: build/trans_presets.java:617 build/trans_presets.java:638
+#: build/trans_presets.java:668 build/trans_presets.java:681
+#: build/trans_presets.java:694 build/trans_presets.java:707
+#: build/trans_presets.java:720 build/trans_presets.java:733
+#: build/trans_presets.java:746 build/trans_presets.java:1311
+#: build/trans_presets.java:1501 build/trans_presets.java:1543
 msgid "Width (meters)"
 msgstr "Bredd (meter)"
@@ -14318,5 +14653,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:228 build/trans_surveyor.java:88
+#: build/trans_presets.java:229 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Bostadsområde"
@@ -14325,5 +14660,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:231
+#: build/trans_presets.java:232
 msgid "Edit Residential Street"
 msgstr "Redigera en gata i bostadsområde"
@@ -14348,14 +14683,14 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:611
-#: build/trans_presets.java:632 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "Surface"
 msgstr "Yta"
@@ -14376,53 +14711,53 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paved"
 msgstr "belagd"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "unpaved"
 msgstr "obelagd"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
 msgid "metal"
 msgstr ""
@@ -14436,22 +14771,22 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
-#: build/trans_style.java:3367
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
+#: build/trans_style.java:3375
 msgid "wood"
 msgstr "skog"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paving_stones"
 msgstr ""
@@ -14459,77 +14794,77 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "cobblestone"
 msgstr "kullersten"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "gravel"
 msgstr "grus"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "grass"
 msgstr "gräs"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "sand"
 msgstr "sand"
@@ -14537,13 +14872,13 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "ground"
 msgstr ""
@@ -14551,5 +14886,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:246
+#: build/trans_presets.java:247
 msgid "Living Street"
 msgstr "Gårdsgata"
@@ -14558,5 +14893,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:249
+#: build/trans_presets.java:250
 msgid "Edit Living Street"
 msgstr "Redigera en gårdsgata"
@@ -14564,5 +14899,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:264
+#: build/trans_presets.java:265
 msgid "Service"
 msgstr "Tillfartsväg"
@@ -14571,5 +14906,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:267
+#: build/trans_presets.java:268
 msgid "Edit Serviceway"
 msgstr "Redigera en tillfartsväg"
@@ -14579,18 +14914,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "Serviceway type"
 msgstr "Type av tillfartsväg"
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "alley"
 msgstr "gränd"
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "driveway"
 msgstr "uppfart"
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "parking_aisle"
 msgstr ""
@@ -14598,5 +14933,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:284
+#: build/trans_presets.java:285
 msgid "Parking Aisle"
 msgstr ""
@@ -14606,5 +14941,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:288
+#: build/trans_presets.java:289
 msgid "Edit Parking Aisle"
 msgstr ""
@@ -14612,5 +14947,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:298
+#: build/trans_presets.java:299
 msgid "Road (Unknown Type)"
 msgstr "Väg (okänd typ)"
@@ -14619,5 +14954,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Edit Road of unknown type"
 msgstr "Redigera en väg av okänd typ"
@@ -14626,20 +14961,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:318
+#: build/trans_presets.java:319
 msgid "Road Restrictions"
 msgstr "Vägbegränsningar"
 
 #. item
-#: build/trans_presets.java:319
+#: build/trans_presets.java:320
 msgid "Edit Road Restrictions"
 msgstr "Redigera vägbegränsningar"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:321
+#: build/trans_presets.java:322
 msgid "Toll"
 msgstr "Betalstation"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:322
+#: build/trans_presets.java:323
 msgid "No exit (cul-de-sac)"
 msgstr "Återvändsgränd"
@@ -14652,8 +14987,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:323 build/trans_presets.java:529
-#: build/trans_presets.java:550 build/trans_presets.java:571
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:634
+#: build/trans_presets.java:324 build/trans_presets.java:530
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:593 build/trans_presets.java:614
+#: build/trans_presets.java:635
 msgid "Access"
 msgstr ""
@@ -14707,29 +15042,29 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1397
-#: build/trans_presets.java:1398 build/trans_presets.java:1399
-#: build/trans_presets.java:1763 build/trans_presets.java:1773
-#: build/trans_presets.java:2397 build/trans_presets.java:2433
-#: build/trans_presets.java:2442 build/trans_presets.java:2443
-#: build/trans_presets.java:2444 build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:1396
+#: build/trans_presets.java:1397 build/trans_presets.java:1400
+#: build/trans_presets.java:1401 build/trans_presets.java:1402
+#: build/trans_presets.java:1767 build/trans_presets.java:1777
+#: build/trans_presets.java:2408 build/trans_presets.java:2444
+#: build/trans_presets.java:2453 build/trans_presets.java:2454
+#: build/trans_presets.java:2455 build/trans_presets.java:2725
 msgid "yes"
 msgstr "ja"
@@ -14742,40 +15077,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:212
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:212
 msgid "private"
 msgstr "privat"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655
 msgid "designated"
 msgstr "avsedd för"
@@ -14788,19 +15123,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:219
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:219
 msgid "destination"
 msgstr "mål"
@@ -14823,71 +15158,71 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:205
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:205
 msgid "permissive"
 msgstr "med tillåtelse"
 
-#: build/trans_presets.java:323 build/trans_presets.java:327
-#: build/trans_presets.java:330 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636
+#: build/trans_presets.java:324 build/trans_presets.java:328
+#: build/trans_presets.java:331 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637
 msgid "agricultural"
 msgstr "jordbruksfordon"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
-#: build/trans_presets.java:2433 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1396 build/trans_presets.java:1397
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
+#: build/trans_presets.java:2444 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
+#: build/trans_presets.java:2725
 msgid "no"
 msgstr "nej"
 
-#: build/trans_presets.java:326
+#: build/trans_presets.java:327
 msgid "Goods"
 msgstr "Lätt lastbil"
 
-#: build/trans_presets.java:327
+#: build/trans_presets.java:328
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Tung lastbil"
@@ -14902,10 +15237,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:328 build/trans_presets.java:651
-#: build/trans_presets.java:858 build/trans_presets.java:891
-#: build/trans_presets.java:913 build/trans_presets.java:950
-#: build/trans_presets.java:963 build/trans_presets.java:975
-#: build/trans_presets.java:987 build/trans_presets.java:999
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:329 build/trans_presets.java:652
+#: build/trans_presets.java:859 build/trans_presets.java:892
+#: build/trans_presets.java:914 build/trans_presets.java:951
+#: build/trans_presets.java:964 build/trans_presets.java:976
+#: build/trans_presets.java:988 build/trans_presets.java:1000
+#: build/trans_presets.java:1040
 msgid "Horse"
 msgstr "Häst"
@@ -14921,13 +15256,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:329 build/trans_presets.java:530
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:635 build/trans_presets.java:859
-#: build/trans_presets.java:877 build/trans_presets.java:892
-#: build/trans_presets.java:914 build/trans_presets.java:951
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:330 build/trans_presets.java:531
+#: build/trans_presets.java:552 build/trans_presets.java:573
+#: build/trans_presets.java:594 build/trans_presets.java:615
+#: build/trans_presets.java:636 build/trans_presets.java:860
+#: build/trans_presets.java:878 build/trans_presets.java:893
+#: build/trans_presets.java:915 build/trans_presets.java:952
+#: build/trans_presets.java:965 build/trans_presets.java:977
+#: build/trans_presets.java:989 build/trans_presets.java:1001
+#: build/trans_presets.java:1041
 msgid "Motorcycle"
 msgstr "Motorcykel"
@@ -14942,30 +15277,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:330 build/trans_presets.java:531
-#: build/trans_presets.java:552 build/trans_presets.java:573
-#: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:636 build/trans_presets.java:654
-#: build/trans_presets.java:878 build/trans_presets.java:893
-#: build/trans_presets.java:915 build/trans_presets.java:952
-#: build/trans_presets.java:965 build/trans_presets.java:977
-#: build/trans_presets.java:989 build/trans_presets.java:1001
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:331 build/trans_presets.java:532
+#: build/trans_presets.java:553 build/trans_presets.java:574
+#: build/trans_presets.java:595 build/trans_presets.java:616
+#: build/trans_presets.java:637 build/trans_presets.java:655
+#: build/trans_presets.java:879 build/trans_presets.java:894
+#: build/trans_presets.java:916 build/trans_presets.java:953
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1042
 msgid "Motorcar"
 msgstr "Bil"
 
-#: build/trans_presets.java:331
+#: build/trans_presets.java:332
 msgid "Public Service Vehicles (psv)"
 msgstr "Allmänna transportmedel (psv)"
 
-#: build/trans_presets.java:332
+#: build/trans_presets.java:333
 msgid "Motorboat"
 msgstr "Motorbåt"
 
-#: build/trans_presets.java:333
+#: build/trans_presets.java:334
 msgid "Boat"
 msgstr "Båt"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:336
 msgid "Min. speed (km/h)"
 msgstr "Minsta tillåtna hastighet (km/h)"
@@ -14973,25 +15308,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:336 build/trans_presets.java:374
+#: build/trans_presets.java:337 build/trans_presets.java:375
 msgid "Max. weight (tonnes)"
 msgstr "Största tillåtna vikt (ton)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:337
+#: build/trans_presets.java:338
 msgid "Max. Height (meters)"
 msgstr "Största tillåtna höjd (meter)"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Max. Width (meters)"
 msgstr "Största tillåtna bredd (meter)"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:339
+#: build/trans_presets.java:340
 msgid "Max. Length (meters)"
 msgstr "Största tillåtna längd (meter)"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:341
+#: build/trans_presets.java:342
 msgid "Roundabout"
 msgstr "Rondell"
@@ -15002,5 +15337,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:346
+#: build/trans_presets.java:347
 msgid "Edit Junction"
 msgstr "Redigera en korsning"
@@ -15022,9 +15357,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:349 build/trans_presets.java:648
-#: build/trans_presets.java:788 build/trans_presets.java:1135
-#: build/trans_presets.java:1392 build/trans_presets.java:2353
-#: build/trans_presets.java:2901 build/trans_presets.java:2911
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:350 build/trans_presets.java:649
+#: build/trans_presets.java:789 build/trans_presets.java:1137
+#: build/trans_presets.java:1395 build/trans_presets.java:2364
+#: build/trans_presets.java:2913 build/trans_presets.java:2923
+#: build/trans_presets.java:2932
 msgid "Type"
 msgstr "Typ"
@@ -15044,10 +15379,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:547
+#: build/trans_presets.java:350 build/trans_style.java:547
 #: build/trans_style.java:555
 msgid "motorway"
 msgstr "motorväg"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "motorway_link"
 msgstr "motorvägslänk"
@@ -15069,10 +15404,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:563
+#: build/trans_presets.java:350 build/trans_style.java:563
 #: build/trans_style.java:571
 msgid "trunk"
 msgstr "stamväg"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "trunk_link"
 msgstr "stamvägslänk"
@@ -15094,10 +15429,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:579
+#: build/trans_presets.java:350 build/trans_style.java:579
 #: build/trans_style.java:587
 msgid "primary"
 msgstr "primärväg"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "primary_link"
 msgstr "primärvägslänk"
@@ -15119,5 +15454,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:595
+#: build/trans_presets.java:350 build/trans_style.java:595
 #: build/trans_style.java:603
 msgid "secondary"
@@ -15132,9 +15467,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:349 build/trans_style.java:611
+#: build/trans_presets.java:350 build/trans_style.java:611
 msgid "tertiary"
 msgstr "tertiärväg"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "unclassified"
 msgstr "oklassificerad"
@@ -15148,9 +15483,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:349 build/trans_style.java:3143
+#: build/trans_presets.java:350 build/trans_style.java:3151
 msgid "residential"
 msgstr "bostadsgata"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "living_street"
 msgstr "gårdsgata"
@@ -15180,10 +15515,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:349 build/trans_style.java:667
-#: build/trans_style.java:4244
+#: build/trans_presets.java:350 build/trans_style.java:667
+#: build/trans_style.java:4252
 msgid "service"
 msgstr "tillfartsväg"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "bus_guideway"
 msgstr "buss_spårväg"
@@ -15213,6 +15548,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:349 build/trans_style.java:877
-#: build/trans_style.java:3208 build/trans_style.java:3209
+#: build/trans_presets.java:350 build/trans_style.java:877
+#: build/trans_style.java:3216 build/trans_style.java:3217
 msgid "construction"
 msgstr "under byggnad"
@@ -15223,10 +15558,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Edit Bridge"
 msgstr "Redigera en bro"
 
 #. item
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "Edit Tunnel"
 msgstr "Redigera en tunnel"
@@ -15234,19 +15569,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:393
+#: build/trans_presets.java:394
 msgid "Ways"
 msgstr "Stigar och småvägar"
 
 #. group "Ways"
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Construction"
 msgstr "Under byggnad"
 
 #. item
-#: build/trans_presets.java:395
+#: build/trans_presets.java:396
 msgid "Edit Highway Under Construction"
 msgstr "Redigera en väg under byggnad"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "Junction"
 msgstr "Korsning"
@@ -15262,5 +15597,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:411 build/trans_style.java:895
+#: build/trans_presets.java:412 build/trans_style.java:895
 msgid "roundabout"
 msgstr "rondell"
@@ -15269,5 +15604,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:417
+#: build/trans_presets.java:418
 msgid "Bridleway"
 msgstr "Gång-/Ridstig"
@@ -15275,5 +15610,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:419
+#: build/trans_presets.java:420
 msgid "Edit Bridleway"
 msgstr "Redigera en gång-/ridstig"
@@ -15281,5 +15616,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:435
+#: build/trans_presets.java:436
 msgid "Cycleway"
 msgstr "Cykelbana"
@@ -15289,10 +15624,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:439
+#: build/trans_presets.java:440
 msgid "Edit Cycleway"
 msgstr "Redigera en cykelbana"
 
 #. item "Ways/Cycleway" check "Embankment"
-#: build/trans_presets.java:449
+#: build/trans_presets.java:450
 msgid "Pedestrians"
 msgstr ""
@@ -15300,5 +15635,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Footway"
 msgstr "Gångstig"
@@ -15307,10 +15642,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Footway"
 msgstr "Redigera en gångstig"
 
 #. item "Ways/Footway" check "Embankment"
-#: build/trans_presets.java:469
+#: build/trans_presets.java:470
 msgid "Bikes"
 msgstr ""
@@ -15318,5 +15653,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:476
+#: build/trans_presets.java:477
 msgid "Pedestrian"
 msgstr "Gågata"
@@ -15325,5 +15660,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Edit Pedestrian Street"
 msgstr "Redigera en gågata"
@@ -15331,5 +15666,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:494
+#: build/trans_presets.java:495
 msgid "Steps"
 msgstr "Trappsteg"
@@ -15339,5 +15674,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:498
+#: build/trans_presets.java:499
 msgid "Edit Flight of Steps"
 msgstr "Redigera en trappa"
@@ -15346,5 +15681,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:515
+#: build/trans_presets.java:516
 msgid "Track"
 msgstr "Bruksväg"
@@ -15353,5 +15688,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:518
+#: build/trans_presets.java:519
 msgid "Edit Track"
 msgstr "Redigera en bruksväg"
@@ -15359,5 +15694,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:535
+#: build/trans_presets.java:536
 msgid "Track Grade 1"
 msgstr "Bruksväg klass 1"
@@ -15366,5 +15701,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:538
+#: build/trans_presets.java:539
 msgid "Edit Track of grade 1"
 msgstr "Redigera en bruksväg klass 1"
@@ -15372,5 +15707,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:556
+#: build/trans_presets.java:557
 msgid "Track Grade 2"
 msgstr "Bruksväg klass 2"
@@ -15379,5 +15714,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:559
+#: build/trans_presets.java:560
 msgid "Edit Track of grade 2"
 msgstr "Redigera en bruksväg klass 2"
@@ -15385,5 +15720,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:577
+#: build/trans_presets.java:578
 msgid "Track Grade 3"
 msgstr "Bruksväg klass 3"
@@ -15392,5 +15727,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:580
+#: build/trans_presets.java:581
 msgid "Edit Track of grade 3"
 msgstr "Redigera en bruksväg klass 3"
@@ -15398,5 +15733,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:598
+#: build/trans_presets.java:599
 msgid "Track Grade 4"
 msgstr "Bruksväg klass 4"
@@ -15405,5 +15740,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:601
+#: build/trans_presets.java:602
 msgid "Edit Track of grade 4"
 msgstr "Redigera en bruksväg klass 4"
@@ -15411,5 +15746,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:619
+#: build/trans_presets.java:620
 msgid "Track Grade 5"
 msgstr "Bruksväg klass 5"
@@ -15418,5 +15753,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:622
+#: build/trans_presets.java:623
 msgid "Edit Track of grade 5"
 msgstr "Redigera en bruksväg klass 5"
@@ -15425,5 +15760,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:641
+#: build/trans_presets.java:642
 msgid "Path"
 msgstr "Stig"
@@ -15432,13 +15767,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:644
+#: build/trans_presets.java:645
 msgid "Edit Path"
 msgstr "Redigera en stig"
 
-#: build/trans_presets.java:652
+#: build/trans_presets.java:653
 msgid "Ski"
 msgstr "Skidor"
 
-#: build/trans_presets.java:653
+#: build/trans_presets.java:654
 msgid "Snowmobile"
 msgstr "Snöskoter"
@@ -15448,6 +15783,6 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:670 build/trans_presets.java:1725
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:671 build/trans_presets.java:1729
+#: build/trans_presets.java:1752
 msgid "Hiking"
 msgstr "Vandringsled"
@@ -15457,5 +15792,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:674
+#: build/trans_presets.java:675
 msgid "Edit Hiking"
 msgstr "Redigera en vandringsled"
@@ -15463,5 +15798,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:683
+#: build/trans_presets.java:684
 msgid "Mountain Hiking"
 msgstr "Bergsvandringsled"
@@ -15471,5 +15806,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:687
+#: build/trans_presets.java:688
 msgid "Edit Mountain Hiking"
 msgstr "Redigera en bergsvandringsled"
@@ -15477,5 +15812,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:696
+#: build/trans_presets.java:697
 msgid "Demanding Mountain Hiking"
 msgstr "Krävande bergsvandringsled"
@@ -15485,5 +15820,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:700
+#: build/trans_presets.java:701
 msgid "Edit Demanding Mountain Hiking"
 msgstr "Redigera en krävande bergsvandringsled"
@@ -15491,5 +15826,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:709
+#: build/trans_presets.java:710
 msgid "Alpine Hiking"
 msgstr "Fjällvandringsled"
@@ -15499,5 +15834,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:713
+#: build/trans_presets.java:714
 msgid "Edit Alpine Hiking"
 msgstr "Redigera en fjällvandringsled"
@@ -15505,5 +15840,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:723
 msgid "Demanding Alpine Hiking"
 msgstr "Krävande fjällvandringsled"
@@ -15513,5 +15848,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:726
+#: build/trans_presets.java:727
 msgid "Edit Demanding Alpine Hiking"
 msgstr "Redigera en krävande fjällvandringsled"
@@ -15519,5 +15854,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:735
+#: build/trans_presets.java:736
 msgid "Difficult Alpine Hiking"
 msgstr "Svår fjällvandringsled"
@@ -15527,5 +15862,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:739
+#: build/trans_presets.java:740
 msgid "Edit Difficult Alpine Hiking"
 msgstr "Redigera en svår fjällvandringsled"
@@ -15533,10 +15868,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:749
+#: build/trans_presets.java:750
 msgid "Waypoints"
 msgstr "Vägpunkter"
 
 #. group "Waypoints"
-#: build/trans_presets.java:750
+#: build/trans_presets.java:751
 msgid "Motorway Junction"
 msgstr "Motorvägskorsning"
@@ -15544,15 +15879,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:752
+#: build/trans_presets.java:753
 msgid "Edit Motorway Junction"
 msgstr "Redigera en motorvägskorsning"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:757
 msgid "Number"
 msgstr "Nummer"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:759
 msgid "Services"
 msgstr ""
@@ -15560,5 +15895,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:761
 msgid "Edit Service Station"
 msgstr ""
@@ -15596,15 +15931,15 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:765 build/trans_presets.java:902
-#: build/trans_presets.java:1382 build/trans_presets.java:1406
-#: build/trans_presets.java:1413 build/trans_presets.java:1419
-#: build/trans_presets.java:1427 build/trans_presets.java:1434
-#: build/trans_presets.java:1761 build/trans_presets.java:1771
-#: build/trans_presets.java:2361 build/trans_presets.java:2368
-#: build/trans_presets.java:2384 build/trans_presets.java:2395
-#: build/trans_presets.java:2403 build/trans_presets.java:2410
-#: build/trans_presets.java:2464 build/trans_presets.java:2512
-#: build/trans_presets.java:2678 build/trans_presets.java:2693
-#: build/trans_presets.java:2732 build/trans_presets.java:3151
+#: build/trans_presets.java:766 build/trans_presets.java:903
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
+#: build/trans_presets.java:1416 build/trans_presets.java:1422
+#: build/trans_presets.java:1430 build/trans_presets.java:1437
+#: build/trans_presets.java:1765 build/trans_presets.java:1775
+#: build/trans_presets.java:2372 build/trans_presets.java:2379
+#: build/trans_presets.java:2395 build/trans_presets.java:2406
+#: build/trans_presets.java:2414 build/trans_presets.java:2421
+#: build/trans_presets.java:2475 build/trans_presets.java:2523
+#: build/trans_presets.java:2689 build/trans_presets.java:2704
+#: build/trans_presets.java:2743 build/trans_presets.java:3163
 msgid "Operator"
 msgstr "Operatör"
@@ -15613,5 +15948,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:769
+#: build/trans_presets.java:770
 msgid "Traffic Signal"
 msgstr "Trafikljus"
@@ -15621,5 +15956,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:774
 msgid "Pedestrian crossing type"
 msgstr "Typ av övergångsställe"
@@ -15628,27 +15963,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "uncontrolled"
 msgstr "obevakad"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "traffic_signals"
 msgstr "trafikljus"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "island"
 msgstr "ö"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "unmarked"
 msgstr "utan markering"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:774 build/trans_presets.java:790
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:775 build/trans_presets.java:791
+#: build/trans_presets.java:1334
 msgid "Cross on horseback"
 msgstr "Korsa ridande"
@@ -15656,6 +15991,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:775 build/trans_presets.java:789
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:776 build/trans_presets.java:790
+#: build/trans_presets.java:1335
 msgid "Cross by bicycle"
 msgstr "Korsa cyklande"
@@ -15664,11 +15999,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:776 build/trans_presets.java:791
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:1336
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:778
 msgid "Crossing type name (UK)"
 msgstr "Brittiskt namn på övergångsställe"
@@ -15676,30 +16011,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "zebra"
 msgstr "övergångsställe"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pelican"
 msgstr "pelican"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "toucan"
 msgstr "toucan"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "puffin"
 msgstr "puffin"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pegasus"
 msgstr "pegasus"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "tiger"
 msgstr "tiger"
 
 #. </optional>
-#: build/trans_presets.java:780
+#: build/trans_presets.java:781
 msgid "Stop"
 msgstr "Stopp"
@@ -15707,5 +16042,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:783
+#: build/trans_presets.java:784
 msgid "Pedestrian Crossing"
 msgstr "Övergångsställe för fotgängare"
@@ -15714,14 +16049,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:786
+#: build/trans_presets.java:787
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:793
 msgid "Type name (UK)"
 msgstr "Brittiskt typnamn"
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:795
 msgid "Mini-roundabout"
 msgstr "Minirondell"
@@ -15732,14 +16067,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "Direction"
 msgstr "Riktning"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "clockwise"
 msgstr "medurs"
 
-#: build/trans_presets.java:801
+#: build/trans_presets.java:802
 msgid "Turning Circle"
 msgstr "Vändplats"
@@ -15749,20 +16084,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:806
+#: build/trans_presets.java:807
 msgid "City Limit"
 msgstr "Stadsgräns"
 
 #. item
-#: build/trans_presets.java:807
+#: build/trans_presets.java:808
 msgid "Edit City Limit Sign"
 msgstr "Redigera en stadsgränsskylt"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:812
+#: build/trans_presets.java:813
 msgid "Second Name"
 msgstr "Andra namn"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:814
+#: build/trans_presets.java:815
 msgid "Speed Camera"
 msgstr "Hastighetskamera"
@@ -15770,5 +16105,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:817
+#: build/trans_presets.java:818
 msgid "Emergency Phone"
 msgstr "Nödtelefon"
@@ -15776,5 +16111,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:820
+#: build/trans_presets.java:821
 msgid "Incline"
 msgstr ""
@@ -15782,5 +16117,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:823
+#: build/trans_presets.java:824
 msgid "Incline Steep"
 msgstr ""
@@ -15789,10 +16124,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:827
+#: build/trans_presets.java:828
 msgid "Ford"
 msgstr "Vadställe"
 
 #. item
-#: build/trans_presets.java:828
+#: build/trans_presets.java:829
 msgid "Edit Ford"
 msgstr "Redigera ett vadställe"
@@ -15800,5 +16135,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:835
+#: build/trans_presets.java:836
 msgid "Mountain Pass"
 msgstr "Bergspass"
@@ -15806,5 +16141,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:837
+#: build/trans_presets.java:838
 msgid "Edit Mountain Pass"
 msgstr "Redigera ett bergspass"
@@ -15816,7 +16151,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:842 build/trans_presets.java:1600
-#: build/trans_presets.java:1745 build/trans_presets.java:2845
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:843 build/trans_presets.java:1604
+#: build/trans_presets.java:1749 build/trans_presets.java:2857
+#: build/trans_presets.java:2864 build/trans_presets.java:2871
 msgid "Elevation"
 msgstr "Höjd"
@@ -15824,5 +16159,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:846
+#: build/trans_presets.java:847
 msgid "Barriers"
 msgstr "Hinder"
@@ -15830,5 +16165,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:849
+#: build/trans_presets.java:850
 msgid "Bollard"
 msgstr "Trafikkon"
@@ -15836,5 +16171,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:852
 msgid "Edit Bollard"
 msgstr "Redigera en trafikkon"
@@ -15879,16 +16214,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:854 build/trans_presets.java:873
-#: build/trans_presets.java:887 build/trans_presets.java:909
-#: build/trans_presets.java:946 build/trans_presets.java:959
-#: build/trans_presets.java:971 build/trans_presets.java:983
-#: build/trans_presets.java:995 build/trans_presets.java:1007
-#: build/trans_presets.java:1017 build/trans_presets.java:1026
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:855 build/trans_presets.java:874
+#: build/trans_presets.java:888 build/trans_presets.java:910
+#: build/trans_presets.java:947 build/trans_presets.java:960
+#: build/trans_presets.java:972 build/trans_presets.java:984
+#: build/trans_presets.java:996 build/trans_presets.java:1008
+#: build/trans_presets.java:1018 build/trans_presets.java:1027
+#: build/trans_presets.java:1036
 msgid "Allowed traffic:"
 msgstr "Tillåten trafik:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:861
+#: build/trans_presets.java:862
 msgid "Cycle Barrier"
 msgstr ""
@@ -15897,5 +16232,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:865
+#: build/trans_presets.java:866
 msgid "Block"
 msgstr ""
@@ -15903,5 +16238,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:868
+#: build/trans_presets.java:869
 msgid "Cattle Grid"
 msgstr "Färist"
@@ -15909,10 +16244,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:870
+#: build/trans_presets.java:871
 msgid "Edit Cattle Grid"
 msgstr "Redigera en färist"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:880
+#: build/trans_presets.java:881
 msgid "Bus Trap"
 msgstr "Bussfålla"
@@ -15920,15 +16255,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:883
+#: build/trans_presets.java:884
 msgid "Spikes"
 msgstr "Spikhinder"
 
 #. item
-#: build/trans_presets.java:884
+#: build/trans_presets.java:885
 msgid "Edit Spikes"
 msgstr "Redigera spikhinder"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:896
 msgid "Toll Booth"
 msgstr "Betalstation"
@@ -15936,5 +16271,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:897
+#: build/trans_presets.java:898
 msgid "Edit Toll Booth"
 msgstr "Redigera betalstation"
@@ -15942,10 +16277,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:905
+#: build/trans_presets.java:906
 msgid "Border Control"
 msgstr "Gränskontroll"
 
 #. item
-#: build/trans_presets.java:906
+#: build/trans_presets.java:907
 msgid "Edit Border Control"
 msgstr "Redigera en gränskontroll"
@@ -15955,5 +16290,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:920
+#: build/trans_presets.java:921
 msgid "Hedge"
 msgstr "Häck"
@@ -15962,5 +16297,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:925
 msgid "Fence"
 msgstr "Stängsel"
@@ -15969,5 +16304,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:929
 msgid "Wall"
 msgstr "Mur"
@@ -15975,5 +16310,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:931
+#: build/trans_presets.java:932
 msgid "City Wall"
 msgstr "Stadsmur"
@@ -15982,5 +16317,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:935
+#: build/trans_presets.java:936
 msgid "Retaining Wall"
 msgstr "Stödmur"
@@ -15992,15 +16327,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:942
+#: build/trans_presets.java:943
 msgid "Entrance"
 msgstr "Ingång"
 
 #. item
-#: build/trans_presets.java:943
+#: build/trans_presets.java:944
 msgid "Edit Entrance"
 msgstr "Redigera en ingång"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:954
+#: build/trans_presets.java:955
 msgid "Gate"
 msgstr "Grind"
@@ -16008,50 +16343,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:956
+#: build/trans_presets.java:957
 msgid "Edit Gate"
 msgstr "Redigera en grind"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:967
+#: build/trans_presets.java:968
 msgid "Lift Gate"
 msgstr "Bom"
 
 #. item
-#: build/trans_presets.java:968
+#: build/trans_presets.java:969
 msgid "Edit Lift Gate"
 msgstr "Redigera en bom"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:979
+#: build/trans_presets.java:980
 msgid "Hampshire Gate"
 msgstr "Taggtrådsgrind"
 
 #. item
-#: build/trans_presets.java:980
+#: build/trans_presets.java:981
 msgid "Edit Hampshire Gate"
 msgstr "Redigera en taggtrådsgrind"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:991
+#: build/trans_presets.java:992
 msgid "Bump Gate"
 msgstr "Fösgrind"
 
 #. item
-#: build/trans_presets.java:992
+#: build/trans_presets.java:993
 msgid "Edit Bump Gate"
 msgstr "Redigera en fösgrind"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:1003
+#: build/trans_presets.java:1004
 msgid "Kissing Gate"
 msgstr "Manshål"
 
 #. item
-#: build/trans_presets.java:1004
+#: build/trans_presets.java:1005
 msgid "Edit Kissing Gate"
 msgstr "Redigera ett manshål"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1013
 msgid "Stile"
 msgstr "Stätta"
@@ -16059,25 +16394,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1014
+#: build/trans_presets.java:1015
 msgid "Edit Stile"
 msgstr "Redigera en stätta"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1023
 msgid "Turnstile"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1024
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1032
 msgid "Sally Port"
 msgstr "Utfallsport"
 
 #. item
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1033
 msgid "Edit Sally Port"
 msgstr "Redigera en utfallsport"
@@ -16085,13 +16420,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #.
-#. <separator/>
+#. group "Water"
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1046 build/trans_presets.java:1089
+#: build/trans_presets.java:1047 build/trans_presets.java:1048
+#: build/trans_presets.java:1091
 msgid "Water"
 msgstr "Vatten"
 
 #. group "Water"
-#: build/trans_presets.java:1047
+#: build/trans_presets.java:1049
 msgid "Spring"
 msgstr "Källa"
@@ -16099,5 +16435,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1049
+#: build/trans_presets.java:1051
 msgid "Edit Spring"
 msgstr "Redigera en källa"
@@ -16105,5 +16441,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1056
 msgid "Drain"
 msgstr "Avlopp"
@@ -16111,10 +16447,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1058
 msgid "Edit Drain"
 msgstr "Redigera en avloppsränna"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1064
 msgid "Stream"
 msgstr "Bäck"
@@ -16122,10 +16458,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1066
 msgid "Edit Stream"
 msgstr "Redigera en bäck"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1072
 msgid "Canal"
 msgstr "Kanal"
@@ -16133,10 +16469,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1074
 msgid "Edit Canal"
 msgstr "Redigera en kanal"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1080
 msgid "River"
 msgstr "Flod"
@@ -16146,5 +16482,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1084
 msgid "Edit River"
 msgstr "Redigera en flod"
@@ -16152,15 +16488,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1093
 msgid "Edit Water"
 msgstr "Redigera vatten"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1097
 msgid "Land"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1098
 msgid "Edit Land"
 msgstr "Redigera land"
@@ -16168,15 +16504,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1103
 msgid "Basin"
 msgstr "Hamnbassäng"
 
 #. item
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1104
 msgid "Edit Basin Landuse"
 msgstr "Redigera användning av mark för hamnbassäng"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1109
 msgid "Reservoir"
 msgstr "Resevoar"
@@ -16184,15 +16520,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1109
+#: build/trans_presets.java:1111
 msgid "Edit Reservoir Landuse"
 msgstr "Redigera användning av mark för resevoar"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1116
 msgid "Covered Reservoir"
 msgstr "Täckt resevoar"
 
 #. item
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1117
 msgid "Edit Covered Reservoir"
 msgstr "Redigera täckt resevoar"
@@ -16200,5 +16536,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1120
+#: build/trans_presets.java:1122
 msgid "Riverbank"
 msgstr "Flodbank"
@@ -16207,10 +16543,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1125
 msgid "Edit Riverbank"
 msgstr "Redigera en flodbank"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1127
+#: build/trans_presets.java:1129
 msgid "Wetland"
 msgstr "Våtmark"
@@ -16221,14 +16557,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1134
 msgid "Edit Wetland"
 msgstr "Redigera våtmark"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "swamp"
 msgstr "träsk"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "bog"
 msgstr "mosse"
@@ -16242,35 +16578,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1135 build/trans_style.java:3384
+#: build/trans_presets.java:1137 build/trans_style.java:3392
 msgid "marsh"
 msgstr "kärr"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "reedbed"
 msgstr "vassbädd"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "saltmarsh"
 msgstr "saltäng"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "tidalflat"
 msgstr "marskland"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "mangrove"
 msgstr "mangroveträsk"
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1139
 msgid "Mud"
 msgstr "Lera"
 
 #. item
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1140
 msgid "Edit Mud"
 msgstr "Redigera lera"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1144
 msgid "Beach"
 msgstr "Strand"
@@ -16278,20 +16614,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1144
+#: build/trans_presets.java:1146
 msgid "Edit Beach"
 msgstr "Redigera strand"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1150
 msgid "Bay"
 msgstr "Bukt"
 
 #. item
-#: build/trans_presets.java:1149
+#: build/trans_presets.java:1151
 msgid "Edit Bay"
 msgstr "Redigera bukt"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1155
 msgid "Cliff"
 msgstr "Stup"
@@ -16299,10 +16635,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1157
 msgid "Edit Cliff"
 msgstr "Redigera stup"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1159
+#: build/trans_presets.java:1161
 msgid "Coastline"
 msgstr "Kustlinje"
@@ -16310,5 +16646,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1163
 msgid "Edit Coastline"
 msgstr "Redigera kustlinje"
@@ -16316,5 +16652,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1168
 msgid "Ferry Route"
 msgstr "Färjelinje"
@@ -16322,5 +16658,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1170
 msgid "Edit Ferry"
 msgstr "Redigera en färjelinje"
@@ -16329,5 +16665,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1176
+#: build/trans_presets.java:1178
 msgid "Boatyard"
 msgstr "Varv"
@@ -16335,10 +16671,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:1180
 msgid "Edit Boatyard"
 msgstr "Redigera ett varv"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1185
 msgid "Dock"
 msgstr "Docka"
@@ -16346,5 +16682,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1187
 msgid "Edit Dock"
 msgstr "Redigera en docka"
@@ -16352,5 +16688,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1193
 msgid "Dam"
 msgstr "Damm"
@@ -16358,15 +16694,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1195
 msgid "Edit Dam"
 msgstr "Redigera en damm"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1199
+#: build/trans_presets.java:1201
 msgid "Waterway Point"
 msgstr "Vattenpunkter"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1202
 msgid "Lock Gate"
 msgstr "Slussport"
@@ -16375,5 +16711,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1206
 msgid "Weir"
 msgstr "Överfallsdamm"
@@ -16381,20 +16717,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1208
 msgid "Edit Weir"
 msgstr "Redigera en överfallsdamm"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1213
 msgid "Waterfall"
 msgstr "Vattenfall"
 
 #. item
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1214
 msgid "Edit Waterfall"
 msgstr "Redigera ett vattenfall"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1219
 msgid "Turning Point"
 msgstr "Vändplats"
@@ -16403,15 +16739,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1221
+#: build/trans_presets.java:1223
 msgid "Marina"
 msgstr "Småbåtshamn"
 
 #. item
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1224
 msgid "Edit Marina"
 msgstr "Redigera en småbåtshamn"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1228
 msgid "Pier"
 msgstr "Pir"
@@ -16419,10 +16755,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1230
 msgid "Edit Pier"
 msgstr "Redigera pir"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1234
 msgid "Ferry Terminal"
 msgstr "Färjeterminal"
@@ -16430,10 +16766,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1236
 msgid "Edit Ferry Terminal"
 msgstr "Redigera en färjeterminal"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1240
 msgid "Slipway"
 msgstr "Slip"
@@ -16443,16 +16779,21 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1244
 msgid "Edit Slipway"
 msgstr "Redigera en slip"
 
 #. item "Waterway Point/Slipway" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1250
+#, fuzzy
+msgid "Transport"
+msgstr "Kollektivtrafik"
+
+#. group "Transport"
+#: build/trans_presets.java:1251
 msgid "Railway"
 msgstr "Järnväg"
 
 #. group "Railway"
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1252
 msgid "Rail"
 msgstr "Järnväg"
@@ -16460,5 +16801,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:1254
 msgid "Edit Rail"
 msgstr "Redigera en järnväg"
@@ -16488,8 +16829,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "Optional Types"
 msgstr "Valfria typer"
@@ -16503,35 +16844,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "yard"
 msgstr "bangård"
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "siding"
 msgstr "sidospår"
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "spur"
 msgstr "stickspår"
 
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1259
 msgid "Narrow Gauge Rail"
 msgstr "Smalspår"
 
 #. item
-#: build/trans_presets.java:1257
+#: build/trans_presets.java:1260
 msgid "Edit Narrow Gauge Rail"
 msgstr "Redigera en smalspårig järnväg"
 
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1265
 msgid "Monorail"
 msgstr "monorail"
@@ -16539,45 +16880,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1267
 msgid "Edit Monorail"
 msgstr "Redigera en monorailbana"
 
-#: build/trans_presets.java:1269
+#: build/trans_presets.java:1272
 msgid "Preserved"
 msgstr "Museijärnväg"
 
 #. item
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1273
 msgid "Edit Preserved Railway"
 msgstr "Redigera en museijärnväg"
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1278
 msgid "Light Rail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1279
 msgid "Edit Light Rail"
 msgstr ""
 
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1284
 msgid "Subway"
 msgstr "Tunnelbana"
 
 #. item
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1285
 msgid "Edit Subway"
 msgstr "Redigera en tunnebana"
 
-#: build/trans_presets.java:1287
+#: build/trans_presets.java:1290
 msgid "Tram"
 msgstr "Spårvagn"
 
 #. item
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1291
 msgid "Edit Tram"
 msgstr "Redigera en spårväg"
 
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1296
 msgid "Bus Guideway"
 msgstr "Spårbussväg"
@@ -16585,5 +16926,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1295
+#: build/trans_presets.java:1298
 msgid "Edit Bus Guideway"
 msgstr "Redigera en spårbussväg"
@@ -16592,14 +16933,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1315
 msgid "Disused Rail"
 msgstr "Järnväg utan trafik"
 
 #. item
-#: build/trans_presets.java:1313
+#: build/trans_presets.java:1316
 msgid "Edit Disused Railway"
 msgstr "Redigera en järnväg utan trafik"
 
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1321
 msgid "Abandoned Rail"
 msgstr "Nedlagd järnväg"
@@ -16608,5 +16949,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1325
 msgid "Level Crossing"
 msgstr "Plankorsning"
@@ -16615,5 +16956,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1329
 msgid "Crossing"
 msgstr "Järnvägsövergång"
@@ -16623,5 +16964,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1333
 msgid "Crossing type"
 msgstr "Typ av övergångsställe"
@@ -16629,5 +16970,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1339
 msgid "Turntable"
 msgstr "Vändskiva"
@@ -16636,10 +16977,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1344
 msgid "Aerialway"
 msgstr "Linbana"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1345
 msgid "Chair Lift"
 msgstr "Stollift"
@@ -16647,10 +16988,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1347
 msgid "Edit Chair Lift"
 msgstr "Redigera en stollift"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1351
 msgid "Drag Lift"
 msgstr "Släplift"
@@ -16658,10 +16999,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1353
 msgid "Edit Drag Lift"
 msgstr "Redigera en släplift"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1357
 msgid "Cable Car"
 msgstr "Linbana"
@@ -16669,10 +17010,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1359
 msgid "Edit Cable Car"
 msgstr "Redigera linbana"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1360
+#: build/trans_presets.java:1363
 msgid "Gondola"
 msgstr ""
@@ -16680,5 +17021,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1365
 msgid "Edit Gondola"
 msgstr ""
@@ -16686,5 +17027,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1366 build/trans_presets.java:1461
+#: build/trans_presets.java:1369 build/trans_presets.java:1464
 msgid "Station"
 msgstr "Station"
@@ -16695,10 +17036,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1368 build/trans_presets.java:1464
+#: build/trans_presets.java:1371 build/trans_presets.java:1467
 msgid "Edit Station"
 msgstr "Redigera station"
 
 #. group "Car"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1378
 msgid "Fuel"
 msgstr "Bränsle"
@@ -16708,5 +17049,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1382
 msgid "Edit Fuel"
 msgstr "Redigera bränsle"
@@ -16764,32 +17105,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1671 build/trans_presets.java:1678
-#: build/trans_presets.java:1686 build/trans_presets.java:1699
-#: build/trans_presets.java:1713 build/trans_presets.java:1810
-#: build/trans_presets.java:1818 build/trans_presets.java:1909
-#: build/trans_presets.java:1915 build/trans_presets.java:2226
-#: build/trans_presets.java:2250 build/trans_presets.java:2465
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1703
+#: build/trans_presets.java:1717 build/trans_presets.java:1814
+#: build/trans_presets.java:1822 build/trans_presets.java:1919
+#: build/trans_presets.java:1925 build/trans_presets.java:2237
+#: build/trans_presets.java:2261 build/trans_presets.java:2476
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Opening Hours"
 msgstr "Öppettider"
@@ -16848,91 +17189,91 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -16947,5 +17288,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1385 build/trans_presets.java:1438
+#: build/trans_presets.java:1388 build/trans_presets.java:1441
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -16955,5 +17296,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1391
 msgid "Edit Parking"
 msgstr "Redigera en parkeringsplats"
@@ -16964,24 +17305,24 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1391 build/trans_presets.java:1762
-#: build/trans_presets.java:1772 build/trans_presets.java:2396
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:1394 build/trans_presets.java:1766
+#: build/trans_presets.java:1776 build/trans_presets.java:2407
+#: build/trans_presets.java:2524
 msgid "Reference number"
 msgstr "Referensnummer"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "multi-storey"
 msgstr "flervånings-"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "surface"
 msgstr "ytbeläggning"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "underground"
 msgstr "underjordisk"
 
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1396
 msgid "Park and Ride"
 msgstr ""
@@ -16990,38 +17331,38 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1394 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
+#: build/trans_presets.java:1397 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
 msgid "Fee"
 msgstr "Avgift"
 
 #. <space />
-#: build/trans_presets.java:1396
+#: build/trans_presets.java:1399
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1400
 msgid "Spaces for Disabled"
 msgstr "Handikappplatser"
 
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1401
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1402
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1403
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1405
 msgid "Wash"
 msgstr "Biltvätt"
 
 #. item
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1406
 msgid "Edit Car Wash"
 msgstr "Redigera en biltvätt"
@@ -17029,5 +17370,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1408 build/trans_presets.java:1452
+#: build/trans_presets.java:1411 build/trans_presets.java:1455
 msgid "Shop"
 msgstr "Affär"
@@ -17035,15 +17376,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1413
 msgid "Edit Car Shop"
 msgstr "Redigera bilförsäljare"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1418
 msgid "Repair"
 msgstr "Bilverkstad"
 
 #. item
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1419
 msgid "Edit Car Repair"
 msgstr "Redigera en bilverkstad"
@@ -17051,5 +17392,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1421 build/trans_presets.java:1445
+#: build/trans_presets.java:1424 build/trans_presets.java:1448
 msgid "Rental"
 msgstr "Uthyrning"
@@ -17058,10 +17399,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1427
 msgid "Edit Car Rental"
 msgstr "Redigera biluthyrning"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1432
 msgid "Sharing"
 msgstr "Bilpool"
@@ -17069,5 +17410,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1434
 msgid "Edit Car Sharing"
 msgstr "Redigera bilpool"
@@ -17075,10 +17416,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Parking"
 msgstr "Redigera en cykelparkering"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1446
 msgid "Capacity"
 msgstr "Kapacitet"
@@ -17087,5 +17428,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1448
+#: build/trans_presets.java:1451
 msgid "Edit Bicycle Rental"
 msgstr "Redigera en cykeluthyrning"
@@ -17094,15 +17435,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1458
 msgid "Edit Bicycle Shop"
 msgstr "Redigera cykelaffär"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1463
 msgid "Public Transport"
 msgstr "Kollektivtrafik"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:1472
 msgid "UIC-Reference"
 msgstr "UIC-klassificering"
@@ -17110,5 +17451,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1475
 msgid "Railway Halt"
 msgstr "Järnvägshållplats"
@@ -17116,5 +17457,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1477
 msgid "Edit Halt"
 msgstr "Redigera hållplats"
@@ -17122,5 +17463,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1484
 msgid "Tram Stop"
 msgstr "Spårvagnshållplats"
@@ -17129,5 +17470,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1484
+#: build/trans_presets.java:1487
 msgid "Edit Tram Stop"
 msgstr "Redigera spårvagnshållplats"
@@ -17135,5 +17476,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1494
 msgid "Railway Platform"
 msgstr "Plattform"
@@ -17142,5 +17483,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1497
 msgid "Edit Railway Platform"
 msgstr "Redigera plattform"
@@ -17152,5 +17493,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1497 build/trans_presets.java:1539
+#: build/trans_presets.java:1500 build/trans_presets.java:1542
 msgid "Reference (track number)"
 msgstr "Referens (spårnummer)"
@@ -17158,10 +17499,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1499 build/trans_presets.java:1541
+#: build/trans_presets.java:1502 build/trans_presets.java:1544
 msgid "Area"
 msgstr "Område"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1504
 msgid "Subway Entrance"
 msgstr "Tunnelbaneingång"
@@ -17170,10 +17511,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1507
 msgid "Edit Subway Entrance"
 msgstr "Redigera tunnelbaneingång"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1512
 msgid "Wheelchair"
 msgstr "Rullstol"
@@ -17182,5 +17523,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1517
 msgid "Bus Station"
 msgstr "Bussterminal"
@@ -17189,5 +17530,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1520
 msgid "Edit Bus Station"
 msgstr "Redigera en bussterminal"
@@ -17195,5 +17536,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1526
 msgid "Bus Stop"
 msgstr "Busshållplats"
@@ -17203,5 +17544,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1530
 msgid "Edit Bus Stop"
 msgstr "Redigera en busshållplats"
@@ -17210,6 +17551,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1532 build/trans_presets.java:1785
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:1535 build/trans_presets.java:1789
+#: build/trans_presets.java:2453
 msgid "Shelter"
 msgstr "VIndskydd"
@@ -17217,10 +17558,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1538
 msgid "Bus Platform"
 msgstr "Bussplattform"
 
 #. item
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1539
 msgid "Edit Bus Platform"
 msgstr "Redigera en bussplattform"
@@ -17228,5 +17569,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1547
 msgid "Taxi"
 msgstr "Taxi"
@@ -17234,5 +17575,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1549
 msgid "Edit Taxi station"
 msgstr "Redigera en taxistation"
@@ -17240,5 +17581,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1554
 msgid "Airport"
 msgstr "Flygplats"
@@ -17246,15 +17587,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1556
 msgid "Edit Airport"
 msgstr ""
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1561
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1559
+#: build/trans_presets.java:1562
 msgid "ICAO"
 msgstr "ICAO"
@@ -17262,6 +17603,11 @@
 #. item "Public Transport/Airport" text "ICAO"
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1567
+#, fuzzy
+msgid "Travel"
+msgstr "grus"
+
+#. group "Travel"
+#: build/trans_presets.java:1568
 msgid "Accomodation"
 msgstr "Logi"
@@ -17273,5 +17619,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1565 build/trans_surveyor.java:43
+#: build/trans_presets.java:1569 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotell"
@@ -17280,15 +17626,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:1568
+#: build/trans_presets.java:1572
 msgid "Edit Hotel"
 msgstr "Redigera ett hotell"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1575
 msgid "Stars"
 msgstr "Stjärnor"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1577
 msgid "Motel"
 msgstr "Motell"
@@ -17296,20 +17642,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1579
 msgid "Edit Motel"
 msgstr "Redigera ett motell"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1583
 msgid "Guest House"
 msgstr "Pensionat"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1584
 msgid "Edit Guest House"
 msgstr "Redigera pensionat"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1588
 msgid "Chalet"
 msgstr "Fäbod"
@@ -17317,10 +17663,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1590
 msgid "Edit Chalet"
 msgstr "Redigera fäbod"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1594
 msgid "Hostel"
 msgstr "Vandrarhem"
@@ -17328,30 +17674,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1592
+#: build/trans_presets.java:1596
 msgid "Edit Hostel"
 msgstr "Redigera ett vandrarhem"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1600
 msgid "Alpine Hut"
 msgstr "Alphydda"
 
 #. item
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1601
 msgid "Edit Alpine Hut"
 msgstr "Redigera alphydda"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1606
 msgid "Caravan Site"
 msgstr "Husvagnscamping"
 
 #. item
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1607
 msgid "Edit Caravan Site"
 msgstr "Redigera en husvagnscamping"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1611
 msgid "Camping Site"
 msgstr "Campingplats"
@@ -17359,10 +17705,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1613
 msgid "Edit Camping Site"
 msgstr "Redigera en campingplats"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1618
 msgid "Food+Drinks"
 msgstr "Mat+Dryck"
@@ -17373,5 +17719,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1615 build/trans_surveyor.java:47
+#: build/trans_presets.java:1619 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurang"
@@ -17379,5 +17725,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1621
 msgid "Edit Restaurant"
 msgstr "Redigera en restaurang"
@@ -17385,5 +17731,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "Cuisine"
 msgstr "Kök"
@@ -17391,61 +17737,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "italian"
 msgstr "italienskt"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "chinese"
 msgstr "kinesiskt"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "burger"
 msgstr "hamburgare"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "greek"
 msgstr "grekiskt"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "german"
 msgstr "tyskt"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "indian"
 msgstr "indiskt"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "regional"
 msgstr "lokalt"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "turkish"
 msgstr "turkiskt"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "asian"
 msgstr "asiatiskt"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "thai"
 msgstr "thailändskt"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "mexican"
 msgstr "mexikanskt"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "japanese"
 msgstr "japanskt"
 
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1627
 msgid "Fast Food"
 msgstr "Snabbmat"
@@ -17453,9 +17799,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1629
 msgid "Edit Fast Food Restaurant"
 msgstr "Redigera en snabbmatsrestaurang"
 
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1635
 msgid "Cafe"
 msgstr "Kafé"
@@ -17463,9 +17809,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1633
+#: build/trans_presets.java:1637
 msgid "Edit Cafe"
 msgstr "Redigera kafé"
 
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1642
 msgid "Pub"
 msgstr "Pub"
@@ -17473,18 +17819,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1644
 msgid "Edit Pub"
 msgstr "Redigera pub"
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1649
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item
-#: build/trans_presets.java:1646
+#: build/trans_presets.java:1650
 msgid "Edit Biergarten"
 msgstr "Redigera Biergarten"
 
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1655
 msgid "Bar"
 msgstr ""
@@ -17492,9 +17838,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1657
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1662
 msgid "Nightclub"
 msgstr "Nattklubb"
@@ -17502,24 +17848,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1664
 msgid "Edit Nightclub"
 msgstr "Redigera nattklubb"
 
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1670
 msgid "Tourism"
 msgstr "Turism"
 
 #. group "Tourism"
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1671
 msgid "Attraction"
 msgstr "Sevärdhet"
 
 #. item
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1672
 msgid "Edit Attraction"
 msgstr "Redigera sevärdhet"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1677
 msgid "Museum"
 msgstr "Museum"
@@ -17527,9 +17873,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1679
 msgid "Edit Museum"
 msgstr "Redigera museum"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1684
 msgid "Zoo"
 msgstr "Zoo"
@@ -17538,9 +17884,9 @@
 #. <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:1683
+#: build/trans_presets.java:1687
 msgid "Edit Zoo"
 msgstr "Redigera zoo"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1692
 msgid "Viewpoint"
 msgstr "Utsiktsplats"
@@ -17548,24 +17894,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1694
 msgid "Edit Viewpoint"
 msgstr "Redigera utsiktsplats"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1697
 msgid "Look-Out Tower"
 msgstr "Utsiktstorn"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1699
 msgid "Theme Park"
 msgstr "Nöjespark"
 
 #. item
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1700
 msgid "Edit Theme Park"
 msgstr "Redigera en nöjespark"
 
-#: build/trans_presets.java:1701
+#: build/trans_presets.java:1705
 msgid "Artwork"
 msgstr "Konst"
@@ -17573,5 +17919,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1707
 msgid "Edit Artwork"
 msgstr "Redigera konstverk"
@@ -17579,19 +17925,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1712
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1719
 msgid "Map"
 msgstr "Karta"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "topo"
 msgstr ""
@@ -17629,5 +17975,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1720 build/trans_style.java:619
+#: build/trans_presets.java:1724 build/trans_style.java:619
 #: build/trans_style.java:635 build/trans_style.java:651
 #: build/trans_style.java:659
@@ -17635,28 +17981,28 @@
 msgstr "gata"
 
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1722 build/trans_presets.java:1738
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1726 build/trans_presets.java:1742
+#: build/trans_presets.java:1786
 msgid "Closer Description"
 msgstr ""
@@ -17666,5 +18012,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1724 build/trans_presets.java:1747
+#: build/trans_presets.java:1728 build/trans_presets.java:1751
 msgid "Routes shown for:"
 msgstr ""
@@ -17672,6 +18018,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1726 build/trans_presets.java:1749
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1965
 msgid "Cycling"
 msgstr "Cykling"
@@ -17679,5 +18025,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1727 build/trans_presets.java:1750
+#: build/trans_presets.java:1731 build/trans_presets.java:1754
 msgid "Mountainbiking"
 msgstr ""
@@ -17685,6 +18031,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1728 build/trans_presets.java:1751
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:1732 build/trans_presets.java:1755
+#: build/trans_presets.java:2019
 msgid "Skiing"
 msgstr "Skidåkning"
@@ -17692,5 +18038,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1729 build/trans_presets.java:1752
+#: build/trans_presets.java:1733 build/trans_presets.java:1756
 msgid "Riding"
 msgstr ""
@@ -17698,46 +18044,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1734 build/trans_presets.java:1757
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1736
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "history"
 msgstr "historiskt"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "nature"
 msgstr "naturfenomen"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "wildlife"
 msgstr "djurliv"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1744
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1759
 msgid "Information Terminal"
 msgstr ""
@@ -17745,29 +18091,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1760 build/trans_presets.java:1770
+#: build/trans_presets.java:1764 build/trans_presets.java:1774
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1769
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1779
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1780
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1778
+#: build/trans_presets.java:1782
 msgid "Other Information Points"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1790
 msgid "Edit Shelter"
 msgstr "Redigera vindskydd"
@@ -17775,25 +18121,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1789 build/trans_presets.java:1795
+#: build/trans_presets.java:1793 build/trans_presets.java:1799
 msgid "Fireplace"
 msgstr "Eldstad"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1791
+#: build/trans_presets.java:1795
 msgid "Picnic Site"
 msgstr "Picknickplats"
 
 #. item
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1796
 msgid "Edit Picnic Site"
 msgstr "Redigera picknickplats"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1802
 msgid "Historic Places"
 msgstr "Historiska platser"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1799
+#: build/trans_presets.java:1803
 msgid "Castle"
 msgstr "Slott"
@@ -17802,19 +18148,19 @@
 #. <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:1802
+#: build/trans_presets.java:1806
 msgid "Edit Castle"
 msgstr "Redigera slott"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1810
 msgid "Ruins"
 msgstr "Ruiner"
 
 #. item
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1811
 msgid "Edit Ruins"
 msgstr "Redigera ruiner"
 
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1816
 msgid "Archaeological Site"
 msgstr "Utgrävningsplats"
@@ -17823,9 +18169,9 @@
 #. <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:1815
+#: build/trans_presets.java:1819
 msgid "Edit Archaeological Site"
 msgstr "Redigera utgrävningsplats"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1824
 msgid "Battlefield"
 msgstr "Krigsskådeplats"
@@ -17833,5 +18179,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1826
 msgid "Edit Battlefield"
 msgstr "Redigera krigsskådeplats"
@@ -17839,15 +18185,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1831
 msgid "Monument"
 msgstr "Monument"
 
 #. item
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1832
 msgid "Edit Monument"
 msgstr "Redigera monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1836
 msgid "Memorial"
 msgstr "Minnesmärke"
@@ -17855,45 +18201,57 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1838
 msgid "Edit Memorial"
 msgstr "Redigera minnesmärke"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1842
 msgid "Wayside Cross"
 msgstr "Vägkors"
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1843
 msgid "Edit Wayside Cross"
 msgstr "Redigera ett vägkors"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1847
 msgid "Wayside Shrine"
 msgstr "Vägaltare"
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1848
 msgid "Edit Wayside Shrine"
 msgstr "Redigera ett vägaltare"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1852
+#, fuzzy
+msgid "Boundary Stone"
+msgstr "Gränser"
+
+#. item
+#: build/trans_presets.java:1853
+#, fuzzy
+msgid "Edit Boundary Stone"
+msgstr "Redigera en busshållplats"
+
+#. item "Historic Places/Boundary Stone" text "Name"
+#: build/trans_presets.java:1858
 msgid "Leisure"
 msgstr "Nöje"
 
 #. group "Leisure"
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1859
 msgid "Water Park"
 msgstr "Badanläggning"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1860
 msgid "Edit Water Park"
 msgstr "Redigera badanläggning"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1864
 msgid "Playground"
 msgstr "Lekplats"
@@ -17901,31 +18259,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1866
 msgid "Edit Playground"
 msgstr "Redigera lekplats"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1870
 msgid "Fishing"
 msgstr "Fiske"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1871
 msgid "Edit Fishing"
 msgstr "Redigera fiske"
 
 #. item "Leisure/Fishing" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1877 build/trans_presets.java:2669
+msgid "Sports"
+msgstr ""
+
+#. group "Sports"
+#: build/trans_presets.java:1878
 msgid "Sport Facilities"
 msgstr "Sportfaciliteteter"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1879
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1880
 msgid "Edit Stadium"
 msgstr "Redigera stadion"
@@ -17939,6 +18301,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1874 build/trans_presets.java:1883
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1902 build/trans_presets.java:1911
 msgid "select sport:"
 msgstr "välj sport:"
@@ -18330,30 +18692,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884 build/trans_style.java:3892
-#: build/trans_style.java:3900 build/trans_style.java:3908
-#: build/trans_style.java:3916 build/trans_style.java:3924
-#: build/trans_style.java:3932
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_style.java:3572 build/trans_style.java:3580
+#: build/trans_style.java:3588 build/trans_style.java:3596
+#: build/trans_style.java:3604 build/trans_style.java:3612
+#: build/trans_style.java:3620 build/trans_style.java:3628
+#: build/trans_style.java:3636 build/trans_style.java:3644
+#: build/trans_style.java:3652 build/trans_style.java:3660
+#: build/trans_style.java:3668 build/trans_style.java:3676
+#: build/trans_style.java:3684 build/trans_style.java:3692
+#: build/trans_style.java:3700 build/trans_style.java:3708
+#: build/trans_style.java:3716 build/trans_style.java:3724
+#: build/trans_style.java:3732 build/trans_style.java:3740
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3764 build/trans_style.java:3772
+#: build/trans_style.java:3780 build/trans_style.java:3788
+#: build/trans_style.java:3796 build/trans_style.java:3804
+#: build/trans_style.java:3812 build/trans_style.java:3820
+#: build/trans_style.java:3828 build/trans_style.java:3836
+#: build/trans_style.java:3844 build/trans_style.java:3852
+#: build/trans_style.java:3860 build/trans_style.java:3868
+#: build/trans_style.java:3876 build/trans_style.java:3884
+#: build/trans_style.java:3892 build/trans_style.java:3900
+#: build/trans_style.java:3908 build/trans_style.java:3916
+#: build/trans_style.java:3924 build/trans_style.java:3932
+#: build/trans_style.java:3940
 msgid "sport"
 msgstr "sport"
@@ -18363,225 +18725,225 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "multi"
 msgstr "flera"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "archery"
 msgstr "bågskytte"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "athletics"
 msgstr "friidrott"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "australian_football"
 msgstr "australisk fotboll"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "basketball"
 msgstr "basket"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "boules"
 msgstr "boule"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "canoe"
 msgstr "kanot"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "climbing"
 msgstr "klättring"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket_nets"
 msgstr "kricket_nät"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "croquet"
 msgstr "krocket"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cycling"
 msgstr "cykling"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "dog_racing"
 msgstr "hundracing"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "equestrian"
 msgstr "ridsport"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "football"
 msgstr "amerikansk fotboll"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "gymnastics"
 msgstr "gymnastik"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "hockey"
 msgstr "ishockey"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "horse_racing"
 msgstr "hästkapplöpning"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "motor"
 msgstr "motorsport"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "racquet"
 msgstr "rackets"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "shooting"
 msgstr "skytte"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skating"
 msgstr "skridskoåkning"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skiing"
 msgstr "skidåkning"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "soccer"
 msgstr "fotboll"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "swimming"
 msgstr "simning"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "table_tennis"
 msgstr "bordtennis"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1888
 msgid "Sports Centre"
 msgstr "Sporthall"
 
 #. item
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1889
 msgid "Edit Sports Centre"
 msgstr "Redigera sporthall"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1897
 msgid "Pitch"
 msgstr "Plan"
 
 #. item
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1898
 msgid "Edit Pitch"
 msgstr "Redigera plan"
 
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1906
 msgid "Racetrack"
 msgstr "Bana"
 
 #. item
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1907
 msgid "Edit Racetrack"
 msgstr "Redigera bana"
 
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1915
 msgid "Golf Course"
 msgstr "Golfbana"
 
 #. item
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1916
 msgid "Edit Golf Course"
 msgstr "Redigera golfbana"
 
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1921
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1922
 msgid "Edit Miniature Golf"
 msgstr "Redigera minigolfbana"
 
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1928
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1929
 msgid "Multi"
 msgstr "Flera"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1930
 msgid "Edit Multi"
 msgstr "Redigera flersportsfacilitet"
@@ -18620,183 +18982,183 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "pitch"
 msgstr "plan"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "sports_centre"
 msgstr "sporthall"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1935
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1936
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1941
 msgid "Athletics"
 msgstr "Friidrott"
 
 #. item
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1942
 msgid "Edit Athletics"
 msgstr "Redigera friidrott"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1947
 msgid "Archery"
 msgstr "Bågskytte"
 
 #. item
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1948
 msgid "Edit Archery"
 msgstr "Redigera bågskytte"
 
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1953
 msgid "Climbing"
 msgstr "Klättring"
 
 #. item
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:1954
 msgid "Edit Climbing"
 msgstr "Redigera klättring"
 
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1959
 msgid "Canoeing"
 msgstr "Kanotpaddling"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1960
 msgid "Edit Canoeing"
 msgstr "Redigera kanotpaddling"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1966
 msgid "Edit Cycling"
 msgstr "Redigera cykling"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1971
 msgid "Dog Racing"
 msgstr "Hundkapplöpning"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1972
 msgid "Edit Dog Racing"
 msgstr "Redigera hundkapplöpning"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1977
 msgid "Equestrian"
 msgstr "Ridsport"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1978
 msgid "Edit Equestrian"
 msgstr "Redigera ridsport"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1983
 msgid "Horse Racing"
 msgstr "Hästkapplöpning"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1984
 msgid "Edit Horse Racing"
 msgstr "Redigera hästkapplöpning"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1989
 msgid "Gymnastics"
 msgstr "Gymnastik"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1990
 msgid "Edit Gymnastics"
 msgstr "Redigera gymnastik"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1995
 msgid "Motor Sports"
 msgstr "Motorsport"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1996
 msgid "Edit Motor Sports"
 msgstr "Redigera motorsport"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2001
 msgid "Skating"
 msgstr "Skridskoåkning"
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2002
 msgid "Edit Skating"
 msgstr "Redigera skridskoåkning"
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2007
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2008
 msgid "Edit Skateboard"
 msgstr "Redigera skateboard"
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2013
 msgid "Swimming"
 msgstr "Simning"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2014
 msgid "Edit Swimming"
 msgstr "Redigera simning"
@@ -18804,56 +19166,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2021
 msgid "Edit Skiing"
 msgstr "Redigera skidåkning"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "Piste type"
 msgstr "Skidspårstyp"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "downhill"
 msgstr "utförsåkning"
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "nordic"
 msgstr "längdskidåkning"
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "Difficulty"
 msgstr "Svårighetsgrad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "novice"
 msgstr "nybörjare"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "easy"
 msgstr "lätt"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "freeride"
 msgstr "ospårat"
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2028
 msgid "Shooting"
 msgstr "Skytte"
@@ -18861,178 +19223,183 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2030
 msgid "Edit Shooting"
 msgstr "Redigera skytte"
 
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2036
 msgid "Sport (Ball)"
 msgstr "Bollsport"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2037
 msgid "Soccer"
 msgstr "Fotboll"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2038
 msgid "Edit Soccer"
 msgstr "Redigera fotboll"
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2043
 msgid "Football"
 msgstr "Amerikansk fotboll"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2044
 msgid "Edit Football"
 msgstr "Redigera amerikansk fotboll"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2049
 msgid "Australian Football"
 msgstr "Australisk fotboll"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2050
 msgid "Edit Australian Football"
 msgstr "Redigera australisk fotboll"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2055
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2056
 msgid "Edit Baseball"
 msgstr "Redigera baseball"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2061
 msgid "Basketball"
 msgstr "Basket"
 
 #. item
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2062
 msgid "Edit Basketball"
 msgstr "Redigera basket"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2067
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2068
 msgid "Edit Golf"
 msgstr "Redigera golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2071
 msgid "golf_course"
 msgstr "golf_bana"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2073
 msgid "Boule"
 msgstr "Boule"
 
 #. item
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2074
 msgid "Edit Boule"
 msgstr "Redigera boule"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2079
 msgid "Bowls"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2080
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2085
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2086
 msgid "Edit Cricket"
 msgstr "Redigera cricket"
 
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2091
 msgid "Cricket Nets"
 msgstr "Cricketnät"
 
 #. item
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2092
 msgid "Edit Cricket Nets"
 msgstr "Redigera cricketnät"
 
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2097
 msgid "Croquet"
 msgstr "Krocket"
 
 #. item
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2098
 msgid "Edit Croquet"
 msgstr "Redigera krocket"
 
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2103
 msgid "Hockey"
 msgstr "Ishockey"
 
 #. item
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2104
 msgid "Edit Hockey"
 msgstr "Redigera ishockey"
 
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2109
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2110
 msgid "Edit Pelota"
 msgstr "Redigera pelota"
 
-#: build/trans_presets.java:2105
+#: build/trans_presets.java:2115
 msgid "Racquet"
 msgstr "Rackets"
 
 #. item
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2116
 msgid "Edit Racquet"
 msgstr "Redigera rackets"
 
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2121
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2122
 msgid "Edit Rugby"
 msgstr "Redigera rugby"
 
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2127
 msgid "Table Tennis"
 msgstr "Bordtennis"
 
 #. item
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2128
 msgid "Edit Table Tennis"
 msgstr "Redigera bordtennis"
 
-#: build/trans_presets.java:2123
+#: build/trans_presets.java:2133
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2134
 msgid "Edit Tennis"
 msgstr "Redigera tennis"
 
-#. <separator/>
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2141
+#, fuzzy
+msgid "Man-Made"
+msgstr "Byggnadsverk"
+
+#. group "Man-Made"
+#: build/trans_presets.java:2142
 msgid "Buildings"
 msgstr "Byggnader"
 
 #. group "Buildings"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2143
 msgid "Building"
 msgstr "Byggnad"
@@ -19040,5 +19407,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Public Building"
 msgstr "Offentlig byggnad"
@@ -19046,10 +19413,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2148
 msgid "Edit Public Building"
 msgstr "Redigera offentlig byggnad"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2152
 msgid "Town hall"
 msgstr "Stadshus"
@@ -19057,10 +19424,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2154
 msgid "Edit Town hall"
 msgstr "Redigera stadshus"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:2158
 msgid "Embassy"
 msgstr "Ambassad"
@@ -19068,10 +19435,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Edit Embassy"
 msgstr "Redigera ambassad"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2164
 msgid "Courthouse"
 msgstr "Domstol"
@@ -19080,10 +19447,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:2156
+#: build/trans_presets.java:2167
 msgid "Edit Courthouse"
 msgstr "Redigera domstol"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2171
 msgid "Prison"
 msgstr "Fängelse"
@@ -19092,10 +19459,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:2163
+#: build/trans_presets.java:2174
 msgid "Edit Prison"
 msgstr "Redigera fängelse"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2178
 msgid "Police"
 msgstr "Polisstation"
@@ -19105,10 +19472,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:2171
+#: build/trans_presets.java:2182
 msgid "Edit Police"
 msgstr "Redigera polisstation"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2186
 msgid "Fire Station"
 msgstr "Brandstation"
@@ -19117,10 +19484,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:2178
+#: build/trans_presets.java:2189
 msgid "Edit Fire Station"
 msgstr "Redigera brandstation"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "Post Office"
 msgstr "Postkontor"
@@ -19128,5 +19495,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Edit Post Office"
 msgstr "Redigera postkontor"
@@ -19134,15 +19501,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2200
 msgid "Kindergarten"
 msgstr "Barndaghem"
 
 #. item
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Kindergarten"
 msgstr "Redigera barndaghem"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2205
 msgid "School"
 msgstr "Skola"
@@ -19150,10 +19517,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Edit School"
 msgstr "Redigera skola"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2211
 msgid "University"
 msgstr "Högskola/universitet"
@@ -19161,10 +19528,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit University"
 msgstr "Redigera högskola/universitet"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "College"
 msgstr "Högskola"
@@ -19172,5 +19539,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2219
 msgid "Edit College"
 msgstr "Redigera högskola"
@@ -19178,5 +19545,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2224
 msgid "Cinema"
 msgstr "Biograf"
@@ -19185,10 +19552,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:2216
+#: build/trans_presets.java:2227
 msgid "Edit Cinema"
 msgstr "Redigera biograf"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2231
 msgid "Library"
 msgstr "Bibliotek"
@@ -19197,9 +19564,9 @@
 #. <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:2223
+#: build/trans_presets.java:2234
 msgid "Edit Library"
 msgstr "Redigera bibliotek"
 
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Arts Centre"
 msgstr "Konstcenter"
@@ -19207,10 +19574,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Arts Centre"
 msgstr "Redigera konstcenter"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Theatre"
 msgstr "Teater"
@@ -19219,10 +19586,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:2237
+#: build/trans_presets.java:2248
 msgid "Edit Theatre"
 msgstr "Redigera teater"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2252
 msgid "Place of Worship"
 msgstr "Religiös helgedom"
@@ -19232,5 +19599,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:2245
+#: build/trans_presets.java:2256
 msgid "Edit Place of Worship"
 msgstr "Redigera religiös helgedom"
@@ -19239,6 +19606,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "Religion"
 msgstr "Religion"
@@ -19247,66 +19614,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "buddhist"
 msgstr "buddism"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "christian"
 msgstr "kristendom"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "hindu"
 msgstr "hinduism"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jewish"
 msgstr "judendom"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "muslim"
 msgstr "islam"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "taoist"
 msgstr "daoism"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "zoroastrian"
 msgstr "zoroastrianism"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "Denomination"
 msgstr "Samfund"
@@ -19315,81 +19682,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "anglican"
 msgstr "anglikaner"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "baptist"
 msgstr "baptister"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "catholic"
 msgstr "katoliker"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "evangelical"
 msgstr "evangelister"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "jehovahs_witness"
 msgstr "jehovas_vittnen"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "lutheran"
 msgstr "luteraner (inkl. Svenska kyrkan)"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "methodist"
 msgstr "metodister"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "mormon"
 msgstr "mormoner"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "orthodox"
 msgstr "ortodoxa"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "pentecostal"
 msgstr "pinstvänner"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "presbyterian"
 msgstr "presbytarianer"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "protestant"
 msgstr "protestanter"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "quaker"
 msgstr "kväkare"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "shia"
 msgstr "shiamuslimer"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "sunni"
 msgstr "sunnimuslimer"
 
 #. <separator/>
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2264
 msgid "Addresses"
 msgstr "Adresser"
@@ -19398,5 +19765,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:2256
+#: build/trans_presets.java:2267
 msgid "Edit Address Information"
 msgstr "Redigera adressinformation"
@@ -19404,5 +19771,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2269
 msgid "House number"
 msgstr "Husnummer"
@@ -19410,20 +19777,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "House name"
 msgstr "Husnamn"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "City name"
 msgstr "Stadsnamn"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2274
 msgid "Post code"
 msgstr "Postnummer"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2275
 msgid "Country code"
 msgstr "Landskod"
@@ -19431,5 +19798,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Address Interpolation"
 msgstr "Adressinterpolation"
@@ -19438,5 +19805,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:2270
+#: build/trans_presets.java:2281
 msgid "Edit Address Interpolation"
 msgstr "Redigera adressinterpolation"
@@ -19444,67 +19811,67 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "Numbering scheme"
 msgstr "Numreringsschema"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "odd"
 msgstr "udda"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "even"
 msgstr "jämn"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2286
 msgid "Man Made"
 msgstr "Byggnadsverk"
 
 #. group "Man Made"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Works"
 msgstr "Fabrik"
 
 #. item
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2288
 msgid "Edit Works"
 msgstr "Redigera fabriksbyggnad"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2292
 msgid "Tower"
 msgstr "Torn"
 
 #. item
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2293
 msgid "Edit Tower"
 msgstr "Redigera torn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Water Tower"
 msgstr "Vattentorn"
 
 #. item
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2298
 msgid "Edit Water Tower"
 msgstr "Redigera vattentorn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Gasometer"
 msgstr "Gasklocka"
 
 #. item
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2303
 msgid "Edit Gasometer"
 msgstr "Redigera gasklocka"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Lighthouse"
 msgstr "Fyrtorn"
@@ -19512,10 +19879,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2309
 msgid "Edit Lighthouse"
 msgstr "Fyrtorn"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Windmill"
 msgstr "Väderkvarn"
@@ -19523,10 +19890,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2315
 msgid "Edit Windmill"
 msgstr "Redigera väderkvarn"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2319
 msgid "Pipeline"
 msgstr "Rörledning"
@@ -19534,10 +19901,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Edit Pipeline"
 msgstr "Redigera rörledning"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2325
 msgid "Wastewater Plant"
 msgstr "Reningsverk"
@@ -19547,10 +19914,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:2318
+#: build/trans_presets.java:2329
 msgid "Edit Wastewater Plant"
 msgstr "Redigera reningsverk"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2333
 msgid "Crane"
 msgstr "Kran"
@@ -19558,10 +19925,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2335
 msgid "Edit Crane"
 msgstr "Redigera kran"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Beacon"
 msgstr "Fyrbåk"
@@ -19569,10 +19936,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2341
 msgid "Edit Beacon"
 msgstr "Redigera fyrbåk"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2345
 msgid "Survey Point"
 msgstr "Mätpunkt"
@@ -19580,10 +19947,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Edit Survey Point"
 msgstr "Redigera mätpunkt"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2351
 msgid "Surveillance"
 msgstr "Övervakning"
@@ -19591,5 +19958,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2353
 msgid "Edit Surveillance Camera"
 msgstr "Redigera övervakningskamera"
@@ -19597,5 +19964,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Power Generator"
 msgstr "Kraftverk"
@@ -19605,39 +19972,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:2351
+#: build/trans_presets.java:2362
 msgid "Edit Power Generator"
 msgstr "Redigera ett kraftverk"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "wind"
 msgstr "vindkraft"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "hydro"
 msgstr "vattenkraft"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "fossil"
 msgstr "fossila bränslen"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "nuclear"
 msgstr "kärnkraft"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "coal"
 msgstr "kolkraft"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "photovoltaic"
 msgstr "solkraft"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "gas"
 msgstr "naturgas"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2367
 msgid "Power Station"
 msgstr "Kraftstation"
@@ -19646,10 +20013,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:2359
+#: build/trans_presets.java:2370
 msgid "Edit Power Station"
 msgstr "Redigera en kraftstation"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2374
 msgid "Power Sub Station"
 msgstr "Transformatorstation"
@@ -19658,5 +20025,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:2366
+#: build/trans_presets.java:2377
 msgid "Edit Power Sub Station"
 msgstr "Redigera en transformatorstation"
@@ -19664,10 +20031,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2369 build/trans_presets.java:2385
+#: build/trans_presets.java:2380 build/trans_presets.java:2396
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2382
 msgid "Power Tower"
 msgstr "Kraftledningsmast"
@@ -19678,5 +20045,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:2376
+#: build/trans_presets.java:2387
 msgid "Edit Power Tower"
 msgstr "Redigera en kraftledningsmast"
@@ -19684,5 +20051,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2390
 msgid "Power Line"
 msgstr "Kraftledning"
@@ -19691,40 +20058,40 @@
 #. <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:2382
+#: build/trans_presets.java:2393
 msgid "Edit Power Line"
 msgstr "Redigera en kraftledning"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Voltage"
 msgstr "Spänning"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2398
 msgid "Amount of Wires"
 msgstr "Antal kablar"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Amenities"
 msgstr "Inrättningar"
 
 #. group "Amenities"
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2402
 msgid "Toilets"
 msgstr "Toaletter"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2398 build/trans_presets.java:2514
+#: build/trans_presets.java:2409 build/trans_presets.java:2525
 msgid "Note"
 msgstr "Anteckning"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2411
 msgid "Post Box"
 msgstr "Brevlåda"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2416
 msgid "Telephone"
 msgstr "Telefon"
@@ -19733,5 +20100,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:2408
+#: build/trans_presets.java:2419
 msgid "Edit Telephone"
 msgstr "Redigera en telefon"
@@ -19739,5 +20106,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2411 build/trans_presets.java:2515
+#: build/trans_presets.java:2422 build/trans_presets.java:2526
 msgid "Coins"
 msgstr "Mynt"
@@ -19745,5 +20112,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2412 build/trans_presets.java:2516
+#: build/trans_presets.java:2423 build/trans_presets.java:2527
 msgid "Notes"
 msgstr "Anteckningar"
@@ -19751,5 +20118,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2413 build/trans_presets.java:2517
+#: build/trans_presets.java:2424 build/trans_presets.java:2528
 msgid "Electronic purses and Charge cards"
 msgstr "Betalkort"
@@ -19757,5 +20124,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2414 build/trans_presets.java:2518
+#: build/trans_presets.java:2425 build/trans_presets.java:2529
 msgid "Debit cards"
 msgstr "Kontokort"
@@ -19763,15 +20130,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2415 build/trans_presets.java:2519
+#: build/trans_presets.java:2426 build/trans_presets.java:2530
 msgid "Credit cards"
 msgstr "Kreditkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2427
 msgid "Telephone cards"
 msgstr "Telefonkort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2429
 msgid "Recycling"
 msgstr "Återvinning"
@@ -19780,5 +20147,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:2421
+#: build/trans_presets.java:2432
 msgid "Edit Recycling station"
 msgstr "Redigera en återvinningsstation"
@@ -19786,35 +20153,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Batteries"
 msgstr "Batterier"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2435
 msgid "Cans"
 msgstr "Burkar"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Clothes"
 msgstr "Kläder"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2437
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2438
 msgid "Paper"
 msgstr "Papper"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2439
 msgid "Scrap Metal"
 msgstr "Metallskrot"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2441
 msgid "Bench"
 msgstr "Bänk"
@@ -19823,40 +20190,33 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2433
-#, fuzzy
+#: build/trans_presets.java:2444
 msgid "Backrest"
-msgstr "Tillbaka"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "Material"
-msgstr "Minnesmärke"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2434
-#, fuzzy
+#: build/trans_presets.java:2445
 msgid "stone"
-msgstr "inget"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "plastic"
-msgstr "plats"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "Colour"
-msgstr "Färg"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "black"
-msgstr "Tillbaka"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "brown"
-msgstr "ned"
+msgstr ""
 
 #. color historic
@@ -19925,39 +20285,35 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2435 build/trans_style.java:3055
-#: build/trans_style.java:3063 build/trans_style.java:3071
-#: build/trans_style.java:3079 build/trans_style.java:3127
-#: build/trans_style.java:3135 build/trans_style.java:3233
-#: build/trans_style.java:3241
+#: build/trans_presets.java:2446 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3135
+#: build/trans_style.java:3143 build/trans_style.java:3241
+#: build/trans_style.java:3249
 msgid "green"
 msgstr ""
 
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "red"
-msgstr "slut"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "blue"
-msgstr "Värde"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "white"
-msgstr "vatten"
-
-#: build/trans_presets.java:2436
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2447
 msgid "Amount of Seats"
-msgstr "Antal kablar"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2449
 msgid "Hunting Stand"
 msgstr "Jakttorn"
 
 #. item
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2450
 msgid "Edit Hunting Stand"
 msgstr "Redigera ett jakttorn"
@@ -19966,30 +20322,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2441 build/trans_presets.java:2902
+#: build/trans_presets.java:2452 build/trans_presets.java:2914
 msgid "Height"
 msgstr "Höjd"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "low"
 msgstr "låg"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "half"
 msgstr "halv"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "full"
 msgstr "full"
 
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2454
 msgid "Hide"
 msgstr "Dölj"
 
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2455
 msgid "Lock"
 msgstr "Lås"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Fountain"
 msgstr "Fontän"
@@ -19998,10 +20354,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:2449
+#: build/trans_presets.java:2460
 msgid "Edit Fountain"
 msgstr "Redigera en fontän"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2464
 msgid "Drinking Water"
 msgstr "Dricksvatten"
@@ -20010,10 +20366,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:2456
+#: build/trans_presets.java:2467
 msgid "Edit Drinking Water"
 msgstr "Redigera dricksvattensfacilitet"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2471
 msgid "Baby Hatch"
 msgstr ""
@@ -20021,33 +20377,33 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2479
 msgid "Shops"
 msgstr "Affärer"
 
 #. group "Shops"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2480
 msgid "Supermarket"
 msgstr "Stormarknad"
 
 #. item
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2481
 msgid "Edit Supermarket"
 msgstr "Redigera stormarknad"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2486
 msgid "Chemist"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2487
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2492
 msgid "Convenience Store"
 msgstr "Närköp"
@@ -20055,9 +20411,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Edit Convenience Store"
 msgstr "Redigera närköp"
 
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2499
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -20065,27 +20421,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Kiosk"
 msgstr "Redigera kiosk"
 
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Book Store"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2507
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2512
 msgid "Travel Agency"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2513
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2518
 msgid "Vending machine"
 msgstr "Automat"
@@ -20093,5 +20449,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Edit Vending machine"
 msgstr "Redigera en automat"
@@ -20099,88 +20455,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "Vending products"
 msgstr "Varor till försäljning"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_tickets"
 msgstr "biljetter för allmänna transportmedel"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "parking_tickets"
 msgstr "parkeringsbiljetter"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "food"
 msgstr "mat"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "drinks"
 msgstr "dryck"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "sweets"
 msgstr "godis"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "cigarettes"
 msgstr "cigaretter"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "photos"
 msgstr "foton"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "animal_food"
 msgstr "djurmat"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "news_papers"
 msgstr "tidningar"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "toys"
 msgstr "leksaker"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "stamps"
 msgstr "frimärken"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "SIM-cards"
 msgstr "SIM-kort"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "telephone_vouchers"
 msgstr "telefonkort"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "condoms"
 msgstr "kondomer"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "tampons"
 msgstr "tamponger"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "excrement_bags"
 msgstr "hundpåsar"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Butcher"
 msgstr "Slakteri"
@@ -20188,9 +20544,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2535
 msgid "Edit Butcher"
 msgstr "Redigera slakteri"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2540
 msgid "Baker"
 msgstr "Bageri"
@@ -20198,9 +20554,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2542
 msgid "Edit Baker"
 msgstr "Redigera bageri"
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2547
 msgid "Florist"
 msgstr "Florist"
@@ -20208,18 +20564,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Florist"
 msgstr "Redigera florist"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2554
 msgid "Organic"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Edit Organic Shop"
 msgstr ""
 
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2560
 msgid "Alcohol"
 msgstr ""
@@ -20227,54 +20583,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2562
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2567
 msgid "Beverages"
 msgstr "Drycker"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2568
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2573
 msgid "Computer"
 msgstr "Dator"
 
 #. item
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2574
 msgid "Edit Computer Shop"
 msgstr "Redigera datoraffär"
 
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Electronics"
 msgstr "Electronik"
 
 #. item
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2580
 msgid "Edit Electronics Shop"
 msgstr "Redigera elektronikaffär"
 
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2585
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2586
 msgid "Edit Hifi Shop"
 msgstr "Redigera hifi-affär"
 
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2591
 msgid "Furniture"
 msgstr "Möbler"
 
 #. item
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Edit Furniture Shop"
 msgstr "Redigera möbelaffär"
 
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Garden Centre"
 msgstr "Trädgårdscenter"
@@ -20282,9 +20638,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2599
 msgid "Edit Garden Centre"
 msgstr "Redigera trädgårdscenter"
 
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Hardware"
 msgstr "Järnvaror"
@@ -20292,9 +20648,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2606
 msgid "Edit Hardware Store"
 msgstr "Redigera järnaffär"
 
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "Do-it-yourself-store"
 msgstr "Gör-det-själv-affär"
@@ -20302,54 +20658,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2613
 msgid "Edit Do-it-yourself-store"
 msgstr "Redigera gör-det-själv-affär"
 
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2618
 msgid "Stationery"
 msgstr "Kontorsmaterial"
 
 #. item
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2619
 msgid "Edit Stationery Shop"
 msgstr "Redigera pappershandel"
 
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Hairdresser"
 msgstr "Hårfrisör"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Hairdresser"
 msgstr "Redigera hårfrisör"
 
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Shoes"
 msgstr "Skor"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Shoe Shop"
 msgstr "Redigera skoaffär"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2636
 msgid "Toys"
 msgstr "Leksaker"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit Toy Shop"
 msgstr "Redigera leksaksaffär"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Video"
 msgstr "Videobutik"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Video Shop"
 msgstr "Redigera videobutik"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "Dry Cleaning"
 msgstr "Kemtvätt"
@@ -20357,9 +20713,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2650
 msgid "Edit Dry Cleaning"
 msgstr "Redigera kemtvätt"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "Laundry"
 msgstr "Tvätteri"
@@ -20367,9 +20723,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2657
 msgid "Edit Laundry"
 msgstr "Redigera tvätteri"
 
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2662
 msgid "Outdoor"
 msgstr "Friluftsliv"
@@ -20377,32 +20733,28 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2664
 msgid "Edit Outdoor Shop"
 msgstr "Redigera affär för friluftsliv"
 
-#: build/trans_presets.java:2658
-msgid "Sports"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2659
+#. item
+#: build/trans_presets.java:2670
 msgid "Edit Sports Shop"
 msgstr "Redigera sportaffär"
 
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Optician"
 msgstr "Redigera optiker"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2683
 msgid "Cash"
 msgstr "Pengar"
 
 #. group "Cash"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2684
 msgid "Bank"
 msgstr "Bank"
@@ -20410,14 +20762,14 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2686
 msgid "Edit Bank"
 msgstr "Redigera bank"
 
-#: build/trans_presets.java:2680 build/trans_presets.java:2689
+#: build/trans_presets.java:2691 build/trans_presets.java:2700
 msgid "Automated Teller Machine"
 msgstr "Uttagsautomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2693
 msgid "Money Exchange"
 msgstr "Växlingskontor"
@@ -20425,5 +20777,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Edit Money Exchange"
 msgstr "Redigera växlingskontor"
@@ -20431,15 +20783,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2691
+#: build/trans_presets.java:2702
 msgid "Edit Automated Teller Machine"
 msgstr "Redigera uttagsautomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2707
 msgid "Health"
 msgstr "Hälsovård"
 
 #. group "Health"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2708
 msgid "Doctors"
 msgstr "Läkare"
@@ -20447,18 +20799,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2710
 msgid "Edit Doctors"
 msgstr "Redigera läkare"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2715
 msgid "Dentist"
 msgstr "Tandläkare"
 
 #. item
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Edit Dentist"
 msgstr "Redigera tandläkare"
 
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2721
 msgid "Pharmacy"
 msgstr "Apotek"
@@ -20466,5 +20818,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Edit Pharmacy"
 msgstr "Redigera apotek"
@@ -20472,9 +20824,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Dispensing"
 msgstr "Receptutlämnande"
 
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2729
 msgid "Hospital"
 msgstr "Sjukhus"
@@ -20482,10 +20834,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Edit Hospital"
 msgstr "Redigera sjukhus"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2735
 msgid "Emergency Access Point"
 msgstr ""
@@ -20494,5 +20846,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:2727
+#: build/trans_presets.java:2738
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -20501,20 +20853,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2741
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2742
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "(Use international code, like +12-345-67890)"
 msgstr "Använd internationellt format, ex +12-345-67890"
@@ -20522,5 +20874,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2748
 msgid "Veterinary"
 msgstr "Veterinär"
@@ -20529,55 +20881,59 @@
 #. <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:2740
+#: build/trans_presets.java:2751
 msgid "Edit Veterinary"
 msgstr "Redigera veterinär"
 
+#: build/trans_presets.java:2758
+msgid "Geography"
+msgstr ""
+
 #. group "Places"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2760
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2761
 msgid "Edit Continent"
 msgstr "Redigera en kontinent"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2766
 msgid "Country"
 msgstr "Land"
 
 #. item
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2767
 msgid "Edit Country"
 msgstr "Redigera land"
 
 #. item "Places/Country" text "Name"
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2772
 msgid "State"
 msgstr "Delstat"
 
 #. item
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2773
 msgid "Edit State"
 msgstr "Redigera delstat"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2778
 msgid "Region"
 msgstr "Region"
 
 #. item
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2779
 msgid "Edit Region"
 msgstr "Redigera region"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2784
 msgid "County"
 msgstr "Län"
 
 #. item
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2785
 msgid "Edit County"
 msgstr "Redigera län"
@@ -20585,15 +20941,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2791
 msgid "City"
 msgstr "Stad"
 
 #. item
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2792
 msgid "Edit City"
 msgstr "Redigera stad"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2797
 msgid "Town"
 msgstr "Småstad"
@@ -20601,10 +20957,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2799
 msgid "Edit Town"
 msgstr "Redigera småstad"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2804
 msgid "Suburb"
 msgstr "Förort"
@@ -20612,25 +20968,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2806
 msgid "Edit Suburb"
 msgstr "Redigera förort"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2811
 msgid "Village"
 msgstr "Mindre tätort"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2812
 msgid "Edit Village"
 msgstr "Redigera mindre tätort"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2817
 msgid "Hamlet"
 msgstr "Småort"
 
 #. item
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2818
 msgid "Edit Hamlet"
 msgstr "Redigera småort"
@@ -20638,5 +20994,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2824
 msgid "Locality"
 msgstr "Plats"
@@ -20644,10 +21000,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2826
 msgid "Edit Locality"
 msgstr "Redigera plats"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2831
 msgid "Island"
 msgstr "Ö"
@@ -20655,10 +21011,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2833
 msgid "Edit Island"
 msgstr "Redigera ö"
 
 #. item "Places/Island" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2838
 msgid "Islet"
 msgstr ""
@@ -20666,5 +21022,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2840
 msgid "Edit Islet"
 msgstr ""
@@ -20672,5 +21028,5 @@
 #. item "Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2846
 msgid "Cave Entrance"
 msgstr "Grottöppning"
@@ -20678,10 +21034,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2848
 msgid "Edit Cave Entrance"
 msgstr "Redigera en grottöppning"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2852
 msgid "Peak"
 msgstr "Topp"
@@ -20689,10 +21045,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2854
 msgid "Edit Peak"
 msgstr "Redigera topp"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2859
 msgid "Glacier"
 msgstr "Glaciär"
@@ -20700,10 +21056,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2861
 msgid "Edit Glacier"
 msgstr "Redigera en glaciär"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2854
+#: build/trans_presets.java:2866
 msgid "Volcano"
 msgstr "Vulkan"
@@ -20711,70 +21067,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2868
 msgid "Edit Volcano"
 msgstr "Redigera en vulkan"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2874
 msgid "Boundaries"
 msgstr "Gränser"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2875
 msgid "National"
 msgstr "Nationella"
 
 #. item
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2876
 msgid "Edit National Boundary"
 msgstr "Redigera nationsgränser"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2881
 msgid "Administrative"
 msgstr "Administrativ"
 
 #. item
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2882
 msgid "Edit Administrative Boundary"
 msgstr "Redigera administrativa gränser"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:2887
 msgid "Civil"
 msgstr "Civilrättslig"
 
 #. item
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2888
 msgid "Edit Civil Boundary"
 msgstr "Redigera en civilrättslig gräns"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2893
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2894
 msgid "Edit Political Boundary"
 msgstr "Redigera politiska gränser"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2899
 msgid "National park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2888
+#: build/trans_presets.java:2900
 msgid "Edit National Park Boundary"
 msgstr "Redigera gräns för nationalpark"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2906
 msgid "Land use"
 msgstr "Markanvändning"
 
 #. group "Land use"
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2907
 msgid "Tree"
 msgstr "Träd"
@@ -20783,15 +21139,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:2898
+#: build/trans_presets.java:2910
 msgid "Edit Tree"
 msgstr "Redigera ett träd"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2915
 msgid "Botanical Name"
 msgstr "Botaniskt namn"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2917
 msgid "Wood"
 msgstr "Naturskog"
@@ -20800,5 +21156,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:2908
+#: build/trans_presets.java:2920
 msgid "Edit Wood"
 msgstr "Redigera naturskog"
@@ -20806,17 +21162,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "coniferous"
 msgstr "barrskog"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "deciduous"
 msgstr "lövskog"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "mixed"
 msgstr "blandskog"
 
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2925
 msgid "Forest"
 msgstr "Kulturskog"
@@ -20825,14 +21181,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:2916
+#: build/trans_presets.java:2928
 msgid "Edit Forest Landuse"
 msgstr "Redigera användning av mark för skogsbruk"
 
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2934
 msgid "Nature Reserve"
 msgstr "Naturreservat"
 
 #. item
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2935
 msgid "Edit Nature Reserve"
 msgstr "Redigera naturreservat"
@@ -20840,25 +21196,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2940
 msgid "Scree"
 msgstr "Bergsluttning (med lösa stenar)"
 
 #. item
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2941
 msgid "Edit Scree"
 msgstr "Redigera bergssluttning (med lösa stenar)"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2945
 msgid "Scrub"
 msgstr "Buskage"
 
 #. item
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2946
 msgid "Edit Scrub"
 msgstr "Redigera buskage"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2950
 msgid "Fell"
 msgstr "Höglandshed"
@@ -20866,10 +21222,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2952
 msgid "Edit Fell"
 msgstr "Redigera en höglandshed"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2956
 msgid "Heath"
 msgstr "Hed"
@@ -20877,5 +21233,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2958
 msgid "Edit Heath"
 msgstr "Redigera hed"
@@ -20883,5 +21239,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2963
 msgid "Farmyard"
 msgstr "Gårdsplan"
@@ -20890,45 +21246,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:2954
+#: build/trans_presets.java:2966
 msgid "Edit Farmyard Landuse"
 msgstr "Redigera markanvändning som gårdsplan"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2971
 msgid "Farmland"
 msgstr "Jordbruksmark"
 
 #. item
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2972
 msgid "Edit Farmland Landuse"
 msgstr "Redigera användning av mark för jordbruk"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2977
 msgid "Meadow"
 msgstr "Äng"
 
 #. item
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2978
 msgid "Edit Meadow Landuse"
 msgstr "Redigera markanvändning som äng"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2983
 msgid "Vineyard"
 msgstr "Vingård"
 
 #. item
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2984
 msgid "Edit Vineyard Landuse"
 msgstr "Redigera användning av mark för vingård"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:2989
 msgid "Allotments"
 msgstr "Kolonilotter"
 
 #. item
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2990
 msgid "Edit Allotments Landuse"
 msgstr "Redigera användning av mark för koloniområden"
@@ -20936,25 +21292,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2996
 msgid "Garden"
 msgstr "Trädgård"
 
 #. item
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2997
 msgid "Edit Garden"
 msgstr "Redigera trädgård"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3001
 msgid "Grass"
 msgstr "Gräs"
 
 #. item
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3002
 msgid "Edit Grass Landuse"
 msgstr "Redigera markanvändning som gräsyta"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3007
 msgid "Village Green"
 msgstr "Allmänning"
@@ -20962,10 +21318,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3009
 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:3002
+#: build/trans_presets.java:3014
 msgid "Common"
 msgstr "Allmänning"
@@ -20973,20 +21329,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3004
+#: build/trans_presets.java:3016
 msgid "Edit Common"
 msgstr "Redigera allmänning"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3020
 msgid "Park"
 msgstr "Park"
 
 #. item
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3021
 msgid "Edit Park"
 msgstr "Redigera park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3025
 msgid "Recreation Ground"
 msgstr "Fritidsområde"
@@ -20994,5 +21350,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3027
 msgid "Edit Recreation Ground Landuse"
 msgstr "Redigera användning av mark för fritidsområde"
@@ -21000,15 +21356,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3033
 msgid "Residential area"
 msgstr "Bostadsområde"
 
 #. item
-#: build/trans_presets.java:3022
+#: build/trans_presets.java:3034
 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:3027
+#: build/trans_presets.java:3039
 msgid "Graveyard"
 msgstr "Kyrkogård"
@@ -21016,9 +21372,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3029
+#: build/trans_presets.java:3041
 msgid "Edit Graveyard"
 msgstr "Redigera kyrkogård"
 
-#: build/trans_presets.java:3035
+#: build/trans_presets.java:3047
 msgid "Cemetery"
 msgstr "Begravningsplats"
@@ -21026,39 +21382,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3049
 msgid "Edit Cemetery Landuse"
 msgstr "Redigera användning av mark för begravningsplats"
 
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3056
 msgid "Retail"
 msgstr "Detaljhandel"
 
 #. item
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3057
 msgid "Edit Retail Landuse"
 msgstr "Redigera användning av mark för detaljhandel"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3062
 msgid "Commercial"
 msgstr "Affärsområde"
 
 #. item
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3063
 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:3056
+#: build/trans_presets.java:3068
 msgid "Industrial"
 msgstr "Industriområde"
 
 #. item
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3069
 msgid "Edit Industrial Landuse"
 msgstr "Redigera användning av mark för industriområde"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3074
 msgid "Railway land"
 msgstr "Järnvägsmark"
@@ -21066,15 +21422,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3076
 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:3069
+#: build/trans_presets.java:3081
 msgid "Military"
 msgstr "Militärt område"
 
 #. item
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3082
 msgid "Edit Military Landuse"
 msgstr "Redigera användning av mark för militärt område"
@@ -21082,55 +21438,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3088
 msgid "Construction area"
 msgstr "Byggnadsplats"
 
 #. item
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3089
 msgid "Edit Construction Landuse"
 msgstr "Redigera markanvändning som byggnadsplats"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3094
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3095
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3100
 msgid "Greenfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3101
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3106
 msgid "Landfill"
 msgstr "Deponi"
 
 #. item
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3107
 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:3100
+#: build/trans_presets.java:3112
 msgid "Quarry"
 msgstr "Stenbrott"
 
 #. item
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3113
 msgid "Edit Quarry Landuse"
 msgstr "Redigera användning av mark för stenbrott"
 
 #. group "Relations"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3122
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -21140,5 +21496,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:3114
+#: build/trans_presets.java:3126
 msgid "Edit Multipolygon"
 msgstr "Redigera en multipolygon"
@@ -21147,10 +21503,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3132
 msgid "outer segment"
 msgstr "yttre segement"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3133
 msgid "inner segment"
 msgstr "inre segment"
@@ -21158,5 +21514,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3136
 msgid "Turn restriction"
 msgstr ""
@@ -21165,5 +21521,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3139
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -21171,34 +21527,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "Restriction"
 msgstr "Begränsning"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_left_turn"
 msgstr "ingen_vänstersväng"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_right_turn"
 msgstr "ingen_högersväng"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_straight_on"
 msgstr "inte_rakt_fram"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_u_turn"
 msgstr "ingen_u_sväng"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_right_turn"
 msgstr "enbart_högersväng"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_left_turn"
 msgstr "enbart_vänstersväng"
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_straight_on"
 msgstr "enbart_rakt_fram"
@@ -21207,15 +21563,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3146
 msgid "from way"
 msgstr "från sträcka"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3147
 msgid "via node or way"
 msgstr "via nod eller sträcka"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3148
 msgid "to way"
 msgstr "till sträcka"
@@ -21223,5 +21579,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3151
 msgid "Route"
 msgstr ""
@@ -21230,5 +21586,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3154
 msgid "Edit Route"
 msgstr ""
@@ -21236,5 +21592,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "Route type"
 msgstr ""
@@ -21306,5 +21662,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3144 build/trans_style.java:233
+#: build/trans_presets.java:3156 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -21313,17 +21669,17 @@
 msgstr "cykel"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "bus"
 msgstr "buss"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ski"
 msgstr ""
@@ -21376,5 +21732,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3144 build/trans_style.java:247
+#: build/trans_presets.java:3156 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -21383,13 +21739,13 @@
 msgstr "fot"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "detour"
 msgstr ""
@@ -21403,10 +21759,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3144 build/trans_style.java:1206
+#: build/trans_presets.java:3156 build/trans_style.java:1206
 msgid "subway"
 msgstr "tunnelbana"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3159
 msgid "Symbol description"
 msgstr ""
@@ -21414,31 +21770,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3162
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "Color (hex)"
 msgstr ""
@@ -21447,30 +21803,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3168
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3169
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3170
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3171
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3172
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3173
 msgid "backward halt point"
 msgstr ""
@@ -21908,11 +22264,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3375 build/trans_style.java:3376
-#: build/trans_style.java:3946 build/trans_style.java:4254
-#: build/trans_style.java:4263 build/trans_style.java:4272
-#: build/trans_style.java:4281 build/trans_style.java:4290
-#: build/trans_style.java:4299 build/trans_style.java:4308
-#: build/trans_style.java:4309 build/trans_style.java:4318
-#: build/trans_style.java:4327
+#: build/trans_style.java:3383 build/trans_style.java:3384
+#: build/trans_style.java:3954 build/trans_style.java:4262
+#: build/trans_style.java:4271 build/trans_style.java:4280
+#: build/trans_style.java:4289 build/trans_style.java:4298
+#: build/trans_style.java:4307 build/trans_style.java:4316
+#: build/trans_style.java:4317 build/trans_style.java:4326
+#: build/trans_style.java:4335
 msgid "deprecated"
 msgstr "förlegad"
@@ -23936,5 +24292,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3294
+#: build/trans_style.java:3302
 msgid "light_water"
 msgstr ""
@@ -24616,8 +24972,17 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="boundary_stone"/>
+#. <icon annotate="true" src="historic/boundary_stone.png"/>
 #: build/trans_style.java:2990 build/trans_style.java:2998
 #: build/trans_style.java:3006 build/trans_style.java:3014
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
+#: build/trans_style.java:3054
 msgid "historic"
 msgstr "historisk"
@@ -24631,5 +24996,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3095
 msgid "quarry"
 msgstr "stenbrott"
@@ -24643,5 +25008,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "landfill"
 msgstr ""
@@ -24663,5 +25028,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3103 build/trans_style.java:3111
+#: build/trans_style.java:3111 build/trans_style.java:3119
 msgid "basin"
 msgstr "hamnbassäng"
@@ -24675,5 +25040,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3127
 msgid "forest"
 msgstr "skog"
@@ -24687,5 +25052,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3159
 msgid "farmyard"
 msgstr "gårdsplan"
@@ -24708,5 +25073,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3160 build/trans_style.java:3168
+#: build/trans_style.java:3168 build/trans_style.java:3176
 msgid "retail"
 msgstr "detaljhandel"
@@ -24720,5 +25085,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3176
+#: build/trans_style.java:3184
 msgid "industrial"
 msgstr "industri"
@@ -24732,5 +25097,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "brownfield"
 msgstr ""
@@ -24744,5 +25109,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "greenfield"
 msgstr ""
@@ -24756,5 +25121,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "railland"
 msgstr ""
@@ -24811,7 +25176,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3217 build/trans_style.java:3252
-#: build/trans_style.java:3260 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3225 build/trans_style.java:3260
+#: build/trans_style.java:3268 build/trans_style.java:3276
+#: build/trans_style.java:3284 build/trans_style.java:3292
 msgid "military"
 msgstr "militär"
@@ -24825,5 +25190,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3225
+#: build/trans_style.java:3233
 msgid "cemetery"
 msgstr "begravningsplats"
@@ -24836,5 +25201,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3301
+#: build/trans_style.java:3309
 msgid "peak"
 msgstr "topp"
@@ -24849,5 +25214,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3310
+#: build/trans_style.java:3318
 msgid "glacier"
 msgstr "glaciär"
@@ -24861,5 +25226,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "volcano"
 msgstr "vulkan"
@@ -24914,8 +25279,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3326 build/trans_style.java:3327
-#: build/trans_style.java:3335 build/trans_style.java:3351
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440
+#: build/trans_style.java:3334 build/trans_style.java:3335
+#: build/trans_style.java:3343 build/trans_style.java:3359
+#: build/trans_style.java:3432 build/trans_style.java:3440
+#: build/trans_style.java:3448
 msgid "natural"
 msgstr "naturfenomen"
@@ -24929,5 +25294,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3343
+#: build/trans_style.java:3351
 msgid "scrub"
 msgstr "buskage"
@@ -24941,5 +25306,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3359
+#: build/trans_style.java:3367
 msgid "heath"
 msgstr "hed"
@@ -24953,5 +25318,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3408
+#: build/trans_style.java:3416
 msgid "mud"
 msgstr "lera"
@@ -24965,5 +25330,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "beach"
 msgstr "strand"
@@ -25041,8 +25406,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
-#: build/trans_style.java:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496 build/trans_style.java:3504
+#: build/trans_style.java:3512 build/trans_style.java:3520
 msgid "route"
 msgstr "rutt"
@@ -25090,7 +25455,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3522 build/trans_style.java:3530
-#: build/trans_style.java:3538 build/trans_style.java:3546
-#: build/trans_style.java:3554
+#: build/trans_style.java:3530 build/trans_style.java:3538
+#: build/trans_style.java:3546 build/trans_style.java:3554
+#: build/trans_style.java:3562
 msgid "boundary"
 msgstr "gräns"
@@ -25240,11 +25605,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090
+#: build/trans_style.java:4002 build/trans_style.java:4010
+#: build/trans_style.java:4018 build/trans_style.java:4026
+#: build/trans_style.java:4034 build/trans_style.java:4042
+#: build/trans_style.java:4050 build/trans_style.java:4058
+#: build/trans_style.java:4066 build/trans_style.java:4074
+#: build/trans_style.java:4082 build/trans_style.java:4090
+#: build/trans_style.java:4098
 msgid "place"
 msgstr "plats"
@@ -25292,6 +25657,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4207 build/trans_style.java:4214
-#: build/trans_style.java:4221 build/trans_style.java:4228
+#: build/trans_style.java:4215 build/trans_style.java:4222
+#: build/trans_style.java:4229 build/trans_style.java:4236
 msgid "address"
 msgstr "adress"
@@ -25599,12 +25964,33 @@
 msgstr ""
 
+#~ msgid "- running version is {0}"
+#~ msgstr "- nuvarande version är {0}"
+
+#~ msgid "Move"
+#~ msgstr "Flytta"
+
+#~ msgid "Email"
+#~ msgstr "Email"
+
+#~ msgid "Object"
+#~ msgstr "Objekt"
+
+#~ msgid "Unknown version"
+#~ msgstr "Okänd version"
+
+#~ msgid "unnamed"
+#~ msgstr "namnlös"
+
+#~ msgid "OSM username (email)"
+#~ msgstr "OSM-användarnamn (email)"
+
+#~ msgid "Aborting..."
+#~ msgstr "Avbryter..."
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Okänd filändelse."
+
 #~ msgid "All the ways were empty"
 #~ msgstr "Alla sträckor var tomma"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Slå ihop noder med olika medlemskap?"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Slå ihop i alla fall"
 
 #~ msgid ""
@@ -25615,39 +26001,6 @@
 #~ "dem?"
 
-#~ msgid "Unknown version"
-#~ msgstr "Okänd version"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "Hittade element av typen <nd> på icke-sträcka"
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> har nollreferens"
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Fann <member>-tagg utanför relation."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Felformaterad nod-id"
-
-#~ msgid "Move"
-#~ msgstr "Flytta"
-
-#~ msgid "Email"
-#~ msgstr "Email"
-
-#~ msgid "Object"
-#~ msgstr "Objekt"
-
-#~ msgid "unnamed"
-#~ msgstr "namnlös"
-
-#~ msgid "OSM username (email)"
-#~ msgstr "OSM-användarnamn (email)"
-
-#~ msgid "Aborting..."
-#~ msgstr "Avbryter..."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Okänd filändelse."
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "Slå ihop noder med olika medlemskap?"
 
 #~ msgid "No document open so nothing to save."
@@ -25701,7 +26054,4 @@
 #~ msgid "Occupied By"
 #~ msgstr "Innehas av"
-
-#~ msgid "Add Selected"
-#~ msgstr "Lägg till vald"
 
 #~ msgid "Add all currently selected objects as members"
@@ -25768,7 +26118,4 @@
 #~ msgstr "Navigation"
 
-#~ msgid "Commit comment"
-#~ msgstr "Bidragskommentar"
-
 #~ msgid "Charge"
 #~ msgstr "Avgift"
@@ -25824,4 +26171,10 @@
 #~ msgstr "Klaffbro"
 
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "Hittade element av typen <nd> på icke-sträcka"
+
+#~ msgid "<nd> has zero ref"
+#~ msgstr "<nd> har nollreferens"
+
 #~ msgid "hikingmap"
 #~ msgstr "vandringskarta"
@@ -25835,4 +26188,10 @@
 #~ msgid "bicyclemap"
 #~ msgstr "cykelkarta"
+
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "Fann <member>-tagg utanför relation."
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "Felformaterad nod-id"
 
 #~ msgid ""
@@ -25987,7 +26346,4 @@
 #~ msgstr "Publik"
 
-#~ msgid "Server does not support changesets"
-#~ msgstr "Servern har inte stöd för ändringssamlingar"
-
 #~ msgid ""
 #~ "Internal Error: cannot check conditions for no layer. Please report this "
@@ -26002,4 +26358,7 @@
 #~ msgid "Delete and Download"
 #~ msgstr "Ta bort och hämta hem"
+
+#~ msgid "Merge Anyway"
+#~ msgstr "Slå ihop i alla fall"
 
 #~ msgid "Continue anyway"
@@ -26119,7 +26478,4 @@
 #~ "<br>Klicka <strong>{3}</strong> för att avbryta.<br>"
 
-#~ msgid "Delete mine"
-#~ msgstr "Radera mina"
-
 #~ msgid ""
 #~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
Index: applications/editors/josm/i18n/po/tr.po
===================================================================
--- applications/editors/josm/i18n/po/tr.po	(revision 17655)
+++ applications/editors/josm/i18n/po/tr.po	(revision 17697)
@@ -10,6 +10,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-12 18:11+0200\n"
-"PO-Revision-Date: 2009-09-06 12:59+0000\n"
+"POT-Creation-Date: 2009-09-19 13:00+0200\n"
+"PO-Revision-Date: 2009-09-15 05:27+0000\n"
 "Last-Translator: katpatuka <email@katpatuka.org>\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-09-12 16:06+0000\n"
+"X-Launchpad-Export-Date: 2009-09-19 10:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -44,10 +44,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:543
 #: ../core/src/org/openstreetmap/josm/Main.java:551
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -72,5 +72,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -88,6 +88,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:358
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
@@ -103,6 +103,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
@@ -126,10 +126,10 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
 msgid "Save and Exit"
 msgstr "Kaydet ve Çık"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
 msgid "Discard and Exit"
 msgstr "Vazgeç ve Çık"
@@ -140,4 +140,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
@@ -145,27 +146,28 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:296
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:258
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:613
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
@@ -173,5 +175,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -191,6 +193,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
@@ -207,17 +209,17 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:654
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1528
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -228,6 +230,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
@@ -280,9 +282,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:607
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:609
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -342,5 +344,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
 msgid "Plugins"
@@ -390,5 +392,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr "Birleştir"
@@ -476,5 +478,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -487,4 +489,5 @@
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -520,6 +523,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
@@ -528,6 +531,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:346
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
@@ -635,4 +638,46 @@
 msgstr "Yakınlaştıracak bir çakışma yok."
 
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#, fuzzy
+msgid "Close open changesets"
+msgstr "Kapanıyor..."
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#, fuzzy
+msgid "Closes open changesets"
+msgstr "Kapanıyor..."
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
+#: ../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:114
+#, java-format
+msgid "File: {0}"
+msgstr "Dosya: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
+#, fuzzy
+msgid "There are no open changesets"
+msgstr "Bu bu bilgiyi desteklemiyor."
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
+#, fuzzy
+msgid "No open changesets"
+msgstr "Kapanıyor..."
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
+#, fuzzy
+msgid "Downloading open changesets ..."
+msgstr "Kapanıyor..."
+
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
@@ -730,10 +775,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:123
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
@@ -776,31 +822,30 @@
 msgstr "Noktaları düz bir çüzgi olarak dağıt"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
 msgid "Download from OSM..."
 msgstr "OSM sitesinden indir..."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
 msgid "Download map data from the OSM server."
 msgstr "Harita verisi OSM sunucusundan indir."
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
-#, java-format
-msgid "File: {0}"
-msgstr "Dosya: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
 msgid "Download"
 msgstr "İndir"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "OK"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
 msgid "Please select at least one task to download"
 msgstr "Lütfen en az bir indirme görevi seçiniz"
@@ -821,5 +866,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1527
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307
@@ -839,6 +884,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:376
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1415
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
 msgid "Duplicate"
 msgstr "Çift"
@@ -910,10 +955,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
@@ -999,25 +1045,26 @@
 msgstr "Varsayılan tabaka başka bir tabaka ile birleştir"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 msgid "Merge Nodes"
 msgstr "Noktaları birleştir"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
 msgid "Merge nodes into the oldest one."
 msgstr "Noktaları en eskisiyle birleştir"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
 msgid "Please select at least two nodes to merge."
 msgstr "Birleştirmek için en azından iki nokta seçmen lazım."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:394
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
@@ -1033,8 +1080,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -1060,6 +1107,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
@@ -1068,10 +1119,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr ""
 "Noktalar birleştirilemiyor: Kullanılan bir yolun silinmesi gerekiyordu."
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283
 #, java-format
 msgid "Merge {0} nodes"
@@ -1143,5 +1194,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "New"
 msgstr "Yeni"
@@ -1414,14 +1465,15 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
+msgid "Status Report"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
-msgid "Status Report"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
 msgid "Copy to clipboard and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
@@ -1495,25 +1547,4 @@
 msgstr "{0} Yolu  {1} parçaya bölünecek"
 
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24
-msgid "Close current changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-msgid "Close the current changeset ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41
-msgid "There is currently no changeset open."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42
-msgid "No open changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60
-msgid "Closing changeset"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
@@ -1679,14 +1710,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "OSM ye yükle..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 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:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
 #, java-format
 msgid ""
@@ -1695,23 +1726,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
 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:166
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 msgid "No changes to upload."
 msgstr "Yüklenilecek değişiklik yok."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
 msgid "Synchronize entire dataset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
 #, java-format
 msgid ""
@@ -1725,17 +1756,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
 msgid "Conflict detected"
 msgstr ""
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:267
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
 #, java-format
 msgid ""
@@ -1746,28 +1777,40 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
+msgid ""
+"<html>Uploading <strong>failed</strong> because you've been "
+"using<br>changeset {0} which was already closed at {1}.<br>Please upload "
+"again with a new or an existing open changeset."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+#, fuzzy
+msgid "Changeset closed"
+msgstr "Değerleri Değiştir?"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
 msgid "Upload to OSM API failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1986,14 +2029,14 @@
 msgstr "Yola kavşak ekle ve birleştir"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:930
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:932
 msgid "Create new node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
 msgid "Select node under cursor."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939
 #, java-format
 msgid "Insert new node into way."
@@ -2002,14 +2045,14 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
 msgid "Start new way from last node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951
 msgid "Continue way from last node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:972
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:974
 msgid "Finish drawing."
 msgstr ""
@@ -2129,60 +2172,70 @@
 "sağzoom taşı ise sağ klik"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "Ara..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "Objeleri ara."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
 msgid "Can't search because there is no loaded data."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
+#, fuzzy
+msgid "Please enter a filter string."
+msgstr "Lütfen bir aramametni giriniz."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
 msgid "Please enter a search string."
 msgstr "Lütfen bir aramametni giriniz."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
 msgid "replace selection"
 msgstr "seçimi değiştiriniz"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72
 msgid "add to selection"
 msgstr "seçime ekleyiniz"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73
 msgid "remove from selection"
 msgstr "Seçimden çıkartınız"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
+#, fuzzy
+msgid "find in selection"
+msgstr "seçime ekleyiniz"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81
 msgid "case sensitive"
 msgstr "Harf hassas"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82
 msgid "regular expression"
 msgstr "ifade anlatımı"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid ""
 "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
@@ -2190,109 +2243,126 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
 msgid "<u>Special targets:</u>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 msgid "<b>nodes:</b>... - object with given number of nodes"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
 msgid "<b>modified</b> - all changed objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
 msgid "<b>selected</b> - all selected objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "<b>untagged</b> - all untagged objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
+msgid "Filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "Arama"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
+msgid "Submit filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "Start Search"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "''{0}'' için herhangi karşılık bulunamadı"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "''{0}'' için yapılan aramada herhangi bir ekleme yapılmadı."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "''{0}'' için yapılan aramada, herhangi birşey çıkartılmadı"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#, fuzzy, java-format
+msgid "Nothing find in selection by searching for ''{0}''"
+msgstr "''{0}'' için yapılan aramada herhangi bir ekleme yapılmadı."
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262
 #, java-format
 msgid "Found {0} matches"
 msgstr "{0} Eşleşme bulundu"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283
 msgid "RX"
 msgstr "RX"
@@ -2476,5 +2546,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
 msgid "Double conflict"
 msgstr ""
@@ -2718,4 +2788,5 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:134
 msgid "Old value"
 msgstr "Eski Değer"
@@ -2879,27 +2950,59 @@
 
 #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
 msgid "E"
 msgstr "D"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:59
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:203
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
 msgid "Changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:323
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:325
-#, fuzzy, java-format
-msgid "paramete''{0}'' must not be null"
-msgstr "parametre ''{0}'' zero (null) olamaz"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331
-#, fuzzy, java-format
-msgid "unsupported value ''{0}'' or parameter ''{1}''"
-msgstr "Kullanışlı rol yok ''{0}''  ''{1}'' yolu için."
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "H"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "Text"
+msgstr "metin"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "C"
+msgstr "CS"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "I"
+msgstr "CI"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "M"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#, fuzzy
+msgid "R"
+msgstr "RX"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+msgid "A"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+msgid "D"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+msgid "F"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
@@ -2913,29 +3016,29 @@
 msgstr "Uyarı: {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
 #, java-format
 msgid "expected id >= 0. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:257
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
 msgid "a primitive with id=0 can't be invisible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:293
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
 #, java-format
 msgid "id > 0 expected. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
 #, java-format
 msgid "version > 0 expected. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
 msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
 msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
@@ -3002,9 +3105,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:247
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:249
 msgid "Area style way is not closed."
 msgstr "Alan stili yol kapalı değil."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:478
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:482
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
@@ -3013,118 +3116,118 @@
 #. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
 #. TODO Remove useless nullcheck when RelationMember.member is encalupsed
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:851
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855
 msgid "Empty member in relation."
 msgstr "İlişkide boş üye."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:853
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "''{0}'' üyesini ilişkiden sil."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:864
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "Yol ''{0}'' iki noktadan az içeriyor."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "More than one \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "More than one \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "More than one \"via\" found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"from\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"to\" way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652
 msgid "No \"via\" node or way found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "Kullanışlı rol yok ''{0}''  ''{1}'' yolu için."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:885
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "Yol-Değil ''{0}'' multipolygon içinde."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:943
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "Multipoligon için dış yol yok ''{0}''."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1032
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "Bu ''{0}'' ve ''{1}'' yolları arasında kesişim."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1044
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "iç yol ''{0}'' dışarıda."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1097
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "İç yol stili ''{0}'' multipolygon ."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1123
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "Dış yol stili ''{0}'' bulunamadı."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1327
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331
 msgid "untagged"
 msgstr "etiketsiz"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1328
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332
 msgid "text"
 msgstr "metin"
@@ -3145,5 +3248,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
@@ -3162,5 +3265,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
@@ -3208,5 +3311,5 @@
 msgstr "Lambert Zone (Fransa)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambert Zone (Estonia)"
@@ -3248,9 +3351,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:38
 msgid "Do not show again"
 msgstr "Tekrar Gösterme"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
 #, java-format
@@ -3258,31 +3361,31 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:91
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:116
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154
 msgid "incomplete"
 msgstr "eksik"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
 msgid "highway"
 msgstr "Karayolu"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
-#: build/trans_presets.java:3144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: build/trans_presets.java:3156
 msgid "railway"
 msgstr "demiryolu"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
 msgid "waterway"
 msgstr "suyolu"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "landuse"
 msgstr "arazi kullanımı"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:474
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
@@ -3291,5 +3394,5 @@
 msgstr[0] "{0} Kavşak"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
 #, java-format
 msgid "{0} member"
@@ -3318,7 +3421,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:130
-#, fuzzy
 msgid "Bad Request"
-msgstr "Raket Düzenle"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:144
@@ -3334,10 +3436,5 @@
 msgstr "Günün Mesajı mevcut değil"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67
-#, java-format
-msgid "- running version is {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:95
 msgid "Downloading \"Message of the day\""
 msgstr ""
@@ -3410,10 +3507,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:162
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
 msgid "Username"
 msgstr "KullanıcıAdı"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
 msgid "Password"
 msgstr "şifre"
@@ -3536,5 +3633,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226
 msgid "Presets"
 msgstr "Ayarlanmış"
@@ -3608,38 +3705,49 @@
 msgstr "ölçek"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Fare imleci üzerindeki coğrafi boylam."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The name of the object at the mouse pointer."
 msgstr "Fare imleci üzerindeki objenin adı."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Fare imleci üzerindeki coğrafi enlem."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The angle between the previous and the current way segment."
 msgstr "Önceki ve şimdiki yol kısımları arasındaki açı."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "Segment çizildi."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The length of the new way segment being drawn."
 msgstr "Yeni yol segmentinin uzunluğu çizildi."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199
+msgid ""
+"Middle click again to cycle through.<br>Hold CTRL to select directly from "
+"this list with the mouse.<hr>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290
 msgid "(no object)"
 msgstr "(obje yok)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:301
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418
+#, fuzzy
+msgid "User:"
+msgstr "Kullanıcı"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
 msgid "layer not in list."
 msgstr "tabaka listede yok."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:488
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3709,7 +3817,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:224
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Tags"
 msgstr ""
@@ -3724,5 +3832,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
@@ -3903,4 +4011,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
 msgid "Up"
 msgstr ""
@@ -3911,4 +4020,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Down"
 msgstr ""
@@ -3921,5 +4031,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
@@ -4342,23 +4452,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:236
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239
 msgid "No conflicts to resolve"
-msgstr "Yakınlaştıracak bir çakışma yok."
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:295
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254
 msgid "Cancel conflict resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:310
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269
 msgid "Apply resolved conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Apply"
 msgstr ""
@@ -4370,5 +4479,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "all"
 msgstr "hepsi"
@@ -4412,7 +4521,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
-msgid "not yet decided"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:213
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
@@ -4439,7 +4545,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
@@ -4448,7 +4554,7 @@
 msgstr[0] "{0} Yol"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:152
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
@@ -4457,20 +4563,20 @@
 msgstr[0] "{0} İlişki"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "Paste ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "From ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:372
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "To ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:428
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
 #, java-format
 msgid "{0} tag"
@@ -4486,13 +4592,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
-#, fuzzy
 msgid "Remove this relation member from the relation"
-msgstr "Seçili satırdaki üyeyi bu ilişkiden kaldır"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-#, fuzzy
 msgid "Replace"
-msgstr "yer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
@@ -4508,5 +4612,5 @@
 #. --- role editing
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:56
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510
 msgid "Role:"
 msgstr ""
@@ -4522,7 +4626,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70
-#, fuzzy
 msgid "Value:"
-msgstr "Değer"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86
@@ -4535,12 +4638,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51
-#, fuzzy
 msgid "Orig. Way"
-msgstr "tek Yol"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
-#, fuzzy
 msgid "Decision"
-msgstr "Revizyon"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -4556,6 +4657,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
@@ -4644,167 +4746,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-msgid "History"
-msgstr "Geçmiş"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-msgid "Display the history of all selected items."
-msgstr "Seçili nesnelerin geçmişini göster."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
-#, java-format
-msgid "index out of bounds Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
-msgid "History item"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "Reload all currently selected objects and refresh the list."
-
-#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
-msgid "Show"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
-msgid "Dialog not created yet. Invoke createInstance() first"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
-msgid "Layers"
-msgstr "Tabakalar"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-msgid "Open a list of all loaded layers."
-msgstr "Yüklenilmiş olan tabakaların listesini göster."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:297
-msgid "Delete the selected layer."
-msgstr "Seçili tabakayı sil."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:367
-msgid "Show/Hide"
-msgstr "Göster/Sakla"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:378
-msgid "Toggle visible state of the selected layer."
-msgstr "Seçili tabakanın görünen kısmını sabitle."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:420
-msgid "Activate the selected layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:475
-msgid "Merge this layer into another layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:581
-msgid "Move the selected layer one row up."
-msgstr "Seçili tabakayı bir satır yukarı taşı."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:600
-msgid "Move the selected layer one row down."
-msgstr "Seçili tabakayı bir satır aşağı taşı."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
-msgid "Information about layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
-#, java-format
-msgid "This will change up to {0} object."
-msgid_plural "This will change up to {0} objects."
-msgstr[0] "İşlem {0} objeyi değiştirecek."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
-msgid "An empty value deletes the key."
-msgstr "Boş değer anahtarı sildi."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
-msgid "<different>"
-msgstr "<farklı>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
-msgid "Change values?"
-msgstr "Değerleri Değiştir?"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
-#, java-format
-msgid "Change properties of up to {0} object"
-msgid_plural "Change properties of up to {0} objects"
-msgstr[0] "Değerleri {0} obje için değiştir"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
-msgid "Please select a key"
-msgstr "Lütfen bir anahtar seçiniz"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
-msgid "Please select a value"
-msgstr "Lütfen bir değer seçiniz"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
-msgid "Please select the objects you want to change properties for."
-msgstr "Özelliklerini değiştirmek istediğiniz objeleri seçiniz."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
-msgid "Properties/Memberships"
-msgstr "Özellikler/Üyelikler"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-msgid "Properties for selected objects."
-msgstr "Seçili objenin özellikleri"
-
-#. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-msgid "Member Of"
-msgstr "Üyesi"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
-msgid "Add Properties"
-msgstr "Özellik Ekle"
-
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+msgid "Filter objects and hide/disable them."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
@@ -4818,4 +4766,210 @@
 msgstr "Ekle"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#, fuzzy
+msgid "Add filter."
+msgstr "Seçileni Ekle"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
+#, fuzzy
+msgid "Edit filter."
+msgstr "Kemer Düzenle"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#, fuzzy
+msgid "Delete filter."
+msgstr "Şunların Arasında Seçiniz:"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
+#, fuzzy
+msgid "Move filter up."
+msgstr "Yukarı Git"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
+#, fuzzy
+msgid "Move filter down."
+msgstr "Aşağı"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128
+msgid "Enable filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
+#, fuzzy
+msgid "Hide elements"
+msgstr "Tek Eleman"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
+msgid "Apply also for children"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
+msgid "Inverse filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
+#, fuzzy
+msgid "Filter mode"
+msgstr "Silme Modu"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
+msgid "History"
+msgstr "Geçmiş"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+msgid "Display the history of all selected items."
+msgstr "Seçili nesnelerin geçmişini göster."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
+msgid "History item"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
+msgid "Reload all currently selected objects and refresh the list."
+msgstr "Reload all currently selected objects and refresh the list."
+
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
+msgid "Show"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
+msgid "Display the history of the selected primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84
+msgid "Dialog not created yet. Invoke createInstance() first"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
+msgid "Layers"
+msgstr "Tabakalar"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+msgid "Open a list of all loaded layers."
+msgstr "Yüklenilmiş olan tabakaların listesini göster."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294
+msgid "Delete the selected layer."
+msgstr "Seçili tabakayı sil."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364
+msgid "Show/Hide"
+msgstr "Göster/Sakla"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375
+msgid "Toggle visible state of the selected layer."
+msgstr "Seçili tabakanın görünen kısmını sabitle."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgid "Activate"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417
+msgid "Activate the selected layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472
+msgid "Merge this layer into another layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578
+msgid "Move the selected layer one row up."
+msgstr "Seçili tabakayı bir satır yukarı taşı."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597
+msgid "Move the selected layer one row down."
+msgstr "Seçili tabakayı bir satır aşağı taşı."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+msgid "Information about layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+#, java-format
+msgid "This will change up to {0} object."
+msgid_plural "This will change up to {0} objects."
+msgstr[0] "İşlem {0} objeyi değiştirecek."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+msgid "An empty value deletes the key."
+msgstr "Boş değer anahtarı sildi."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+msgid "<different>"
+msgstr "<farklı>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+msgid "Change values?"
+msgstr "Değerleri Değiştir?"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#, java-format
+msgid "Change properties of up to {0} object"
+msgid_plural "Change properties of up to {0} objects"
+msgstr[0] "Değerleri {0} obje için değiştir"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+msgid "Please select a key"
+msgstr "Lütfen bir anahtar seçiniz"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+msgid "Please select a value"
+msgstr "Lütfen bir değer seçiniz"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
+msgid "Please select the objects you want to change properties for."
+msgstr "Özelliklerini değiştirmek istediğiniz objeleri seçiniz."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
+msgid "Properties/Memberships"
+msgstr "Özellikler/Üyelikler"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+msgid "Properties for selected objects."
+msgstr "Seçili objenin özellikleri"
+
+#. setting up the membership table
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+msgid "Member Of"
+msgstr "Üyesi"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
+msgid "Add Properties"
+msgstr "Özellik Ekle"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574
 msgid "Add a new key/value pair to all objects"
@@ -4857,10 +5011,9 @@
 
 #. item "Land use/Quarry" text "Name"
-#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
-#: build/trans_presets.java:3109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168
+#: build/trans_presets.java:3121
 msgid "Relations"
 msgstr "İlişkiler"
@@ -4870,23 +5023,23 @@
 msgstr "İlişkilerin listesini göster."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166
 #, java-format
 msgid "Relations: {0}"
 msgstr "İlişkiler: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276
 msgid "Open an editor for the selected relation"
 msgstr "Seçili ilişki için bir editör aç."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
 msgid "Delete the selected relation"
 msgstr "Seçili ilişkiyi sil"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349
 msgid "Create a new relation"
 msgstr "Yeni ilişki oluştur"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:373
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1412
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
@@ -4919,5 +5072,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4929,14 +5082,14 @@
 msgstr "Seçim: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441
 msgid "Undock the panel"
 msgstr "Panelin kilidini Kaldır"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr "Paneli Kapat. Soldaki araç çubuğundan tekrar açabilirsiniz."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:457
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "paneli büyütüp/küçültmek için tıklayınız"
@@ -4997,5 +5150,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5019,5 +5172,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1502
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1370
 msgid "Download relation members"
 msgstr ""
@@ -5047,5 +5200,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -5053,18 +5206,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
 msgid "Tags and Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:167
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5073,14 +5226,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613
 #, java-format
 msgid ""
@@ -5090,9 +5243,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid ""
@@ -5102,15 +5255,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5118,5 +5271,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5124,20 +5277,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849
 #, java-format
 msgid ""
@@ -5146,57 +5299,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:961
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909
 msgid "Move the currently selected members up"
 msgstr "Seçili üyeyi yukarı taşı"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:979
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:912
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928
 msgid "Move the currently selected members down"
 msgstr "Seçili üyeyi aşağı taşı"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:998
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:931
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5205,9 +5358,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1058
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
 #, java-format
 msgid ""
@@ -5216,56 +5369,41 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090
+msgid "Apply the current updates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123
+msgid "Apply the updates and close the dialog"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
-msgid "Apply the current updates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
-msgid "Apply the updates and close the dialog"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "OK"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
-msgid "Delete the currently selected tags"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "Bütün eksik yolları ve kavşakları ilişkili olarak indir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 msgid "Download Members"
 msgstr "Üyeleri İndir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1208
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1211
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1356
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 #, java-format
 msgid ""
@@ -5275,13 +5413,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1229
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1367
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
 msgid "Confirm empty role"
 msgstr ""
@@ -5368,37 +5506,37 @@
 msgstr "Sık Kullanılanlar"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:82
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
 msgid "Please enter the desired coordinates first."
 msgstr "lütfen ilk olarak istenilen koordinatı giriniz."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
 msgid "Please enter a name for the location."
 msgstr "Lütfen bu yer için bir isim giriniz."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:107
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
 msgid "Select a bookmark first."
 msgstr "İlk olarak sık kullanılanlardan bir yer seçiniz."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
 msgid "min lat"
 msgstr "min lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
 msgid "min lon"
 msgstr "min lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid "max lat"
 msgstr "max lat"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
 msgid "max lon"
 msgstr "max lon"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5406,26 +5544,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
 msgid "Bounding Box"
 msgstr "Sınır Çerçevesi"
 
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
 msgid "Data Sources and Types"
 msgstr "Bilgi Kaynağı ve Tipi"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
 msgid "Download as new layer"
 msgstr "Yeni tabaka olarak indir"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
 msgid "Download Area"
 msgstr "Alanı indir"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
 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:219
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
 msgid "Download area ok, size probably acceptable to server"
 msgstr "Seçilen alan uygun, server kabul edecektir"
@@ -5450,7 +5588,7 @@
 msgstr "Aranacak yerin adını giriniz:"
 
-#. <separator/>
+#. group "Geography"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2759
 msgid "Places"
 msgstr "Yerler"
@@ -5497,21 +5635,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "type"
 msgstr "tip"
@@ -5528,5 +5666,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:120
-#, fuzzy
 msgid ""
 "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
@@ -5534,6 +5671,4 @@
 "Hold left mousebutton and draw a frame."
 msgstr ""
-"Yakınlaştır:FareTekeri veya çift Klik. Harita Taşı: Sağ klik ve fareyi oynat."
-"Seçim:Klik"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:123
@@ -5994,4 +6129,6 @@
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
 #. <key key="historic" value="wayside_shrine" />
+#. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
+#. <key key="historic" value="boundary_stone" />
 #. item "Leisure/Water Park" label "Edit Water Park"
 #. <key key="leisure" value="water_park" />
@@ -6363,153 +6500,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/trans_presets.java:66 build/trans_presets.java:102
-#: build/trans_presets.java:142 build/trans_presets.java:179
-#: build/trans_presets.java:199 build/trans_presets.java:217
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:272 build/trans_presets.java:305
-#: build/trans_presets.java:351 build/trans_presets.java:371
-#: build/trans_presets.java:386 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:463 build/trans_presets.java:482
-#: build/trans_presets.java:502 build/trans_presets.java:522
-#: build/trans_presets.java:543 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627 build/trans_presets.java:658
-#: build/trans_presets.java:679 build/trans_presets.java:692
-#: build/trans_presets.java:705 build/trans_presets.java:718
-#: build/trans_presets.java:731 build/trans_presets.java:744
-#: build/trans_presets.java:755 build/trans_presets.java:764
-#: build/trans_presets.java:811 build/trans_presets.java:832
-#: build/trans_presets.java:841 build/trans_presets.java:901
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1067 build/trans_presets.java:1075
-#: build/trans_presets.java:1085 build/trans_presets.java:1093
-#: build/trans_presets.java:1098 build/trans_presets.java:1105
-#: build/trans_presets.java:1112 build/trans_presets.java:1117
-#: build/trans_presets.java:1125 build/trans_presets.java:1134
-#: build/trans_presets.java:1140 build/trans_presets.java:1146
-#: build/trans_presets.java:1151 build/trans_presets.java:1157
-#: build/trans_presets.java:1163 build/trans_presets.java:1172
-#: build/trans_presets.java:1181 build/trans_presets.java:1188
-#: build/trans_presets.java:1196 build/trans_presets.java:1209
-#: build/trans_presets.java:1215 build/trans_presets.java:1224
-#: build/trans_presets.java:1230 build/trans_presets.java:1236
-#: build/trans_presets.java:1244 build/trans_presets.java:1299
-#: build/trans_presets.java:1346 build/trans_presets.java:1352
-#: build/trans_presets.java:1358 build/trans_presets.java:1364
-#: build/trans_presets.java:1370 build/trans_presets.java:1381
-#: build/trans_presets.java:1390 build/trans_presets.java:1405
-#: build/trans_presets.java:1412 build/trans_presets.java:1418
-#: build/trans_presets.java:1426 build/trans_presets.java:1433
-#: build/trans_presets.java:1442 build/trans_presets.java:1450
-#: build/trans_presets.java:1457 build/trans_presets.java:1468
-#: build/trans_presets.java:1478 build/trans_presets.java:1488
-#: build/trans_presets.java:1508 build/trans_presets.java:1520
-#: build/trans_presets.java:1531 build/trans_presets.java:1548
-#: build/trans_presets.java:1555 build/trans_presets.java:1570
-#: build/trans_presets.java:1577 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1594
-#: build/trans_presets.java:1599 build/trans_presets.java:1605
-#: build/trans_presets.java:1611 build/trans_presets.java:1619
-#: build/trans_presets.java:1627 build/trans_presets.java:1635
-#: build/trans_presets.java:1642 build/trans_presets.java:1648
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1670 build/trans_presets.java:1677
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1712 build/trans_presets.java:1719
-#: build/trans_presets.java:1736 build/trans_presets.java:1744
-#: build/trans_presets.java:1759 build/trans_presets.java:1769
-#: build/trans_presets.java:1781 build/trans_presets.java:1788
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:1809 build/trans_presets.java:1817
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1841
-#: build/trans_presets.java:1846 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1864
-#: build/trans_presets.java:1872 build/trans_presets.java:1881
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1908 build/trans_presets.java:1914
-#: build/trans_presets.java:1922 build/trans_presets.java:1928
-#: build/trans_presets.java:1934 build/trans_presets.java:1940
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2013
-#: build/trans_presets.java:2022 build/trans_presets.java:2030
-#: build/trans_presets.java:2036 build/trans_presets.java:2042
-#: build/trans_presets.java:2048 build/trans_presets.java:2054
-#: build/trans_presets.java:2060 build/trans_presets.java:2066
-#: build/trans_presets.java:2072 build/trans_presets.java:2078
-#: build/trans_presets.java:2084 build/trans_presets.java:2090
-#: build/trans_presets.java:2096 build/trans_presets.java:2102
-#: build/trans_presets.java:2108 build/trans_presets.java:2114
-#: build/trans_presets.java:2120 build/trans_presets.java:2126
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2158
-#: build/trans_presets.java:2165 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2186
-#: build/trans_presets.java:2192 build/trans_presets.java:2198
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2218 build/trans_presets.java:2225
-#: build/trans_presets.java:2232 build/trans_presets.java:2239
-#: build/trans_presets.java:2247 build/trans_presets.java:2279
-#: build/trans_presets.java:2284 build/trans_presets.java:2289
-#: build/trans_presets.java:2294 build/trans_presets.java:2300
-#: build/trans_presets.java:2306 build/trans_presets.java:2312
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2354
-#: build/trans_presets.java:2451 build/trans_presets.java:2458
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2485 build/trans_presets.java:2492
-#: build/trans_presets.java:2498 build/trans_presets.java:2504
-#: build/trans_presets.java:2526 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2553 build/trans_presets.java:2559
-#: build/trans_presets.java:2565 build/trans_presets.java:2571
-#: build/trans_presets.java:2577 build/trans_presets.java:2583
-#: build/trans_presets.java:2590 build/trans_presets.java:2597
-#: build/trans_presets.java:2604 build/trans_presets.java:2610
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2661
-#: build/trans_presets.java:2667 build/trans_presets.java:2677
-#: build/trans_presets.java:2686 build/trans_presets.java:2701
-#: build/trans_presets.java:2707 build/trans_presets.java:2715
-#: build/trans_presets.java:2722 build/trans_presets.java:2742
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2783
-#: build/trans_presets.java:2790 build/trans_presets.java:2797
-#: build/trans_presets.java:2803 build/trans_presets.java:2809
-#: build/trans_presets.java:2817 build/trans_presets.java:2824
-#: build/trans_presets.java:2831 build/trans_presets.java:2838
-#: build/trans_presets.java:2844 build/trans_presets.java:2851
-#: build/trans_presets.java:2858 build/trans_presets.java:2867
-#: build/trans_presets.java:2873 build/trans_presets.java:2879
-#: build/trans_presets.java:2885 build/trans_presets.java:2891
-#: build/trans_presets.java:2900 build/trans_presets.java:2910
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2948
-#: build/trans_presets.java:2957 build/trans_presets.java:2963
-#: build/trans_presets.java:2969 build/trans_presets.java:2975
-#: build/trans_presets.java:2981 build/trans_presets.java:2987
-#: build/trans_presets.java:2993 build/trans_presets.java:3000
-#: build/trans_presets.java:3006 build/trans_presets.java:3011
-#: build/trans_presets.java:3018 build/trans_presets.java:3025
-#: build/trans_presets.java:3031 build/trans_presets.java:3040
-#: build/trans_presets.java:3048 build/trans_presets.java:3054
-#: build/trans_presets.java:3060 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3080
-#: build/trans_presets.java:3086 build/trans_presets.java:3092
-#: build/trans_presets.java:3098 build/trans_presets.java:3104
-#: build/trans_presets.java:3117 build/trans_presets.java:3131
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:67 build/trans_presets.java:103
+#: build/trans_presets.java:143 build/trans_presets.java:180
+#: build/trans_presets.java:200 build/trans_presets.java:218
+#: build/trans_presets.java:235 build/trans_presets.java:253
+#: build/trans_presets.java:273 build/trans_presets.java:306
+#: build/trans_presets.java:352 build/trans_presets.java:372
+#: build/trans_presets.java:387 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:503 build/trans_presets.java:523
+#: build/trans_presets.java:544 build/trans_presets.java:565
+#: build/trans_presets.java:586 build/trans_presets.java:607
+#: build/trans_presets.java:628 build/trans_presets.java:659
+#: build/trans_presets.java:680 build/trans_presets.java:693
+#: build/trans_presets.java:706 build/trans_presets.java:719
+#: build/trans_presets.java:732 build/trans_presets.java:745
+#: build/trans_presets.java:756 build/trans_presets.java:765
+#: build/trans_presets.java:812 build/trans_presets.java:833
+#: build/trans_presets.java:842 build/trans_presets.java:902
+#: build/trans_presets.java:1053 build/trans_presets.java:1061
+#: build/trans_presets.java:1069 build/trans_presets.java:1077
+#: build/trans_presets.java:1087 build/trans_presets.java:1095
+#: build/trans_presets.java:1100 build/trans_presets.java:1107
+#: build/trans_presets.java:1114 build/trans_presets.java:1119
+#: build/trans_presets.java:1127 build/trans_presets.java:1136
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1153 build/trans_presets.java:1159
+#: build/trans_presets.java:1165 build/trans_presets.java:1174
+#: build/trans_presets.java:1183 build/trans_presets.java:1190
+#: build/trans_presets.java:1198 build/trans_presets.java:1211
+#: build/trans_presets.java:1217 build/trans_presets.java:1226
+#: build/trans_presets.java:1232 build/trans_presets.java:1238
+#: build/trans_presets.java:1246 build/trans_presets.java:1302
+#: build/trans_presets.java:1349 build/trans_presets.java:1355
+#: build/trans_presets.java:1361 build/trans_presets.java:1367
+#: build/trans_presets.java:1373 build/trans_presets.java:1384
+#: build/trans_presets.java:1393 build/trans_presets.java:1408
+#: build/trans_presets.java:1415 build/trans_presets.java:1421
+#: build/trans_presets.java:1429 build/trans_presets.java:1436
+#: build/trans_presets.java:1445 build/trans_presets.java:1453
+#: build/trans_presets.java:1460 build/trans_presets.java:1471
+#: build/trans_presets.java:1481 build/trans_presets.java:1491
+#: build/trans_presets.java:1511 build/trans_presets.java:1523
+#: build/trans_presets.java:1534 build/trans_presets.java:1551
+#: build/trans_presets.java:1558 build/trans_presets.java:1574
+#: build/trans_presets.java:1581 build/trans_presets.java:1586
+#: build/trans_presets.java:1592 build/trans_presets.java:1598
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1646 build/trans_presets.java:1652
+#: build/trans_presets.java:1659 build/trans_presets.java:1666
+#: build/trans_presets.java:1674 build/trans_presets.java:1681
+#: build/trans_presets.java:1689 build/trans_presets.java:1696
+#: build/trans_presets.java:1702 build/trans_presets.java:1709
+#: build/trans_presets.java:1716 build/trans_presets.java:1723
+#: build/trans_presets.java:1740 build/trans_presets.java:1748
+#: build/trans_presets.java:1763 build/trans_presets.java:1773
+#: build/trans_presets.java:1785 build/trans_presets.java:1792
+#: build/trans_presets.java:1798 build/trans_presets.java:1808
+#: build/trans_presets.java:1813 build/trans_presets.java:1821
+#: build/trans_presets.java:1828 build/trans_presets.java:1834
+#: build/trans_presets.java:1840 build/trans_presets.java:1845
+#: build/trans_presets.java:1850 build/trans_presets.java:1855
+#: build/trans_presets.java:1862 build/trans_presets.java:1868
+#: build/trans_presets.java:1873 build/trans_presets.java:1882
+#: build/trans_presets.java:1891 build/trans_presets.java:1900
+#: build/trans_presets.java:1909 build/trans_presets.java:1918
+#: build/trans_presets.java:1924 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 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:2023 build/trans_presets.java:2032
+#: build/trans_presets.java:2040 build/trans_presets.java:2046
+#: build/trans_presets.java:2052 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 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:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2150
+#: build/trans_presets.java:2156 build/trans_presets.java:2162
+#: build/trans_presets.java:2169 build/trans_presets.java:2176
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2197 build/trans_presets.java:2203
+#: build/trans_presets.java:2209 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2229
+#: build/trans_presets.java:2236 build/trans_presets.java:2243
+#: build/trans_presets.java:2250 build/trans_presets.java:2258
+#: build/trans_presets.java:2290 build/trans_presets.java:2295
+#: build/trans_presets.java:2300 build/trans_presets.java:2305
+#: build/trans_presets.java:2311 build/trans_presets.java:2317
+#: build/trans_presets.java:2323 build/trans_presets.java:2331
+#: build/trans_presets.java:2337 build/trans_presets.java:2343
+#: build/trans_presets.java:2349 build/trans_presets.java:2355
+#: build/trans_presets.java:2365 build/trans_presets.java:2462
+#: build/trans_presets.java:2469 build/trans_presets.java:2483
+#: build/trans_presets.java:2489 build/trans_presets.java:2496
+#: build/trans_presets.java:2503 build/trans_presets.java:2509
+#: build/trans_presets.java:2515 build/trans_presets.java:2537
+#: build/trans_presets.java:2544 build/trans_presets.java:2551
+#: build/trans_presets.java:2557 build/trans_presets.java:2564
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2594 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2615
+#: build/trans_presets.java:2621 build/trans_presets.java:2627
+#: build/trans_presets.java:2633 build/trans_presets.java:2639
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2672 build/trans_presets.java:2678
+#: build/trans_presets.java:2688 build/trans_presets.java:2697
+#: build/trans_presets.java:2712 build/trans_presets.java:2718
+#: build/trans_presets.java:2726 build/trans_presets.java:2733
+#: build/trans_presets.java:2753 build/trans_presets.java:2764
+#: build/trans_presets.java:2770 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2788
+#: build/trans_presets.java:2795 build/trans_presets.java:2802
+#: build/trans_presets.java:2809 build/trans_presets.java:2815
+#: build/trans_presets.java:2821 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2912
+#: build/trans_presets.java:2922 build/trans_presets.java:2931
+#: build/trans_presets.java:2937 build/trans_presets.java:2943
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 build/trans_presets.java:2981
+#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:2999 build/trans_presets.java:3005
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3023 build/trans_presets.java:3030
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3066 build/trans_presets.java:3072
+#: build/trans_presets.java:3079 build/trans_presets.java:3085
+#: build/trans_presets.java:3092 build/trans_presets.java:3098
+#: build/trans_presets.java:3104 build/trans_presets.java:3110
+#: build/trans_presets.java:3116 build/trans_presets.java:3129
+#: build/trans_presets.java:3143 build/trans_presets.java:3157
 msgid "Name"
 msgstr "İsim"
@@ -6543,4 +6681,58 @@
 msgid "Version"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
+#, fuzzy
+msgid "Changeset id:"
+msgstr "İlişkiyi değiştir"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
+#, fuzzy
+msgid "Created at:"
+msgstr "Alanları Oluştur"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
+#, fuzzy
+msgid "Changeset comment:"
+msgstr "Açıklamayı Kabul Ediniz"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
+msgid "No open changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48
+#, fuzzy
+msgid "<html>Please select the changesets you want to close</html>"
+msgstr "lütfen hangi özelliğin değişimin uygulanacağını seçiniz."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
+#, fuzzy
+msgid "Open changesets"
+msgstr "Kapanıyor..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101
+#, fuzzy
+msgid "Close changesets"
+msgstr "Kapanıyor..."
+
+#. putValue(SMALL_ICON, ImageProvider.get("cancel"));
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
+#, fuzzy
+msgid "Close the selected open changesets"
+msgstr "Seçili Objeleri Sil."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126
+#, fuzzy
+msgid "Cancel closeing of changesets"
+msgstr "Kapanıyor..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37
+msgid "Closing changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77
+#, fuzzy, java-format
+msgid "Closing changeset {0}"
+msgstr "Kapanıyor..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
@@ -6569,5 +6761,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be uploaded"
+msgid "Layer ''{0}'' has no modifications to be uploaded."
 msgstr ""
 
@@ -6575,5 +6767,5 @@
 #, java-format
 msgid ""
-"Layer ''{0}'' has modifications which should be saved to its assoicated file "
+"Layer ''{0}'' has modifications which should be saved to its associated file "
 "''{1}''."
 msgstr ""
@@ -6581,5 +6773,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be saved"
+msgid "Layer ''{0}'' has no modifications to be saved."
 msgstr ""
 
@@ -6613,17 +6805,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113
 msgid "Unsaved changes - Save/Upload before exiting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194
 #, java-format
 msgid ""
@@ -6636,9 +6828,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205
 msgid "Unsaved data and conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212
 #, java-format
 msgid ""
@@ -6652,9 +6844,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223
 msgid "Unsaved data and missing associated file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230
 #, java-format
 msgid ""
@@ -6669,42 +6861,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243
 msgid "Unsaved data non-writable files"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
 msgid "Close this dialog and resume editing in JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322
+msgid "Discard and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
-msgid "Discard and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354
+msgid "Save and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
-msgid "Save and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
 msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402
 #, java-format
 msgid "Preparing layer ''{0}'' for upload ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
@@ -6712,5 +6904,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491
 msgid "Incomplete upload and/or save"
 msgstr ""
@@ -6750,21 +6942,21 @@
 #. item "Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:200
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:278
-#: build/trans_presets.java:311 build/trans_presets.java:357
-#: build/trans_presets.java:372 build/trans_presets.java:387
-#: build/trans_presets.java:409 build/trans_presets.java:429
-#: build/trans_presets.java:450 build/trans_presets.java:470
-#: build/trans_presets.java:489 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:549
-#: build/trans_presets.java:570 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:633
-#: build/trans_presets.java:664 build/trans_presets.java:1060
-#: build/trans_presets.java:1068 build/trans_presets.java:1076
-#: build/trans_presets.java:1086 build/trans_presets.java:1305
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:242
+#: build/trans_presets.java:260 build/trans_presets.java:279
+#: build/trans_presets.java:312 build/trans_presets.java:358
+#: build/trans_presets.java:373 build/trans_presets.java:388
+#: build/trans_presets.java:410 build/trans_presets.java:430
+#: build/trans_presets.java:451 build/trans_presets.java:471
+#: build/trans_presets.java:490 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:665 build/trans_presets.java:1062
+#: build/trans_presets.java:1070 build/trans_presets.java:1078
+#: build/trans_presets.java:1088 build/trans_presets.java:1308
 msgid "Layer"
 msgstr "Tabaka"
@@ -6783,67 +6975,32 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:200
 msgid "Upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-msgid "Use a new changeset and close it"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
-msgid ""
-"Select to upload the data using a new changeset and to close the changeset "
-"after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
-msgid "Use a new changeset and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
-msgid ""
-"Select to upload the data using a new changeset and to leave the changeset "
-"open after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
-msgid "Upload to a new or to an existing changeset?"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
-msgid "upload all changes in one request"
+msgid "Settings"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
-msgid ""
-"Enable to upload all changes in one request, disable to use one request per "
-"changed primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171
-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/gui/io/UploadDialog.java:216
-msgid "Settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908
 msgid "Tags of new changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:221
 msgid "Objects to add:"
 msgstr "Eklenilecek objeler:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:227
 msgid "Objects to modify:"
 msgstr "Düzenlenecek objeler:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:233
 msgid "Objects to delete:"
 msgstr "Silinecek objeler:"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
 #, java-format
 msgid "{0} object to add:"
@@ -6852,5 +7009,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:277
 #, java-format
 msgid "{0} object to modifiy:"
@@ -6859,5 +7016,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:286
 #, java-format
 msgid "{0} object to delete:"
@@ -6866,53 +7023,86 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422
-#, java-format
-msgid "Use the existing changeset {0} and close it after upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:423
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to close the changeset "
-"after this upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426
-#, java-format
-msgid "Use the existing changeset {0} and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:427
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to leave the changeset "
-"open for further uploads"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:470
+msgid "Upload Changes"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472
+msgid "Upload the changed primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
+msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:479
+msgid "Illegal upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
+msgid "Cancel the upload and resume editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606
+#, fuzzy
+msgid "Upload all changes in one request"
+msgstr "Bütün değişiklikleri OSM server'ına yükle."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607
+msgid ""
+"Enable to upload all changes in one request, disable to use one request per "
+"changed primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:617
+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/gui/io/UploadDialog.java:672
+msgid "Open a new changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
+msgid "Open a new changeset and use it in the next upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
+#, fuzzy
+msgid "Use an open changeset"
+msgstr "Kaydedilmemiş Değişiklikler"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
+msgid "Upload data to an already opened changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
+#, fuzzy
+msgid "Close changeset after upload"
+msgstr "Yüklenilecek değişiklik yok."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
+msgid "Select to close the changeset after the next upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922
 #, java-format
 msgid "Tags of changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584
-msgid "Upload Changes"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
 #, fuzzy
-msgid "Upload the changed primitives"
-msgstr "Değişiklikleri yükle?"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592
+msgid "Load the list of your open changesets from the server"
+msgstr "Tercihleri server'a yükleyiniz"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
 #, fuzzy
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "Lütfen bu yer için bir isim giriniz."
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:593
-msgid "Illegal upload comment"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
-msgid "Cancel the upload and resume editing"
+msgid "Close the currently selected open changeset"
+msgstr "Seçili üyeyi yukarı taşı"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
+#, java-format
+msgid "changeset id > 0 expected. Got {1}"
 msgstr ""
 
@@ -6990,5 +7180,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
@@ -7026,5 +7216,5 @@
 msgstr "Girilen zaman ayrıştırılamadı."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
@@ -7032,30 +7222,30 @@
 msgstr "gps noktası"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
 msgid "Customize line drawing"
 msgstr "Çizimi özelleştir"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
 msgid "Use global settings."
 msgstr "Genel ayarları kullan."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Draw lines between points for this layer."
 msgstr "Bu tabaka için çizgiler arasını birleştir."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Do not draw lines between points for this layer."
 msgstr "Bu tabaka için çizgileri birleştirme."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 msgid "Select line drawing options"
 msgstr "Çizim seçeneklerini seçiniz"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7063,5 +7253,5 @@
 msgstr "Renkleri Ayarla"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7070,5 +7260,5 @@
 msgstr "Varsayılan"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7077,37 +7267,74 @@
 msgstr "Renk seç"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
 msgid "Markers From Named Points"
 msgstr "işaretli noktalardan imleçler"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "{0} isim verilen izler"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
 msgid "Import Audio"
 msgstr "Sesi içeri al"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave Audio files (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "{0} daki ses imleçleri"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
 msgid "Import images"
 msgstr "Görüntüleri içeri al"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#, java-format
+msgid "Name: {0}"
+msgstr "İsim: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#, java-format
+msgid "Description: {0}"
+msgstr "Tanım: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#, fuzzy, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
 msgstr[0] "{0} iz, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
+#: build/trans_presets.java:3160
+msgid "Description"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#, fuzzy
+msgid "Timespan"
+msgstr "Zaman_aralığı: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#, fuzzy
+msgid "Length"
+msgstr "Uzunluk: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
+msgid "URL"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+msgid "Length: "
+msgstr "Uzunluk: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
 #, java-format
 msgid "{0} route, "
@@ -7115,5 +7342,5 @@
 msgstr[0] "{0} rut, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 #, java-format
 msgid "{0} waypoint"
@@ -7121,29 +7348,10 @@
 msgstr[0] "{0} yol noktaları"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
-#, java-format
-msgid "Name: {0}"
-msgstr "İsim: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
-#, java-format
-msgid "Description: {0}"
-msgstr "Tanım: {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
-msgid "Timespan: "
-msgstr "Zaman_aralığı: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
-msgid "Length: "
-msgstr "Uzunluk: "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "Bilgi tabakasına çevir"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7153,10 +7361,10 @@
 "yüklemek isterseniz buraya bakınız:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -7167,29 +7375,29 @@
 msgstr "Çevrildiği yer: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
 msgid "Download from OSM along this track"
 msgstr "OSM den bu izi indir"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
 msgid "Download everything within:"
 msgstr "Bunun içindeki herşeyi indir:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metre"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 msgid "Maximum area per request:"
 msgstr "Her istek için max. alan:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
 #, java-format
 msgid ""
@@ -7200,13 +7408,13 @@
 "istiyor musunuz?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
 msgid "Download data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
 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:1143
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7214,5 +7422,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7264,30 +7472,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
-#, fuzzy
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
 "<br>If you want to upload traces, look here:</html>"
 msgstr ""
-"<html>İşlenilmemiş GPS bilgisis yüklemek zararlı olabilir.<br>Eğer izleri "
-"yüklemek isterseniz buraya bakınız:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "track"
 msgid_plural "tracks"
@@ -7413,4 +7618,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
@@ -7642,13 +7848,18 @@
 msgstr "Geniş gps noktaları çiz."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+msgid "Draw a circle form HDOP value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr ""
@@ -7656,6 +7867,6 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1374
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:1377
 msgid "Car"
 msgstr "Araba"
@@ -7676,14 +7887,14 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:324 build/trans_presets.java:650
-#: build/trans_presets.java:857 build/trans_presets.java:876
-#: build/trans_presets.java:890 build/trans_presets.java:912
-#: build/trans_presets.java:949 build/trans_presets.java:962
-#: build/trans_presets.java:974 build/trans_presets.java:986
-#: build/trans_presets.java:998 build/trans_presets.java:1010
-#: build/trans_presets.java:1020 build/trans_presets.java:1029
-#: build/trans_presets.java:1038 build/trans_presets.java:1437
-#: build/trans_presets.java:1510
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:325 build/trans_presets.java:651
+#: build/trans_presets.java:858 build/trans_presets.java:877
+#: build/trans_presets.java:891 build/trans_presets.java:913
+#: build/trans_presets.java:950 build/trans_presets.java:963
+#: build/trans_presets.java:975 build/trans_presets.java:987
+#: build/trans_presets.java:999 build/trans_presets.java:1011
+#: build/trans_presets.java:1021 build/trans_presets.java:1030
+#: build/trans_presets.java:1039 build/trans_presets.java:1440
+#: build/trans_presets.java:1513
 msgid "Bicycle"
 msgstr "Bisiklet"
@@ -7716,62 +7927,62 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:325 build/trans_presets.java:649
-#: build/trans_presets.java:856 build/trans_presets.java:875
-#: build/trans_presets.java:889 build/trans_presets.java:911
-#: build/trans_presets.java:948 build/trans_presets.java:961
-#: build/trans_presets.java:973 build/trans_presets.java:985
-#: build/trans_presets.java:997 build/trans_presets.java:1009
-#: build/trans_presets.java:1019 build/trans_presets.java:1028
-#: build/trans_presets.java:1037
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:326 build/trans_presets.java:650
+#: build/trans_presets.java:857 build/trans_presets.java:876
+#: build/trans_presets.java:890 build/trans_presets.java:912
+#: build/trans_presets.java:949 build/trans_presets.java:962
+#: build/trans_presets.java:974 build/trans_presets.java:986
+#: build/trans_presets.java:998 build/trans_presets.java:1010
+#: build/trans_presets.java:1020 build/trans_presets.java:1029
+#: build/trans_presets.java:1038
 msgid "Foot"
 msgstr "Ayak"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "Yön oklarını çiz"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "Hızlı Çizim (kötü görünür)"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "Sadece ilginiç yön ipuçlar (ör:tek yön)."
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Only on the head of a way."
 msgstr "Sadece yolun başında"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "Segment sıra numaralarını çiz"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "İndirilen alan için sınırları çiz"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "Seçim modunda sanal kavşakları çiziniz"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "Pasif tabakaları başka renkte çiz"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "Düzgün harita grafikleri (antialiasing)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:82
 msgid "Draw lines between raw GPS points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -7779,9 +7990,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
 msgid "Maximum length for local files (meters)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
@@ -7790,25 +8001,25 @@
 "'-1' yap."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length (meters)"
 msgstr "Maximum uzunluk (metre)"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "Gelen çizimde herhangi bilgi olmasa bile çizime zorla."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:129
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "GPS noktalarını bağlayan yönler için okları çiz."
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:135
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr "Yön çizgi okları için tablo değerlerini kullan hesap yapma."
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:141
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -7816,13 +8027,13 @@
 msgstr "Son çizilen çizgiden sonra bu kadar boşluk varsa okları çizme"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:144
 msgid "Minimum distance (pixels)"
 msgstr "Minimum uzaklık (pixel)"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Draw larger dots for the GPS points."
 msgstr "GPS noktaları için geniş nokta çiz."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -7830,9 +8041,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Colors points and track segments by velocity."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -7840,46 +8051,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "Farklı ortalama hızar için farklı renklerin kullanılmasına izin ver"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid "Track and Point Coloring"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202
 msgid "GPS Points"
 msgstr "GPS Noktaları"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "Draw direction hints for way segments."
 msgstr "Yol segmentleri için yön ipuçları çiz."
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:237
 msgid "Draw the order numbers of all segments within their way."
 msgstr "Her segment için kendi yolu buyunca sıra numarası çiz."
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "Daha düzgün harita grafikleri için 'antialiasing' uygula  ."
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "Server'dan gelen bilginin sınırlarını çiz ."
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "Kolay yol düzenlemesi için sanal kavşaklar çiz."
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257
 msgid "Draw the inactive data layers in a different color."
 msgstr "Pasif tabakaları farklı renklerde çiz."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "OSM Data"
 msgstr "OSM Data"
@@ -7958,45 +8169,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Configure available plugins."
 msgstr "Yüklü eklentileri ayarla."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50
+#. buttons at the bottom
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
 msgid "Download List"
 msgstr "İndirme listesi"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:100
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 msgid "Update"
 msgstr "Güncelle"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Configure Sites..."
 msgstr "Siteleri Ayarla..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:125
 msgid "Add JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:126
 msgid "Enter URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:162
 msgid "Please select an entry."
 msgstr "Lütfen bir seçim yapınız."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:147
 msgid "Edit JOSM Plugin description URL."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:148
 msgid "JOSM Plugin description URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:175
 msgid "Configure Plugin Sites"
 msgstr "Eklenti sitelerini ayarla"
@@ -8339,6 +8551,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:369
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341
 #, java-format
 msgid "Remove old keys from up to {0} object"
@@ -8347,9 +8559,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135
 msgid "Add a new tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160
 msgid "Delete the selection in the tag table"
 msgstr ""
@@ -8384,7 +8596,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:68
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:75
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -8427,4 +8639,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24
+#, fuzzy, java-format
+msgid "Preset group ''{0}'' of group ''{1}''"
+msgstr "''{1}'' gurubu için ''{0}'' kullan"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
 #, java-format
 msgid "Preset group ''{0}''"
@@ -8445,4 +8662,10 @@
 msgstr "{0} ve {1} arası bilgiler indiriliyor"
 
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, fuzzy, java-format
+msgid "parameter ''{0}'' > 0 expected. Got {1}"
+msgstr "parametre ''{0}'' zero (null) olamaz"
+
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8551,5 +8774,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "Ayrıştırma hatası: gpx dökümanı için geçersiz yapı."
@@ -8669,10 +8892,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -8680,75 +8904,79 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315
 msgid "Creating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
 #, java-format
 msgid "Successfully opened changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#, java-format
+msgid "id of changeset > 0 required. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
-#, java-format
-msgid "Changeset {0} is unchanged. Skipping update."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
 #, java-format
 msgid "Updating changeset {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
-msgid ""
-"Failed to update changeset. Either there is no current changeset or the id "
-"of the current changeset is 0"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
 msgid "Closing changeset..."
 msgstr "Kapanıyor..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
-#, java-format
-msgid "Closing changeset {0}..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
-#, java-format
-msgid "Leaving changeset {0} open..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
 msgid "No changeset present for diff upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414
 msgid "Preparing..."
 msgstr "Hazırlanıyor..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419
 msgid "Uploading..."
 msgstr "Yükleniyor..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438
 msgid "Waiting 10 seconds ... "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449
 msgid "OK - trying again."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:485
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517
 #, java-format
 msgid "Starting retry {0} of {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
+msgid "current changeset is null. Can't upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
+#, java-format
+msgid "id of current changeset > required. Current id is {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
+#, java-format
+msgid "Open changeset expected. Got closed changeset with id {0}"
 msgstr ""
 
@@ -8774,50 +9002,109 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
+#, java-format
+msgid "missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:128
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:134
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
+#, java-format
+msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
+#, java-format
+msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
+#, java-format
+msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#, java-format
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#, java-format
+msgid "Unsupported version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:176
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Aborting."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#, java-format
+msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
+#, fuzzy
+msgid "Parsing list of changesets..."
+msgstr "Kapanıyor..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
 msgid "Incorrect password or username."
 msgstr "Hatalı kullanıcı adı veya şifre."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:168
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Warning: The password is transferred unencrypted."
 msgstr "Uyarı: Şifre düz metin olarak ileticektir."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 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:178
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
 msgid "Enter Password"
 msgstr "Enter Password"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 msgid "Login"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:242
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
 msgid "The base URL for the OSM server (REST API)"
 msgstr "OSM için asıl link"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
 msgid "Login name (e-mail) to the OSM account."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr "OSM için login şifresi, herhangi şifre saklamamak için boş bırakınız."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
 msgid "Base Server URL"
 msgstr "Asıl Link"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
 msgid "OSM username (e-mail)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
 msgid "OSM password"
 msgstr "OSM şifresi"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -8826,5 +9113,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:51
+#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #, java-format
 msgid "(at line {0}, column {1})"
@@ -8914,20 +9201,5 @@
 msgstr "Ayrıştırma sırasında hata oluştu."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124
-#, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
-#, fuzzy, java-format
-msgid "Missing mandatory attribute ''{0}''"
-msgstr "Gerekli özellik eksik \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
-#, fuzzy, java-format
-msgid "Unsupported version: {0}"
-msgstr "çözülen versiyon:"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:155
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -8936,38 +9208,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
 msgid "found XML element <nd> element not as direct child of element <way>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
 #, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
 #, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
 msgid "Found XML element <member> not as direct child of element <relation>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
 #, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
 #, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
 #, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
 #, java-format
 msgid ""
@@ -8975,24 +9247,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
 msgid "Incomplete <member> specification with ref=0"
 msgstr "Ref=0, eksik <member> tanımı."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
-#, java-format
-msgid "Warning: Undefined element ''{0}'' found in input stream. Skipping."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
-#, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Skipping."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
 msgid "Illegal object with id=0"
 msgstr "Geçersiz obje bulundu id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
 #, java-format
 msgid ""
@@ -9000,5 +9267,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:303
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
 #, java-format
 msgid ""
@@ -9007,5 +9274,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
 #, java-format
 msgid ""
@@ -9014,5 +9281,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
@@ -9022,25 +9289,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:316
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
 #, java-format
 msgid "Unknown or unsupported API version. Got {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
 #, java-format
 msgid "Missing attribute ''version'' on OSM primitive with id {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
+#, java-format
 msgid "Missing required attribute ''{0}''."
-msgstr "Gerekli özellik eksik \"{0}\"."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
 #, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
 #, java-format
 msgid ""
@@ -9048,5 +9315,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
 #, java-format
 msgid ""
@@ -9055,5 +9322,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
 #, java-format
 msgid ""
@@ -9061,5 +9328,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
 #, java-format
 msgid ""
@@ -9068,17 +9335,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
 msgid "Prepare OSM data..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 msgid "Parsing OSM data..."
-msgstr "Bilgiler hazırlanıyor..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
 msgid "Preparing data set..."
-msgstr "Bilgiler hazırlanıyor..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
@@ -9099,4 +9364,24 @@
 msgid "Downloading referring relations ..."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51
+#, fuzzy
+msgid "Reading changesets..."
+msgstr "Kapanıyor..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
+#, fuzzy
+msgid "Downloading changesets ..."
+msgstr "Kapanıyor..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85
+#, fuzzy, java-format
+msgid "Reading changeset {0} ..."
+msgstr "{0} Okunuyor..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91
+#, fuzzy, java-format
+msgid "Downloading changeset {0} ..."
+msgstr "Kapanıyor..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
@@ -9113,10 +9398,14 @@
 msgstr "Server'e bağlanıyor..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
 msgid "Failed to open connection to API {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
+msgid "Error: failed to add authentication credentials to the connection."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
@@ -9125,33 +9414,52 @@
 "ediniz."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+msgid "XML tag <user> is missing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
+#, fuzzy, java-format
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgstr "''{1}'' gurubu için ''{0}'' kullan"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
+#, java-format
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
 msgid "Starting to upload with one request per primitive ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
 msgid "Starting to upload in one request ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:171
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135
 msgid "Uploading data ..."
-msgstr "Yükleniyor..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:178
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
 msgid ""
 "WARNING: no API version defined for data to upload. Falling back to version "
@@ -9159,5 +9467,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147
 #, java-format
 msgid ""
@@ -9167,10 +9475,10 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
 msgid "Update Plugins"
 msgstr "Eklentileri Güncelle"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 msgid "Download Plugins"
 msgstr ""
@@ -9328,5 +9636,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -9334,18 +9642,18 @@
 msgstr[0] "{0} sitesinden indirilen eklenti"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
 msgid "No plugin information found."
 msgstr "Eklenti bilgisi bulunamadı."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:93
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
 msgid "All installed plugins are up to date."
 msgstr "Bütün eklentiler güncel."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
 #, java-format
 msgid ""
@@ -9358,9 +9666,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
 msgid "Download missing plugins"
 msgstr "Eksik eklentileri yükle"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
 #, java-format
 msgid ""
@@ -9375,43 +9683,43 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
 msgid "unknown"
 msgstr "bilinmeyen"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}: Versiyon {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 msgid "Plugin bundled with JOSM"
 msgstr "Eklenti JOSM ile beraber geliyor."
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:357
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -9532,5 +9840,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:165
-#, fuzzy
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -9538,6 +9845,4 @@
 "community."
 msgstr ""
-"Max seçim alanı boyutu 0.25 ve sizin alanınız çok büyük. Daha küçükalan "
-"seçiniz veya planet.osm yi kullanın"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:168
@@ -9728,10 +10033,4 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:140
 msgid "(What does that mean?)"
-msgstr ""
-
-#. item "Relations/Route" text "Symbol description"
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3148
-msgid "Description"
 msgstr ""
 
@@ -10495,6 +10794,7 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
-msgid "Set "
-msgstr ""
+#, fuzzy, java-format
+msgid "Set {0} Lambert coordinates"
+msgstr "Sıfır koordinatlar: "
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -11113,6 +11413,6 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 #: build/trans_style.java:990 build/trans_style.java:1007
-#: build/trans_style.java:1023 build/trans_style.java:3392
-#: build/trans_style.java:3400
+#: build/trans_style.java:1023 build/trans_style.java:3400
+#: build/trans_style.java:3408
 msgid "water"
 msgstr "su"
@@ -11406,4 +11706,55 @@
 msgstr "ölçümler"
 
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Michigan Left"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Adds no left turn for sets of 4 or 5 ways."
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45
+#, fuzzy
+msgid "Please select 4 or 5 ways to assign no left turns."
+msgstr "Lütfen birleştirmek için en az iki yol seçiniz."
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61
+#, fuzzy, java-format
+msgid "{0} extrem nodes."
+msgstr "{0} Kavşak"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69
+#, java-format
+msgid "Via node {0}, {1}"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75
+#, fuzzy, java-format
+msgid "{0} via nodes."
+msgstr "{0} Kavşak"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78
+msgid "Unable to find via nodes. Please check your selection"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98
+#, fuzzy, java-format
+msgid "MIddle way: {0}"
+msgstr "Mode: {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121
+msgid "Create Michigan left turn restriction"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129
+#, fuzzy, java-format
+msgid "Processing {0}"
+msgstr "Sürüm {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142
+#, java-format
+msgid "Relation: from {0} to {1} via {2}"
+msgstr ""
+
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
 msgid "OpenLayers"
@@ -11553,7 +11904,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
-#, fuzzy
 msgid "create new objects"
-msgstr "Seçili Objeleri Sil."
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
@@ -11616,7 +11966,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
-#, fuzzy
 msgid "Remote Control has been asked to create a new node."
-msgstr "API tarafından uzaktan kontrol veri yüklemesi soruldu."
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
@@ -11876,5 +12225,5 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:158
 msgid "JOSM Tag Editor Plugin"
 msgstr ""
@@ -11884,5 +12233,5 @@
 msgstr ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:370
 #, java-format
 msgid "Updating properties of up to {0} object"
@@ -11891,18 +12240,4 @@
 msgstr[1] ""
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44
-msgid "INFO: entering compatibilty mode for JOSM with Main.ds"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47
-msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49
-msgid ""
-"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-"found."
-msgstr ""
-
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
 msgid "Group"
@@ -11911,9 +12246,4 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:24
 msgid "Item"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-msgid "Filter"
 msgstr ""
 
@@ -12000,5 +12330,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2272
 msgid "Street name"
 msgstr "Sokak Adı"
@@ -12162,8 +12492,4 @@
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:88
 msgid "Zoom (in metres)"
-msgstr ""
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
-msgid "URL"
 msgstr ""
 
@@ -12369,7 +12695,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501
-#, fuzzy
 msgid "Updating map ..."
-msgstr "Yükleniyor..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69
@@ -12861,7 +13186,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
-#: build/trans_style.java:4179
+#: build/trans_style.java:4159 build/trans_style.java:4166
+#: build/trans_style.java:4173 build/trans_style.java:4180
+#: build/trans_style.java:4187
 msgid "building"
 msgstr "yapılar"
@@ -12875,5 +13200,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4186
+#: build/trans_style.java:4194
 msgid "area"
 msgstr "alan"
@@ -13002,10 +13327,10 @@
 msgstr ""
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:148
 msgid "Reached the end of the line"
 msgstr ""
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:155
 msgid "Reached a junction"
 msgstr ""
@@ -13295,7 +13620,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:171
-#, fuzzy
 msgid "Overlap tiles"
-msgstr "Üstüste gelen alanlar"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
@@ -13304,7 +13628,6 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
-#, fuzzy
 msgid "% of north:"
-msgstr "kuzey"
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -13453,6 +13776,11 @@
 msgstr ""
 
+#. Plugin michigan_left
+#: build/trans_plugins.java:35
+msgid "Adds no left turn for sets of 4 or 5 ways"
+msgstr ""
+
 #. Plugin nearclick
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid ""
 "Simulates a click when you do a small and short drag. This is usefull for "
@@ -13462,15 +13790,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid "Displays an OpenLayers background image"
 msgstr ""
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Imports issues from OpenStreetBugs"
 msgstr ""
 
 #. Plugin openvisible
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13478,5 +13806,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13484,5 +13812,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13491,15 +13819,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13508,10 +13836,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13520,15 +13848,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -13538,10 +13866,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin usertools
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -13550,5 +13878,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -13557,5 +13885,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -13564,5 +13892,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -13571,10 +13899,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -13630,4 +13958,10 @@
 #. <annotations>
 #: build/trans_presets.java:57
+#, fuzzy
+msgid "Highways"
+msgstr "Karayolu"
+
+#. group "Highways"
+#: build/trans_presets.java:58
 msgid "Streets"
 msgstr "Sokaklar"
@@ -13638,5 +13972,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:58 build/trans_surveyor.java:72
+#: build/trans_presets.java:59 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Araçyolu"
@@ -13645,5 +13979,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:61
+#: build/trans_presets.java:62
 msgid "Edit Motorway"
 msgstr "Araçyolunu düzenle"
@@ -13670,8 +14004,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:120 build/trans_presets.java:140
-#: build/trans_presets.java:177 build/trans_presets.java:197
-#: build/trans_presets.java:1557 build/trans_presets.java:3146
+#: build/trans_presets.java:65 build/trans_presets.java:101
+#: build/trans_presets.java:121 build/trans_presets.java:141
+#: build/trans_presets.java:178 build/trans_presets.java:198
+#: build/trans_presets.java:1560 build/trans_presets.java:3158
 msgid "Reference"
 msgstr "Referans"
@@ -13685,8 +14019,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:358
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:359
 msgid "Lanes"
 msgstr "Şeritler"
@@ -13703,15 +14037,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:224 build/trans_presets.java:280
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:373 build/trans_presets.java:388
-#: build/trans_presets.java:412 build/trans_presets.java:431
-#: build/trans_presets.java:452 build/trans_presets.java:472
-#: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1307
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:225 build/trans_presets.java:281
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:374 build/trans_presets.java:389
+#: build/trans_presets.java:413 build/trans_presets.java:432
+#: build/trans_presets.java:453 build/trans_presets.java:473
+#: build/trans_presets.java:511 build/trans_presets.java:667
+#: build/trans_presets.java:1310
 msgid "Max. speed (km/h)"
 msgstr "Max. hız (km/sa)"
@@ -13748,16 +14082,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:293 build/trans_presets.java:306
-#: build/trans_presets.java:320 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:464
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:659 build/trans_presets.java:1300
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:294 build/trans_presets.java:307
+#: build/trans_presets.java:321 build/trans_presets.java:353
+#: build/trans_presets.java:405 build/trans_presets.java:425
+#: build/trans_presets.java:445 build/trans_presets.java:465
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:660 build/trans_presets.java:1303
 msgid "Oneway"
 msgstr "TekYol"
@@ -13799,19 +14133,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:353
-#: build/trans_presets.java:362 build/trans_presets.java:405
-#: build/trans_presets.java:425 build/trans_presets.java:445
-#: build/trans_presets.java:465 build/trans_presets.java:485
-#: build/trans_presets.java:504 build/trans_presets.java:523
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:586 build/trans_presets.java:607
-#: build/trans_presets.java:628 build/trans_presets.java:660
-#: build/trans_presets.java:1301 build/trans_surveyor.java:12
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:354
+#: build/trans_presets.java:363 build/trans_presets.java:406
+#: build/trans_presets.java:426 build/trans_presets.java:446
+#: build/trans_presets.java:466 build/trans_presets.java:486
+#: build/trans_presets.java:505 build/trans_presets.java:524
+#: build/trans_presets.java:545 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629 build/trans_presets.java:661
+#: build/trans_presets.java:1304 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "köprü"
@@ -13847,19 +14181,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:354
-#: build/trans_presets.java:378 build/trans_presets.java:406
-#: build/trans_presets.java:426 build/trans_presets.java:446
-#: build/trans_presets.java:466 build/trans_presets.java:486
-#: build/trans_presets.java:505 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629 build/trans_presets.java:661
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:355
+#: build/trans_presets.java:379 build/trans_presets.java:407
+#: build/trans_presets.java:427 build/trans_presets.java:447
+#: build/trans_presets.java:467 build/trans_presets.java:487
+#: build/trans_presets.java:506 build/trans_presets.java:525
+#: build/trans_presets.java:546 build/trans_presets.java:567
+#: build/trans_presets.java:588 build/trans_presets.java:609
+#: build/trans_presets.java:630 build/trans_presets.java:662
+#: build/trans_presets.java:1305
 msgid "Tunnel"
 msgstr "Tunel"
@@ -13893,18 +14227,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:73 build/trans_presets.java:90
-#: build/trans_presets.java:110 build/trans_presets.java:129
-#: build/trans_presets.java:150 build/trans_presets.java:166
-#: build/trans_presets.java:186 build/trans_presets.java:205
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:355
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:467
-#: build/trans_presets.java:487 build/trans_presets.java:506
-#: build/trans_presets.java:525 build/trans_presets.java:546
-#: build/trans_presets.java:567 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:630
-#: build/trans_presets.java:662 build/trans_presets.java:1303
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:356
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:468
+#: build/trans_presets.java:488 build/trans_presets.java:507
+#: build/trans_presets.java:526 build/trans_presets.java:547
+#: build/trans_presets.java:568 build/trans_presets.java:589
+#: build/trans_presets.java:610 build/trans_presets.java:631
+#: build/trans_presets.java:663 build/trans_presets.java:1306
 msgid "Cutting"
 msgstr "Kesen"
@@ -13938,18 +14272,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:74 build/trans_presets.java:91
-#: build/trans_presets.java:111 build/trans_presets.java:130
-#: build/trans_presets.java:151 build/trans_presets.java:167
-#: build/trans_presets.java:187 build/trans_presets.java:206
-#: build/trans_presets.java:222 build/trans_presets.java:240
-#: build/trans_presets.java:258 build/trans_presets.java:277
-#: build/trans_presets.java:310 build/trans_presets.java:356
-#: build/trans_presets.java:408 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:468
-#: build/trans_presets.java:488 build/trans_presets.java:507
-#: build/trans_presets.java:526 build/trans_presets.java:547
-#: build/trans_presets.java:568 build/trans_presets.java:589
-#: build/trans_presets.java:610 build/trans_presets.java:631
-#: build/trans_presets.java:663 build/trans_presets.java:1304
+#: build/trans_presets.java:75 build/trans_presets.java:92
+#: build/trans_presets.java:112 build/trans_presets.java:131
+#: build/trans_presets.java:152 build/trans_presets.java:168
+#: build/trans_presets.java:188 build/trans_presets.java:207
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:357
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:469
+#: build/trans_presets.java:489 build/trans_presets.java:508
+#: build/trans_presets.java:527 build/trans_presets.java:548
+#: build/trans_presets.java:569 build/trans_presets.java:590
+#: build/trans_presets.java:611 build/trans_presets.java:632
+#: build/trans_presets.java:664 build/trans_presets.java:1307
 msgid "Embankment"
 msgstr "toprak set"
@@ -13957,5 +14291,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Motorway Link"
 msgstr "Araç yolu hattı"
@@ -13964,5 +14298,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:80
+#: build/trans_presets.java:81
 msgid "Edit Motorway Link"
 msgstr "araç yolu hattını düzenle"
@@ -13970,5 +14304,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:94
+#: build/trans_presets.java:95
 msgid "Trunk"
 msgstr "Anayol"
@@ -13977,5 +14311,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:97
+#: build/trans_presets.java:98
 msgid "Edit Trunk"
 msgstr "Anayol düzenle"
@@ -13985,6 +14319,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
 msgid "Motorroad"
 msgstr ""
@@ -13992,5 +14326,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:114
+#: build/trans_presets.java:115
 msgid "Trunk Link"
 msgstr "Anayol Hattı"
@@ -13999,5 +14333,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:117
+#: build/trans_presets.java:118
 msgid "Edit Trunk Link"
 msgstr "Anayol Hattı düzünle"
@@ -14010,5 +14344,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:134 build/trans_surveyor.java:76
+#: build/trans_presets.java:135 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Birincil"
@@ -14017,5 +14351,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:137
+#: build/trans_presets.java:138
 msgid "Edit Primary Road"
 msgstr "Birincil yolu düzenle"
@@ -14023,10 +14357,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:154
+#: build/trans_presets.java:155
 msgid "Primary Link"
 msgstr "Birincil hat"
 
 #. item
-#: build/trans_presets.java:155
+#: build/trans_presets.java:156
 msgid "Edit Primary Link"
 msgstr "Birincil hat düzenle"
@@ -14038,5 +14372,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:170 build/trans_surveyor.java:80
+#: build/trans_presets.java:171 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "İkincil"
@@ -14046,5 +14380,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:174
+#: build/trans_presets.java:175
 msgid "Edit Secondary Road"
 msgstr "İkincil yol düzenle"
@@ -14052,5 +14386,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:190
+#: build/trans_presets.java:191
 msgid "Tertiary"
 msgstr "Üçüncül"
@@ -14060,5 +14394,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:194
+#: build/trans_presets.java:195
 msgid "Edit Tertiary Road"
 msgstr "Üçüncül yolu düzenle"
@@ -14070,5 +14404,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:209 build/trans_surveyor.java:84
+#: build/trans_presets.java:210 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "tanzim edilmemiş"
@@ -14078,5 +14412,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:213
+#: build/trans_presets.java:214
 msgid "Edit Unclassified Road"
 msgstr "Sınıflandırılmamış yolu düzenle"
@@ -14103,19 +14437,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:225 build/trans_presets.java:243
-#: build/trans_presets.java:261 build/trans_presets.java:281
-#: build/trans_presets.java:314 build/trans_presets.java:359
-#: build/trans_presets.java:375 build/trans_presets.java:389
-#: build/trans_presets.java:413 build/trans_presets.java:432
-#: build/trans_presets.java:453 build/trans_presets.java:473
-#: build/trans_presets.java:491 build/trans_presets.java:511
-#: build/trans_presets.java:532 build/trans_presets.java:553
-#: build/trans_presets.java:574 build/trans_presets.java:595
-#: build/trans_presets.java:616 build/trans_presets.java:637
-#: build/trans_presets.java:667 build/trans_presets.java:680
-#: build/trans_presets.java:693 build/trans_presets.java:706
-#: build/trans_presets.java:719 build/trans_presets.java:732
-#: build/trans_presets.java:745 build/trans_presets.java:1308
-#: build/trans_presets.java:1498 build/trans_presets.java:1540
+#: build/trans_presets.java:226 build/trans_presets.java:244
+#: build/trans_presets.java:262 build/trans_presets.java:282
+#: build/trans_presets.java:315 build/trans_presets.java:360
+#: build/trans_presets.java:376 build/trans_presets.java:390
+#: build/trans_presets.java:414 build/trans_presets.java:433
+#: build/trans_presets.java:454 build/trans_presets.java:474
+#: build/trans_presets.java:492 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:554
+#: build/trans_presets.java:575 build/trans_presets.java:596
+#: build/trans_presets.java:617 build/trans_presets.java:638
+#: build/trans_presets.java:668 build/trans_presets.java:681
+#: build/trans_presets.java:694 build/trans_presets.java:707
+#: build/trans_presets.java:720 build/trans_presets.java:733
+#: build/trans_presets.java:746 build/trans_presets.java:1311
+#: build/trans_presets.java:1501 build/trans_presets.java:1543
 msgid "Width (meters)"
 msgstr ""
@@ -14127,5 +14461,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:228 build/trans_surveyor.java:88
+#: build/trans_presets.java:229 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "yerleşim alanı"
@@ -14134,5 +14468,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:231
+#: build/trans_presets.java:232
 msgid "Edit Residential Street"
 msgstr "yerleşim sokağını düzenle"
@@ -14157,14 +14491,14 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:611
-#: build/trans_presets.java:632 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "Surface"
 msgstr "Yüzey"
@@ -14185,53 +14519,53 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paved"
 msgstr "kaldırım"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "unpaved"
 msgstr "kaldırımsız"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
 msgid "metal"
 msgstr ""
@@ -14245,22 +14579,22 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
-#: build/trans_style.java:3367
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
+#: build/trans_style.java:3375
 msgid "wood"
 msgstr "orman"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paving_stones"
 msgstr ""
@@ -14268,77 +14602,77 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "cobblestone"
 msgstr "parke taşı"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "gravel"
 msgstr "Çakıl"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "grass"
 msgstr "ot"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "sand"
 msgstr "kum"
@@ -14346,13 +14680,13 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "ground"
 msgstr "toprak"
@@ -14360,5 +14694,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:246
+#: build/trans_presets.java:247
 msgid "Living Street"
 msgstr "Canlı Sokak"
@@ -14367,5 +14701,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:249
+#: build/trans_presets.java:250
 msgid "Edit Living Street"
 msgstr "Living Street düzenle"
@@ -14373,5 +14707,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:264
+#: build/trans_presets.java:265
 msgid "Service"
 msgstr "Servis"
@@ -14380,5 +14714,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:267
+#: build/trans_presets.java:268
 msgid "Edit Serviceway"
 msgstr "Servis yolu düzenle"
@@ -14388,18 +14722,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "parking_aisle"
 msgstr ""
@@ -14407,5 +14741,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:284
+#: build/trans_presets.java:285
 msgid "Parking Aisle"
 msgstr "Park alanı"
@@ -14415,5 +14749,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:288
+#: build/trans_presets.java:289
 msgid "Edit Parking Aisle"
 msgstr "Park alanı düzenle"
@@ -14421,5 +14755,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:298
+#: build/trans_presets.java:299
 msgid "Road (Unknown Type)"
 msgstr "yol (tipi bilinmiyor)"
@@ -14428,5 +14762,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Edit Road of unknown type"
 msgstr "Tipi olmayan yolu düzenle"
@@ -14435,20 +14769,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:318
+#: build/trans_presets.java:319
 msgid "Road Restrictions"
 msgstr "Yol kısıtlamaları"
 
 #. item
-#: build/trans_presets.java:319
+#: build/trans_presets.java:320
 msgid "Edit Road Restrictions"
 msgstr "Yol kısıtlamalarını düzenle"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:321
+#: build/trans_presets.java:322
 msgid "Toll"
 msgstr "ücret"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:322
+#: build/trans_presets.java:323
 msgid "No exit (cul-de-sac)"
 msgstr "Çıkış Yok"
@@ -14461,8 +14795,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:323 build/trans_presets.java:529
-#: build/trans_presets.java:550 build/trans_presets.java:571
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:634
+#: build/trans_presets.java:324 build/trans_presets.java:530
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:593 build/trans_presets.java:614
+#: build/trans_presets.java:635
 msgid "Access"
 msgstr "Erişim"
@@ -14516,29 +14850,29 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1397
-#: build/trans_presets.java:1398 build/trans_presets.java:1399
-#: build/trans_presets.java:1763 build/trans_presets.java:1773
-#: build/trans_presets.java:2397 build/trans_presets.java:2433
-#: build/trans_presets.java:2442 build/trans_presets.java:2443
-#: build/trans_presets.java:2444 build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:1396
+#: build/trans_presets.java:1397 build/trans_presets.java:1400
+#: build/trans_presets.java:1401 build/trans_presets.java:1402
+#: build/trans_presets.java:1767 build/trans_presets.java:1777
+#: build/trans_presets.java:2408 build/trans_presets.java:2444
+#: build/trans_presets.java:2453 build/trans_presets.java:2454
+#: build/trans_presets.java:2455 build/trans_presets.java:2725
 msgid "yes"
 msgstr "Evet"
@@ -14551,40 +14885,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:212
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:212
 msgid "private"
 msgstr "özel"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655
 msgid "designated"
 msgstr "atanmış"
@@ -14597,19 +14931,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:219
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:219
 msgid "destination"
 msgstr "varış"
@@ -14632,71 +14966,71 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:205
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:205
 msgid "permissive"
 msgstr "ihtiyari"
 
-#: build/trans_presets.java:323 build/trans_presets.java:327
-#: build/trans_presets.java:330 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636
+#: build/trans_presets.java:324 build/trans_presets.java:328
+#: build/trans_presets.java:331 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637
 msgid "agricultural"
 msgstr "tarımsal"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
-#: build/trans_presets.java:2433 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1396 build/trans_presets.java:1397
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
+#: build/trans_presets.java:2444 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
+#: build/trans_presets.java:2725
 msgid "no"
 msgstr "hayır"
 
-#: build/trans_presets.java:326
+#: build/trans_presets.java:327
 msgid "Goods"
 msgstr "mallar"
 
-#: build/trans_presets.java:327
+#: build/trans_presets.java:328
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Ağır araç"
@@ -14711,10 +15045,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:328 build/trans_presets.java:651
-#: build/trans_presets.java:858 build/trans_presets.java:891
-#: build/trans_presets.java:913 build/trans_presets.java:950
-#: build/trans_presets.java:963 build/trans_presets.java:975
-#: build/trans_presets.java:987 build/trans_presets.java:999
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:329 build/trans_presets.java:652
+#: build/trans_presets.java:859 build/trans_presets.java:892
+#: build/trans_presets.java:914 build/trans_presets.java:951
+#: build/trans_presets.java:964 build/trans_presets.java:976
+#: build/trans_presets.java:988 build/trans_presets.java:1000
+#: build/trans_presets.java:1040
 msgid "Horse"
 msgstr "AT"
@@ -14730,13 +15064,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:329 build/trans_presets.java:530
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:635 build/trans_presets.java:859
-#: build/trans_presets.java:877 build/trans_presets.java:892
-#: build/trans_presets.java:914 build/trans_presets.java:951
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:330 build/trans_presets.java:531
+#: build/trans_presets.java:552 build/trans_presets.java:573
+#: build/trans_presets.java:594 build/trans_presets.java:615
+#: build/trans_presets.java:636 build/trans_presets.java:860
+#: build/trans_presets.java:878 build/trans_presets.java:893
+#: build/trans_presets.java:915 build/trans_presets.java:952
+#: build/trans_presets.java:965 build/trans_presets.java:977
+#: build/trans_presets.java:989 build/trans_presets.java:1001
+#: build/trans_presets.java:1041
 msgid "Motorcycle"
 msgstr "Motosiklet"
@@ -14751,30 +15085,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:330 build/trans_presets.java:531
-#: build/trans_presets.java:552 build/trans_presets.java:573
-#: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:636 build/trans_presets.java:654
-#: build/trans_presets.java:878 build/trans_presets.java:893
-#: build/trans_presets.java:915 build/trans_presets.java:952
-#: build/trans_presets.java:965 build/trans_presets.java:977
-#: build/trans_presets.java:989 build/trans_presets.java:1001
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:331 build/trans_presets.java:532
+#: build/trans_presets.java:553 build/trans_presets.java:574
+#: build/trans_presets.java:595 build/trans_presets.java:616
+#: build/trans_presets.java:637 build/trans_presets.java:655
+#: build/trans_presets.java:879 build/trans_presets.java:894
+#: build/trans_presets.java:916 build/trans_presets.java:953
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1042
 msgid "Motorcar"
 msgstr "otomobil"
 
-#: build/trans_presets.java:331
+#: build/trans_presets.java:332
 msgid "Public Service Vehicles (psv)"
 msgstr "Toplu taşıma araçları"
 
-#: build/trans_presets.java:332
+#: build/trans_presets.java:333
 msgid "Motorboat"
 msgstr "Motorboat"
 
-#: build/trans_presets.java:333
+#: build/trans_presets.java:334
 msgid "Boat"
 msgstr "Boat"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:336
 msgid "Min. speed (km/h)"
 msgstr "Min. Hız (km/h)"
@@ -14782,25 +15116,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:336 build/trans_presets.java:374
+#: build/trans_presets.java:337 build/trans_presets.java:375
 msgid "Max. weight (tonnes)"
 msgstr "Max. ağırlık (ton)"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:337
+#: build/trans_presets.java:338
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:339
+#: build/trans_presets.java:340
 msgid "Max. Length (meters)"
 msgstr ""
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:341
+#: build/trans_presets.java:342
 msgid "Roundabout"
 msgstr "Döner Kavşak"
@@ -14811,5 +15145,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:346
+#: build/trans_presets.java:347
 msgid "Edit Junction"
 msgstr "Kavşak Düzenle"
@@ -14831,9 +15165,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:349 build/trans_presets.java:648
-#: build/trans_presets.java:788 build/trans_presets.java:1135
-#: build/trans_presets.java:1392 build/trans_presets.java:2353
-#: build/trans_presets.java:2901 build/trans_presets.java:2911
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:350 build/trans_presets.java:649
+#: build/trans_presets.java:789 build/trans_presets.java:1137
+#: build/trans_presets.java:1395 build/trans_presets.java:2364
+#: build/trans_presets.java:2913 build/trans_presets.java:2923
+#: build/trans_presets.java:2932
 msgid "Type"
 msgstr "Tip"
@@ -14853,10 +15187,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:547
+#: build/trans_presets.java:350 build/trans_style.java:547
 #: build/trans_style.java:555
 msgid "motorway"
 msgstr "araçyolu"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "motorway_link"
 msgstr "otoyol_hat"
@@ -14878,10 +15212,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:563
+#: build/trans_presets.java:350 build/trans_style.java:563
 #: build/trans_style.java:571
 msgid "trunk"
 msgstr "ana_hat"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "trunk_link"
 msgstr "anayol_hat"
@@ -14903,10 +15237,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:579
+#: build/trans_presets.java:350 build/trans_style.java:579
 #: build/trans_style.java:587
 msgid "primary"
 msgstr "birincil"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "primary_link"
 msgstr "birincil_hat"
@@ -14928,5 +15262,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:595
+#: build/trans_presets.java:350 build/trans_style.java:595
 #: build/trans_style.java:603
 msgid "secondary"
@@ -14941,9 +15275,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:349 build/trans_style.java:611
+#: build/trans_presets.java:350 build/trans_style.java:611
 msgid "tertiary"
 msgstr "üçüncül"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "unclassified"
 msgstr "sınıflandırılmamış"
@@ -14957,9 +15291,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:349 build/trans_style.java:3143
+#: build/trans_presets.java:350 build/trans_style.java:3151
 msgid "residential"
 msgstr "yerleşim_alanı"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "living_street"
 msgstr "canlı_sokak"
@@ -14989,10 +15323,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:349 build/trans_style.java:667
-#: build/trans_style.java:4244
+#: build/trans_presets.java:350 build/trans_style.java:667
+#: build/trans_style.java:4252
 msgid "service"
 msgstr "servis"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "bus_guideway"
 msgstr "otobüs_hattı"
@@ -15022,6 +15356,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:349 build/trans_style.java:877
-#: build/trans_style.java:3208 build/trans_style.java:3209
+#: build/trans_presets.java:350 build/trans_style.java:877
+#: build/trans_style.java:3216 build/trans_style.java:3217
 msgid "construction"
 msgstr "inşaat"
@@ -15032,10 +15366,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Edit Bridge"
 msgstr "Köprü Düzenle"
 
 #. item
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "Edit Tunnel"
 msgstr ""
@@ -15043,19 +15377,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:393
+#: build/trans_presets.java:394
 msgid "Ways"
 msgstr "Yollar"
 
 #. group "Ways"
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Construction"
 msgstr "İnşaat"
 
 #. item
-#: build/trans_presets.java:395
+#: build/trans_presets.java:396
 msgid "Edit Highway Under Construction"
 msgstr "Otoyolda onarım var olarak düzenle"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "Junction"
 msgstr "Kavşak"
@@ -15071,5 +15405,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:411 build/trans_style.java:895
+#: build/trans_presets.java:412 build/trans_style.java:895
 msgid "roundabout"
 msgstr "döner kavşak"
@@ -15078,5 +15412,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:417
+#: build/trans_presets.java:418
 msgid "Bridleway"
 msgstr "At yolu"
@@ -15084,5 +15418,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:419
+#: build/trans_presets.java:420
 msgid "Edit Bridleway"
 msgstr "At yolu düzenle"
@@ -15090,5 +15424,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:435
+#: build/trans_presets.java:436
 msgid "Cycleway"
 msgstr "Bisiklet yolu"
@@ -15098,10 +15432,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:439
+#: build/trans_presets.java:440
 msgid "Edit Cycleway"
 msgstr "Bisiklet yolu düzenle"
 
 #. item "Ways/Cycleway" check "Embankment"
-#: build/trans_presets.java:449
+#: build/trans_presets.java:450
 msgid "Pedestrians"
 msgstr ""
@@ -15109,5 +15443,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Footway"
 msgstr "Yürüyüş Yolu"
@@ -15116,10 +15450,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Footway"
 msgstr "Yürüyüş Yolu Düzenle"
 
 #. item "Ways/Footway" check "Embankment"
-#: build/trans_presets.java:469
+#: build/trans_presets.java:470
 msgid "Bikes"
 msgstr ""
@@ -15127,5 +15461,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:476
+#: build/trans_presets.java:477
 msgid "Pedestrian"
 msgstr "Yaya Yolu"
@@ -15134,5 +15468,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Edit Pedestrian Street"
 msgstr "yaya yol sokağını düzenle"
@@ -15140,5 +15474,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:494
+#: build/trans_presets.java:495
 msgid "Steps"
 msgstr "adımlar"
@@ -15148,5 +15482,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:498
+#: build/trans_presets.java:499
 msgid "Edit Flight of Steps"
 msgstr "Uçuş adımları düzenle"
@@ -15155,5 +15489,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:515
+#: build/trans_presets.java:516
 msgid "Track"
 msgstr "İz"
@@ -15162,5 +15496,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:518
+#: build/trans_presets.java:519
 msgid "Edit Track"
 msgstr "İz düzenle"
@@ -15168,5 +15502,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:535
+#: build/trans_presets.java:536
 msgid "Track Grade 1"
 msgstr "İz derecesi 1"
@@ -15175,5 +15509,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:538
+#: build/trans_presets.java:539
 msgid "Edit Track of grade 1"
 msgstr "İz derecesi 1 düzenle"
@@ -15181,5 +15515,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:556
+#: build/trans_presets.java:557
 msgid "Track Grade 2"
 msgstr "İz derecesi 2"
@@ -15188,5 +15522,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:559
+#: build/trans_presets.java:560
 msgid "Edit Track of grade 2"
 msgstr "İz derecesi 2 düzenle"
@@ -15194,5 +15528,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:577
+#: build/trans_presets.java:578
 msgid "Track Grade 3"
 msgstr "İz derecesi 3"
@@ -15201,5 +15535,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:580
+#: build/trans_presets.java:581
 msgid "Edit Track of grade 3"
 msgstr "İz derecesi 3 düzenle"
@@ -15207,5 +15541,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:598
+#: build/trans_presets.java:599
 msgid "Track Grade 4"
 msgstr "İz derecesi 4"
@@ -15214,5 +15548,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:601
+#: build/trans_presets.java:602
 msgid "Edit Track of grade 4"
 msgstr "İz derecesi 4 düzenle"
@@ -15220,5 +15554,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:619
+#: build/trans_presets.java:620
 msgid "Track Grade 5"
 msgstr "İz derecesi 5"
@@ -15227,5 +15561,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:622
+#: build/trans_presets.java:623
 msgid "Edit Track of grade 5"
 msgstr "İz derecesi 5 düzenle"
@@ -15234,5 +15568,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:641
+#: build/trans_presets.java:642
 msgid "Path"
 msgstr "Yol"
@@ -15241,13 +15575,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:644
+#: build/trans_presets.java:645
 msgid "Edit Path"
 msgstr "Yol düzenle"
 
-#: build/trans_presets.java:652
+#: build/trans_presets.java:653
 msgid "Ski"
 msgstr "Kayak"
 
-#: build/trans_presets.java:653
+#: build/trans_presets.java:654
 msgid "Snowmobile"
 msgstr "kar motosikleti"
@@ -15257,6 +15591,6 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:670 build/trans_presets.java:1725
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:671 build/trans_presets.java:1729
+#: build/trans_presets.java:1752
 msgid "Hiking"
 msgstr "gezme"
@@ -15266,5 +15600,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:674
+#: build/trans_presets.java:675
 msgid "Edit Hiking"
 msgstr "gezme düzenle"
@@ -15272,5 +15606,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:683
+#: build/trans_presets.java:684
 msgid "Mountain Hiking"
 msgstr "Dağ gezisi"
@@ -15280,5 +15614,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:687
+#: build/trans_presets.java:688
 msgid "Edit Mountain Hiking"
 msgstr "Dağ gezisi düzenle"
@@ -15286,5 +15620,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:696
+#: build/trans_presets.java:697
 msgid "Demanding Mountain Hiking"
 msgstr "istenen dağ gezisi"
@@ -15294,5 +15628,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:700
+#: build/trans_presets.java:701
 msgid "Edit Demanding Mountain Hiking"
 msgstr "istenen dağ gezisi düzenle"
@@ -15300,5 +15634,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:709
+#: build/trans_presets.java:710
 msgid "Alpine Hiking"
 msgstr "Dağ Gezisi"
@@ -15308,5 +15642,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:713
+#: build/trans_presets.java:714
 msgid "Edit Alpine Hiking"
 msgstr "Dağ Gezisi düzenle"
@@ -15314,5 +15648,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:723
 msgid "Demanding Alpine Hiking"
 msgstr "istenen Dağ Gezisi"
@@ -15322,5 +15656,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:726
+#: build/trans_presets.java:727
 msgid "Edit Demanding Alpine Hiking"
 msgstr "istenen Dağ Gezisi düzenle"
@@ -15328,5 +15662,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:735
+#: build/trans_presets.java:736
 msgid "Difficult Alpine Hiking"
 msgstr "Zor Dağ Gezisi"
@@ -15336,5 +15670,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:739
+#: build/trans_presets.java:740
 msgid "Edit Difficult Alpine Hiking"
 msgstr "Zor Dağ Gezisi düzenle"
@@ -15342,10 +15676,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:749
+#: build/trans_presets.java:750
 msgid "Waypoints"
 msgstr "Yol noktaları"
 
 #. group "Waypoints"
-#: build/trans_presets.java:750
+#: build/trans_presets.java:751
 msgid "Motorway Junction"
 msgstr "Otoyol Kavşağı"
@@ -15353,15 +15687,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:752
+#: build/trans_presets.java:753
 msgid "Edit Motorway Junction"
 msgstr "Otoyol Kavşağı birleştirme"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:757
 msgid "Number"
 msgstr "Numara"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:759
 msgid "Services"
 msgstr "Servis"
@@ -15369,5 +15703,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:761
 msgid "Edit Service Station"
 msgstr "Sevis istasyonu düzenle"
@@ -15405,15 +15739,15 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:765 build/trans_presets.java:902
-#: build/trans_presets.java:1382 build/trans_presets.java:1406
-#: build/trans_presets.java:1413 build/trans_presets.java:1419
-#: build/trans_presets.java:1427 build/trans_presets.java:1434
-#: build/trans_presets.java:1761 build/trans_presets.java:1771
-#: build/trans_presets.java:2361 build/trans_presets.java:2368
-#: build/trans_presets.java:2384 build/trans_presets.java:2395
-#: build/trans_presets.java:2403 build/trans_presets.java:2410
-#: build/trans_presets.java:2464 build/trans_presets.java:2512
-#: build/trans_presets.java:2678 build/trans_presets.java:2693
-#: build/trans_presets.java:2732 build/trans_presets.java:3151
+#: build/trans_presets.java:766 build/trans_presets.java:903
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
+#: build/trans_presets.java:1416 build/trans_presets.java:1422
+#: build/trans_presets.java:1430 build/trans_presets.java:1437
+#: build/trans_presets.java:1765 build/trans_presets.java:1775
+#: build/trans_presets.java:2372 build/trans_presets.java:2379
+#: build/trans_presets.java:2395 build/trans_presets.java:2406
+#: build/trans_presets.java:2414 build/trans_presets.java:2421
+#: build/trans_presets.java:2475 build/trans_presets.java:2523
+#: build/trans_presets.java:2689 build/trans_presets.java:2704
+#: build/trans_presets.java:2743 build/trans_presets.java:3163
 msgid "Operator"
 msgstr "Operator"
@@ -15422,5 +15756,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:769
+#: build/trans_presets.java:770
 msgid "Traffic Signal"
 msgstr "Trafik ışıkları"
@@ -15430,5 +15764,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:774
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -15437,27 +15771,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "uncontrolled"
 msgstr "kontrolsuz"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "island"
 msgstr "ada"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:774 build/trans_presets.java:790
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:775 build/trans_presets.java:791
+#: build/trans_presets.java:1334
 msgid "Cross on horseback"
 msgstr ""
@@ -15465,6 +15799,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:775 build/trans_presets.java:789
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:776 build/trans_presets.java:790
+#: build/trans_presets.java:1335
 msgid "Cross by bicycle"
 msgstr ""
@@ -15473,11 +15807,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:776 build/trans_presets.java:791
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:1336
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:778
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -15485,30 +15819,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pelican"
 msgstr "pelikan"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:780
+#: build/trans_presets.java:781
 msgid "Stop"
 msgstr "Dur"
@@ -15516,5 +15850,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:783
+#: build/trans_presets.java:784
 msgid "Pedestrian Crossing"
 msgstr ""
@@ -15523,14 +15857,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:786
+#: build/trans_presets.java:787
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:793
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:795
 msgid "Mini-roundabout"
 msgstr ""
@@ -15541,14 +15875,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:801
+#: build/trans_presets.java:802
 msgid "Turning Circle"
 msgstr "Dönme Daire"
@@ -15558,20 +15892,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:806
+#: build/trans_presets.java:807
 msgid "City Limit"
 msgstr "şehir sınırı"
 
 #. item
-#: build/trans_presets.java:807
+#: build/trans_presets.java:808
 msgid "Edit City Limit Sign"
 msgstr "şehir sınırı düzenle"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:812
+#: build/trans_presets.java:813
 msgid "Second Name"
 msgstr "ikinci isim"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:814
+#: build/trans_presets.java:815
 msgid "Speed Camera"
 msgstr "hız kamerası"
@@ -15579,5 +15913,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:817
+#: build/trans_presets.java:818
 msgid "Emergency Phone"
 msgstr "Acil durum telefonu"
@@ -15585,5 +15919,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:820
+#: build/trans_presets.java:821
 msgid "Incline"
 msgstr ""
@@ -15591,5 +15925,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:823
+#: build/trans_presets.java:824
 msgid "Incline Steep"
 msgstr ""
@@ -15598,10 +15932,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:827
+#: build/trans_presets.java:828
 msgid "Ford"
 msgstr "sığ geçit"
 
 #. item
-#: build/trans_presets.java:828
+#: build/trans_presets.java:829
 msgid "Edit Ford"
 msgstr "sığ geçit düzenle"
@@ -15609,5 +15943,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:835
+#: build/trans_presets.java:836
 msgid "Mountain Pass"
 msgstr "Dağ geçidi"
@@ -15615,5 +15949,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:837
+#: build/trans_presets.java:838
 msgid "Edit Mountain Pass"
 msgstr "dağ geçidi düzenle"
@@ -15625,7 +15959,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:842 build/trans_presets.java:1600
-#: build/trans_presets.java:1745 build/trans_presets.java:2845
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:843 build/trans_presets.java:1604
+#: build/trans_presets.java:1749 build/trans_presets.java:2857
+#: build/trans_presets.java:2864 build/trans_presets.java:2871
 msgid "Elevation"
 msgstr "yükseklik"
@@ -15633,5 +15967,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:846
+#: build/trans_presets.java:847
 msgid "Barriers"
 msgstr "Bariyer"
@@ -15639,5 +15973,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:849
+#: build/trans_presets.java:850
 msgid "Bollard"
 msgstr "direk-iskele"
@@ -15645,5 +15979,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:852
 msgid "Edit Bollard"
 msgstr "direk-iskele düzenle"
@@ -15688,16 +16022,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:854 build/trans_presets.java:873
-#: build/trans_presets.java:887 build/trans_presets.java:909
-#: build/trans_presets.java:946 build/trans_presets.java:959
-#: build/trans_presets.java:971 build/trans_presets.java:983
-#: build/trans_presets.java:995 build/trans_presets.java:1007
-#: build/trans_presets.java:1017 build/trans_presets.java:1026
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:855 build/trans_presets.java:874
+#: build/trans_presets.java:888 build/trans_presets.java:910
+#: build/trans_presets.java:947 build/trans_presets.java:960
+#: build/trans_presets.java:972 build/trans_presets.java:984
+#: build/trans_presets.java:996 build/trans_presets.java:1008
+#: build/trans_presets.java:1018 build/trans_presets.java:1027
+#: build/trans_presets.java:1036
 msgid "Allowed traffic:"
 msgstr "İzin verilen trafik:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:861
+#: build/trans_presets.java:862
 msgid "Cycle Barrier"
 msgstr ""
@@ -15706,5 +16040,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:865
+#: build/trans_presets.java:866
 msgid "Block"
 msgstr "Blok"
@@ -15712,5 +16046,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:868
+#: build/trans_presets.java:869
 msgid "Cattle Grid"
 msgstr "Hayvan Kapısı"
@@ -15718,10 +16052,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:870
+#: build/trans_presets.java:871
 msgid "Edit Cattle Grid"
 msgstr "Hayvan Kapısı Düzenle"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:880
+#: build/trans_presets.java:881
 msgid "Bus Trap"
 msgstr "otobüs geçidi"
@@ -15729,15 +16063,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:883
+#: build/trans_presets.java:884
 msgid "Spikes"
 msgstr "Spikes"
 
 #. item
-#: build/trans_presets.java:884
+#: build/trans_presets.java:885
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:896
 msgid "Toll Booth"
 msgstr "gişe"
@@ -15745,5 +16079,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:897
+#: build/trans_presets.java:898
 msgid "Edit Toll Booth"
 msgstr "gişe  düzenle"
@@ -15751,10 +16085,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:905
+#: build/trans_presets.java:906
 msgid "Border Control"
 msgstr "Sınır kontrol noktası"
 
 #. item
-#: build/trans_presets.java:906
+#: build/trans_presets.java:907
 msgid "Edit Border Control"
 msgstr "Sınır kontrol noktası düzenle"
@@ -15764,5 +16098,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:920
+#: build/trans_presets.java:921
 msgid "Hedge"
 msgstr "Çalı Çit"
@@ -15771,5 +16105,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:925
 msgid "Fence"
 msgstr "Çit"
@@ -15778,5 +16112,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:929
 msgid "Wall"
 msgstr "Duvar"
@@ -15784,5 +16118,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:931
+#: build/trans_presets.java:932
 msgid "City Wall"
 msgstr "Şehir Duvarı"
@@ -15791,5 +16125,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:935
+#: build/trans_presets.java:936
 msgid "Retaining Wall"
 msgstr "istinat duvarı"
@@ -15801,15 +16135,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:942
+#: build/trans_presets.java:943
 msgid "Entrance"
 msgstr "Giriş"
 
 #. item
-#: build/trans_presets.java:943
+#: build/trans_presets.java:944
 msgid "Edit Entrance"
 msgstr "Giriş düzenle"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:954
+#: build/trans_presets.java:955
 msgid "Gate"
 msgstr "Geçit"
@@ -15817,50 +16151,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:956
+#: build/trans_presets.java:957
 msgid "Edit Gate"
 msgstr "Geçit Düzenle"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:967
+#: build/trans_presets.java:968
 msgid "Lift Gate"
 msgstr "Kalkan geçit"
 
 #. item
-#: build/trans_presets.java:968
+#: build/trans_presets.java:969
 msgid "Edit Lift Gate"
 msgstr "kalkan geçit düzenle"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:979
+#: build/trans_presets.java:980
 msgid "Hampshire Gate"
 msgstr "Hampshire Geçidi"
 
 #. item
-#: build/trans_presets.java:980
+#: build/trans_presets.java:981
 msgid "Edit Hampshire Gate"
 msgstr "Hampshire Geçidi Düzenle"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:991
+#: build/trans_presets.java:992
 msgid "Bump Gate"
 msgstr "Hız engeli"
 
 #. item
-#: build/trans_presets.java:992
+#: build/trans_presets.java:993
 msgid "Edit Bump Gate"
 msgstr "Hız engeli düzenle"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:1003
+#: build/trans_presets.java:1004
 msgid "Kissing Gate"
 msgstr "geçit"
 
 #. item
-#: build/trans_presets.java:1004
+#: build/trans_presets.java:1005
 msgid "Edit Kissing Gate"
 msgstr "geçit düzenle"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1013
 msgid "Stile"
 msgstr "Stil"
@@ -15868,25 +16202,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1014
+#: build/trans_presets.java:1015
 msgid "Edit Stile"
 msgstr "Stil düzenle"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1023
 msgid "Turnstile"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1024
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1032
 msgid "Sally Port"
 msgstr "Çıkış Kapısı-asker"
 
 #. item
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1033
 msgid "Edit Sally Port"
 msgstr "Çıkış Kapısı-asker düzenle"
@@ -15894,13 +16228,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #.
-#. <separator/>
+#. group "Water"
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1046 build/trans_presets.java:1089
+#: build/trans_presets.java:1047 build/trans_presets.java:1048
+#: build/trans_presets.java:1091
 msgid "Water"
 msgstr "Su"
 
 #. group "Water"
-#: build/trans_presets.java:1047
+#: build/trans_presets.java:1049
 msgid "Spring"
 msgstr "Spring"
@@ -15908,5 +16243,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1049
+#: build/trans_presets.java:1051
 msgid "Edit Spring"
 msgstr "Spring Düzenle"
@@ -15914,5 +16249,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1056
 msgid "Drain"
 msgstr "kanalizasyon"
@@ -15920,10 +16255,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1058
 msgid "Edit Drain"
 msgstr "kanalizasyon düzenle"
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1064
 msgid "Stream"
 msgstr "dere"
@@ -15931,10 +16266,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1066
 msgid "Edit Stream"
 msgstr "dere düzenle"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1072
 msgid "Canal"
 msgstr "Kanal"
@@ -15942,10 +16277,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1074
 msgid "Edit Canal"
 msgstr "Kanal düzenle"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1080
 msgid "River"
 msgstr "nehir"
@@ -15955,5 +16290,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1084
 msgid "Edit River"
 msgstr "nehir düzenle"
@@ -15961,15 +16296,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1093
 msgid "Edit Water"
 msgstr "Su Düzenle"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1097
 msgid "Land"
 msgstr "Kara"
 
 #. item
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1098
 msgid "Edit Land"
 msgstr "Kara Düzenle"
@@ -15977,15 +16312,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1103
 msgid "Basin"
 msgstr "havza"
 
 #. item
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1104
 msgid "Edit Basin Landuse"
 msgstr "havza kullanım düzenle"
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1109
 msgid "Reservoir"
 msgstr "Havuz"
@@ -15993,15 +16328,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1109
+#: build/trans_presets.java:1111
 msgid "Edit Reservoir Landuse"
 msgstr "Havuz Kullanımı Düzenle"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1116
 msgid "Covered Reservoir"
 msgstr "Kapalı Sarnıç"
 
 #. item
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1117
 msgid "Edit Covered Reservoir"
 msgstr "Kapalı Sarnıç Düzenle"
@@ -16009,5 +16344,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1120
+#: build/trans_presets.java:1122
 msgid "Riverbank"
 msgstr "Nehirkenarı"
@@ -16016,10 +16351,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1125
 msgid "Edit Riverbank"
 msgstr "Nehirkenarı Düzenle"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1127
+#: build/trans_presets.java:1129
 msgid "Wetland"
 msgstr "sulak alan"
@@ -16030,14 +16365,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1134
 msgid "Edit Wetland"
 msgstr "sulak alan düzenle"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "swamp"
 msgstr "bataklık"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "bog"
 msgstr "kenef"
@@ -16051,35 +16386,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1135 build/trans_style.java:3384
+#: build/trans_presets.java:1137 build/trans_style.java:3392
 msgid "marsh"
 msgstr "batak"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "reedbed"
 msgstr "sazlık alan"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "saltmarsh"
 msgstr "çolak alan"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "tidalflat"
 msgstr "gelgit alanı"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "mangrove"
 msgstr "bataklık ormanı"
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1139
 msgid "Mud"
 msgstr "Çamur"
 
 #. item
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1140
 msgid "Edit Mud"
 msgstr "Çamur Alan Düzenle"
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1144
 msgid "Beach"
 msgstr "Sahil"
@@ -16087,20 +16422,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1144
+#: build/trans_presets.java:1146
 msgid "Edit Beach"
 msgstr "Sahil Düzenle"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1150
 msgid "Bay"
 msgstr "Koy"
 
 #. item
-#: build/trans_presets.java:1149
+#: build/trans_presets.java:1151
 msgid "Edit Bay"
 msgstr "koy Düzenle"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1155
 msgid "Cliff"
 msgstr "Uçurum"
@@ -16108,10 +16443,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1157
 msgid "Edit Cliff"
 msgstr "Uçurum Düzenle"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1159
+#: build/trans_presets.java:1161
 msgid "Coastline"
 msgstr "Sahil Çizgisi"
@@ -16119,5 +16454,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1163
 msgid "Edit Coastline"
 msgstr "Sahil Çizgisi Düzenle"
@@ -16125,5 +16460,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1168
 msgid "Ferry Route"
 msgstr "feribot hat"
@@ -16131,5 +16466,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1170
 msgid "Edit Ferry"
 msgstr "feribot hat düzenle"
@@ -16138,5 +16473,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1176
+#: build/trans_presets.java:1178
 msgid "Boatyard"
 msgstr "Marina"
@@ -16144,10 +16479,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:1180
 msgid "Edit Boatyard"
 msgstr "Marina düzenle"
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1185
 msgid "Dock"
 msgstr "iskele"
@@ -16155,5 +16490,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1187
 msgid "Edit Dock"
 msgstr "iskele düzenle"
@@ -16161,5 +16496,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1193
 msgid "Dam"
 msgstr "Baraj"
@@ -16167,15 +16502,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1195
 msgid "Edit Dam"
 msgstr "Baraj düzenle"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1199
+#: build/trans_presets.java:1201
 msgid "Waterway Point"
 msgstr "Su yolu noktası"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1202
 msgid "Lock Gate"
 msgstr "Lock Gate"
@@ -16184,5 +16519,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1206
 msgid "Weir"
 msgstr "bent"
@@ -16190,20 +16525,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1208
 msgid "Edit Weir"
 msgstr "bent dünele"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1213
 msgid "Waterfall"
 msgstr "şelale"
 
 #. item
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1214
 msgid "Edit Waterfall"
 msgstr "şelale düzenle"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1219
 msgid "Turning Point"
 msgstr "dönüm noktası"
@@ -16212,15 +16547,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1221
+#: build/trans_presets.java:1223
 msgid "Marina"
 msgstr "Marina"
 
 #. item
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1224
 msgid "Edit Marina"
 msgstr "Marina düzenle"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1228
 msgid "Pier"
 msgstr "Kemer"
@@ -16228,10 +16563,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1230
 msgid "Edit Pier"
 msgstr "Kemer Düzenle"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1234
 msgid "Ferry Terminal"
 msgstr "Feribot Terminal"
@@ -16239,10 +16574,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1236
 msgid "Edit Ferry Terminal"
 msgstr "Feribot Terminal düzenle"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1240
 msgid "Slipway"
 msgstr "Gemi Kızağı"
@@ -16252,16 +16587,21 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1244
 msgid "Edit Slipway"
 msgstr "Gemi Kızağı Düzenle"
 
 #. item "Waterway Point/Slipway" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1250
+#, fuzzy
+msgid "Transport"
+msgstr "Toplu taşıma"
+
+#. group "Transport"
+#: build/trans_presets.java:1251
 msgid "Railway"
 msgstr "Demiryolu"
 
 #. group "Railway"
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1252
 msgid "Rail"
 msgstr "Demiryolu"
@@ -16269,5 +16609,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:1254
 msgid "Edit Rail"
 msgstr "Demiryolu düzenle"
@@ -16297,8 +16637,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "Optional Types"
 msgstr "seçmeli tipler"
@@ -16312,35 +16652,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "yard"
 msgstr "saha"
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "siding"
 msgstr "yük boşaltma yeri"
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "spur"
 msgstr "demiryolu hattı şube-kısa"
 
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1259
 msgid "Narrow Gauge Rail"
 msgstr "Dar geçiş demiryolu"
 
 #. item
-#: build/trans_presets.java:1257
+#: build/trans_presets.java:1260
 msgid "Edit Narrow Gauge Rail"
 msgstr "Dar geçiş demiryolu düzenle"
 
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1265
 msgid "Monorail"
 msgstr "tek ray"
@@ -16348,45 +16688,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1267
 msgid "Edit Monorail"
 msgstr "tek ray düzenle"
 
-#: build/trans_presets.java:1269
+#: build/trans_presets.java:1272
 msgid "Preserved"
 msgstr "Korunmuş"
 
 #. item
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1273
 msgid "Edit Preserved Railway"
 msgstr "Korunmuş demiryolu düzenle"
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1278
 msgid "Light Rail"
 msgstr "Hafif Ray"
 
 #. item
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1279
 msgid "Edit Light Rail"
 msgstr "Hafif Ray Düzenle"
 
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1284
 msgid "Subway"
 msgstr "Metro"
 
 #. item
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1285
 msgid "Edit Subway"
 msgstr "Metro Düzenle"
 
-#: build/trans_presets.java:1287
+#: build/trans_presets.java:1290
 msgid "Tram"
 msgstr "Tramvay"
 
 #. item
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1291
 msgid "Edit Tram"
 msgstr "Tramvay Düzenle"
 
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1296
 msgid "Bus Guideway"
 msgstr "Otobüs Yolu"
@@ -16394,5 +16734,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1295
+#: build/trans_presets.java:1298
 msgid "Edit Bus Guideway"
 msgstr "Otobüs Yolu Düzenle"
@@ -16401,14 +16741,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1315
 msgid "Disused Rail"
 msgstr "Kullanılmayan Demiryolu"
 
 #. item
-#: build/trans_presets.java:1313
+#: build/trans_presets.java:1316
 msgid "Edit Disused Railway"
 msgstr "Kullanılmayan Demiryolu Düzenle"
 
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1321
 msgid "Abandoned Rail"
 msgstr "Terkedilmiş demiryolu düzenle"
@@ -16417,5 +16757,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1325
 msgid "Level Crossing"
 msgstr "hemzemin geçit"
@@ -16424,5 +16764,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1329
 msgid "Crossing"
 msgstr "geçit"
@@ -16432,5 +16772,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1333
 msgid "Crossing type"
 msgstr ""
@@ -16438,5 +16778,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1339
 msgid "Turntable"
 msgstr "döner levha"
@@ -16445,10 +16785,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1344
 msgid "Aerialway"
 msgstr "havayolu"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1345
 msgid "Chair Lift"
 msgstr "Teleski"
@@ -16456,10 +16796,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1347
 msgid "Edit Chair Lift"
 msgstr "Teleski Düzenle"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1351
 msgid "Drag Lift"
 msgstr "Kayakçı Asansörü"
@@ -16467,10 +16807,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1353
 msgid "Edit Drag Lift"
 msgstr "Kayakçı Asansörü Düzenle"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1357
 msgid "Cable Car"
 msgstr "Hava tramvayı"
@@ -16478,10 +16818,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1359
 msgid "Edit Cable Car"
 msgstr "Hava tramvayı düzenle"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1360
+#: build/trans_presets.java:1363
 msgid "Gondola"
 msgstr ""
@@ -16489,5 +16829,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1365
 msgid "Edit Gondola"
 msgstr ""
@@ -16495,5 +16835,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1366 build/trans_presets.java:1461
+#: build/trans_presets.java:1369 build/trans_presets.java:1464
 msgid "Station"
 msgstr "İstasyon"
@@ -16504,10 +16844,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1368 build/trans_presets.java:1464
+#: build/trans_presets.java:1371 build/trans_presets.java:1467
 msgid "Edit Station"
 msgstr "İstasyon Düzenle"
 
 #. group "Car"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1378
 msgid "Fuel"
 msgstr "Yakıt"
@@ -16517,5 +16857,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1382
 msgid "Edit Fuel"
 msgstr "Yakıt düzenle"
@@ -16573,32 +16913,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1671 build/trans_presets.java:1678
-#: build/trans_presets.java:1686 build/trans_presets.java:1699
-#: build/trans_presets.java:1713 build/trans_presets.java:1810
-#: build/trans_presets.java:1818 build/trans_presets.java:1909
-#: build/trans_presets.java:1915 build/trans_presets.java:2226
-#: build/trans_presets.java:2250 build/trans_presets.java:2465
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1703
+#: build/trans_presets.java:1717 build/trans_presets.java:1814
+#: build/trans_presets.java:1822 build/trans_presets.java:1919
+#: build/trans_presets.java:1925 build/trans_presets.java:2237
+#: build/trans_presets.java:2261 build/trans_presets.java:2476
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Opening Hours"
 msgstr "Açılış saati"
@@ -16657,91 +16997,91 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -16756,5 +17096,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1385 build/trans_presets.java:1438
+#: build/trans_presets.java:1388 build/trans_presets.java:1441
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -16764,5 +17104,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1391
 msgid "Edit Parking"
 msgstr "Park düzenle"
@@ -16773,24 +17113,24 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1391 build/trans_presets.java:1762
-#: build/trans_presets.java:1772 build/trans_presets.java:2396
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:1394 build/trans_presets.java:1766
+#: build/trans_presets.java:1776 build/trans_presets.java:2407
+#: build/trans_presets.java:2524
 msgid "Reference number"
 msgstr "Referans Numarası"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "multi-storey"
 msgstr "kat otoparkı"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "surface"
 msgstr "yüzey"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "underground"
 msgstr "yer altı"
 
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1396
 msgid "Park and Ride"
 msgstr ""
@@ -16799,38 +17139,38 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1394 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
+#: build/trans_presets.java:1397 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
 msgid "Fee"
 msgstr "Ücret"
 
 #. <space />
-#: build/trans_presets.java:1396
+#: build/trans_presets.java:1399
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1400
 msgid "Spaces for Disabled"
 msgstr "Özürlü Alanı"
 
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1401
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1402
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1403
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1405
 msgid "Wash"
 msgstr "Yıkama"
 
 #. item
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1406
 msgid "Edit Car Wash"
 msgstr "Yıkama düzenle"
@@ -16838,5 +17178,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1408 build/trans_presets.java:1452
+#: build/trans_presets.java:1411 build/trans_presets.java:1455
 msgid "Shop"
 msgstr "Alışveriş"
@@ -16844,15 +17184,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1413
 msgid "Edit Car Shop"
 msgstr "araçlı alışveriş düzenle"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1418
 msgid "Repair"
 msgstr "tamirci"
 
 #. item
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1419
 msgid "Edit Car Repair"
 msgstr "tamirci düzenle"
@@ -16860,5 +17200,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1421 build/trans_presets.java:1445
+#: build/trans_presets.java:1424 build/trans_presets.java:1448
 msgid "Rental"
 msgstr "araç kiralam"
@@ -16867,10 +17207,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1427
 msgid "Edit Car Rental"
 msgstr "araç kiralam düzenle"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1432
 msgid "Sharing"
 msgstr "Paylaşım Alanı"
@@ -16878,5 +17218,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1434
 msgid "Edit Car Sharing"
 msgstr "Araç Paylaşım alanı düzenle"
@@ -16884,10 +17224,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Parking"
 msgstr "Bisiklet parkyeri düzenle"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1446
 msgid "Capacity"
 msgstr "kapasite"
@@ -16896,5 +17236,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1448
+#: build/trans_presets.java:1451
 msgid "Edit Bicycle Rental"
 msgstr "bisiklet kiralama düzenle"
@@ -16903,15 +17243,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1458
 msgid "Edit Bicycle Shop"
 msgstr "Bisiklet dükkanı düzenle"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1463
 msgid "Public Transport"
 msgstr "Toplu taşıma"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:1472
 msgid "UIC-Reference"
 msgstr "UIC-Referans"
@@ -16919,5 +17259,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1475
 msgid "Railway Halt"
 msgstr "Demiryolu sonu"
@@ -16925,5 +17265,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1477
 msgid "Edit Halt"
 msgstr "Son nokta düzenle"
@@ -16931,5 +17271,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1484
 msgid "Tram Stop"
 msgstr "Tramvay durağı"
@@ -16938,5 +17278,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1484
+#: build/trans_presets.java:1487
 msgid "Edit Tram Stop"
 msgstr "tramvay durağı düzenle"
@@ -16944,5 +17284,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1494
 msgid "Railway Platform"
 msgstr "Demiryolu platformu"
@@ -16951,5 +17291,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1497
 msgid "Edit Railway Platform"
 msgstr "Demiryolu platformu düzenle"
@@ -16961,5 +17301,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1497 build/trans_presets.java:1539
+#: build/trans_presets.java:1500 build/trans_presets.java:1542
 msgid "Reference (track number)"
 msgstr "referans (iz numarası)"
@@ -16967,10 +17307,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1499 build/trans_presets.java:1541
+#: build/trans_presets.java:1502 build/trans_presets.java:1544
 msgid "Area"
 msgstr "Alan"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1504
 msgid "Subway Entrance"
 msgstr "Metro Girişi"
@@ -16979,10 +17319,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1507
 msgid "Edit Subway Entrance"
 msgstr "Metro Girişi Düzenle"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1512
 msgid "Wheelchair"
 msgstr "tekerlekli sandalye"
@@ -16991,5 +17331,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1517
 msgid "Bus Station"
 msgstr "otogar"
@@ -16998,5 +17338,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1520
 msgid "Edit Bus Station"
 msgstr "otogar düzenle"
@@ -17004,5 +17344,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1526
 msgid "Bus Stop"
 msgstr "otobüs durağı"
@@ -17012,5 +17352,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1530
 msgid "Edit Bus Stop"
 msgstr "otobüs durağı düzenle"
@@ -17019,6 +17359,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1532 build/trans_presets.java:1785
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:1535 build/trans_presets.java:1789
+#: build/trans_presets.java:2453
 msgid "Shelter"
 msgstr "Sığınak"
@@ -17026,10 +17366,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1538
 msgid "Bus Platform"
 msgstr "otobüs platformu"
 
 #. item
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1539
 msgid "Edit Bus Platform"
 msgstr "otobüs platformu düzenle"
@@ -17037,5 +17377,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1547
 msgid "Taxi"
 msgstr "Taksi"
@@ -17043,5 +17383,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1549
 msgid "Edit Taxi station"
 msgstr "taksi istasyonu düzenle"
@@ -17049,5 +17389,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1554
 msgid "Airport"
 msgstr "Havaalanı"
@@ -17055,15 +17395,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1556
 msgid "Edit Airport"
 msgstr ""
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1561
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1559
+#: build/trans_presets.java:1562
 msgid "ICAO"
 msgstr "ICAO"
@@ -17071,6 +17411,11 @@
 #. item "Public Transport/Airport" text "ICAO"
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1567
+#, fuzzy
+msgid "Travel"
+msgstr "Çakıl"
+
+#. group "Travel"
+#: build/trans_presets.java:1568
 msgid "Accomodation"
 msgstr "Kalınacak Yerler"
@@ -17082,5 +17427,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1565 build/trans_surveyor.java:43
+#: build/trans_presets.java:1569 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -17089,15 +17434,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:1568
+#: build/trans_presets.java:1572
 msgid "Edit Hotel"
 msgstr "Hotel Düzenle"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1575
 msgid "Stars"
 msgstr "Stars"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1577
 msgid "Motel"
 msgstr "Motel"
@@ -17105,20 +17450,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1579
 msgid "Edit Motel"
 msgstr "Motel Düzenle"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1583
 msgid "Guest House"
 msgstr "Misafir Evi"
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1584
 msgid "Edit Guest House"
 msgstr "Misafir Evi Düzenle"
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1588
 msgid "Chalet"
 msgstr "kulübe"
@@ -17126,10 +17471,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1590
 msgid "Edit Chalet"
 msgstr "külübe düzenle"
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1594
 msgid "Hostel"
 msgstr "Hostel"
@@ -17137,30 +17482,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1592
+#: build/trans_presets.java:1596
 msgid "Edit Hostel"
 msgstr "Hostel Düzenle"
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1600
 msgid "Alpine Hut"
 msgstr "Dağcı Barakası"
 
 #. item
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1601
 msgid "Edit Alpine Hut"
 msgstr "Dağcı Barakası Düzenle"
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1606
 msgid "Caravan Site"
 msgstr "Karavan Alanı"
 
 #. item
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1607
 msgid "Edit Caravan Site"
 msgstr "Karavan Alanı Düzenle"
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1611
 msgid "Camping Site"
 msgstr "Kamp Sitesi"
@@ -17168,10 +17513,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1613
 msgid "Edit Camping Site"
 msgstr "Kamp Sitesi Düzenle"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1618
 msgid "Food+Drinks"
 msgstr "Yüyecek+içecek"
@@ -17182,5 +17527,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1615 build/trans_surveyor.java:47
+#: build/trans_presets.java:1619 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -17188,5 +17533,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1621
 msgid "Edit Restaurant"
 msgstr "Restorant Düzenle"
@@ -17194,5 +17539,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "Cuisine"
 msgstr "lokanta"
@@ -17200,61 +17545,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "italian"
 msgstr "italyan"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "chinese"
 msgstr "çinli"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "burger"
 msgstr "burger"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "greek"
 msgstr "yunan"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "german"
 msgstr "alman"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "indian"
 msgstr "hint"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "regional"
 msgstr "yöresel"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "turkish"
 msgstr "türk"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "asian"
 msgstr "asyalı"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "mexican"
 msgstr "mexican"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "japanese"
 msgstr "japanese"
 
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1627
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -17262,9 +17607,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1629
 msgid "Edit Fast Food Restaurant"
 msgstr "Fast Food düzenle"
 
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1635
 msgid "Cafe"
 msgstr "Kafe"
@@ -17272,9 +17617,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1633
+#: build/trans_presets.java:1637
 msgid "Edit Cafe"
 msgstr "Cafe düzenle"
 
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1642
 msgid "Pub"
 msgstr "Pub"
@@ -17282,18 +17627,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1644
 msgid "Edit Pub"
 msgstr "Pub Düzenle"
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1649
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item
-#: build/trans_presets.java:1646
+#: build/trans_presets.java:1650
 msgid "Edit Biergarten"
 msgstr "Biergarten Düzenle"
 
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1655
 msgid "Bar"
 msgstr ""
@@ -17301,9 +17646,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1657
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1662
 msgid "Nightclub"
 msgstr "GeceKlubu"
@@ -17311,24 +17656,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1664
 msgid "Edit Nightclub"
 msgstr "GeceKulubu Düzenle"
 
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1670
 msgid "Tourism"
 msgstr "Turizm"
 
 #. group "Tourism"
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1671
 msgid "Attraction"
 msgstr "İlginç Yerler"
 
 #. item
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1672
 msgid "Edit Attraction"
 msgstr "İlginç Yerler Düzenle"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1677
 msgid "Museum"
 msgstr "Müse"
@@ -17336,9 +17681,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1679
 msgid "Edit Museum"
 msgstr "Müze Düzenle"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1684
 msgid "Zoo"
 msgstr "Hayvanat Bahçesi"
@@ -17347,9 +17692,9 @@
 #. <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:1683
+#: build/trans_presets.java:1687
 msgid "Edit Zoo"
 msgstr "Hayvanat Bahçesi Düzenle"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1692
 msgid "Viewpoint"
 msgstr "Seyir Yeri"
@@ -17357,24 +17702,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1694
 msgid "Edit Viewpoint"
 msgstr "Seyir Yeri Düzenle"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1697
 msgid "Look-Out Tower"
 msgstr "Seyir Kulesi"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1699
 msgid "Theme Park"
 msgstr "Lunapark"
 
 #. item
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1700
 msgid "Edit Theme Park"
 msgstr "Lunapark Düzenle"
 
-#: build/trans_presets.java:1701
+#: build/trans_presets.java:1705
 msgid "Artwork"
 msgstr "Sanatsal"
@@ -17382,5 +17727,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1707
 msgid "Edit Artwork"
 msgstr "Sanatsal Düzenle"
@@ -17388,19 +17733,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1712
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1719
 msgid "Map"
 msgstr "Harita"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "topo"
 msgstr ""
@@ -17438,5 +17783,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1720 build/trans_style.java:619
+#: build/trans_presets.java:1724 build/trans_style.java:619
 #: build/trans_style.java:635 build/trans_style.java:651
 #: build/trans_style.java:659
@@ -17444,28 +17789,28 @@
 msgstr "sokak"
 
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1722 build/trans_presets.java:1738
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1726 build/trans_presets.java:1742
+#: build/trans_presets.java:1786
 msgid "Closer Description"
 msgstr ""
@@ -17475,5 +17820,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1724 build/trans_presets.java:1747
+#: build/trans_presets.java:1728 build/trans_presets.java:1751
 msgid "Routes shown for:"
 msgstr ""
@@ -17481,6 +17826,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1726 build/trans_presets.java:1749
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1965
 msgid "Cycling"
 msgstr "Bisiklet"
@@ -17488,5 +17833,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1727 build/trans_presets.java:1750
+#: build/trans_presets.java:1731 build/trans_presets.java:1754
 msgid "Mountainbiking"
 msgstr ""
@@ -17494,6 +17839,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1728 build/trans_presets.java:1751
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:1732 build/trans_presets.java:1755
+#: build/trans_presets.java:2019
 msgid "Skiing"
 msgstr "Kayak"
@@ -17501,5 +17846,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1729 build/trans_presets.java:1752
+#: build/trans_presets.java:1733 build/trans_presets.java:1756
 msgid "Riding"
 msgstr ""
@@ -17507,46 +17852,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1734 build/trans_presets.java:1757
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1736
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "history"
 msgstr "tarih"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "nature"
 msgstr "doğa"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "wildlife"
 msgstr "vahşiyaşam"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1744
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1759
 msgid "Information Terminal"
 msgstr ""
@@ -17554,29 +17899,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1760 build/trans_presets.java:1770
+#: build/trans_presets.java:1764 build/trans_presets.java:1774
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1769
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1779
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1780
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1778
+#: build/trans_presets.java:1782
 msgid "Other Information Points"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1790
 msgid "Edit Shelter"
 msgstr "Sığınak Düzenle"
@@ -17584,25 +17929,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1789 build/trans_presets.java:1795
+#: build/trans_presets.java:1793 build/trans_presets.java:1799
 msgid "Fireplace"
 msgstr "Mangal Alanı"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1791
+#: build/trans_presets.java:1795
 msgid "Picnic Site"
 msgstr "Piknik Alanı"
 
 #. item
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1796
 msgid "Edit Picnic Site"
 msgstr "Piknik Alanı Düzenle"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1802
 msgid "Historic Places"
 msgstr "Tarihi Alanlar"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1799
+#: build/trans_presets.java:1803
 msgid "Castle"
 msgstr "Kale"
@@ -17611,19 +17956,19 @@
 #. <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:1802
+#: build/trans_presets.java:1806
 msgid "Edit Castle"
 msgstr "Kale Düzenle"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1810
 msgid "Ruins"
 msgstr "Harabe"
 
 #. item
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1811
 msgid "Edit Ruins"
 msgstr "Harabe Düzenle"
 
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1816
 msgid "Archaeological Site"
 msgstr "Arkeolojik Site"
@@ -17632,9 +17977,9 @@
 #. <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:1815
+#: build/trans_presets.java:1819
 msgid "Edit Archaeological Site"
 msgstr "Arkeolojik Site Düzenle"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1824
 msgid "Battlefield"
 msgstr "Savaş Alanı"
@@ -17642,5 +17987,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1826
 msgid "Edit Battlefield"
 msgstr "Savaş Alanı Düzenle"
@@ -17648,15 +17993,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1831
 msgid "Monument"
 msgstr "Anıt"
 
 #. item
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1832
 msgid "Edit Monument"
 msgstr "Anıt Düzenle"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1836
 msgid "Memorial"
 msgstr "Abide"
@@ -17664,45 +18009,57 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1838
 msgid "Edit Memorial"
 msgstr "Abide Düzenle"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1842
 msgid "Wayside Cross"
 msgstr "Yol Kenar Geçişi"
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1843
 msgid "Edit Wayside Cross"
 msgstr "Yol Kenar Geçişi Düzenle"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1847
 msgid "Wayside Shrine"
 msgstr "Yolkenarı İbadetyeri"
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1848
 msgid "Edit Wayside Shrine"
 msgstr "Yolkenarı İbadetyeri Düzenle"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1852
+#, fuzzy
+msgid "Boundary Stone"
+msgstr "Belediye Sınırı"
+
+#. item
+#: build/trans_presets.java:1853
+#, fuzzy
+msgid "Edit Boundary Stone"
+msgstr "otobüs durağı düzenle"
+
+#. item "Historic Places/Boundary Stone" text "Name"
+#: build/trans_presets.java:1858
 msgid "Leisure"
 msgstr "Dinlenme Alanı"
 
 #. group "Leisure"
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1859
 msgid "Water Park"
 msgstr "Su Parkı"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1860
 msgid "Edit Water Park"
 msgstr "Su Parkı Düzenle"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1864
 msgid "Playground"
 msgstr "Oyun Sahası"
@@ -17710,31 +18067,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1866
 msgid "Edit Playground"
 msgstr "Oyun Sahası Düzenle"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1870
 msgid "Fishing"
 msgstr "Balıkçılık"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1871
 msgid "Edit Fishing"
 msgstr "Balıkçılık Düzenle"
 
 #. item "Leisure/Fishing" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1877 build/trans_presets.java:2669
+msgid "Sports"
+msgstr ""
+
+#. group "Sports"
+#: build/trans_presets.java:1878
 msgid "Sport Facilities"
 msgstr "Spor Aktivite"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1879
 msgid "Stadium"
 msgstr "Stadyum"
 
 #. item
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1880
 msgid "Edit Stadium"
 msgstr "Stadyum Düzenle"
@@ -17748,6 +18109,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1874 build/trans_presets.java:1883
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1902 build/trans_presets.java:1911
 msgid "select sport:"
 msgstr "Spor Seç"
@@ -18139,30 +18500,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884 build/trans_style.java:3892
-#: build/trans_style.java:3900 build/trans_style.java:3908
-#: build/trans_style.java:3916 build/trans_style.java:3924
-#: build/trans_style.java:3932
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_style.java:3572 build/trans_style.java:3580
+#: build/trans_style.java:3588 build/trans_style.java:3596
+#: build/trans_style.java:3604 build/trans_style.java:3612
+#: build/trans_style.java:3620 build/trans_style.java:3628
+#: build/trans_style.java:3636 build/trans_style.java:3644
+#: build/trans_style.java:3652 build/trans_style.java:3660
+#: build/trans_style.java:3668 build/trans_style.java:3676
+#: build/trans_style.java:3684 build/trans_style.java:3692
+#: build/trans_style.java:3700 build/trans_style.java:3708
+#: build/trans_style.java:3716 build/trans_style.java:3724
+#: build/trans_style.java:3732 build/trans_style.java:3740
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3764 build/trans_style.java:3772
+#: build/trans_style.java:3780 build/trans_style.java:3788
+#: build/trans_style.java:3796 build/trans_style.java:3804
+#: build/trans_style.java:3812 build/trans_style.java:3820
+#: build/trans_style.java:3828 build/trans_style.java:3836
+#: build/trans_style.java:3844 build/trans_style.java:3852
+#: build/trans_style.java:3860 build/trans_style.java:3868
+#: build/trans_style.java:3876 build/trans_style.java:3884
+#: build/trans_style.java:3892 build/trans_style.java:3900
+#: build/trans_style.java:3908 build/trans_style.java:3916
+#: build/trans_style.java:3924 build/trans_style.java:3932
+#: build/trans_style.java:3940
 msgid "sport"
 msgstr "spor"
@@ -18172,225 +18533,225 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "multi"
 msgstr "çoğul"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "archery"
 msgstr "okçuluk"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "athletics"
 msgstr "atletik"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "australian_football"
 msgstr "avustralya_footbol"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "baseball"
 msgstr "basebol"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "basketball"
 msgstr "basketbol"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "boules"
 msgstr "bowling"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "bowls"
 msgstr "çimen bowling"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "canoe"
 msgstr "kano"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "climbing"
 msgstr "tırmanma"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket"
 msgstr "kriket"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket_nets"
 msgstr "cricket nets"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cycling"
 msgstr "bisiklet"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "dog_racing"
 msgstr "köpek yarışı"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "equestrian"
 msgstr "at binicilik"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "football"
 msgstr "futbol"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "gymnastics"
 msgstr "jimnastik"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "hockey"
 msgstr "hokey"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "horse_racing"
 msgstr "at_yarışı"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "racquet"
 msgstr "raket"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "shooting"
 msgstr "atıcılık"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skateboard"
 msgstr "kaykay"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skating"
 msgstr "paten"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skiing"
 msgstr "kaymak"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "soccer"
 msgstr "futbol"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "swimming"
 msgstr "yüzmek"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "table_tennis"
 msgstr "masa_tenisi"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1888
 msgid "Sports Centre"
 msgstr "spor merkezi"
 
 #. item
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1889
 msgid "Edit Sports Centre"
 msgstr "spor merkezi düzenle"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1897
 msgid "Pitch"
 msgstr "atıcılık"
 
 #. item
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1898
 msgid "Edit Pitch"
 msgstr "atıcılık düzenle"
 
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1906
 msgid "Racetrack"
 msgstr "yarış pisti"
 
 #. item
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1907
 msgid "Edit Racetrack"
 msgstr "yarış pisti düzenle"
 
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1915
 msgid "Golf Course"
 msgstr "Golf Alanı"
 
 #. item
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1916
 msgid "Edit Golf Course"
 msgstr "Golf Alanı Düzenle"
 
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1921
 msgid "Miniature Golf"
 msgstr "Minyatür Golf"
 
 #. item
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1922
 msgid "Edit Miniature Golf"
 msgstr "Minyatür Golf Düzenle"
 
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1928
 msgid "Sport"
 msgstr "Spor"
 
 #. group "Sport"
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1929
 msgid "Multi"
 msgstr "Çoğul"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1930
 msgid "Edit Multi"
 msgstr "Çoğul Düzenle"
@@ -18429,183 +18790,183 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "pitch"
 msgstr "atıcılık"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "sports_centre"
 msgstr "spor_merkezi"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "stadium"
 msgstr "stadyum"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1935
 msgid "10pin"
 msgstr "10pin"
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1936
 msgid "Edit 10pin"
 msgstr "10pin Düzenle"
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1941
 msgid "Athletics"
 msgstr "Atletik"
 
 #. item
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1942
 msgid "Edit Athletics"
 msgstr "Atletik Düzenle"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1947
 msgid "Archery"
 msgstr "okçuluk"
 
 #. item
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1948
 msgid "Edit Archery"
 msgstr "okçuluk düzenle"
 
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1953
 msgid "Climbing"
 msgstr "tırmanma"
 
 #. item
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:1954
 msgid "Edit Climbing"
 msgstr "tırmanma düzenle"
 
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1959
 msgid "Canoeing"
 msgstr "Kano"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1960
 msgid "Edit Canoeing"
 msgstr "Kano Düzenle"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1966
 msgid "Edit Cycling"
 msgstr "Bisiklet Düzenle"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1971
 msgid "Dog Racing"
 msgstr "Köpek Yarışı"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1972
 msgid "Edit Dog Racing"
 msgstr "Köpek Yarışı Düzenle"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1977
 msgid "Equestrian"
 msgstr "binicilik"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1978
 msgid "Edit Equestrian"
 msgstr "binicilik düzenle"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1983
 msgid "Horse Racing"
 msgstr "At Yarışı"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1984
 msgid "Edit Horse Racing"
 msgstr "At Yarışı Düzenle"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1989
 msgid "Gymnastics"
 msgstr "jimnastik"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1990
 msgid "Edit Gymnastics"
 msgstr "jimnastik düzenle"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1995
 msgid "Motor Sports"
 msgstr "Motor Sporlar"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1996
 msgid "Edit Motor Sports"
 msgstr "Motor Sporları Düzenle"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2001
 msgid "Skating"
 msgstr "patinaj"
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2002
 msgid "Edit Skating"
 msgstr "patinaj düzenle"
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2007
 msgid "Skateboard"
 msgstr "kaykay"
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2008
 msgid "Edit Skateboard"
 msgstr "kaykay düzenle"
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2013
 msgid "Swimming"
 msgstr "yüzme"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2014
 msgid "Edit Swimming"
 msgstr "yüzme düzenle"
@@ -18613,56 +18974,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2021
 msgid "Edit Skiing"
 msgstr "Kayak Düzenle"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2028
 msgid "Shooting"
 msgstr "Atıcılık"
@@ -18670,178 +19031,183 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2030
 msgid "Edit Shooting"
 msgstr "Atıcılık Düzenle"
 
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2036
 msgid "Sport (Ball)"
 msgstr "Spor (Topla)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2037
 msgid "Soccer"
 msgstr "Futbol"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2038
 msgid "Edit Soccer"
 msgstr "Futbol Düzenle"
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2043
 msgid "Football"
 msgstr "Amerikan Futbolu"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2044
 msgid "Edit Football"
 msgstr "Amerikan Futbolu Düzenle"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2049
 msgid "Australian Football"
 msgstr "Avustralyan Futbol"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2050
 msgid "Edit Australian Football"
 msgstr "Avustralyan Futbol Düzenle"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2055
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2056
 msgid "Edit Baseball"
 msgstr "Baseball Düzenle"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2061
 msgid "Basketball"
 msgstr "Basketbol"
 
 #. item
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2062
 msgid "Edit Basketball"
 msgstr "Basketbol Düzenle"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2067
 msgid "Golf"
 msgstr "Golf"
 
 #. item
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2068
 msgid "Edit Golf"
 msgstr "Golf Düzenle"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2071
 msgid "golf_course"
 msgstr "golf_alanı"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2073
 msgid "Boule"
 msgstr "Boule"
 
 #. item
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2074
 msgid "Edit Boule"
 msgstr "Boule Düzenle"
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2079
 msgid "Bowls"
 msgstr "Bowling"
 
 #. item
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2080
 msgid "Edit Bowls"
 msgstr "Bowling Düzenle"
 
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2085
 msgid "Cricket"
 msgstr "Kricket"
 
 #. item
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2086
 msgid "Edit Cricket"
 msgstr "Kricket Düzenle"
 
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2091
 msgid "Cricket Nets"
 msgstr "Cricket Nets"
 
 #. item
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2092
 msgid "Edit Cricket Nets"
 msgstr "Cricket Nets Düzenle"
 
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2097
 msgid "Croquet"
 msgstr "Kroke"
 
 #. item
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2098
 msgid "Edit Croquet"
 msgstr "kroke Düzelt"
 
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2103
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2104
 msgid "Edit Hockey"
 msgstr "Hockey Düzenle"
 
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2109
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2110
 msgid "Edit Pelota"
 msgstr "Pelota Düzenle"
 
-#: build/trans_presets.java:2105
+#: build/trans_presets.java:2115
 msgid "Racquet"
 msgstr "Raket"
 
 #. item
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2116
 msgid "Edit Racquet"
 msgstr "Raket Düzenle"
 
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2121
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2122
 msgid "Edit Rugby"
 msgstr "Rugby Düzenle"
 
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2127
 msgid "Table Tennis"
 msgstr "Masa Tenisi"
 
 #. item
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2128
 msgid "Edit Table Tennis"
 msgstr "Masa Tenisi Düzenle"
 
-#: build/trans_presets.java:2123
+#: build/trans_presets.java:2133
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2134
 msgid "Edit Tennis"
 msgstr "Tennis Düzenle"
 
-#. <separator/>
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2141
+#, fuzzy
+msgid "Man-Made"
+msgstr "İnsan Yapımı"
+
+#. group "Man-Made"
+#: build/trans_presets.java:2142
 msgid "Buildings"
 msgstr "Binalar"
 
 #. group "Buildings"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2143
 msgid "Building"
 msgstr "Bina"
@@ -18849,5 +19215,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Public Building"
 msgstr "Kamu Binası"
@@ -18855,10 +19221,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2148
 msgid "Edit Public Building"
 msgstr "Kamu Binası Düzenle"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2152
 msgid "Town hall"
 msgstr "belediye binası"
@@ -18866,10 +19232,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2154
 msgid "Edit Town hall"
 msgstr "belediye binası düzenle"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:2158
 msgid "Embassy"
 msgstr "Büyükelçilik"
@@ -18877,10 +19243,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Edit Embassy"
 msgstr "Büyükelçilik Düzenle"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2164
 msgid "Courthouse"
 msgstr "adliye sarayı"
@@ -18889,10 +19255,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:2156
+#: build/trans_presets.java:2167
 msgid "Edit Courthouse"
 msgstr "adliye sarayı düzenle"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2171
 msgid "Prison"
 msgstr "Hapishane"
@@ -18901,10 +19267,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:2163
+#: build/trans_presets.java:2174
 msgid "Edit Prison"
 msgstr "Hapishane Düzenle"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2178
 msgid "Police"
 msgstr "Polis"
@@ -18914,10 +19280,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:2171
+#: build/trans_presets.java:2182
 msgid "Edit Police"
 msgstr "Polis Düzenle"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2186
 msgid "Fire Station"
 msgstr "İtfaye İstasyonu"
@@ -18926,10 +19292,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:2178
+#: build/trans_presets.java:2189
 msgid "Edit Fire Station"
 msgstr "İtfaye İstasyonu Düzenle"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "Post Office"
 msgstr "Postane"
@@ -18937,5 +19303,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Edit Post Office"
 msgstr "Postane Düzenle"
@@ -18943,15 +19309,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2200
 msgid "Kindergarten"
 msgstr "Anaokul"
 
 #. item
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Kindergarten"
 msgstr "Anaokul Düzenle"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2205
 msgid "School"
 msgstr "Okul"
@@ -18959,10 +19325,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Edit School"
 msgstr "okul düzenle"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2211
 msgid "University"
 msgstr "Universite"
@@ -18970,10 +19336,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit University"
 msgstr "Universite Düzenle"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "College"
 msgstr "kolej"
@@ -18981,5 +19347,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2219
 msgid "Edit College"
 msgstr "kolej düzenle"
@@ -18987,5 +19353,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2224
 msgid "Cinema"
 msgstr "Sinema"
@@ -18994,10 +19360,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:2216
+#: build/trans_presets.java:2227
 msgid "Edit Cinema"
 msgstr "Sinema Düzenle"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2231
 msgid "Library"
 msgstr "kütüphane"
@@ -19006,9 +19372,9 @@
 #. <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:2223
+#: build/trans_presets.java:2234
 msgid "Edit Library"
 msgstr "kütüphane düzenle"
 
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Arts Centre"
 msgstr "sanat merkezi"
@@ -19016,10 +19382,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Arts Centre"
 msgstr "sanat merkezi düzenle"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Theatre"
 msgstr "Tiyatro"
@@ -19028,10 +19394,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:2237
+#: build/trans_presets.java:2248
 msgid "Edit Theatre"
 msgstr "Tiyatro Düzenle"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2252
 msgid "Place of Worship"
 msgstr "Tapınak"
@@ -19041,5 +19407,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:2245
+#: build/trans_presets.java:2256
 msgid "Edit Place of Worship"
 msgstr "Tapınak Düzenle"
@@ -19048,6 +19414,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "Religion"
 msgstr "Din"
@@ -19056,66 +19422,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "buddhist"
 msgstr "budist"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "christian"
 msgstr "hristiyan"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jewish"
 msgstr "yahudi"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "muslim"
 msgstr "müslüman"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "zoroastrian"
 msgstr "Zerdüştlük"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "Denomination"
 msgstr "mezhep"
@@ -19124,81 +19490,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "anglican"
 msgstr "anglikan"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "catholic"
 msgstr "katholik"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "evangelical"
 msgstr "protestan"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "jehovahs_witness"
 msgstr "yahova_şahitleri"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "lutheran"
 msgstr "lutheran"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "methodist"
 msgstr "methodist"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "mormon"
 msgstr "mormon"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "presbyterian"
 msgstr "presbyterian"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "sunni"
 msgstr "sunni"
 
 #. <separator/>
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2264
 msgid "Addresses"
 msgstr "Adres"
@@ -19207,5 +19573,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:2256
+#: build/trans_presets.java:2267
 msgid "Edit Address Information"
 msgstr "Adres Bilgileri Düzenle"
@@ -19213,5 +19579,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2269
 msgid "House number"
 msgstr "Ev no:"
@@ -19219,20 +19585,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "House name"
 msgstr "Ev İsmi"
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "City name"
 msgstr "Şehir Adı"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2274
 msgid "Post code"
 msgstr "Posta Kodu"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2275
 msgid "Country code"
 msgstr "Ülke Kodu"
@@ -19240,5 +19606,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Address Interpolation"
 msgstr "Adres İnterpolasyon"
@@ -19247,5 +19613,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:2270
+#: build/trans_presets.java:2281
 msgid "Edit Address Interpolation"
 msgstr "Adres İnterpolasyon Düzenle"
@@ -19253,67 +19619,67 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "Numbering scheme"
 msgstr "Numara şeması"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "odd"
 msgstr "tek"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "even"
 msgstr "çift"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2286
 msgid "Man Made"
 msgstr "İnsan Yapımı"
 
 #. group "Man Made"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Works"
 msgstr "Tesis"
 
 #. item
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2288
 msgid "Edit Works"
 msgstr "Tesis Düzenle"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2292
 msgid "Tower"
 msgstr "Kule"
 
 #. item
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2293
 msgid "Edit Tower"
 msgstr "Kule Düzenle"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Water Tower"
 msgstr "Su Kulesi"
 
 #. item
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2298
 msgid "Edit Water Tower"
 msgstr "Su Kulesi Düzenle"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Gasometer"
 msgstr "Gazdeposu"
 
 #. item
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2303
 msgid "Edit Gasometer"
 msgstr "Gazdeposu Düzenle"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Lighthouse"
 msgstr "DenizFeneri"
@@ -19321,10 +19687,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2309
 msgid "Edit Lighthouse"
 msgstr "DenizFeneri Düzenle"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Windmill"
 msgstr "Yeldeğerimeni"
@@ -19332,10 +19698,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2315
 msgid "Edit Windmill"
 msgstr "Yeldeğerimeni Düzenle"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2319
 msgid "Pipeline"
 msgstr "Suboru Hattı"
@@ -19343,10 +19709,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Edit Pipeline"
 msgstr "Suboru hattı Düzenle"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2325
 msgid "Wastewater Plant"
 msgstr "Kanalizasyon Plant"
@@ -19356,10 +19722,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:2318
+#: build/trans_presets.java:2329
 msgid "Edit Wastewater Plant"
 msgstr "Kanalizasyon Plant Düzenle"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2333
 msgid "Crane"
 msgstr "Vinç"
@@ -19367,10 +19733,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2335
 msgid "Edit Crane"
 msgstr "Vinç Düzenle"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Beacon"
 msgstr "Fener"
@@ -19378,10 +19744,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2341
 msgid "Edit Beacon"
 msgstr "Fener Düzenle"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2345
 msgid "Survey Point"
 msgstr "Poligon Noktası"
@@ -19389,10 +19755,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Edit Survey Point"
 msgstr "Poligon Noktası Düzenle"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2351
 msgid "Surveillance"
 msgstr "Gözetim"
@@ -19400,5 +19766,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2353
 msgid "Edit Surveillance Camera"
 msgstr "Gözetim Kamera Düzenle"
@@ -19406,5 +19772,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Power Generator"
 msgstr "Güç Jeneratorü"
@@ -19414,39 +19780,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:2351
+#: build/trans_presets.java:2362
 msgid "Edit Power Generator"
 msgstr "Güç Jeneratorü Düzenle"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "wind"
 msgstr "rüzgar"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "hydro"
 msgstr "hidro"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "fossil"
 msgstr "fosil"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "nuclear"
 msgstr "nükleer"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "coal"
 msgstr "kömür"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "photovoltaic"
 msgstr "güneş enerjisi"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "gas"
 msgstr "benzin"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2367
 msgid "Power Station"
 msgstr "Güç İstasyonu"
@@ -19455,10 +19821,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:2359
+#: build/trans_presets.java:2370
 msgid "Edit Power Station"
 msgstr "Güç İstasyonu Düzenle"
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2374
 msgid "Power Sub Station"
 msgstr "Alt Güç İstasyonu"
@@ -19467,5 +19833,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:2366
+#: build/trans_presets.java:2377
 msgid "Edit Power Sub Station"
 msgstr "Alt Güç İstasyonu Düzenle"
@@ -19473,10 +19839,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2369 build/trans_presets.java:2385
+#: build/trans_presets.java:2380 build/trans_presets.java:2396
 msgid "Line reference"
 msgstr "çizgi referansı"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2382
 msgid "Power Tower"
 msgstr "Güç Kulesi"
@@ -19487,5 +19853,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:2376
+#: build/trans_presets.java:2387
 msgid "Edit Power Tower"
 msgstr "güç Kulesi Düzenle"
@@ -19493,5 +19859,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2390
 msgid "Power Line"
 msgstr "Güç Hattı"
@@ -19500,40 +19866,40 @@
 #. <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:2382
+#: build/trans_presets.java:2393
 msgid "Edit Power Line"
 msgstr "Güç Hattı Düzenle"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Voltage"
 msgstr "Voltaj"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2398
 msgid "Amount of Wires"
 msgstr "Kablo Miktarı"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Amenities"
 msgstr "hoş mekan"
 
 #. group "Amenities"
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2402
 msgid "Toilets"
 msgstr "Tuvalet"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2398 build/trans_presets.java:2514
+#: build/trans_presets.java:2409 build/trans_presets.java:2525
 msgid "Note"
 msgstr "Not"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2411
 msgid "Post Box"
 msgstr "Posta Kutusu"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2416
 msgid "Telephone"
 msgstr "Telefon"
@@ -19542,5 +19908,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:2408
+#: build/trans_presets.java:2419
 msgid "Edit Telephone"
 msgstr "Telefon Düzenle"
@@ -19548,5 +19914,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2411 build/trans_presets.java:2515
+#: build/trans_presets.java:2422 build/trans_presets.java:2526
 msgid "Coins"
 msgstr "Madeni Para"
@@ -19554,5 +19920,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2412 build/trans_presets.java:2516
+#: build/trans_presets.java:2423 build/trans_presets.java:2527
 msgid "Notes"
 msgstr "Notlar"
@@ -19560,5 +19926,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2413 build/trans_presets.java:2517
+#: build/trans_presets.java:2424 build/trans_presets.java:2528
 msgid "Electronic purses and Charge cards"
 msgstr "Elektronik cüzdan ve Para Değişim Kartları"
@@ -19566,5 +19932,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2414 build/trans_presets.java:2518
+#: build/trans_presets.java:2425 build/trans_presets.java:2529
 msgid "Debit cards"
 msgstr "ATM kartı"
@@ -19572,15 +19938,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2415 build/trans_presets.java:2519
+#: build/trans_presets.java:2426 build/trans_presets.java:2530
 msgid "Credit cards"
 msgstr "Kredi Kartı"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2427
 msgid "Telephone cards"
 msgstr "Telefon kart"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2429
 msgid "Recycling"
 msgstr "Geri Dönüşüm"
@@ -19589,5 +19955,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:2421
+#: build/trans_presets.java:2432
 msgid "Edit Recycling station"
 msgstr "Geri Dönüşüm İstasyonu"
@@ -19595,35 +19961,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Batteries"
 msgstr "Piller"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2435
 msgid "Cans"
 msgstr "Çöp Tenekesi"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Clothes"
 msgstr "Kıyafet"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2437
 msgid "Glass"
 msgstr "Cam"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2438
 msgid "Paper"
 msgstr "Kağıt"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2439
 msgid "Scrap Metal"
 msgstr "Hurda Metal"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2441
 msgid "Bench"
 msgstr "banket"
@@ -19632,40 +19998,33 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2433
-#, fuzzy
+#: build/trans_presets.java:2444
 msgid "Backrest"
-msgstr "Geri"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "Material"
-msgstr "Abide"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2434
-#, fuzzy
+#: build/trans_presets.java:2445
 msgid "stone"
-msgstr "boş"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "plastic"
-msgstr "yer"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "Colour"
-msgstr "Renk"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "black"
-msgstr "Geri"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "brown"
-msgstr "aşağı"
+msgstr ""
 
 #. color historic
@@ -19734,39 +20093,35 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2435 build/trans_style.java:3055
-#: build/trans_style.java:3063 build/trans_style.java:3071
-#: build/trans_style.java:3079 build/trans_style.java:3127
-#: build/trans_style.java:3135 build/trans_style.java:3233
-#: build/trans_style.java:3241
+#: build/trans_presets.java:2446 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3135
+#: build/trans_style.java:3143 build/trans_style.java:3241
+#: build/trans_style.java:3249
 msgid "green"
 msgstr "yeşil"
 
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "red"
-msgstr "bitiş"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "blue"
-msgstr "Değer"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "white"
-msgstr "su"
-
-#: build/trans_presets.java:2436
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2447
 msgid "Amount of Seats"
-msgstr "Kablo Miktarı"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2449
 msgid "Hunting Stand"
 msgstr "Av Standı"
 
 #. item
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2450
 msgid "Edit Hunting Stand"
 msgstr "Av Standı Düzenle"
@@ -19775,30 +20130,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2441 build/trans_presets.java:2902
+#: build/trans_presets.java:2452 build/trans_presets.java:2914
 msgid "Height"
 msgstr "Yükseklik"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "low"
 msgstr "alçak"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "half"
 msgstr "yarım"
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "full"
 msgstr "tam"
 
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2454
 msgid "Hide"
 msgstr "Sakla"
 
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2455
 msgid "Lock"
 msgstr "Kilitle"
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Fountain"
 msgstr "Kaynak"
@@ -19807,10 +20162,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:2449
+#: build/trans_presets.java:2460
 msgid "Edit Fountain"
 msgstr "Kaynak Düzenle"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2464
 msgid "Drinking Water"
 msgstr "İçme Suyu"
@@ -19819,10 +20174,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:2456
+#: build/trans_presets.java:2467
 msgid "Edit Drinking Water"
 msgstr "İçme Suyu Düzenle"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2471
 msgid "Baby Hatch"
 msgstr "Bebek Yuvası"
@@ -19830,33 +20185,33 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Baby Hatch"
 msgstr "Bebek Yuvası Düzenle"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2479
 msgid "Shops"
 msgstr "Dükkanlar"
 
 #. group "Shops"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2480
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2481
 msgid "Edit Supermarket"
 msgstr "Supermarket Düzenle"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2486
 msgid "Chemist"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2487
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2492
 msgid "Convenience Store"
 msgstr "Bakkal"
@@ -19864,9 +20219,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Edit Convenience Store"
 msgstr "Bakkal Düzenle"
 
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2499
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -19874,27 +20229,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Kiosk"
 msgstr "Kiosk Düzenle"
 
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Book Store"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2507
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2512
 msgid "Travel Agency"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2513
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2518
 msgid "Vending machine"
 msgstr "Kahve Makinası"
@@ -19902,5 +20257,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Edit Vending machine"
 msgstr "Kahve Makinası Düzenle"
@@ -19908,88 +20263,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "Vending products"
 msgstr "Ücretli Ürünler"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_tickets"
 msgstr "toplu_taşıma_bileti"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_plans"
 msgstr "toplu_taşıma_hatları"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "parking_tickets"
 msgstr "Park_bileti"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "food"
 msgstr "yiyecek"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "drinks"
 msgstr "içecek"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "sweets"
 msgstr "tatlı"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "cigarettes"
 msgstr "sigara"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "photos"
 msgstr "fotoğraf"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "animal_food"
 msgstr "hayvan_besini"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "news_papers"
 msgstr "gazeteler"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "toys"
 msgstr "oyuncuklar"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "stamps"
 msgstr "pullar"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "SIM-cards"
 msgstr "SIM-kart"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "telephone_vouchers"
 msgstr "telefon_kartı"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "vouchers"
 msgstr "bilet"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "condoms"
 msgstr "kondom"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "tampons"
 msgstr "tampon"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "excrement_bags"
 msgstr "dışkı_poşeti"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Account or loyalty cards"
 msgstr "hesap veya üyelik kartı"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Butcher"
 msgstr "kasap"
@@ -19997,9 +20352,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2535
 msgid "Edit Butcher"
 msgstr "kasap düzenle"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2540
 msgid "Baker"
 msgstr "fırın"
@@ -20007,9 +20362,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2542
 msgid "Edit Baker"
 msgstr "fırın düzenle"
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2547
 msgid "Florist"
 msgstr ""
@@ -20017,18 +20372,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Florist"
 msgstr ""
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2554
 msgid "Organic"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Edit Organic Shop"
 msgstr ""
 
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2560
 msgid "Alcohol"
 msgstr ""
@@ -20036,54 +20391,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2562
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2567
 msgid "Beverages"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2568
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2573
 msgid "Computer"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2574
 msgid "Edit Computer Shop"
 msgstr ""
 
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Electronics"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2580
 msgid "Edit Electronics Shop"
 msgstr ""
 
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2585
 msgid "Hifi"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2586
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2591
 msgid "Furniture"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Edit Furniture Shop"
 msgstr ""
 
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Garden Centre"
 msgstr ""
@@ -20091,9 +20446,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2599
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Hardware"
 msgstr ""
@@ -20101,9 +20456,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2606
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "Do-it-yourself-store"
 msgstr "kendin-al-market"
@@ -20111,54 +20466,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2613
 msgid "Edit Do-it-yourself-store"
 msgstr "kendin-al-market düzenle"
 
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2618
 msgid "Stationery"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2619
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Hairdresser"
 msgstr "berber"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Hairdresser"
 msgstr "berber düzenle"
 
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Shoes"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Shoe Shop"
 msgstr ""
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2636
 msgid "Toys"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit Toy Shop"
 msgstr ""
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Video"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "Dry Cleaning"
 msgstr "Kuru Temizleme"
@@ -20166,9 +20521,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2650
 msgid "Edit Dry Cleaning"
 msgstr "Kuru Temizleme Düzenle"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "Laundry"
 msgstr "Çamaşırhane"
@@ -20176,9 +20531,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2657
 msgid "Edit Laundry"
 msgstr "Çamaşırhane Düzenle"
 
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2662
 msgid "Outdoor"
 msgstr "Dışortam"
@@ -20186,32 +20541,28 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2664
 msgid "Edit Outdoor Shop"
 msgstr "Dış ortam dükkanları düzenle"
 
-#: build/trans_presets.java:2658
-msgid "Sports"
-msgstr ""
-
-#. item
-#: build/trans_presets.java:2659
+#. item
+#: build/trans_presets.java:2670
 msgid "Edit Sports Shop"
 msgstr ""
 
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Optician"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Optician"
 msgstr ""
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2683
 msgid "Cash"
 msgstr "Kasa"
 
 #. group "Cash"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2684
 msgid "Bank"
 msgstr "Banka"
@@ -20219,14 +20570,14 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2686
 msgid "Edit Bank"
 msgstr "Banka düzenle"
 
-#: build/trans_presets.java:2680 build/trans_presets.java:2689
+#: build/trans_presets.java:2691 build/trans_presets.java:2700
 msgid "Automated Teller Machine"
 msgstr "ATM"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2693
 msgid "Money Exchange"
 msgstr "Döviz Bürosu"
@@ -20234,5 +20585,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Edit Money Exchange"
 msgstr "Döviz Bürosu Düzenle"
@@ -20240,15 +20591,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2691
+#: build/trans_presets.java:2702
 msgid "Edit Automated Teller Machine"
 msgstr "ATM Düzenle"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2707
 msgid "Health"
 msgstr "Sağlık"
 
 #. group "Health"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2708
 msgid "Doctors"
 msgstr "Doktor"
@@ -20256,18 +20607,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2710
 msgid "Edit Doctors"
 msgstr "Doktor Düzenle"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2715
 msgid "Dentist"
 msgstr "Dişçi"
 
 #. item
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Edit Dentist"
 msgstr "Dişçi Düzenle"
 
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2721
 msgid "Pharmacy"
 msgstr "Eczane"
@@ -20275,5 +20626,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Edit Pharmacy"
 msgstr "Eczane Düzenle"
@@ -20281,9 +20632,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Dispensing"
 msgstr "Dispenser"
 
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2729
 msgid "Hospital"
 msgstr "Hastane"
@@ -20291,10 +20642,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Edit Hospital"
 msgstr "Hastane Düzenle"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2735
 msgid "Emergency Access Point"
 msgstr "Acil Durum Noktası"
@@ -20303,5 +20654,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:2727
+#: build/trans_presets.java:2738
 msgid "Edit Emergency Access Point"
 msgstr "Acil Durum Noktası Düzenle"
@@ -20310,20 +20661,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2741
 msgid "Point Number"
 msgstr "Nokta Numarası"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2742
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Phone Number"
 msgstr "Telefon Numarası"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Uluslararası kod kullanın, ör +90-212-67890)"
@@ -20331,5 +20682,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2748
 msgid "Veterinary"
 msgstr "Veteriner"
@@ -20338,55 +20689,59 @@
 #. <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:2740
+#: build/trans_presets.java:2751
 msgid "Edit Veterinary"
 msgstr "Veteriner Düzenle"
 
+#: build/trans_presets.java:2758
+msgid "Geography"
+msgstr ""
+
 #. group "Places"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2760
 msgid "Continent"
 msgstr "Kıta"
 
 #. item
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2761
 msgid "Edit Continent"
 msgstr "Kıta Düzenle"
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2766
 msgid "Country"
 msgstr "Ülke"
 
 #. item
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2767
 msgid "Edit Country"
 msgstr "Ülke Düzenle"
 
 #. item "Places/Country" text "Name"
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2772
 msgid "State"
 msgstr "İl"
 
 #. item
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2773
 msgid "Edit State"
 msgstr "İl Düzenle"
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2778
 msgid "Region"
 msgstr "Bölge"
 
 #. item
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2779
 msgid "Edit Region"
 msgstr "Bölge Düzenle"
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2784
 msgid "County"
 msgstr "vilayet"
 
 #. item
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2785
 msgid "Edit County"
 msgstr "vilayet Düzenle"
@@ -20394,15 +20749,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2791
 msgid "City"
 msgstr "Şehir"
 
 #. item
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2792
 msgid "Edit City"
 msgstr "Şehir Düzenle"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2797
 msgid "Town"
 msgstr "Mahalle"
@@ -20410,10 +20765,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2799
 msgid "Edit Town"
 msgstr "Mahalle Düzenle"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2804
 msgid "Suburb"
 msgstr "Banliyo"
@@ -20421,25 +20776,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2806
 msgid "Edit Suburb"
 msgstr "Banliyo Düzenle"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2811
 msgid "Village"
 msgstr "Köy"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2812
 msgid "Edit Village"
 msgstr "Köy Düzenle"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2817
 msgid "Hamlet"
 msgstr "Mezra"
 
 #. item
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2818
 msgid "Edit Hamlet"
 msgstr "Mezra Düzenle"
@@ -20447,5 +20802,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2824
 msgid "Locality"
 msgstr "Semt"
@@ -20453,10 +20808,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2826
 msgid "Edit Locality"
 msgstr "Semt Düzenle"
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2831
 msgid "Island"
 msgstr "Ada"
@@ -20464,10 +20819,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2833
 msgid "Edit Island"
 msgstr "Ada Düzenle"
 
 #. item "Places/Island" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2838
 msgid "Islet"
 msgstr ""
@@ -20475,5 +20830,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2840
 msgid "Edit Islet"
 msgstr ""
@@ -20481,5 +20836,5 @@
 #. item "Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2846
 msgid "Cave Entrance"
 msgstr "Mağara Girişi"
@@ -20487,10 +20842,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2848
 msgid "Edit Cave Entrance"
 msgstr "Mağara Girişi Düzenle"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2852
 msgid "Peak"
 msgstr "Zirve"
@@ -20498,10 +20853,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2854
 msgid "Edit Peak"
 msgstr "Zirve Düzenle"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2859
 msgid "Glacier"
 msgstr "Buzul"
@@ -20509,10 +20864,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2861
 msgid "Edit Glacier"
 msgstr "Buzul Düzenle"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2854
+#: build/trans_presets.java:2866
 msgid "Volcano"
 msgstr "Volkan"
@@ -20520,70 +20875,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2868
 msgid "Edit Volcano"
 msgstr "Volkan Düzenle"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2874
 msgid "Boundaries"
 msgstr "Belediye Sınırı"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2875
 msgid "National"
 msgstr "Milli"
 
 #. item
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2876
 msgid "Edit National Boundary"
 msgstr "Ülke Sınırı Düzenle"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2881
 msgid "Administrative"
 msgstr "İdari"
 
 #. item
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2882
 msgid "Edit Administrative Boundary"
 msgstr "İdari Sınırları Düzenle"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:2887
 msgid "Civil"
 msgstr "Sivil"
 
 #. item
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2888
 msgid "Edit Civil Boundary"
 msgstr "Sivil Sınırları Düzenle"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2893
 msgid "Political"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2894
 msgid "Edit Political Boundary"
 msgstr "Politik Sınır Düzenle"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2899
 msgid "National park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2888
+#: build/trans_presets.java:2900
 msgid "Edit National Park Boundary"
 msgstr "Milli Park Sınırı Düzenle"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2906
 msgid "Land use"
 msgstr "Arazi Kullanımı"
 
 #. group "Land use"
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2907
 msgid "Tree"
 msgstr "Ağaç"
@@ -20592,15 +20947,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:2898
+#: build/trans_presets.java:2910
 msgid "Edit Tree"
 msgstr "Ağaç Düzenle"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2915
 msgid "Botanical Name"
 msgstr "Botannik İsim"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2917
 msgid "Wood"
 msgstr "Orman"
@@ -20609,5 +20964,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:2908
+#: build/trans_presets.java:2920
 msgid "Edit Wood"
 msgstr "Orman Düzenle"
@@ -20615,17 +20970,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "coniferous"
 msgstr "Kozalaklı Orman"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "deciduous"
 msgstr "yaprak düken orman"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "mixed"
 msgstr "karışık"
 
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2925
 msgid "Forest"
 msgstr "orman"
@@ -20634,14 +20989,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:2916
+#: build/trans_presets.java:2928
 msgid "Edit Forest Landuse"
 msgstr "orman kullanımı düzenle"
 
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2934
 msgid "Nature Reserve"
 msgstr "korunacak doğa alanı"
 
 #. item
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2935
 msgid "Edit Nature Reserve"
 msgstr "korunacak doğa alanı düzenle"
@@ -20649,25 +21004,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2940
 msgid "Scree"
 msgstr "Taşlık Alan"
 
 #. item
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2941
 msgid "Edit Scree"
 msgstr "Taşlık Alan Düzenle"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2945
 msgid "Scrub"
 msgstr "Çalılık"
 
 #. item
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2946
 msgid "Edit Scrub"
 msgstr "Çalılık Düzenle"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2950
 msgid "Fell"
 msgstr "Dağ Eteği"
@@ -20675,10 +21030,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2952
 msgid "Edit Fell"
 msgstr "Dağ Eteği Kullanımı"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2956
 msgid "Heath"
 msgstr "Sağlıksız Ağaç"
@@ -20686,5 +21041,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2958
 msgid "Edit Heath"
 msgstr "Sağlıksız Ağaç Düzenle"
@@ -20692,5 +21047,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2963
 msgid "Farmyard"
 msgstr "Çiftlik"
@@ -20699,45 +21054,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:2954
+#: build/trans_presets.java:2966
 msgid "Edit Farmyard Landuse"
 msgstr "Çiftlik Kullanımı Düzenle"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2971
 msgid "Farmland"
 msgstr "Çiftlik Arazisi"
 
 #. item
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2972
 msgid "Edit Farmland Landuse"
 msgstr "Çiftlik Arazisi Kullanımı Düzenle"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2977
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2978
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2983
 msgid "Vineyard"
 msgstr "Bağ"
 
 #. item
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2984
 msgid "Edit Vineyard Landuse"
 msgstr "Bağ Kullanımı Düzenle"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:2989
 msgid "Allotments"
 msgstr "Kiralık Tarım Alanı"
 
 #. item
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2990
 msgid "Edit Allotments Landuse"
 msgstr "Kiralık Tarım Alanı Düzenle"
@@ -20745,25 +21100,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2996
 msgid "Garden"
 msgstr "Bahçe"
 
 #. item
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2997
 msgid "Edit Garden"
 msgstr "Bahçe Düzenle"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3001
 msgid "Grass"
 msgstr "Otlak"
 
 #. item
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3002
 msgid "Edit Grass Landuse"
 msgstr "Otlak Kullanım Düzenle"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3007
 msgid "Village Green"
 msgstr "Köy Yerleşimi"
@@ -20771,10 +21126,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3009
 msgid "Edit Village Green Landuse"
 msgstr "Köy Yerleşimi Düzenle"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3014
 msgid "Common"
 msgstr "Genel"
@@ -20782,20 +21137,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3004
+#: build/trans_presets.java:3016
 msgid "Edit Common"
 msgstr "Genel Düzenle"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3020
 msgid "Park"
 msgstr "Park"
 
 #. item
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3021
 msgid "Edit Park"
 msgstr "Park Düzenle"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3025
 msgid "Recreation Ground"
 msgstr "oyun alanı"
@@ -20803,5 +21158,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3027
 msgid "Edit Recreation Ground Landuse"
 msgstr "oyun alanı kullanımı düzenle"
@@ -20809,15 +21164,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3033
 msgid "Residential area"
 msgstr "Yerleşim Alanı"
 
 #. item
-#: build/trans_presets.java:3022
+#: build/trans_presets.java:3034
 msgid "Edit Residential Landuse"
 msgstr "Yerleşim Alanı Kullanımı Düzenle"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3039
 msgid "Graveyard"
 msgstr "Mezarlık"
@@ -20825,9 +21180,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3029
+#: build/trans_presets.java:3041
 msgid "Edit Graveyard"
 msgstr "Mezarlık Düzenle"
 
-#: build/trans_presets.java:3035
+#: build/trans_presets.java:3047
 msgid "Cemetery"
 msgstr "Mezarlık"
@@ -20835,39 +21190,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3049
 msgid "Edit Cemetery Landuse"
 msgstr "Mezarlık Kullanımı Düzenle"
 
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3056
 msgid "Retail"
 msgstr "Perakende"
 
 #. item
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3057
 msgid "Edit Retail Landuse"
 msgstr "Perakende Alan Kullanımı Düzenle"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3062
 msgid "Commercial"
 msgstr "Ticari"
 
 #. item
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3063
 msgid "Edit Commercial Landuse"
 msgstr "Ticari Alan Kullanımı Düzenle"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3056
+#: build/trans_presets.java:3068
 msgid "Industrial"
 msgstr "Endüstriyel"
 
 #. item
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3069
 msgid "Edit Industrial Landuse"
 msgstr "Endüstriyel Alan Kullanımı Düzenle"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3074
 msgid "Railway land"
 msgstr "Demiryolu alanı"
@@ -20875,15 +21230,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3076
 msgid "Edit Railway Landuse"
 msgstr "Demiryolu alanı kullanımı düzenle"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3081
 msgid "Military"
 msgstr "Askeri"
 
 #. item
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3082
 msgid "Edit Military Landuse"
 msgstr "Askeri Alan Düzenle"
@@ -20891,55 +21246,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3088
 msgid "Construction area"
 msgstr "İnşaat Alanı"
 
 #. item
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3089
 msgid "Edit Construction Landuse"
 msgstr "İnşaat Alanı Düzenle"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3094
 msgid "Brownfield"
 msgstr "Ağaçsız_Alan"
 
 #. item
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3095
 msgid "Edit Brownfield Landuse"
 msgstr "Ağaçsız_Alan Kullanımı Düzenle"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3100
 msgid "Greenfield"
 msgstr "Yeşil Alan"
 
 #. item
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3101
 msgid "Edit Greenfield Landuse"
 msgstr "yeşil Alan kullanımı düzenle"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3106
 msgid "Landfill"
 msgstr "Toprak Dolum"
 
 #. item
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3107
 msgid "Edit Landfill Landuse"
 msgstr "Toprak Dolum Alanı Düzenle"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3112
 msgid "Quarry"
 msgstr "Taşocağı"
 
 #. item
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3113
 msgid "Edit Quarry Landuse"
 msgstr "taşocağı Düzenle"
 
 #. group "Relations"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3122
 msgid "Multipolygon"
 msgstr ""
@@ -20949,5 +21304,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:3114
+#: build/trans_presets.java:3126
 msgid "Edit Multipolygon"
 msgstr ""
@@ -20956,10 +21311,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3132
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3133
 msgid "inner segment"
 msgstr ""
@@ -20967,5 +21322,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3136
 msgid "Turn restriction"
 msgstr ""
@@ -20974,5 +21329,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3139
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -20980,34 +21335,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_straight_on"
 msgstr ""
@@ -21016,15 +21371,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3146
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3147
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3148
 msgid "to way"
 msgstr ""
@@ -21032,5 +21387,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3151
 msgid "Route"
 msgstr ""
@@ -21039,5 +21394,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3154
 msgid "Edit Route"
 msgstr ""
@@ -21045,5 +21400,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "Route type"
 msgstr ""
@@ -21115,5 +21470,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3144 build/trans_style.java:233
+#: build/trans_presets.java:3156 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -21122,17 +21477,17 @@
 msgstr "bisiklet"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "bus"
 msgstr "otobüs"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ski"
 msgstr ""
@@ -21185,5 +21540,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3144 build/trans_style.java:247
+#: build/trans_presets.java:3156 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -21192,13 +21547,13 @@
 msgstr "ayak"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "detour"
 msgstr ""
@@ -21212,10 +21567,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3144 build/trans_style.java:1206
+#: build/trans_presets.java:3156 build/trans_style.java:1206
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3159
 msgid "Symbol description"
 msgstr ""
@@ -21223,31 +21578,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3162
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "Color (hex)"
 msgstr ""
@@ -21256,30 +21611,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3168
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3169
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3170
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3171
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3172
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3173
 msgid "backward halt point"
 msgstr ""
@@ -21717,11 +22072,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3375 build/trans_style.java:3376
-#: build/trans_style.java:3946 build/trans_style.java:4254
-#: build/trans_style.java:4263 build/trans_style.java:4272
-#: build/trans_style.java:4281 build/trans_style.java:4290
-#: build/trans_style.java:4299 build/trans_style.java:4308
-#: build/trans_style.java:4309 build/trans_style.java:4318
-#: build/trans_style.java:4327
+#: build/trans_style.java:3383 build/trans_style.java:3384
+#: build/trans_style.java:3954 build/trans_style.java:4262
+#: build/trans_style.java:4271 build/trans_style.java:4280
+#: build/trans_style.java:4289 build/trans_style.java:4298
+#: build/trans_style.java:4307 build/trans_style.java:4316
+#: build/trans_style.java:4317 build/trans_style.java:4326
+#: build/trans_style.java:4335
 msgid "deprecated"
 msgstr "kırılmış"
@@ -23745,5 +24100,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3294
+#: build/trans_style.java:3302
 msgid "light_water"
 msgstr "su_lambası"
@@ -24425,8 +24780,17 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="boundary_stone"/>
+#. <icon annotate="true" src="historic/boundary_stone.png"/>
 #: build/trans_style.java:2990 build/trans_style.java:2998
 #: build/trans_style.java:3006 build/trans_style.java:3014
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
+#: build/trans_style.java:3054
 msgid "historic"
 msgstr "tarihi"
@@ -24440,5 +24804,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3095
 msgid "quarry"
 msgstr "taş_ocağı"
@@ -24452,5 +24816,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "landfill"
 msgstr "toprak_doldurma"
@@ -24472,5 +24836,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3103 build/trans_style.java:3111
+#: build/trans_style.java:3111 build/trans_style.java:3119
 msgid "basin"
 msgstr "havza"
@@ -24484,5 +24848,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3127
 msgid "forest"
 msgstr "orman"
@@ -24496,5 +24860,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3159
 msgid "farmyard"
 msgstr "çiftlik"
@@ -24517,5 +24881,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3160 build/trans_style.java:3168
+#: build/trans_style.java:3168 build/trans_style.java:3176
 msgid "retail"
 msgstr "perakende"
@@ -24529,5 +24893,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3176
+#: build/trans_style.java:3184
 msgid "industrial"
 msgstr "endüstri"
@@ -24541,5 +24905,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "brownfield"
 msgstr "ağaçsız_alan"
@@ -24553,5 +24917,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "greenfield"
 msgstr "yeşil_alan"
@@ -24565,5 +24929,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "railland"
 msgstr "demiryolu"
@@ -24620,7 +24984,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3217 build/trans_style.java:3252
-#: build/trans_style.java:3260 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3225 build/trans_style.java:3260
+#: build/trans_style.java:3268 build/trans_style.java:3276
+#: build/trans_style.java:3284 build/trans_style.java:3292
 msgid "military"
 msgstr "askeri"
@@ -24634,5 +24998,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3225
+#: build/trans_style.java:3233
 msgid "cemetery"
 msgstr "mezarlık"
@@ -24645,5 +25009,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3301
+#: build/trans_style.java:3309
 msgid "peak"
 msgstr "zirve"
@@ -24658,5 +25022,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3310
+#: build/trans_style.java:3318
 msgid "glacier"
 msgstr "buzul"
@@ -24670,5 +25034,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "volcano"
 msgstr "volkanik"
@@ -24723,8 +25087,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3326 build/trans_style.java:3327
-#: build/trans_style.java:3335 build/trans_style.java:3351
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440
+#: build/trans_style.java:3334 build/trans_style.java:3335
+#: build/trans_style.java:3343 build/trans_style.java:3359
+#: build/trans_style.java:3432 build/trans_style.java:3440
+#: build/trans_style.java:3448
 msgid "natural"
 msgstr "doğal"
@@ -24738,5 +25102,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3343
+#: build/trans_style.java:3351
 msgid "scrub"
 msgstr "çalılık"
@@ -24750,5 +25114,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3359
+#: build/trans_style.java:3367
 msgid "heath"
 msgstr "çalılık"
@@ -24762,5 +25126,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3408
+#: build/trans_style.java:3416
 msgid "mud"
 msgstr "çamur"
@@ -24774,5 +25138,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "beach"
 msgstr "sahil"
@@ -24850,8 +25214,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
-#: build/trans_style.java:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496 build/trans_style.java:3504
+#: build/trans_style.java:3512 build/trans_style.java:3520
 msgid "route"
 msgstr "rut"
@@ -24899,7 +25263,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3522 build/trans_style.java:3530
-#: build/trans_style.java:3538 build/trans_style.java:3546
-#: build/trans_style.java:3554
+#: build/trans_style.java:3530 build/trans_style.java:3538
+#: build/trans_style.java:3546 build/trans_style.java:3554
+#: build/trans_style.java:3562
 msgid "boundary"
 msgstr "sınırlar"
@@ -25049,11 +25413,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090
+#: build/trans_style.java:4002 build/trans_style.java:4010
+#: build/trans_style.java:4018 build/trans_style.java:4026
+#: build/trans_style.java:4034 build/trans_style.java:4042
+#: build/trans_style.java:4050 build/trans_style.java:4058
+#: build/trans_style.java:4066 build/trans_style.java:4074
+#: build/trans_style.java:4082 build/trans_style.java:4090
+#: build/trans_style.java:4098
 msgid "place"
 msgstr "yer"
@@ -25101,6 +25465,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4207 build/trans_style.java:4214
-#: build/trans_style.java:4221 build/trans_style.java:4228
+#: build/trans_style.java:4215 build/trans_style.java:4222
+#: build/trans_style.java:4229 build/trans_style.java:4236
 msgid "address"
 msgstr "adres"
@@ -25408,35 +25772,4 @@
 msgstr ""
 
-#~ msgid "All the ways were empty"
-#~ msgstr "Bütün yollar boştu"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Farklı üyelik olan noktaları birleştirmek istiyor musun?"
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Neyse Birleştir"
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr ""
-#~ "Seçili noktaların farklı üyelikleri var. Ona rağmen birleştirmek istiyor "
-#~ "musun?"
-
-#~ msgid "Unknown version"
-#~ msgstr "Bilinmeyen versiyon"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "<nd>-bileşene erişelemdi."
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> in içi boş"
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "<member>. eleman ile bağlantı bulunamadı."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Yanlış tanımlı kavşak bilgisi"
-
 #~ msgid ""
 #~ "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -25451,9 +25784,18 @@
 #~ "yapınız."
 
-#~ msgid "Commit comment"
-#~ msgstr "Açıklamayı Kabul Ediniz"
-
-#~ msgid "Server does not support changesets"
-#~ msgstr "Bu bu bilgiyi desteklemiyor."
+#~ msgid "Unknown version"
+#~ msgstr "Bilinmeyen versiyon"
+
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "<nd>-bileşene erişelemdi."
+
+#~ msgid "<nd> has zero ref"
+#~ msgstr "<nd> in içi boş"
+
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "<member>. eleman ile bağlantı bulunamadı."
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "Yanlış tanımlı kavşak bilgisi"
 
 #~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
@@ -25474,7 +25816,4 @@
 #~ msgid "Tags (empty value deletes tag)"
 #~ msgstr "Etiket (Boş değerler etiketi siler)"
-
-#~ msgid "Add Selected"
-#~ msgstr "Seçileni Ekle"
 
 #~ msgid "Add all currently selected objects as members"
@@ -25626,4 +25965,7 @@
 #~ msgid "EPSG:4326"
 #~ msgstr "EPSG:4326"
+
+#~ msgid "All the ways were empty"
+#~ msgstr "Bütün yollar boştu"
 
 #~ msgid "Email"
@@ -25785,2 +26127,15 @@
 #~ msgid "Edit Portcullis"
 #~ msgstr "Demir parmaklık düzenle"
+
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "Farklı üyelik olan noktaları birleştirmek istiyor musun?"
+
+#~ msgid "Merge Anyway"
+#~ msgstr "Neyse Birleştir"
+
+#~ msgid ""
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
+#~ msgstr ""
+#~ "Seçili noktaların farklı üyelikleri var. Ona rağmen birleştirmek istiyor "
+#~ "musun?"
Index: applications/editors/josm/i18n/po/zh_TW.po
===================================================================
--- applications/editors/josm/i18n/po/zh_TW.po	(revision 17655)
+++ applications/editors/josm/i18n/po/zh_TW.po	(revision 17697)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-12 18:11+0200\n"
-"PO-Revision-Date: 2009-09-06 12:54+0000\n"
+"POT-Creation-Date: 2009-09-19 13:00+0200\n"
+"PO-Revision-Date: 2009-09-15 03:31+0000\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Traditional Chinese\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2009-09-12 16:06+0000\n"
+"X-Launchpad-Export-Date: 2009-09-19 10:41+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: zh_TW\n"
@@ -43,10 +43,10 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:543
 #: ../core/src/org/openstreetmap/josm/Main.java:551
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:75
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:82
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:87
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:94
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:93
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:136
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:210
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:64
 #: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:72
@@ -71,5 +71,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:791
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:798
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1020
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
@@ -87,6 +87,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:124
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:318
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:61
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:358
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:69
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:404
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:458
@@ -102,6 +102,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:69
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:76
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:279
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:286
@@ -125,10 +125,10 @@
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:348
 msgid "Save and Exit"
 msgstr "存檔後離開"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:454
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:316
 msgid "Discard and Exit"
 msgstr "放棄修改且離開"
@@ -139,4 +139,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/DiskAccessAction.java:56
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:47
 #: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:42
@@ -144,27 +145,28 @@
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:113
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:208
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:264
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:266
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:196
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:296
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:258
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:299
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:255
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:163
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:835
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1226
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:104
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:613
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:124
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:284
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:503
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:696
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:286
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:577
@@ -172,5 +174,5 @@
 #: ../plugins/grid/src/grid/GridLayer.java:199
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:296
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -190,6 +192,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:205
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:115
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:225
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:54
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:107
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:130
@@ -206,17 +208,17 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:346
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:352
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:156
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:167
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:137
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:158
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:169
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:359
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:253
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:208
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:53
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:258
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:115
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:654
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:717
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1528
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:587
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1396
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:193
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:717
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:308
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:69
@@ -227,6 +229,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:223
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:248
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:106
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:129
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:163
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:158
@@ -279,9 +281,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:133
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:64
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:96
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:94
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:100
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:144
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:607
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:609
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:620
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:622
 #: ../core/src/org/openstreetmap/josm/gui/SplashScreen.java:67
 msgid "Java OpenStreetMap Editor"
@@ -341,5 +343,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:153
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
 msgid "Plugins"
@@ -389,5 +391,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:76
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:469
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:466
 msgid "Merge"
 msgstr ""
@@ -475,5 +477,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:30
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:34
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:43
@@ -486,4 +488,5 @@
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:41
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:52
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java:39
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
@@ -519,6 +522,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/ReverseWayAction.java:50
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:88
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:83
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:71
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:96
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
@@ -527,6 +530,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:312
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:346
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:54
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:94
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:62
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:104
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:655
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:677
@@ -634,4 +637,45 @@
 msgstr "沒有要縮放的衝突"
 
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:32
+#, fuzzy
+msgid "Close open changesets"
+msgstr "正在關閉資料組合..."
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#, fuzzy
+msgid "Closes open changesets"
+msgstr "正在關閉資料組合..."
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
+#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
+#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
+#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
+#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
+#: ../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:114
+#, java-format
+msgid "File: {0}"
+msgstr "檔案: {0}"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:57
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:64
+msgid "There are no open changesets"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:65
+#, fuzzy
+msgid "No open changesets"
+msgstr "變更組合"
+
+#: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:90
+#: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:43
+#, fuzzy
+msgid "Downloading open changesets ..."
+msgstr "正在關閉資料組合..."
+
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:46
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:47
@@ -723,10 +767,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:95
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:415
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:286
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:283
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:854
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:305
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1035
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:123
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:157
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:178
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:231
@@ -769,31 +814,30 @@
 msgstr "依一條直線將選取的節點等距離散佈。"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
 #: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:35
 msgid "Download from OSM..."
 msgstr "從 OSM 下載"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:33
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
 msgid "Download map data from the OSM server."
 msgstr "從 OSM 主機下載圖資"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:34
-#: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:38
-#: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:37
-#: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:33
-#: ../core/src/org/openstreetmap/josm/actions/SaveAction.java:28
-#: ../core/src/org/openstreetmap/josm/actions/SaveAsAction.java:25
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
-#, java-format
-msgid "File: {0}"
-msgstr "檔案: {0}"
-
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:44
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:52
 msgid "Download"
 msgstr "下載"
 
-#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:74
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:53
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
+#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
+#: ../plugins/grid/src/grid/GridLayer.java:162
+#: ../plugins/grid/src/grid/GridLayer.java:199
+#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+msgid "OK"
+msgstr "確定"
+
+#: ../core/src/org/openstreetmap/josm/actions/DownloadAction.java:81
 msgid "Please select at least one task to download"
 msgstr "請選擇至少一項要下載的工作"
@@ -814,5 +858,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:483
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1527
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1395
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:191
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307
@@ -832,6 +876,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:17
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:376
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1415
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1283
 msgid "Duplicate"
 msgstr "重製"
@@ -903,10 +947,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:110
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:579
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:264
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:133
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:100
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:134
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:151
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:207
@@ -992,25 +1037,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:42
 msgid "Merge Nodes"
 msgstr "合併節點"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:40
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:41
 msgid "Merge nodes into the oldest one."
 msgstr "將節點合併到最舊的一個中。"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:52
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:53
 msgid "Please select at least two nodes to merge."
 msgstr "請至少選取兩個節點來合併"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:139
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:141
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:166
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:168
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:140
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:142
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:222
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:224
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:293
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:295
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:94
 #: ../core/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java:105
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:394
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:36
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
@@ -1026,8 +1072,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:179
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:284
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:467
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:409
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:464
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:121
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:78
@@ -1053,6 +1099,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java:27
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:380
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:52
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:74
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:46
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:33
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:343
@@ -1061,9 +1111,9 @@
 msgstr "參數「{0}」必須不為空值(null)"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
 msgid "Cannot merge nodes: Would have to delete a way that is still used."
 msgstr "不能合併節點。會刪除仍在使用的路徑。"
 
-#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:248
+#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:283
 #, java-format
 msgid "Merge {0} nodes"
@@ -1135,5 +1185,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/NewAction.java:18
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:350
 msgid "New"
 msgstr "新增"
@@ -1403,14 +1453,15 @@
 msgstr "求助：{0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:102
 msgid "Status Report"
 msgstr "狀態報告"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 msgid "Copy to clipboard and close"
 msgstr "複製到剪貼簿並關閉"
 
-#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:103
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:110
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:950
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:888
@@ -1482,25 +1533,4 @@
 msgstr "將路徑 {0} 分割為 {1} 個部分"
 
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:24
-msgid "Close current changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:26
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:29
-msgid "Close the current changeset ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:41
-msgid "There is currently no changeset open."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:42
-msgid "No open changeset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/StopChangesetAction.java:60
-msgid "Closing changeset"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:15
 #: ../core/src/org/openstreetmap/josm/actions/ToggleGPXLinesAction.java:16
@@ -1663,14 +1693,14 @@
 msgstr "選擇區域是空的"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:114
 msgid "Upload to OSM..."
 msgstr "上傳至 OSM..."
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:113
 msgid "Upload all changes to the OSM server."
 msgstr "將所有的變更上傳至 OSM 伺服器。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:135
 #, java-format
 msgid ""
@@ -1679,23 +1709,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:155
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
 msgid "Nothing to upload. Get some data first."
 msgstr "沒有要上傳的項目。請先取得一些資料。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:166
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:168
 msgid "No changes to upload."
 msgstr "沒有要上傳的變更。"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:218
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:220
 #, java-format
 msgid "Synchronize {0} {1} only"
 msgstr "只同步 {0} {1}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:219
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:263
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:221
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:265
 msgid "Synchronize entire dataset"
 msgstr "同步整個資料組"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:223
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:225
 #, java-format
 msgid ""
@@ -1709,17 +1739,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:238
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:278
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:240
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:280
 msgid "Conflict detected"
 msgstr "偵測到衝突"
 
 #. should not happen
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:252
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:291
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:293
 #, java-format
 msgid "unexpected return value. Got {0}"
 msgstr "未預期的回傳值。得到 {0}"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:267
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:269
 #, java-format
 msgid ""
@@ -1733,28 +1763,40 @@
 "<strong>{1}</strong>則會放棄並繼續編輯。<br></html>"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:307
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:303
+msgid ""
+"<html>Uploading <strong>failed</strong> because you've been "
+"using<br>changeset {0} which was already closed at {1}.<br>Please upload "
+"again with a new or an existing open changeset."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
+#, fuzzy
+msgid "Changeset closed"
+msgstr "變更組合"
+
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:336
 #, java-format
 msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
 msgstr "警告：錯誤的標頭「{0}」與預期的樣式「{1}」不符"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:345
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:373
 #, java-format
 msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:394
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:422
 #, java-format
 msgid "<html>Uploading <strong>failed</strong>.<br>{0}</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:403
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:431
 msgid "Upload to OSM API failed"
 msgstr "上傳至 OSM API 失敗"
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:426
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:454
 msgid "Updating primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:493
+#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:524
 #, java-format
 msgid "Uploading data for layer ''{0}''"
@@ -1973,14 +2015,14 @@
 msgstr "將節點加入路徑並連接"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:930
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:932
 msgid "Create new node."
 msgstr "建立新的節點。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:935
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:959
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
 msgid "Select node under cursor."
 msgstr "選取游標下的節點。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:937
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:939
 #, java-format
 msgid "Insert new node into way."
@@ -1988,14 +2030,14 @@
 msgstr[0] "插入新的節點到{0} 路徑中。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:947
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
 msgid "Start new way from last node."
 msgstr "從最後的節點開始新的路徑。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:949
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:951
 msgid "Continue way from last node."
 msgstr "從最後的節點繼續路徑。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:961
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:972
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:963
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:974
 msgid "Finish drawing."
 msgstr "結束繪製。"
@@ -2112,60 +2154,70 @@
 "動縮放"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:43
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:43
 msgid "Search..."
 msgstr "搜尋..."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:41
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:42
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search for objects."
 msgstr "搜尋物件。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:51
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:52
 msgid "Can't search because there is no loaded data."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:65
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
+#, fuzzy
+msgid "Please enter a filter string."
+msgstr "請輸入搜尋字串。"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:67
 msgid "Please enter a search string."
 msgstr "請輸入搜尋字串。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:69
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
 msgid "replace selection"
 msgstr "取代選擇區域"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:70
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:72
 msgid "add to selection"
 msgstr "加入至選擇區域"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:71
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:73
 msgid "remove from selection"
 msgstr "從選擇區域移除"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:77
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:74
+#, fuzzy
+msgid "find in selection"
+msgstr "加入至選擇區域"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:81
 msgid "case sensitive"
 msgstr "區分大小寫"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:78
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:82
 msgid "regular expression"
 msgstr "正規表示式"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
 msgid "<b>Baker Street</b> - 'Baker' and 'Street' in any key or name."
 msgstr "<b>Baker Street</b> - 「Baker」和「Street」出現在何設定鍵或名稱中。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:93
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
 msgid "<b>\"Baker Street\"</b> - 'Baker Street' in any key or name."
 msgstr "<b>\"Baker Street\"</b> -  「Baker Street」出現在何設定鍵或名稱中。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:94
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
 msgid "<b>name:Bak</b> - 'Bak' anywhere in the name."
 msgstr "<b>name:Bak</b> - 「Bak」出現在名稱中的任何地方。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
 msgid "<b>type=route</b> - key 'type' with value exactly 'route'."
 msgstr "<b>type=route</b> - 含有設定鍵「type」為「route」者。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:96
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
 msgid ""
 "<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, "
@@ -2175,17 +2227,17 @@
 "<b>type=</b>、<b>*=*</b>、<b>*=</b>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:97
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
 msgid "<b>-name:Bak</b> - not 'Bak' in the name."
 msgstr "<b>-name:Bak</b> - 名稱中沒有「Bak」。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:98
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
 msgid "<b>foot:</b> - key=foot set to any value."
 msgstr "<b>foot:</b> - key=foot 設定為任何數值。"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:99
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
 msgid "<u>Special targets:</u>"
 msgstr "<u>特殊的目標：</u>"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:100
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
 msgid ""
 "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
@@ -2194,92 +2246,109 @@
 "(relation)</b>)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
 msgid "<b>user:</b>... - all objects changed by user"
 msgstr "<b>使用者：</b>... - 所有由某使用者改變的物件"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:103
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
 msgid "<b>nodes:</b>... - object with given number of nodes"
 msgstr "<b>節點數：</b>... - 含有此數目節點的物件"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:104
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
 msgid "<b>modified</b> - all changed objects"
 msgstr "<b>修改過</b> - 所有改變過的物件"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:105
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
 msgid "<b>selected</b> - all selected objects"
 msgstr "<b>選取的</b> - 所有選取的物件"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:106
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
 msgid "<b>incomplete</b> - all incomplete objects"
 msgstr "<b>不完整</b> - 所有不完整的物件"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:107
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
 msgid "<b>untagged</b> - all untagged objects"
 msgstr "<b>未標籤的</b> - 所有未標籤的物件"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:108
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:113
 msgid ""
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr "<b>child <i>expr</i></b> - 所有物件的子項符合正規表示式的"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:109
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:114
 msgid ""
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr "<b>parent <i>expr</i></b> - 所有物件父項符合正規表示式的"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:110
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:115
 msgid "Use <b>|</b> or <b>OR</b> to combine with logical or"
 msgstr "使用 <b>|</b> 或 <b>OR</b> 做邏輯或運算"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains :)"
 msgstr "使用 <b>\"</b> 將運算子包覆 (例如當設定鍵含有 :)"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:117
 msgid "Use <b>(</b> and <b>)</b> to group expressions"
 msgstr "使用 <b>(</b> 和 <b>)</b> 將正規表示式群組起來"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
+msgid "Filter"
+msgstr "過濾條件"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:127
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147
 msgid "Search"
 msgstr "搜尋"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
+msgid "Submit filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "Start Search"
 msgstr "開始搜尋"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:198
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:246
 #, java-format
 msgid "No match found for ''{0}''"
 msgstr "找不到「{0}」的符合項"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:200
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:248
 #, java-format
 msgid "Nothing added to selection by searching for ''{0}''"
 msgstr "搜尋「{0}」的結果沒有任何項目可加入選擇區域"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:250
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
 msgstr "搜尋「{0}」的結果沒有任何項目可自選擇區域移除"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:252
+#, fuzzy, java-format
+msgid "Nothing find in selection by searching for ''{0}''"
+msgstr "搜尋「{0}」的結果沒有任何項目可加入選擇區域"
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:262
 #, java-format
 msgid "Found {0} matches"
 msgstr "找到 {0} 個符合項"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CS"
 msgstr "CS"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:241
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:282
 msgid "CI"
 msgstr "CI"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:242
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:283
 msgid "RX"
 msgstr "RX"
@@ -2465,5 +2534,5 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
 msgid "Double conflict"
 msgstr ""
@@ -2707,4 +2776,5 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrectionTableModel.java:25
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:134
 msgid "Old value"
 msgstr "舊的數值"
@@ -2868,27 +2938,59 @@
 
 #: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:67
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
 msgid "E"
 msgstr "東"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:59
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
+#: ../core/src/org/openstreetmap/josm/data/osm/Changeset.java:104
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:203
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
 msgid "Changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:323
+#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:392
 #, java-format
 msgid "parameter {0} > 0 required. Got {1}."
 msgstr "參數 {0} 必須 > 0 。得到 {1}。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:325
-#, fuzzy, java-format
-msgid "paramete''{0}'' must not be null"
-msgstr "參數「{0}」必須不為空值(null)"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:331
-#, fuzzy, java-format
-msgid "unsupported value ''{0}'' or parameter ''{1}''"
-msgstr "路徑「{1}」沒有有用的角色「{0}」。"
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "H"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "Text"
+msgstr "文字"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "C"
+msgstr "CS"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+#, fuzzy
+msgid "I"
+msgstr "CI"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:141
+msgid "M"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:198
+#, fuzzy
+msgid "R"
+msgstr "RX"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:199
+msgid "A"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:200
+msgid "D"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:201
+msgid "F"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:71
@@ -2902,29 +3004,29 @@
 msgstr "警告：{0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:166
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:178
+#, java-format
 msgid "expected id >= 0. Got {0}"
-msgstr "未預期的欄位索引。得到 {0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:257
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:302
 msgid "a primitive with id=0 can't be invisible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:293
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:338
+#, java-format
 msgid "id > 0 expected. Got {0}"
-msgstr "未預期的記號：{0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:295
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:340
+#, java-format
 msgid "version > 0 expected. Got {0}"
-msgstr "未預期的記號：{0}"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:26
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:25
 #, java-format
 msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
 msgstr "參數「{0}」不是有效的類型名稱，取得「{1}」"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:36
 #, java-format
 msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
@@ -2991,9 +3093,9 @@
 msgstr "參數「{0}」不應使用範圍 0..{1}，卻收到 {2}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:247
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:249
 msgid "Area style way is not closed."
 msgstr "區域類型的路徑並未封閉。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:478
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:482
 #, java-format
 msgid "multipolygon way ''{0}'' is not closed."
@@ -3002,118 +3104,118 @@
 #. TODO Nullable member will not be allowed after RelationMember.member is encalupsed
 #. TODO Remove useless nullcheck when RelationMember.member is encalupsed
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:582
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:851
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:586
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:855
 msgid "Empty member in relation."
 msgstr "關係中的成員是空的。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:584
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:853
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:588
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:857
 #, java-format
 msgid "Deleted member ''{0}'' in relation."
 msgstr "關係中已刪除的成員「{0}」。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:595
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:864
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:599
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:868
 #, java-format
 msgid "Way ''{0}'' with less than two points."
 msgstr "路徑「{0}」少於兩個節點。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:600
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:604
 msgid "More than one \"from\" way found."
 msgstr "找到一個以上「從」路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:606
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:610
 msgid "More than one \"to\" way found."
 msgstr "找到一個以上「到」路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:612
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:626
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:616
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:630
 msgid "More than one \"via\" found."
 msgstr "找到一個以上的「經過」。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:617
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:631
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:621
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:635
 #, java-format
 msgid "Unknown role ''{0}''."
 msgstr "不明的角色「{0}」。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:634
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:638
 #, java-format
 msgid "Unknown member type for ''{0}''."
 msgstr "「{0}」的不明成員類型。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:640
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
 msgid "No \"from\" way found."
 msgstr "找不到「從」路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:644
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
 msgid "No \"to\" way found."
 msgstr "找不到「到」路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:648
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:652
 msgid "No \"via\" node or way found."
 msgstr "找到一個以上「經過」路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:657
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
 msgid "The \"from\" way doesn't start or end at a \"via\" node."
 msgstr "「從」路徑沒有開始或結束於「經過」節點。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:661
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:665
 msgid "The \"to\" way doesn't start or end at a \"via\" node."
 msgstr "「到」路徑沒有開始或結束於「經過」節點。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:689
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
 msgid "The \"from\" way doesn't start or end at the \"via\" way."
 msgstr "「從」路徑沒有開始或結束於「經過」路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:693
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:697
 msgid "The \"to\" way doesn't start or end at the \"via\" way."
 msgstr "「到」路徑沒有開始或結束於「經過」路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:816
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:820
 #, java-format
 msgid "Style for restriction {0} not found."
 msgstr "找不到限制 {0} 的樣式"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:873
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:877
 #, java-format
 msgid "No useful role ''{0}'' for Way ''{1}''."
 msgstr "路徑「{1}」沒有有用的角色「{0}」。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:885
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:889
 #, java-format
 msgid "Non-Way ''{0}'' in multipolygon."
 msgstr "多邊形中有非-路徑「{0}」。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:943
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:947
 #, java-format
 msgid "No outer way for multipolygon ''{0}''."
 msgstr "多邊形「{0}」沒有外部路徑。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1032
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1036
 #, java-format
 msgid "Intersection between ways ''{0}'' and ''{1}''."
 msgstr "路徑「{0}」和「{1}」之間的十字路。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1044
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1048
 #, java-format
 msgid "Inner way ''{0}'' is outside."
 msgstr "內部路徑「{0}」在外。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1097
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1101
 #, java-format
 msgid "Style for inner way ''{0}'' equals multipolygon."
 msgstr "內部路徑「{0}」的樣式等同多邊形。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1123
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1127
 #, java-format
 msgid "Style for outer way ''{0}'' mismatches."
 msgstr "外部路徑「{0}」的樣式不符。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1327
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1331
 msgid "untagged"
 msgstr "未上標籤的"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1328
+#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:1332
 msgid "text"
 msgstr "文字"
@@ -3134,5 +3236,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:98
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:99
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:247
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
@@ -3151,5 +3253,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:157
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:158
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:532
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:71
@@ -3202,5 +3304,5 @@
 msgstr "Lambert Zone (法國)"
 
-#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:97
+#: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
 msgid "Lambert Zone (Estonia)"
 msgstr "Lambert Zone (愛沙尼亞)"
@@ -3242,9 +3344,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:174
-#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:37
+#: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:38
 msgid "Do not show again"
 msgstr "不再顯示"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:76
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:77
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:81
 #, java-format
@@ -3252,31 +3354,31 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:90
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:115
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:153
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:91
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:116
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:154
 msgid "incomplete"
 msgstr "不完整"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:127
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
 msgid "highway"
 msgstr "公路"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:128
-#: build/trans_presets.java:3144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: build/trans_presets.java:3156
 msgid "railway"
 msgstr "鐵路"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:129
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
 msgid "waterway"
 msgstr "航道"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:130
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:131
 msgid "landuse"
 msgstr "土地利用"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:150
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:448
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:474
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:147
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:445
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:471
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
 #, java-format
@@ -3285,5 +3387,5 @@
 msgstr[0] "{0} 節點"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:183
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:187
 #, java-format
 msgid "{0} member"
@@ -3327,10 +3429,5 @@
 msgstr "無法取得當天的訊息。"
 
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:67
-#, java-format
-msgid "- running version is {0}"
-msgstr "- 執行的版本是 {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:97
+#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:95
 msgid "Downloading \"Message of the day\""
 msgstr "正在下載「當天的訊息」"
@@ -3400,10 +3497,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:87
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:162
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:163
 msgid "Username"
 msgstr "使用者名稱"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:90
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:165
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:166
 msgid "Password"
 msgstr "密碼"
@@ -3526,5 +3623,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:162
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:226
 msgid "Presets"
 msgstr "預設組合"
@@ -3598,38 +3695,49 @@
 msgstr "縮放"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:93
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
 msgid "The geographic longitude at the mouse pointer."
 msgstr "滑鼠指標所在的地理經度。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:94
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The name of the object at the mouse pointer."
 msgstr "滑鼠指標所在的物件名稱。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:96
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The geographic latitude at the mouse pointer."
 msgstr "滑鼠指標所在的地理緯度。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:97
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The angle between the previous and the current way segment."
 msgstr "前一個路徑區段與目前區段之間的角度。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:98
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "繪出線段的（指南針）箭頭。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The length of the new way segment being drawn."
 msgstr "繪出新的路徑區段的長度。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:165
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:199
+msgid ""
+"Middle click again to cycle through.<br>Hold CTRL to select directly from "
+"this list with the mouse.<hr>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:290
 msgid "(no object)"
 msgstr "(沒有物件)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:284
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:301
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:418
+#, fuzzy
+msgid "User:"
+msgstr "使用者"
+
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:286
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:303
 msgid "layer not in list."
 msgstr "圖層不在清單中。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapView.java:488
+#: ../core/src/org/openstreetmap/josm/gui/MapView.java:501
 #, java-format
 msgid "Layer ''{0}'' must be in list of layers"
@@ -3699,7 +3807,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:106
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:164
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:281
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:224
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:63
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
 msgid "Tags"
 msgstr "標籤"
@@ -3714,5 +3822,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:116
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:237
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:331
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:260
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:69
 msgid "Members"
@@ -3893,4 +4001,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:632
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
 msgid "Up"
 msgstr "上"
@@ -3901,4 +4010,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:664
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
 msgid "Down"
 msgstr "下"
@@ -3911,5 +4021,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:52
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:100
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:88
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:192
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:64
@@ -4331,23 +4441,22 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:236
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:239
 msgid "No conflicts to resolve"
-msgstr "沒有待解決的標籤衝突"
-
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:295
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:257
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:298
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:254
 msgid "Cancel conflict resolution"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:310
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:313
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:269
 msgid "Apply resolved conflicts"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:311
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:314
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:270
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:84
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
 msgid "Apply"
 msgstr ""
@@ -4359,5 +4468,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:176
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "all"
 msgstr "全部"
@@ -4401,7 +4510,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
-msgid "not yet decided"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:213
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:251
@@ -4428,7 +4534,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:151
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:449
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:475
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:472
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
 #, java-format
@@ -4437,7 +4543,7 @@
 msgstr[0] "{0} 路徑"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:152
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:450
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:476
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:473
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
 #, java-format
@@ -4446,20 +4552,20 @@
 msgstr[0] "{0} 關係"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:355
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "Paste ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:365
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:362
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "From ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:372
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:369
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:377
 msgid "To ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:428
+#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:425
 #, java-format
 msgid "{0} tag"
@@ -4475,13 +4581,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:53
-#, fuzzy
 msgid "Remove this relation member from the relation"
-msgstr "將目前表格列中的成員自這個關係中移除"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:37
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:57
-#, fuzzy
 msgid "Replace"
-msgstr "本名"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
@@ -4492,11 +4596,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:41
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:62
-#, fuzzy
 msgid "Undecided"
-msgstr "未決定"
+msgstr ""
 
 #. --- role editing
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:56
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:581
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:510
 msgid "Role:"
 msgstr ""
@@ -4512,7 +4615,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:70
-#, fuzzy
 msgid "Value:"
-msgstr "數值"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:86
@@ -4529,7 +4631,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
-#, fuzzy
 msgid "Decision"
-msgstr "重訂版本"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -4545,6 +4646,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
@@ -4633,167 +4735,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
-msgid "History"
-msgstr "歷史紀錄"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
-msgid "Display the history of all selected items."
-msgstr "顯示所有選取的項目歷史紀錄。"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
-#, java-format
-msgid "index out of bounds Got {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
-#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
-#, java-format
-msgid "Node {0}"
-msgstr "節點 {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
-#, java-format
-msgid "Way {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
-#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
-#, java-format
-msgid "Relation {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
-msgid "History item"
-msgstr "歷史記錄項目"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
-msgid "Reload all currently selected objects and refresh the list."
-msgstr "重新載入所有目前的物件並重新整理清單。"
-
-#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
-msgid "Show"
-msgstr "顯示"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
-msgid "Display the history of the selected primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:87
-msgid "Dialog not created yet. Invoke createInstance() first"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
-msgid "Layers"
-msgstr "圖層"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-msgid "Open a list of all loaded layers."
-msgstr "開啟所有載入圖層的清單。"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:297
-msgid "Delete the selected layer."
-msgstr "刪除選取的圖層。"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:367
-msgid "Show/Hide"
-msgstr "顯示/隱藏"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:378
-msgid "Toggle visible state of the selected layer."
-msgstr "切換選取的圖層可見性狀態。"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:414
-msgid "Activate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:420
-msgid "Activate the selected layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:475
-msgid "Merge this layer into another layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:581
-msgid "Move the selected layer one row up."
-msgstr "將選取的圖層上移一列。"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:600
-msgid "Move the selected layer one row down."
-msgstr "將選取的圖層下移一列。"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
-msgid "Information about layer"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
-#, java-format
-msgid "This will change up to {0} object."
-msgid_plural "This will change up to {0} objects."
-msgstr[0] "這會改變 {0} 個物件。"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
-msgid "An empty value deletes the key."
-msgstr "空白的數值會刪除該設定鍵。"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
-msgid "<different>"
-msgstr "<不同>"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
-msgid "Change values?"
-msgstr "是否改變數值？"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
-#, java-format
-msgid "Change properties of up to {0} object"
-msgid_plural "Change properties of up to {0} objects"
-msgstr[0] "改變屬性至 {0} 個物件"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
-msgid "Please select a key"
-msgstr "請選擇一個設定鍵"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
-msgid "Please select a value"
-msgstr "請選擇一個數值"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
-msgid "Please select the objects you want to change properties for."
-msgstr "請選擇您要改變屬性的物件。"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
-msgid "Properties/Memberships"
-msgstr "屬性/成員"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
-msgid "Properties for selected objects."
-msgstr "選取物件的屬性。"
-
-#. setting up the membership table
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
-msgid "Member Of"
-msgstr "成員"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
-msgid "Add Properties"
-msgstr "加入屬性"
-
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:56
+msgid "Filter objects and hide/disable them."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:573
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:63
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:87
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:121
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:136
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:193
@@ -4807,4 +4755,210 @@
 msgstr "加入"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:66
+#, fuzzy
+msgid "Add filter."
+msgstr "加入選取的"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:78
+#, fuzzy
+msgid "Edit filter."
+msgstr "編輯渡頭"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:93
+#, fuzzy
+msgid "Delete filter."
+msgstr "刪除圖層"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:103
+#, fuzzy
+msgid "Move filter up."
+msgstr "上移"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:114
+#, fuzzy
+msgid "Move filter down."
+msgstr "下移(_D"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:128
+msgid "Enable filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
+#, fuzzy
+msgid "Hide elements"
+msgstr "單一元件"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:131
+msgid "Apply also for children"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
+msgid "Inverse filter"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
+#, fuzzy
+msgid "Filter mode"
+msgstr "過濾條件"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:158
+msgid "History"
+msgstr "歷史紀錄"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:157
+msgid "Display the history of all selected items."
+msgstr "顯示所有選取的項目歷史紀錄。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:239
+#, java-format
+msgid "index out of bounds Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:270
+#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79
+#, java-format
+msgid "Node {0}"
+msgstr "節點 {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:80
+#, java-format
+msgid "Way {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:272
+#: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:81
+#, java-format
+msgid "Relation {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:300
+msgid "History item"
+msgstr "歷史記錄項目"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:317
+msgid "Reload all currently selected objects and refresh the list."
+msgstr "重新載入所有目前的物件並重新整理清單。"
+
+#. putValue(Action.SMALL_ICON, ImageProvider.get("dialogs","refresh"));
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:341
+msgid "Show"
+msgstr "顯示"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:342
+msgid "Display the history of the selected primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:84
+msgid "Dialog not created yet. Invoke createInstance() first"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:146
+msgid "Layers"
+msgstr "圖層"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:145
+msgid "Open a list of all loaded layers."
+msgstr "開啟所有載入圖層的清單。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:294
+msgid "Delete the selected layer."
+msgstr "刪除選取的圖層。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:364
+msgid "Show/Hide"
+msgstr "顯示/隱藏"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:375
+msgid "Toggle visible state of the selected layer."
+msgstr "切換選取的圖層可見性狀態。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:411
+msgid "Activate"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:417
+msgid "Activate the selected layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:472
+msgid "Merge this layer into another layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:578
+msgid "Move the selected layer one row up."
+msgstr "將選取的圖層上移一列。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:597
+msgid "Move the selected layer one row down."
+msgstr "將選取的圖層下移一列。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33
+msgid "Information about layer"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:324
+#, java-format
+msgid "This will change up to {0} object."
+msgid_plural "This will change up to {0} objects."
+msgstr[0] "這會改變 {0} 個物件。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:150
+msgid "An empty value deletes the key."
+msgstr "空白的數值會刪除該設定鍵。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:193
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:243
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:473
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:516
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:106
+msgid "<different>"
+msgstr "<不同>"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:207
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:348
+msgid "Change values?"
+msgstr "是否改變數值？"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:265
+#, java-format
+msgid "Change properties of up to {0} object"
+msgid_plural "Change properties of up to {0} objects"
+msgstr[0] "改變屬性至 {0} 個物件"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:326
+msgid "Please select a key"
+msgstr "請選擇一個設定鍵"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:336
+msgid "Please select a value"
+msgstr "請選擇一個數值"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:448
+msgid "Please select the objects you want to change properties for."
+msgstr "請選擇您要改變屬性的物件。"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:455
+msgid "Properties/Memberships"
+msgstr "屬性/成員"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:454
+msgid "Properties for selected objects."
+msgstr "選取物件的屬性。"
+
+#. setting up the membership table
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:488
+msgid "Member Of"
+msgstr "成員"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:571
+msgid "Add Properties"
+msgstr "加入屬性"
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:574
 msgid "Add a new key/value pair to all objects"
@@ -4846,10 +5000,9 @@
 
 #. item "Land use/Quarry" text "Name"
-#. <separator/>
 #. <!-- FIXME: element role not yet supported! -->
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:71
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:72
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:146
-#: build/trans_presets.java:3109
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:168
+#: build/trans_presets.java:3121
 msgid "Relations"
 msgstr "關係"
@@ -4859,23 +5012,23 @@
 msgstr "開啓所有關係的清單。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:144
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:166
 #, java-format
 msgid "Relations: {0}"
 msgstr "關係：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:263
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:276
 msgid "Open an editor for the selected relation"
 msgstr "開啓選取的關係編輯器"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:304
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:317
 msgid "Delete the selected relation"
 msgstr "刪除選取的關係"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:349
 msgid "Create a new relation"
 msgstr "建立新的關係"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:373
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1412
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:386
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1280
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
@@ -4908,5 +5061,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:294
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:362
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
 msgid "Selection"
@@ -4918,14 +5071,14 @@
 msgstr "選擇區域：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:434
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:441
 msgid "Undock the panel"
 msgstr "解鎖面板"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:447
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:454
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr "關閉這個面板。您可以用左側工具列的按鈕重新開啟它。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:457
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:464
 msgid "Click to minimize/maximize the panel content"
 msgstr "點選以最小化/最大化面板內容"
@@ -4986,5 +5139,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1435
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1303
 msgid "Edit the relation the currently selected relation member refers to"
 msgstr ""
@@ -5008,5 +5161,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:291
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:448
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1502
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1370
 msgid "Download relation members"
 msgstr ""
@@ -5036,5 +5189,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:428
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:529
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1566
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1434
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:199
 #, java-format
@@ -5042,18 +5195,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:163
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
 msgid "Tags and Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:165
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:173
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:159
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:167
 msgid "Parent Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:166
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
 msgid "Child Relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:650
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
 msgid ""
 "<html>There is at least one member in this relation referring<br>to the "
@@ -5062,14 +5215,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:658
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:591
 msgid "Remove them, clean up relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:657
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:590
 msgid "Ignore them, leave relation as is"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:680
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:613
 #, java-format
 msgid ""
@@ -5079,9 +5232,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:690
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:623
 msgid "Multiple members referring to same primitive"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:641
 #, java-format
 msgid ""
@@ -5091,15 +5244,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:749
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:682
 msgid ""
 "Add all primitives selected in the current dataset before the first member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:775
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:708
 msgid ""
 "Add all primitives selected in the current dataset after the last member"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:735
 msgid ""
 "Add all primitives selected in the current dataset before the first selected "
@@ -5107,5 +5260,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:770
 msgid ""
 "Add all primitives selected in the current dataset after the last selected "
@@ -5113,20 +5266,20 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:869
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:802
 msgid "Remove all members referring to one of the selected primitives"
 msgstr ""
 
 #. putValue(NAME, tr("Remove Selected"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:872
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:805
 msgid "Relation Editor: Remove Selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:918
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:851
 msgid ""
 "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:916
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:849
 #, java-format
 msgid ""
@@ -5135,57 +5288,57 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:940
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:873
 msgid "Select primitives for selected relation members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:961
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:894
 msgid "Sort the relation members"
 msgstr ""
 
 #. putValue(NAME, tr("Sort"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:964
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:897
 msgid "Relation Editor: Sort"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:976
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909
 msgid "Move the currently selected members up"
 msgstr "將目前選取的成員上移"
 
 #. putValue(NAME, tr("Move Up"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:979
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:912
 msgid "Relation Editor: Move Up"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:995
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:928
 msgid "Move the currently selected members down"
 msgstr "將目前選取的成員下移"
 
 #. putValue(NAME, tr("Move Down"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:998
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:931
 msgid "Relation Editor: Move Down"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1014
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:947
 msgid "Remove the currently selected members from this relation"
 msgstr ""
 
 #. putValue(NAME, tr("Remove"));
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1017
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:950
 msgid "Relation Editor: Remove"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:966
 msgid "Delete the currently edited relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1116
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1049
 msgid "Yes, create a conflict and close"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1050
 msgid "No, continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1054
 msgid ""
 "<html>This relation has been changed outside of the editor.<br>You can't "
@@ -5194,9 +5347,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1125
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1058
 msgid "Conflict in data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
 #, java-format
 msgid ""
@@ -5205,56 +5358,41 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1090
+msgid "Apply the current updates"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1123
+msgid "Apply the updates and close the dialog"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
-msgid "Apply the current updates"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
-msgid "Apply the updates and close the dialog"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1192
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
-#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
-#: ../plugins/grid/src/grid/GridLayer.java:162
-#: ../plugins/grid/src/grid/GridLayer.java:199
-#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:144
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:334
-msgid "OK"
-msgstr "確定"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 msgid "Cancel the updates and close the dialog"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1241
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1174
 msgid "Add an empty tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
-msgid "Delete the currently selected tags"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1187
 msgid "Download all incomplete ways and nodes in relation"
 msgstr "下載關係中所有不完整的路徑和節點"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 msgid "Download Members"
 msgstr "下載成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1322
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1190
 msgid "Relation Editor: Download Members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1208
 msgid "Sets a role for the selected members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1211
 msgid "Apply Role"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1356
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1224
 #, java-format
 msgid ""
@@ -5264,13 +5402,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1360
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1228
 msgid "Yes, apply it"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1361
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1229
 msgid "No, don't apply"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1367
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1235
 msgid "Confirm empty role"
 msgstr ""
@@ -5357,37 +5495,37 @@
 msgstr "書籤"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:82
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:70
 msgid "Please enter the desired coordinates first."
 msgstr "請先輸入想要的坐標。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:89
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:77
 msgid "Please enter a name for the location."
 msgstr "請輸入此位置的名稱。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:90
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:78
 msgid "Name of location"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:107
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:95
 msgid "Select a bookmark first."
 msgstr "先選擇一個書籤。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:110
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:100
 msgid "min lat"
 msgstr "最小緯度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:112
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:102
 msgid "min lon"
 msgstr "最小經度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:114
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
 msgid "max lat"
 msgstr "最大緯度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:116
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:106
 msgid "max lon"
 msgstr "最大經度"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:119
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:109
 msgid ""
 "URL from www.openstreetmap.org (you can paste an URL here to download the "
@@ -5395,26 +5533,26 @@
 msgstr "www.openstreetmap.org 的 URL (您可以在這裡貼上 URL 下載該區域)"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:131
+#: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:121
 msgid "Bounding Box"
 msgstr "綁定方塊"
 
 #. adding the download tasks
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:111
 msgid "Data Sources and Types"
 msgstr "資料來源和類型"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:164
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:160
 msgid "Download as new layer"
 msgstr "下載為新圖層"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:167
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:163
 msgid "Download Area"
 msgstr "下載區域"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:216
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:212
 msgid "Download area too large; will probably be rejected by server"
 msgstr "下載區域太大；可能會被伺服器拒絕"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:219
+#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
 msgid "Download area ok, size probably acceptable to server"
 msgstr "下載區域確定，大小應該會被伺服器接受"
@@ -5439,7 +5577,7 @@
 msgstr "輸入要搜尋位置的名稱："
 
-#. <separator/>
+#. group "Geography"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:226
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2759
 msgid "Places"
 msgstr "地名"
@@ -5486,21 +5624,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:244
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:250
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "type"
 msgstr "類型"
@@ -5980,4 +6118,6 @@
 #. item "Historic Places/Wayside Shrine" label "Edit Wayside Shrine"
 #. <key key="historic" value="wayside_shrine" />
+#. item "Historic Places/Boundary Stone" label "Edit Boundary Stone"
+#. <key key="historic" value="boundary_stone" />
 #. item "Leisure/Water Park" label "Edit Water Park"
 #. <key key="leisure" value="water_park" />
@@ -6349,153 +6489,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:350
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:71
-#: build/trans_presets.java:66 build/trans_presets.java:102
-#: build/trans_presets.java:142 build/trans_presets.java:179
-#: build/trans_presets.java:199 build/trans_presets.java:217
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:272 build/trans_presets.java:305
-#: build/trans_presets.java:351 build/trans_presets.java:371
-#: build/trans_presets.java:386 build/trans_presets.java:403
-#: build/trans_presets.java:423 build/trans_presets.java:443
-#: build/trans_presets.java:463 build/trans_presets.java:482
-#: build/trans_presets.java:502 build/trans_presets.java:522
-#: build/trans_presets.java:543 build/trans_presets.java:564
-#: build/trans_presets.java:585 build/trans_presets.java:606
-#: build/trans_presets.java:627 build/trans_presets.java:658
-#: build/trans_presets.java:679 build/trans_presets.java:692
-#: build/trans_presets.java:705 build/trans_presets.java:718
-#: build/trans_presets.java:731 build/trans_presets.java:744
-#: build/trans_presets.java:755 build/trans_presets.java:764
-#: build/trans_presets.java:811 build/trans_presets.java:832
-#: build/trans_presets.java:841 build/trans_presets.java:901
-#: build/trans_presets.java:1051 build/trans_presets.java:1059
-#: build/trans_presets.java:1067 build/trans_presets.java:1075
-#: build/trans_presets.java:1085 build/trans_presets.java:1093
-#: build/trans_presets.java:1098 build/trans_presets.java:1105
-#: build/trans_presets.java:1112 build/trans_presets.java:1117
-#: build/trans_presets.java:1125 build/trans_presets.java:1134
-#: build/trans_presets.java:1140 build/trans_presets.java:1146
-#: build/trans_presets.java:1151 build/trans_presets.java:1157
-#: build/trans_presets.java:1163 build/trans_presets.java:1172
-#: build/trans_presets.java:1181 build/trans_presets.java:1188
-#: build/trans_presets.java:1196 build/trans_presets.java:1209
-#: build/trans_presets.java:1215 build/trans_presets.java:1224
-#: build/trans_presets.java:1230 build/trans_presets.java:1236
-#: build/trans_presets.java:1244 build/trans_presets.java:1299
-#: build/trans_presets.java:1346 build/trans_presets.java:1352
-#: build/trans_presets.java:1358 build/trans_presets.java:1364
-#: build/trans_presets.java:1370 build/trans_presets.java:1381
-#: build/trans_presets.java:1390 build/trans_presets.java:1405
-#: build/trans_presets.java:1412 build/trans_presets.java:1418
-#: build/trans_presets.java:1426 build/trans_presets.java:1433
-#: build/trans_presets.java:1442 build/trans_presets.java:1450
-#: build/trans_presets.java:1457 build/trans_presets.java:1468
-#: build/trans_presets.java:1478 build/trans_presets.java:1488
-#: build/trans_presets.java:1508 build/trans_presets.java:1520
-#: build/trans_presets.java:1531 build/trans_presets.java:1548
-#: build/trans_presets.java:1555 build/trans_presets.java:1570
-#: build/trans_presets.java:1577 build/trans_presets.java:1582
-#: build/trans_presets.java:1588 build/trans_presets.java:1594
-#: build/trans_presets.java:1599 build/trans_presets.java:1605
-#: build/trans_presets.java:1611 build/trans_presets.java:1619
-#: build/trans_presets.java:1627 build/trans_presets.java:1635
-#: build/trans_presets.java:1642 build/trans_presets.java:1648
-#: build/trans_presets.java:1655 build/trans_presets.java:1662
-#: build/trans_presets.java:1670 build/trans_presets.java:1677
-#: build/trans_presets.java:1685 build/trans_presets.java:1692
-#: build/trans_presets.java:1698 build/trans_presets.java:1705
-#: build/trans_presets.java:1712 build/trans_presets.java:1719
-#: build/trans_presets.java:1736 build/trans_presets.java:1744
-#: build/trans_presets.java:1759 build/trans_presets.java:1769
-#: build/trans_presets.java:1781 build/trans_presets.java:1788
-#: build/trans_presets.java:1794 build/trans_presets.java:1804
-#: build/trans_presets.java:1809 build/trans_presets.java:1817
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1841
-#: build/trans_presets.java:1846 build/trans_presets.java:1853
-#: build/trans_presets.java:1859 build/trans_presets.java:1864
-#: build/trans_presets.java:1872 build/trans_presets.java:1881
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1908 build/trans_presets.java:1914
-#: build/trans_presets.java:1922 build/trans_presets.java:1928
-#: build/trans_presets.java:1934 build/trans_presets.java:1940
-#: build/trans_presets.java:1946 build/trans_presets.java:1952
-#: build/trans_presets.java:1958 build/trans_presets.java:1964
-#: build/trans_presets.java:1970 build/trans_presets.java:1976
-#: build/trans_presets.java:1982 build/trans_presets.java:1988
-#: build/trans_presets.java:1994 build/trans_presets.java:2000
-#: build/trans_presets.java:2006 build/trans_presets.java:2013
-#: build/trans_presets.java:2022 build/trans_presets.java:2030
-#: build/trans_presets.java:2036 build/trans_presets.java:2042
-#: build/trans_presets.java:2048 build/trans_presets.java:2054
-#: build/trans_presets.java:2060 build/trans_presets.java:2066
-#: build/trans_presets.java:2072 build/trans_presets.java:2078
-#: build/trans_presets.java:2084 build/trans_presets.java:2090
-#: build/trans_presets.java:2096 build/trans_presets.java:2102
-#: build/trans_presets.java:2108 build/trans_presets.java:2114
-#: build/trans_presets.java:2120 build/trans_presets.java:2126
-#: build/trans_presets.java:2139 build/trans_presets.java:2145
-#: build/trans_presets.java:2151 build/trans_presets.java:2158
-#: build/trans_presets.java:2165 build/trans_presets.java:2173
-#: build/trans_presets.java:2180 build/trans_presets.java:2186
-#: build/trans_presets.java:2192 build/trans_presets.java:2198
-#: build/trans_presets.java:2204 build/trans_presets.java:2210
-#: build/trans_presets.java:2218 build/trans_presets.java:2225
-#: build/trans_presets.java:2232 build/trans_presets.java:2239
-#: build/trans_presets.java:2247 build/trans_presets.java:2279
-#: build/trans_presets.java:2284 build/trans_presets.java:2289
-#: build/trans_presets.java:2294 build/trans_presets.java:2300
-#: build/trans_presets.java:2306 build/trans_presets.java:2312
-#: build/trans_presets.java:2320 build/trans_presets.java:2326
-#: build/trans_presets.java:2332 build/trans_presets.java:2338
-#: build/trans_presets.java:2344 build/trans_presets.java:2354
-#: build/trans_presets.java:2451 build/trans_presets.java:2458
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2485 build/trans_presets.java:2492
-#: build/trans_presets.java:2498 build/trans_presets.java:2504
-#: build/trans_presets.java:2526 build/trans_presets.java:2533
-#: build/trans_presets.java:2540 build/trans_presets.java:2546
-#: build/trans_presets.java:2553 build/trans_presets.java:2559
-#: build/trans_presets.java:2565 build/trans_presets.java:2571
-#: build/trans_presets.java:2577 build/trans_presets.java:2583
-#: build/trans_presets.java:2590 build/trans_presets.java:2597
-#: build/trans_presets.java:2604 build/trans_presets.java:2610
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2628 build/trans_presets.java:2634
-#: build/trans_presets.java:2641 build/trans_presets.java:2648
-#: build/trans_presets.java:2655 build/trans_presets.java:2661
-#: build/trans_presets.java:2667 build/trans_presets.java:2677
-#: build/trans_presets.java:2686 build/trans_presets.java:2701
-#: build/trans_presets.java:2707 build/trans_presets.java:2715
-#: build/trans_presets.java:2722 build/trans_presets.java:2742
-#: build/trans_presets.java:2752 build/trans_presets.java:2758
-#: build/trans_presets.java:2764 build/trans_presets.java:2770
-#: build/trans_presets.java:2776 build/trans_presets.java:2783
-#: build/trans_presets.java:2790 build/trans_presets.java:2797
-#: build/trans_presets.java:2803 build/trans_presets.java:2809
-#: build/trans_presets.java:2817 build/trans_presets.java:2824
-#: build/trans_presets.java:2831 build/trans_presets.java:2838
-#: build/trans_presets.java:2844 build/trans_presets.java:2851
-#: build/trans_presets.java:2858 build/trans_presets.java:2867
-#: build/trans_presets.java:2873 build/trans_presets.java:2879
-#: build/trans_presets.java:2885 build/trans_presets.java:2891
-#: build/trans_presets.java:2900 build/trans_presets.java:2910
-#: build/trans_presets.java:2919 build/trans_presets.java:2925
-#: build/trans_presets.java:2931 build/trans_presets.java:2936
-#: build/trans_presets.java:2942 build/trans_presets.java:2948
-#: build/trans_presets.java:2957 build/trans_presets.java:2963
-#: build/trans_presets.java:2969 build/trans_presets.java:2975
-#: build/trans_presets.java:2981 build/trans_presets.java:2987
-#: build/trans_presets.java:2993 build/trans_presets.java:3000
-#: build/trans_presets.java:3006 build/trans_presets.java:3011
-#: build/trans_presets.java:3018 build/trans_presets.java:3025
-#: build/trans_presets.java:3031 build/trans_presets.java:3040
-#: build/trans_presets.java:3048 build/trans_presets.java:3054
-#: build/trans_presets.java:3060 build/trans_presets.java:3067
-#: build/trans_presets.java:3073 build/trans_presets.java:3080
-#: build/trans_presets.java:3086 build/trans_presets.java:3092
-#: build/trans_presets.java:3098 build/trans_presets.java:3104
-#: build/trans_presets.java:3117 build/trans_presets.java:3131
-#: build/trans_presets.java:3145
+#: build/trans_presets.java:67 build/trans_presets.java:103
+#: build/trans_presets.java:143 build/trans_presets.java:180
+#: build/trans_presets.java:200 build/trans_presets.java:218
+#: build/trans_presets.java:235 build/trans_presets.java:253
+#: build/trans_presets.java:273 build/trans_presets.java:306
+#: build/trans_presets.java:352 build/trans_presets.java:372
+#: build/trans_presets.java:387 build/trans_presets.java:404
+#: build/trans_presets.java:424 build/trans_presets.java:444
+#: build/trans_presets.java:464 build/trans_presets.java:483
+#: build/trans_presets.java:503 build/trans_presets.java:523
+#: build/trans_presets.java:544 build/trans_presets.java:565
+#: build/trans_presets.java:586 build/trans_presets.java:607
+#: build/trans_presets.java:628 build/trans_presets.java:659
+#: build/trans_presets.java:680 build/trans_presets.java:693
+#: build/trans_presets.java:706 build/trans_presets.java:719
+#: build/trans_presets.java:732 build/trans_presets.java:745
+#: build/trans_presets.java:756 build/trans_presets.java:765
+#: build/trans_presets.java:812 build/trans_presets.java:833
+#: build/trans_presets.java:842 build/trans_presets.java:902
+#: build/trans_presets.java:1053 build/trans_presets.java:1061
+#: build/trans_presets.java:1069 build/trans_presets.java:1077
+#: build/trans_presets.java:1087 build/trans_presets.java:1095
+#: build/trans_presets.java:1100 build/trans_presets.java:1107
+#: build/trans_presets.java:1114 build/trans_presets.java:1119
+#: build/trans_presets.java:1127 build/trans_presets.java:1136
+#: build/trans_presets.java:1142 build/trans_presets.java:1148
+#: build/trans_presets.java:1153 build/trans_presets.java:1159
+#: build/trans_presets.java:1165 build/trans_presets.java:1174
+#: build/trans_presets.java:1183 build/trans_presets.java:1190
+#: build/trans_presets.java:1198 build/trans_presets.java:1211
+#: build/trans_presets.java:1217 build/trans_presets.java:1226
+#: build/trans_presets.java:1232 build/trans_presets.java:1238
+#: build/trans_presets.java:1246 build/trans_presets.java:1302
+#: build/trans_presets.java:1349 build/trans_presets.java:1355
+#: build/trans_presets.java:1361 build/trans_presets.java:1367
+#: build/trans_presets.java:1373 build/trans_presets.java:1384
+#: build/trans_presets.java:1393 build/trans_presets.java:1408
+#: build/trans_presets.java:1415 build/trans_presets.java:1421
+#: build/trans_presets.java:1429 build/trans_presets.java:1436
+#: build/trans_presets.java:1445 build/trans_presets.java:1453
+#: build/trans_presets.java:1460 build/trans_presets.java:1471
+#: build/trans_presets.java:1481 build/trans_presets.java:1491
+#: build/trans_presets.java:1511 build/trans_presets.java:1523
+#: build/trans_presets.java:1534 build/trans_presets.java:1551
+#: build/trans_presets.java:1558 build/trans_presets.java:1574
+#: build/trans_presets.java:1581 build/trans_presets.java:1586
+#: build/trans_presets.java:1592 build/trans_presets.java:1598
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1615 build/trans_presets.java:1623
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1646 build/trans_presets.java:1652
+#: build/trans_presets.java:1659 build/trans_presets.java:1666
+#: build/trans_presets.java:1674 build/trans_presets.java:1681
+#: build/trans_presets.java:1689 build/trans_presets.java:1696
+#: build/trans_presets.java:1702 build/trans_presets.java:1709
+#: build/trans_presets.java:1716 build/trans_presets.java:1723
+#: build/trans_presets.java:1740 build/trans_presets.java:1748
+#: build/trans_presets.java:1763 build/trans_presets.java:1773
+#: build/trans_presets.java:1785 build/trans_presets.java:1792
+#: build/trans_presets.java:1798 build/trans_presets.java:1808
+#: build/trans_presets.java:1813 build/trans_presets.java:1821
+#: build/trans_presets.java:1828 build/trans_presets.java:1834
+#: build/trans_presets.java:1840 build/trans_presets.java:1845
+#: build/trans_presets.java:1850 build/trans_presets.java:1855
+#: build/trans_presets.java:1862 build/trans_presets.java:1868
+#: build/trans_presets.java:1873 build/trans_presets.java:1882
+#: build/trans_presets.java:1891 build/trans_presets.java:1900
+#: build/trans_presets.java:1909 build/trans_presets.java:1918
+#: build/trans_presets.java:1924 build/trans_presets.java:1932
+#: build/trans_presets.java:1938 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:2023 build/trans_presets.java:2032
+#: build/trans_presets.java:2040 build/trans_presets.java:2046
+#: build/trans_presets.java:2052 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 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:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2150
+#: build/trans_presets.java:2156 build/trans_presets.java:2162
+#: build/trans_presets.java:2169 build/trans_presets.java:2176
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2197 build/trans_presets.java:2203
+#: build/trans_presets.java:2209 build/trans_presets.java:2215
+#: build/trans_presets.java:2221 build/trans_presets.java:2229
+#: build/trans_presets.java:2236 build/trans_presets.java:2243
+#: build/trans_presets.java:2250 build/trans_presets.java:2258
+#: build/trans_presets.java:2290 build/trans_presets.java:2295
+#: build/trans_presets.java:2300 build/trans_presets.java:2305
+#: build/trans_presets.java:2311 build/trans_presets.java:2317
+#: build/trans_presets.java:2323 build/trans_presets.java:2331
+#: build/trans_presets.java:2337 build/trans_presets.java:2343
+#: build/trans_presets.java:2349 build/trans_presets.java:2355
+#: build/trans_presets.java:2365 build/trans_presets.java:2462
+#: build/trans_presets.java:2469 build/trans_presets.java:2483
+#: build/trans_presets.java:2489 build/trans_presets.java:2496
+#: build/trans_presets.java:2503 build/trans_presets.java:2509
+#: build/trans_presets.java:2515 build/trans_presets.java:2537
+#: build/trans_presets.java:2544 build/trans_presets.java:2551
+#: build/trans_presets.java:2557 build/trans_presets.java:2564
+#: build/trans_presets.java:2570 build/trans_presets.java:2576
+#: build/trans_presets.java:2582 build/trans_presets.java:2588
+#: build/trans_presets.java:2594 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2615
+#: build/trans_presets.java:2621 build/trans_presets.java:2627
+#: build/trans_presets.java:2633 build/trans_presets.java:2639
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2666
+#: build/trans_presets.java:2672 build/trans_presets.java:2678
+#: build/trans_presets.java:2688 build/trans_presets.java:2697
+#: build/trans_presets.java:2712 build/trans_presets.java:2718
+#: build/trans_presets.java:2726 build/trans_presets.java:2733
+#: build/trans_presets.java:2753 build/trans_presets.java:2764
+#: build/trans_presets.java:2770 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2788
+#: build/trans_presets.java:2795 build/trans_presets.java:2802
+#: build/trans_presets.java:2809 build/trans_presets.java:2815
+#: build/trans_presets.java:2821 build/trans_presets.java:2829
+#: build/trans_presets.java:2836 build/trans_presets.java:2843
+#: build/trans_presets.java:2850 build/trans_presets.java:2856
+#: build/trans_presets.java:2863 build/trans_presets.java:2870
+#: build/trans_presets.java:2879 build/trans_presets.java:2885
+#: build/trans_presets.java:2891 build/trans_presets.java:2897
+#: build/trans_presets.java:2903 build/trans_presets.java:2912
+#: build/trans_presets.java:2922 build/trans_presets.java:2931
+#: build/trans_presets.java:2937 build/trans_presets.java:2943
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2969
+#: build/trans_presets.java:2975 build/trans_presets.java:2981
+#: build/trans_presets.java:2987 build/trans_presets.java:2993
+#: build/trans_presets.java:2999 build/trans_presets.java:3005
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3023 build/trans_presets.java:3030
+#: build/trans_presets.java:3037 build/trans_presets.java:3043
+#: build/trans_presets.java:3052 build/trans_presets.java:3060
+#: build/trans_presets.java:3066 build/trans_presets.java:3072
+#: build/trans_presets.java:3079 build/trans_presets.java:3085
+#: build/trans_presets.java:3092 build/trans_presets.java:3098
+#: build/trans_presets.java:3104 build/trans_presets.java:3110
+#: build/trans_presets.java:3116 build/trans_presets.java:3129
+#: build/trans_presets.java:3143 build/trans_presets.java:3157
 msgid "Name"
 msgstr "名稱"
@@ -6530,4 +6671,58 @@
 msgstr "版本"
 
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
+#, fuzzy
+msgid "Changeset id:"
+msgstr "變更組合"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
+#, fuzzy
+msgid "Created at:"
+msgstr "建立區域"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
+#, fuzzy
+msgid "Changeset comment:"
+msgstr "改變關係"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
+msgid "No open changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:48
+#, fuzzy
+msgid "<html>Please select the changesets you want to close</html>"
+msgstr "請選擇要接受的屬性變更。"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:74
+#, fuzzy
+msgid "Open changesets"
+msgstr "變更組合"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:101
+#, fuzzy
+msgid "Close changesets"
+msgstr "正在關閉資料組合..."
+
+#. putValue(SMALL_ICON, ImageProvider.get("cancel"));
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:103
+#, fuzzy
+msgid "Close the selected open changesets"
+msgstr "刪除選擇的物件"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:126
+#, fuzzy
+msgid "Cancel closeing of changesets"
+msgstr "正在關閉資料組合..."
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:37
+msgid "Closing changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:77
+#, fuzzy, java-format
+msgid "Closing changeset {0}"
+msgstr "正在關閉資料組合..."
+
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
 msgid "Launch a file chooser to select a file"
@@ -6555,5 +6750,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:50
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be uploaded"
+msgid "Layer ''{0}'' has no modifications to be uploaded."
 msgstr ""
 
@@ -6561,5 +6756,5 @@
 #, java-format
 msgid ""
-"Layer ''{0}'' has modifications which should be saved to its assoicated file "
+"Layer ''{0}'' has modifications which should be saved to its associated file "
 "''{1}''."
 msgstr ""
@@ -6567,5 +6762,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:63
 #, java-format
-msgid "Layer ''{0}'' has no modifications to be saved"
+msgid "Layer ''{0}'' has no modifications to be saved."
 msgstr ""
 
@@ -6599,17 +6794,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:113
 msgid "Unsaved changes - Save/Upload before exiting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:119
 msgid "Unsaved changes - Save/Upload before deleting?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:139
 msgid "Uploading and saving modified layers ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:194
 #, java-format
 msgid ""
@@ -6622,10 +6817,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:205
 msgid "Unsaved data and conflicts"
-msgstr "解決衝突"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:212
 #, java-format
 msgid ""
@@ -6639,9 +6833,9 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:224
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:223
 msgid "Unsaved data and missing associated file"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:230
 #, java-format
 msgid ""
@@ -6656,43 +6850,42 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:243
 msgid "Unsaved data non-writable files"
-msgstr "使用預設標籤忽略檔案。"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:285
 msgid "Close this dialog and resume editing in JOSM"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:318
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317
 msgid "Exit JOSM without saving. Unsaved changes are lost."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:322
+msgid "Discard and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
-msgid "Discard and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
 msgid "Delete layers without saving. Unsaved changes are lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:350
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
 msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:354
+msgid "Save and Delete"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:355
-msgid "Save and Delete"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
 msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:402
 #, java-format
 msgid "Preparing layer ''{0}'' for upload ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:482
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:481
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
@@ -6700,5 +6893,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:492
+#: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:491
 msgid "Incomplete upload and/or save"
 msgstr ""
@@ -6738,21 +6931,21 @@
 #. item "Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:21
-#: build/trans_presets.java:67 build/trans_presets.java:84
-#: build/trans_presets.java:103 build/trans_presets.java:122
-#: build/trans_presets.java:143 build/trans_presets.java:159
-#: build/trans_presets.java:180 build/trans_presets.java:200
-#: build/trans_presets.java:223 build/trans_presets.java:241
-#: build/trans_presets.java:259 build/trans_presets.java:278
-#: build/trans_presets.java:311 build/trans_presets.java:357
-#: build/trans_presets.java:372 build/trans_presets.java:387
-#: build/trans_presets.java:409 build/trans_presets.java:429
-#: build/trans_presets.java:450 build/trans_presets.java:470
-#: build/trans_presets.java:489 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:549
-#: build/trans_presets.java:570 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:633
-#: build/trans_presets.java:664 build/trans_presets.java:1060
-#: build/trans_presets.java:1068 build/trans_presets.java:1076
-#: build/trans_presets.java:1086 build/trans_presets.java:1305
+#: build/trans_presets.java:68 build/trans_presets.java:85
+#: build/trans_presets.java:104 build/trans_presets.java:123
+#: build/trans_presets.java:144 build/trans_presets.java:160
+#: build/trans_presets.java:181 build/trans_presets.java:201
+#: build/trans_presets.java:224 build/trans_presets.java:242
+#: build/trans_presets.java:260 build/trans_presets.java:279
+#: build/trans_presets.java:312 build/trans_presets.java:358
+#: build/trans_presets.java:373 build/trans_presets.java:388
+#: build/trans_presets.java:410 build/trans_presets.java:430
+#: build/trans_presets.java:451 build/trans_presets.java:471
+#: build/trans_presets.java:490 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:550
+#: build/trans_presets.java:571 build/trans_presets.java:592
+#: build/trans_presets.java:613 build/trans_presets.java:634
+#: build/trans_presets.java:665 build/trans_presets.java:1062
+#: build/trans_presets.java:1070 build/trans_presets.java:1078
+#: build/trans_presets.java:1088 build/trans_presets.java:1308
 msgid "Layer"
 msgstr "層級"
@@ -6771,67 +6964,32 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:54
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:200
 msgid "Upload"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
-msgid "Use a new changeset and close it"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:125
-msgid ""
-"Select to upload the data using a new changeset and to close the changeset "
-"after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
-msgid "Use a new changeset and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
-msgid ""
-"Select to upload the data using a new changeset and to leave the changeset "
-"open after the upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:131
-msgid "Upload to a new or to an existing changeset?"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:153
-msgid "upload all changes in one request"
+msgid "Settings"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:154
-msgid ""
-"Enable to upload all changes in one request, disable to use one request per "
-"changed primitive"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:171
-msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "提供關於您所上傳變更的簡短註解："
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:216
-msgid "Settings"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:217
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:466
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:853
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:877
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:908
 msgid "Tags of new changeset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:221
 msgid "Objects to add:"
 msgstr "要加入的物件："
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:274
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:227
 msgid "Objects to modify:"
 msgstr "要編輯的物件："
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:280
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:233
 msgid "Objects to delete:"
 msgstr "要刪除的物件："
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:315
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:268
 #, java-format
 msgid "{0} object to add:"
@@ -6840,5 +6998,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:324
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:277
 #, java-format
 msgid "{0} object to modifiy:"
@@ -6847,5 +7005,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:333
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:286
 #, java-format
 msgid "{0} object to delete:"
@@ -6854,54 +7012,88 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:422
-#, java-format
-msgid "Use the existing changeset {0} and close it after upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:423
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to close the changeset "
-"after this upload"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:426
-#, java-format
-msgid "Use the existing changeset {0} and leave it open"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:427
-#, java-format
-msgid ""
-"Select to upload to the existing changeset {0} and to leave the changeset "
-"open for further uploads"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:481
-#, java-format
-msgid "Tags of changeset {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:584
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:470
 msgid "Upload Changes"
 msgstr "上傳變更"
 
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:586
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:472
+msgid "Upload the changed primitives"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:478
+msgid "Please enter a comment for this upload changeset (min. 3 characters)"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:479
+msgid "Illegal upload comment"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:505
+msgid "Cancel the upload and resume editing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:606
 #, fuzzy
-msgid "Upload the changed primitives"
-msgstr "是否上傳這些變更？"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:592
+msgid "Upload all changes in one request"
+msgstr "將所有的變更上傳至 OSM 伺服器。"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:607
+msgid ""
+"Enable to upload all changes in one request, disable to use one request per "
+"changed primitive"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:617
+msgid "Provide a brief comment for the changes you are uploading:"
+msgstr "提供關於您所上傳變更的簡短註解："
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:672
 #, fuzzy
-msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr "請輸入此位置的名稱。"
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:593
-msgid "Illegal upload comment"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:615
-msgid "Cancel the upload and resume editing"
-msgstr ""
+msgid "Open a new changeset"
+msgstr "變更組合"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:673
+msgid "Open a new changeset and use it in the next upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:680
+#, fuzzy
+msgid "Use an open changeset"
+msgstr "未儲存的變更"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:681
+msgid "Upload data to an already opened changeset"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:721
+#, fuzzy
+msgid "Close changeset after upload"
+msgstr "沒有要上傳的變更。"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:722
+msgid "Select to close the changeset after the next upload"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:895
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:922
+#, java-format
+msgid "Tags of changeset {0}"
+msgstr ""
+
+#. putValue(NAME, tr("Reload"));
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:938
+#, fuzzy
+msgid "Load the list of your open changesets from the server"
+msgstr "將目前的偏好設定上傳到伺服器"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:951
+#, fuzzy
+msgid "Close the currently selected open changeset"
+msgstr "將目前選取的成員上移"
+
+#: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:999
+#, fuzzy, java-format
+msgid "changeset id > 0 expected. Got {1}"
+msgstr "參數「{0}」應為 > 0，得到「{1}」"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:63
@@ -6978,5 +7170,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:687
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:289
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:296
 #: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:37
 msgid "JPEG images (*.jpg)"
@@ -7014,5 +7206,5 @@
 msgstr "輸入的時刻無法解析。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:124
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
@@ -7020,30 +7212,30 @@
 msgstr "gps 點"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:196
 msgid "Customize line drawing"
 msgstr "自訂線條的繪製"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:200
 msgid "Use global settings."
 msgstr "使用全域設定值。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:201
 msgid "Draw lines between points for this layer."
 msgstr "在這個圖層的各點之間繪出線條。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:123
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:128
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202
 msgid "Do not draw lines between points for this layer."
 msgstr "在這個圖層的各點之間不要繪出線條。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:142
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:218
 msgid "Select line drawing options"
 msgstr "選擇線條繪製選項"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:154
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:233
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
@@ -7051,5 +7243,5 @@
 msgstr "自訂顏色"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:159
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:237
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:200
@@ -7058,5 +7250,5 @@
 msgstr "預設值"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:241
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
@@ -7065,37 +7257,73 @@
 msgstr "選擇一種顏色"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:183
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:188
 msgid "Markers From Named Points"
 msgstr "已命名點的標記"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:198
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:203
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "{0} 的已命名軌跡點"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:206
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:211
 msgid "Import Audio"
 msgstr "匯入音效"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:222
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave 音效檔案 (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:263
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "{0} 的音效標記"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:273
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:280
 msgid "Import images"
 msgstr "匯入圖片"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:332
-#, java-format
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:340
+#, java-format
+msgid "Name: {0}"
+msgstr "名稱：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
+#, java-format
+msgid "Description: {0}"
+msgstr "描述：{0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:349
+#, fuzzy, java-format
+msgid "{0} track"
+msgid_plural "{0} tracks"
 msgstr[0] "{0} 軌跡， "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:333
+#. item "Relations/Route" text "Symbol description"
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
+#: build/trans_presets.java:3160
+msgid "Description"
+msgstr "描述"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:351
+msgid "Timespan"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#, fuzzy
+msgid "Length"
+msgstr "長度： "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:352
+#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
+msgid "URL"
+msgstr "URL"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:400
+msgid "Length: "
+msgstr "長度： "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:403
 #, java-format
 msgid "{0} route, "
@@ -7103,5 +7331,5 @@
 msgstr[0] "{0} 路線， "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:404
 #, java-format
 msgid "{0} waypoint"
@@ -7109,29 +7337,10 @@
 msgstr[0] "{0} 航點"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:337
-#, java-format
-msgid "Name: {0}"
-msgstr "名稱：{0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:341
-#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:69
-#, java-format
-msgid "Description: {0}"
-msgstr "描述：{0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:366
-msgid "Timespan: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
-msgid "Length: "
-msgstr "長度： "
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:706
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:750
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:59
 msgid "Convert to data layer"
 msgstr "轉換為資料圖層"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:758
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -7141,10 +7350,10 @@
 "軌跡，請看這裡："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:760
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:64
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:739
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:783
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:504
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:86
@@ -7155,29 +7364,29 @@
 msgstr "轉換自：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:761
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:787
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:805
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:831
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:929
 msgid "Download from OSM along this track"
 msgstr "從 OSM 沿這條軌跡下載"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:769
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:813
 msgid "Download everything within:"
 msgstr "下載這裡面的每個物件："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:772
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:816
 #, java-format
 msgid "{0} meters"
 msgstr "{0} 公尺"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:776
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:820
 msgid "Maximum area per request:"
 msgstr "每個要求最大區域："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:779
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:823
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} 平方公里"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:878
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:922
 #, java-format
 msgid ""
@@ -7187,13 +7396,13 @@
 "<html>這個動作會發出 {0} 個<br>個別的下載要求。您是否希望<br>繼續？</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:897
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:941
 msgid "Download data"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:974
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1019
 msgid "No GPX track available in layer to associate audio with."
 msgstr "在圖層中沒有可用的 GPX 軌跡可供音效關聯。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1143
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1188
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -7201,5 +7410,5 @@
 msgstr "部分航點的時刻戳記早於軌跡起點或晚於終點會被忽略或是移至起點。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1149
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1195
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -7250,30 +7459,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:63
-#, fuzzy
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
 "<br>If you want to upload traces, look here:</html>"
 msgstr ""
-"<html>上傳未經處理的 GPS 資料做為地圖資料被認為是有壞處的。<br>如果您想要上傳"
-"軌跡，請看這裡："
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:158
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "track"
 msgid_plural "tracks"
@@ -7397,4 +7603,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:53
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:52
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:48
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:46
@@ -7621,13 +7828,18 @@
 msgstr "繪出大型 GPS 點。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:44
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
+msgid "Draw a circle form HDOP value."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
 msgid "Velocity (red = slow, green = fast)"
 msgstr "速率（紅 = 慢，綠 = 快）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
 msgid "Dilution of Position (red = high, green = low, if available)"
 msgstr "位置的準確誤差（紅 = 高，綠 = 低，如果可用的話）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:47
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
 msgid "Single Color (can be customized for named layers)"
 msgstr "單一顏色（可以為已命名的圖層自訂）"
@@ -7635,6 +7847,6 @@
 #. item "Aerialway/Station" text "Name"
 #. <separator/>
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:1374
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:1377
 msgid "Car"
 msgstr "汽車"
@@ -7655,14 +7867,14 @@
 #. item "Car/Sharing" text "Operator"
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:324 build/trans_presets.java:650
-#: build/trans_presets.java:857 build/trans_presets.java:876
-#: build/trans_presets.java:890 build/trans_presets.java:912
-#: build/trans_presets.java:949 build/trans_presets.java:962
-#: build/trans_presets.java:974 build/trans_presets.java:986
-#: build/trans_presets.java:998 build/trans_presets.java:1010
-#: build/trans_presets.java:1020 build/trans_presets.java:1029
-#: build/trans_presets.java:1038 build/trans_presets.java:1437
-#: build/trans_presets.java:1510
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:325 build/trans_presets.java:651
+#: build/trans_presets.java:858 build/trans_presets.java:877
+#: build/trans_presets.java:891 build/trans_presets.java:913
+#: build/trans_presets.java:950 build/trans_presets.java:963
+#: build/trans_presets.java:975 build/trans_presets.java:987
+#: build/trans_presets.java:999 build/trans_presets.java:1011
+#: build/trans_presets.java:1021 build/trans_presets.java:1030
+#: build/trans_presets.java:1039 build/trans_presets.java:1440
+#: build/trans_presets.java:1513
 msgid "Bicycle"
 msgstr "單車"
@@ -7695,62 +7907,62 @@
 #. item "Barriers/Sally Port" label "Allowed traffic:"
 #. <space />
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:48
-#: build/trans_presets.java:325 build/trans_presets.java:649
-#: build/trans_presets.java:856 build/trans_presets.java:875
-#: build/trans_presets.java:889 build/trans_presets.java:911
-#: build/trans_presets.java:948 build/trans_presets.java:961
-#: build/trans_presets.java:973 build/trans_presets.java:985
-#: build/trans_presets.java:997 build/trans_presets.java:1009
-#: build/trans_presets.java:1019 build/trans_presets.java:1028
-#: build/trans_presets.java:1037
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
+#: build/trans_presets.java:326 build/trans_presets.java:650
+#: build/trans_presets.java:857 build/trans_presets.java:876
+#: build/trans_presets.java:890 build/trans_presets.java:912
+#: build/trans_presets.java:949 build/trans_presets.java:962
+#: build/trans_presets.java:974 build/trans_presets.java:986
+#: build/trans_presets.java:998 build/trans_presets.java:1010
+#: build/trans_presets.java:1020 build/trans_presets.java:1029
+#: build/trans_presets.java:1038
 msgid "Foot"
 msgstr "步行"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:50
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
 msgid "Draw Direction Arrows"
 msgstr "繪出方向箭頭"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:51
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:52
 msgid "Fast drawing (looks uglier)"
 msgstr "快速繪製（看起來較醜）"
 
 #. only interesting directions
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:53
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:219
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
 msgid "Only interesting direction hints (e.g. with oneway tag)."
 msgstr "只有重要的方向提示（例如單行道標籤）。"
 
 #. only on the head of a way
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:54
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:225
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
 msgid "Only on the head of a way."
 msgstr "只在路徑的開頭。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:55
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
 msgid "Draw segment order numbers"
 msgstr "繪製區段順序編號"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:56
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
 msgid "Draw boundaries of downloaded data"
 msgstr "繪出已下載資料的邊界"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:57
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
 msgid "Draw virtual nodes in select mode"
 msgstr "在選擇模式繪出虛擬節點"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
 msgid "Draw inactive layers in other color"
 msgstr "將未使用的圖層以其他顏色繪製"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:59
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:60
 msgid "Smooth map graphics (antialiasing)"
 msgstr "平滑化地圖圖片（反鉅齒）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:81
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:82
 msgid "Draw lines between raw GPS points"
 msgstr "在原始 GPS 點之間繪出線條"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:103
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to '-1' to "
@@ -7758,34 +7970,34 @@
 msgstr "繪出本地端檔案線條的最大長度（公尺）。設為「-1」則繪出所有的線條。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
 msgid "Maximum length for local files (meters)"
 msgstr "本地端檔案最大長度（公尺）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:110
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:111
 msgid ""
 "Maximum length (in meters) to draw lines. Set to '-1' to draw all lines."
 msgstr "繪出線條的最大長度（公尺）。設為「-1」則繪出所有的線條。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:113
 msgid "Maximum length (meters)"
 msgstr "最大長度（公尺）"
 
 #. forceRawGpsLines
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:116
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:117
 msgid ""
 "Force drawing of lines if the imported data contain no line information."
 msgstr "如果匯入的資料不含線條資訊，仍強制繪出線條。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:129
 msgid "Draw direction arrows for lines, connecting GPS points."
 msgstr "繪出線條的方向箭頭，連接 GPS 點。"
 
 #. drawGpsArrowsFast
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:134
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:135
 msgid "Draw the direction arrows using table lookups instead of complex math."
 msgstr "使用表格查詢的方式繪製方向箭頭而非複雜的數學運算。"
 
 #. drawGpsArrowsMinDist
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:140
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:141
 msgid ""
 "Don't draw arrows if they are not at least this distance away from the last "
@@ -7793,13 +8005,13 @@
 msgstr "如果沒有距離最後一個至少這個距離就不要繪出箭頭。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:143
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:144
 msgid "Minimum distance (pixels)"
 msgstr "最小距離（像素）"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:148
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:154
 msgid "Draw larger dots for the GPS points."
 msgstr "將 GPS 點以較大的點繪製。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:175
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:181
 msgid ""
 "All points and track segments will have the same color. Can be customized in "
@@ -7807,9 +8019,9 @@
 msgstr "所有的點和軌跡區段都使用同樣的顏色。可以在圖層管理程式自訂。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:176
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
 msgid "Colors points and track segments by velocity."
 msgstr "依速度來為點和軌跡區段上色。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:177
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
 msgid ""
 "Colors points and track segments by dilution of position (HDOP). Your "
@@ -7818,46 +8030,46 @@
 "依位置準確誤差 (HDOP) 來為點和軌跡區段上色。您的記錄裝置必須能記錄該項資訊。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:188
 msgid "Allows to tune the track coloring for different average speeds."
 msgstr "允許依不同的平均速度調整軌跡顏色。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:187
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:193
 msgid "Track and Point Coloring"
 msgstr "軌跡與點的顏色"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:196
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:202
 msgid "GPS Points"
 msgstr "GPS 點"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:214
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:220
 msgid "Draw direction hints for way segments."
 msgstr "繪出路徑區段的方向提示。"
 
 #. segment order number
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:231
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:237
 msgid "Draw the order numbers of all segments within their way."
 msgstr "繪出所有區段在其路徑中的順序編號。"
 
 #. antialiasing
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:236
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:242
 msgid "Apply antialiasing to the map view resulting in a smoother appearance."
 msgstr "在地圖檢視套用平滑化以產生較平滑的外觀。"
 
 #. downloaded area
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:241
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:247
 msgid "Draw the boundaries of data loaded from the server."
 msgstr "繪出從伺服器下載資料的邊界。"
 
 #. virtual nodes
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:246
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:252
 msgid "Draw virtual nodes in select mode for easy way modification."
 msgstr "為了容易修改路徑在選擇模式中繪出虛擬節點。"
 
 #. background layers in inactive color
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:251
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:257
 msgid "Draw the inactive data layers in a different color."
 msgstr "將未使用的資料圖層以不同的顏色繪製。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:258
+#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:264
 msgid "OSM Data"
 msgstr "OSM 資料"
@@ -7936,45 +8148,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:45
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:49
 msgid "Configure available plugins."
 msgstr "設定可用的外掛程式。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:50
+#. buttons at the bottom
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:82
 msgid "Download List"
 msgstr "下載清單"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:58
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:90
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSources.java:257
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:100
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:110
 msgid "Update"
 msgstr "更新"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:66
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:98
 msgid "Configure Sites..."
 msgstr "設定網站..."
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:79
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:91
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:125
 msgid "Add JOSM Plugin description URL."
 msgstr "加入 JOSM 外掛程式描述 URL。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:92
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:126
 msgid "Enter URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:105
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:128
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:139
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:162
 msgid "Please select an entry."
 msgstr "請選擇一個項目。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:113
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:147
 msgid "Edit JOSM Plugin description URL."
 msgstr "編輯 JOSM 外掛程式描述 URL。"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:148
 msgid "JOSM Plugin description URL"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:141
+#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:175
 msgid "Configure Plugin Sites"
 msgstr "設定外掛程式網站"
@@ -8311,6 +8524,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:369
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:342
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:407
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:341
 #, java-format
 msgid "Remove old keys from up to {0} object"
@@ -8318,9 +8531,9 @@
 msgstr[0] "移除 {0} 個物件之多的舊設定鍵"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:136
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:135
 msgid "Add a new tag"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:161
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java:160
 msgid "Delete the selection in the tag table"
 msgstr ""
@@ -8355,7 +8568,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:616
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:66
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:68
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:75
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTester.java:50
 #, java-format
@@ -8398,4 +8611,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:24
+#, fuzzy, java-format
+msgid "Preset group ''{0}'' of group ''{1}''"
+msgstr "使用群組「{1}」的預設組合「{0}」"
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:25
 #, java-format
 msgid "Preset group ''{0}''"
@@ -8416,4 +8634,10 @@
 msgstr "正在下載點 {0} 到 {1}..."
 
+#: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:25
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:80
+#, fuzzy, java-format
+msgid "parameter ''{0}'' > 0 expected. Got {1}"
+msgstr "參數「{0}」應為 > 0，得到「{1}」"
+
 #. SAXException does not chain correctly
 #: ../core/src/org/openstreetmap/josm/io/DiffResultReader.java:58
@@ -8520,5 +8744,5 @@
 msgstr "分析檔案「{0}」失敗"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:310
 msgid "Parse error: invalid document structure for gpx document"
 msgstr "分析錯誤：gpx 文件有無效的文件結構"
@@ -8638,10 +8862,11 @@
 msgstr "使用 {1} 版協定建立與 {0} 的連線"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:237
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:253
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:323
 #, java-format
 msgid "unexpected format of id replied by the server, got ''{0}''"
 msgstr "伺服器回覆未預期的 id 格式，取得「{0}」"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:261
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:279
 #, java-format
 msgid ""
@@ -8649,75 +8874,79 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:290
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:315
 msgid "Creating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:293
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
 #, java-format
 msgid "Successfully opened changeset {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:309
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:350
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:385
+#, fuzzy, java-format
+msgid "id of changeset > 0 required. Got {0}"
+msgstr "參數 {0} 必須 > 0 。得到 {1}。"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:352
 msgid "Updating changeset..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
-#, java-format
-msgid "Changeset {0} is unchanged. Skipping update."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:317
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:354
 #, java-format
 msgid "Updating changeset {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
-msgid ""
-"Failed to update changeset. Either there is no current changeset or the id "
-"of the current changeset is 0"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:344
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
 msgid "Closing changeset..."
 msgstr "正在關閉資料組合..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:347
-#, java-format
-msgid "Closing changeset {0}..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:353
-#, java-format
-msgid "Leaving changeset {0} open..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:372
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:407
 msgid "No changeset present for diff upload"
 msgstr "沒有需要進行差異上傳的資料組合"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:379
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:414
 msgid "Preparing..."
 msgstr "正在準備..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:384
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:419
 msgid "Uploading..."
 msgstr "正在上傳..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:406
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:438
 msgid "Waiting 10 seconds ... "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:409
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:441
 #, java-format
 msgid "Starting retry {0} of {1} in {2} seconds ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:417
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:449
 msgid "OK - trying again."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:485
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:517
 #, java-format
 msgid "Starting retry {0} of {1}."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:596
+msgid "current changeset is null. Can't upload data."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:598
+#, java-format
+msgid "id of current changeset > required. Current id is {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:624
+#, java-format
+msgid "Changeset id > 0 expected. Got {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:626
+#, java-format
+msgid "Open changeset expected. Got closed changeset with id {0}"
 msgstr ""
 
@@ -8743,50 +8972,109 @@
 msgstr "無效的 bz2 檔案。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:160
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:72
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:109
+#, fuzzy, java-format
+msgid "missing mandatory attribute ''{0}''"
+msgstr "缺少必要的屬性「{0}」"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:128
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:134
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:144
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:150
+#, java-format
+msgid "illegal value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:81
+#, java-format
+msgid "illegal nummeric value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:115
+#, java-format
+msgid "illegal boolean value for attribute ''{0}''. Got ''{1}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:159
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:174
+#, java-format
+msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:163
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#, java-format
+msgid "Missing mandatory attribute ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:166
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:181
+#, java-format
+msgid "Unsupported version: {0}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:176
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Aborting."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:197
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#, java-format
+msgid "Illegal value for attribute ''uid''. Got ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmChangesetParser.java:215
+#, fuzzy
+msgid "Parsing list of changesets..."
+msgstr "正在關閉資料組合..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:161
 msgid "Incorrect password or username."
 msgstr "不正確的密碼或使用者名稱。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:168
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:169
 msgid "Warning: The password is transferred unencrypted."
 msgstr "警告：密碼是以未加密的方式傳輸。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:172
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:173
 msgid "Save user and password (unencrypted)"
 msgstr "儲存使用者與密碼(未加密)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
 msgid "Enter Password"
 msgstr "輸入密碼"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:179
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:180
 msgid "Login"
 msgstr "登入"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:242
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
 msgid "The base URL for the OSM server (REST API)"
 msgstr "OSM 伺服器 (REST API) 的基礎 URL"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:243
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
 msgid "Login name (e-mail) to the OSM account."
 msgstr "OSM 帳號的登入名稱 (e-mail)。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:244
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
 msgid ""
 "Login password to the OSM account. Leave blank to not store any password."
 msgstr "OSM 帳號的登入密碼。留空則不會儲存任何密碼。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:245
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:246
 msgid "Base Server URL"
 msgstr "基礎伺服器 URL"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:247
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:248
 msgid "OSM username (e-mail)"
 msgstr "OSM 使用者名稱 (e-mail)"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:249
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:250
 msgid "OSM password"
 msgstr "OSM 密碼"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:251
+#: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:252
 msgid ""
 "<html>WARNING: The password is stored in plain text in the preferences file."
@@ -8797,5 +9085,5 @@
 "以純文字的方式傳送到伺服器。<br><b>請勿使用重要的密碼。</b></html>"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:51
+#: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
 #, java-format
 msgid "(at line {0}, column {1})"
@@ -8885,20 +9173,5 @@
 msgstr "分析時發生錯誤。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:124
-#, fuzzy, java-format
-msgid "Missing mandatory attribute ''{0}'' of XML element {1}"
-msgstr "缺少必要的屬性「{0}」"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:128
-#, fuzzy, java-format
-msgid "Missing mandatory attribute ''{0}''"
-msgstr "缺少必要的屬性「{0}」"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:131
-#, fuzzy, java-format
-msgid "Unsupported version: {0}"
-msgstr "不明的版本：{0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:155
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:205
 #, java-format
 msgid ""
@@ -8907,69 +9180,64 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:178
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
 msgid "found XML element <nd> element not as direct child of element <way>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:183
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:233
+#, java-format
 msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}"
-msgstr "缺少必要的屬性「{0}」"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:189
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:239
+#, java-format
 msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}"
-msgstr "在關係 {0} 的成員中屬性「ref」為不合法的數值，得到 {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:206
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:256
 msgid "Found XML element <member> not as direct child of element <relation>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:212
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:262
+#, java-format
 msgid "Missing attribute ''ref'' on member in relation {0}"
-msgstr "在關係 {0} 的成員中缺少屬性「ref」"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:217
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:267
+#, java-format
 msgid "Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
-msgstr "在關係 {0} 的成員中屬性「ref」為不合法的數值，得到 {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:221
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#, java-format
 msgid "Missing attribute ''type'' on member {0} in relation {1}"
-msgstr "在關係 {1} 的成員 {0} 中缺少屬性「type」"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
+#, java-format
 msgid ""
 "Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}."
-msgstr "在關係 {0} 的成員中屬性「ref」為不合法的數值，得到 {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
 msgid "Incomplete <member> specification with ref=0"
 msgstr "不完整的 <member>> 規格，ref=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
-#, java-format
-msgid "Warning: Undefined element ''{0}'' found in input stream. Skipping."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:261
-#, fuzzy, java-format
-msgid "Illegal value for attribute ''uid''. Got ''{0}''"
-msgstr "在關係 {0} 的成員中屬性「ref」為不合法的數值，得到 {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:271
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:293
+#, java-format
+msgid "Undefined element ''{0}'' found in input stream. Skipping."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
 msgid "Illegal object with id=0"
 msgstr "不合法的物件，id=0"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:297
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:301
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:347
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:351
+#, java-format
 msgid ""
 "Illegal value for attribute ''version'' on OSM primitive with id {0}. Got {1}"
-msgstr "在關係 {0} 的成員中屬性「ref」為不合法的數值，得到 {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:303
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:353
 #, java-format
 msgid ""
@@ -8978,5 +9246,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
 #, java-format
 msgid ""
@@ -8985,5 +9253,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:311
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:361
 #, java-format
 msgid ""
@@ -8993,25 +9261,25 @@
 
 #. should not happen. API version has been checked before
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:316
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:366
+#, java-format
 msgid "Unknown or unsupported API version. Got {0}"
-msgstr "不明的版本：{0}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:322
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:372
+#, java-format
 msgid "Missing attribute ''version'' on OSM primitive with id {0}"
-msgstr "在關係 {0} 的成員中缺少屬性「ref」"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:339
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:389
 #, java-format
 msgid "Missing required attribute ''{0}''."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:344
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:394
+#, java-format
 msgid "Illegal long value for attribute ''{0}''. Got ''{1}''"
-msgstr "在關係 {0} 的成員中屬性「ref」為不合法的數值，得到 {1}"
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:368
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:418
 #, java-format
 msgid ""
@@ -9019,5 +9287,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:381
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:431
 #, java-format
 msgid ""
@@ -9026,5 +9294,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:429
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:479
 #, java-format
 msgid ""
@@ -9032,5 +9300,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:440
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:490
 #, java-format
 msgid ""
@@ -9039,17 +9307,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:481
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:531
 msgid "Prepare OSM data..."
 msgstr "準備 OSM 資料..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:482
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:532
 msgid "Parsing OSM data..."
-msgstr "準備 OSM 資料..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:487
-#, fuzzy
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:537
 msgid "Preparing data set..."
-msgstr "正在準備資料..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java:54
@@ -9070,4 +9336,24 @@
 msgid "Downloading referring relations ..."
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:51
+#, fuzzy
+msgid "Reading changesets..."
+msgstr "正在關閉資料組合..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:57
+#, fuzzy
+msgid "Downloading changesets ..."
+msgstr "正在關閉資料組合..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:85
+#, fuzzy, java-format
+msgid "Reading changeset {0} ..."
+msgstr "正在讀取 {0}..."
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:91
+#, fuzzy, java-format
+msgid "Downloading changeset {0} ..."
+msgstr "正在下載外掛程式 {0}..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:35
@@ -9084,43 +9370,66 @@
 msgstr "正在連接伺服器..."
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:61
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:63
 #, java-format
 msgid "Failed to open connection to API {0}"
 msgstr "開啟 API {0} 連線失敗"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:78
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
+msgid "Error: failed to add authentication credentials to the connection."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:88
 msgid ""
 "Couldn't connect to the osm server. Please check your internet connection."
 msgstr "無法連線到 osm 伺服器。請檢查您的網際網路連線。"
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:75
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:48
+msgid "XML tag <user> is missing"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:53
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:77
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:87
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:97
+#, fuzzy, java-format
+msgid "Missing attribute ''{0}'' on XML tag ''{1}''"
+msgstr "使用群組「{1}」的預設組合「{0}」"
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:57
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:82
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:92
+#: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:102
+#, java-format
+msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:72
 msgid "Starting to upload with one request per primitive ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:88
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:80
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:89
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:81
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:90
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:82
 #, java-format
 msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:138
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:116
 msgid "Starting to upload in one request ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:171
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:135
 msgid "Uploading data ..."
-msgstr "正在上傳..."
-
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:178
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:142
 msgid ""
 "WARNING: no API version defined for data to upload. Falling back to version "
@@ -9128,5 +9437,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:183
+#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:147
 #, java-format
 msgid ""
@@ -9136,10 +9445,10 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:101
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:111
 msgid "Update Plugins"
 msgstr "更新外掛程式"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloader.java:42
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:139
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:150
 msgid "Download Plugins"
 msgstr "下載外掛程式"
@@ -9291,5 +9600,5 @@
 msgstr "更多詳細資料"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:52
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
 #, java-format
 msgid "Downloaded plugin information from {0} site"
@@ -9297,18 +9606,18 @@
 msgstr[0] "從 {0} 網站下載的外掛程式資訊"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:60
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:68
 msgid "No plugin information found."
 msgstr "找不到外掛程式資訊。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:81
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:91
 #, java-format
 msgid "Plug-in named {0} is not available. Update skipped."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:93
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
 msgid "All installed plugins are up to date."
 msgstr "所有已安裝的外掛程式都是最新版。"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:103
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:113
 #, java-format
 msgid ""
@@ -9321,9 +9630,9 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:138
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:149
 msgid "Download missing plugins"
 msgstr "下載缺少的外掛程式"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:141
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:152
 #, java-format
 msgid ""
@@ -9338,43 +9647,43 @@
 #. item "Ways/Cycleway" combo "Pedestrians"
 #. item "Ways/Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:198
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:210
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:208
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:220
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:45
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:92
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:185
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
 msgid "unknown"
 msgstr "不明"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:216
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:237
 #, java-format
 msgid "{0}: Version {1}{2}"
 msgstr "{0}：版本 {1}{2}"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:224
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:245
 msgid "Plugin bundled with JOSM"
 msgstr "JOSM 隨附外掛程式"
 
-#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:357
+#: ../core/src/org/openstreetmap/josm/plugins/PluginSelection.java:403
 #, java-format
 msgid "Error reading plugin information file: {0}"
@@ -9493,5 +9802,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:165
-#, fuzzy
 msgid ""
 "The area you tried to download is too big or your request was too large."
@@ -9499,6 +9807,4 @@
 "community."
 msgstr ""
-"最大的 bbox 大小為 0.25，而您的要求太大了。請使用更小的區域，或改用 planet."
-"osm"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:168
@@ -9690,10 +9996,4 @@
 msgid "(What does that mean?)"
 msgstr ""
-
-#. item "Relations/Route" text "Symbol description"
-#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3148
-msgid "Description"
-msgstr "描述"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
@@ -10460,6 +10760,7 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java:266
-msgid "Set "
-msgstr ""
+#, fuzzy, java-format
+msgid "Set {0} Lambert coordinates"
+msgstr "保留他們的坐標"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLambertZone.java:25
@@ -11086,6 +11387,6 @@
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 #: build/trans_style.java:990 build/trans_style.java:1007
-#: build/trans_style.java:1023 build/trans_style.java:3392
-#: build/trans_style.java:3400
+#: build/trans_style.java:1023 build/trans_style.java:3400
+#: build/trans_style.java:3408
 msgid "water"
 msgstr "水域"
@@ -11374,4 +11675,55 @@
 msgstr "測量"
 
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Michigan Left"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:32
+msgid "Adds no left turn for sets of 4 or 5 ways."
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:45
+#, fuzzy
+msgid "Please select 4 or 5 ways to assign no left turns."
+msgstr "請選擇一或多個至少有四個節點的封閉路徑。"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:61
+#, fuzzy, java-format
+msgid "{0} extrem nodes."
+msgstr "{0} 節點"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:69
+#, java-format
+msgid "Via node {0}, {1}"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:75
+#, fuzzy, java-format
+msgid "{0} via nodes."
+msgstr "{0} 節點"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:78
+msgid "Unable to find via nodes. Please check your selection"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:98
+#, fuzzy, java-format
+msgid "MIddle way: {0}"
+msgstr "模式：{0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:121
+msgid "Create Michigan left turn restriction"
+msgstr ""
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:129
+#, fuzzy, java-format
+msgid "Processing {0}"
+msgstr "版本 {0}"
+
+#: ../plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java:142
+#, fuzzy, java-format
+msgid "Relation: from {0} to {1} via {2}"
+msgstr "版本 {0} 由 {2} 建立於 {1}"
+
 #: ../plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersPlugin.java:44
 msgid "OpenLayers"
@@ -11523,7 +11875,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:27
-#, fuzzy
 msgid "create new objects"
-msgstr "建立新的節點。"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:28
@@ -11586,7 +11937,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:226
-#, fuzzy
 msgid "Remote Control has been asked to create a new node."
-msgstr "遠端控制被要求自 API 下載資料。"
+msgstr ""
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RequestProcessor.java:238
@@ -11846,5 +12196,5 @@
 msgstr "啟動標籤編輯器對話盒"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:159
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:158
 msgid "JOSM Tag Editor Plugin"
 msgstr "JOSM 標籤編輯器外掛程式"
@@ -11854,5 +12204,5 @@
 msgstr "突顯"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:371
+#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagEditorModel.java:370
 #, java-format
 msgid "Updating properties of up to {0} object"
@@ -11860,18 +12210,4 @@
 msgstr[0] "更新 {0} 個物件之多的屬性"
 
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:44
-msgid "INFO: entering compatibilty mode for JOSM with Main.ds"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:47
-msgid "INFO: entering compatibilty mode for JOSM with Main.getCurrentDataSet()"
-msgstr ""
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/josm/CompatibilityUtil.java:49
-msgid ""
-"Unexpected version of JOSM. Neither Main.ds nor Main.getCurrentDataSet() "
-"found."
-msgstr ""
-
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/PresetsTableColumnModel.java:17
 msgid "Group"
@@ -11881,9 +12217,4 @@
 msgid "Item"
 msgstr "項目"
-
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:53
-#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TabularTagSelector.java:51
-msgid "Filter"
-msgstr "過濾條件"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/ui/TabularPresetSelector.java:63
@@ -11969,5 +12300,5 @@
 #. item "Buildings/Addresses" text "House name"
 #: ../plugins/terracer/src/terracer/TerracerAction.java:475
-#: build/trans_presets.java:2261
+#: build/trans_presets.java:2272
 msgid "Street name"
 msgstr "街道名稱"
@@ -12132,8 +12463,4 @@
 msgid "Zoom (in metres)"
 msgstr "縮放（以公尺計）"
-
-#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:91
-msgid "URL"
-msgstr "URL"
 
 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:94
@@ -12337,7 +12664,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:501
-#, fuzzy
 msgid "Updating map ..."
-msgstr "正在上傳..."
+msgstr ""
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69
@@ -12825,7 +13151,7 @@
 #. <icon annotate="true" src="misc/no_icon.png" priority="-10000"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:100
-#: build/trans_style.java:4151 build/trans_style.java:4158
-#: build/trans_style.java:4165 build/trans_style.java:4172
-#: build/trans_style.java:4179
+#: build/trans_style.java:4159 build/trans_style.java:4166
+#: build/trans_style.java:4173 build/trans_style.java:4180
+#: build/trans_style.java:4187
 msgid "building"
 msgstr "建築"
@@ -12839,5 +13165,5 @@
 #. <condition k="area" b="yes"/>
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnclosedWays.java:103
-#: build/trans_style.java:4186
+#: build/trans_style.java:4194
 msgid "area"
 msgstr "區域"
@@ -12964,10 +13290,10 @@
 msgstr "在路徑的結尾選擇開始的節點"
 
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:147
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:148
 msgid "Reached the end of the line"
 msgstr "到達線條的結尾"
 
 #. Three or more ways meeting at this node. Means we have a junction.
-#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:154
+#: ../plugins/waydownloader/src/WayDownloaderPlugin.java:155
 msgid "Reached a junction"
 msgstr "到達交會點"
@@ -13281,12 +13607,10 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:172
-#, fuzzy
 msgid "% of east:"
-msgstr "% 緯度："
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:173
-#, fuzzy
 msgid "% of north:"
-msgstr "% 緯度："
+msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/io/WMSLayerExporter.java:11
@@ -13444,6 +13768,11 @@
 "並建立測量路徑（也可以從 gps 圖層匯入）。"
 
+#. Plugin michigan_left
+#: build/trans_plugins.java:35
+msgid "Adds no left turn for sets of 4 or 5 ways"
+msgstr ""
+
 #. Plugin nearclick
-#: build/trans_plugins.java:35
+#: build/trans_plugins.java:37
 msgid ""
 "Simulates a click when you do a small and short drag. This is usefull for "
@@ -13455,15 +13784,15 @@
 
 #. Plugin openlayers
-#: build/trans_plugins.java:37
+#: build/trans_plugins.java:39
 msgid "Displays an OpenLayers background image"
 msgstr "顯示 OpenLayers 背景圖片"
 
 #. Plugin openstreetbugs
-#: build/trans_plugins.java:39
+#: build/trans_plugins.java:41
 msgid "Imports issues from OpenStreetBugs"
 msgstr "匯入OpenStreetBugs 的議題"
 
 #. Plugin openvisible
-#: build/trans_plugins.java:41
+#: build/trans_plugins.java:43
 msgid ""
 "Allows opening gpx/osm files that intersect the currently visible screen area"
@@ -13471,5 +13800,5 @@
 
 #. Plugin osmarender
-#: build/trans_plugins.java:43
+#: build/trans_plugins.java:45
 msgid ""
 "Launches FireFox to display the current visible screen as a nice SVG image."
@@ -13477,5 +13806,5 @@
 
 #. Plugin PicLayer
-#: build/trans_plugins.java:45
+#: build/trans_plugins.java:47
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -13484,15 +13813,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:47
+#: build/trans_plugins.java:49
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "超棒的 JGoodies 塑膠外觀與感覺。"
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid "Let other applications send commands to JOSM."
 msgstr "讓其他的應用程式傳送指令給 JOSM。"
 
 #. Plugin routes
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -13501,10 +13830,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Provides routing capabilities."
 msgstr "提供路線規畫的功能。"
 
 #. Plugin slippymap
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -13514,15 +13843,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "允許在目前的 gps 位置加入標記/節點。"
 
 #. Plugin tageditor
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "提供在表格線中編輯標籤的對話盒。"
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -13534,10 +13863,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Make terraced houses out of single blocks."
 msgstr "讓連棟房屋能超出單一區塊。"
 
 #. Plugin usertools
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Tools to work with authors/users. Selects map data that belongs to selected "
@@ -13548,5 +13877,5 @@
 
 #. Plugin utilsplugin
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid ""
 "Several utilities that make your life easier: e.g. simplify way, join areas, "
@@ -13555,5 +13884,5 @@
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -13564,5 +13893,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -13571,10 +13900,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "方便的下載一整組互相聯結的路徑"
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -13630,4 +13959,10 @@
 #. <annotations>
 #: build/trans_presets.java:57
+#, fuzzy
+msgid "Highways"
+msgstr "公路"
+
+#. group "Highways"
+#: build/trans_presets.java:58
 msgid "Streets"
 msgstr "街道"
@@ -13638,5 +13973,5 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:58 build/trans_surveyor.java:72
+#: build/trans_presets.java:59 build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "高速公路(Motorway)"
@@ -13645,5 +13980,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway" />
-#: build/trans_presets.java:61
+#: build/trans_presets.java:62
 msgid "Edit Motorway"
 msgstr "編輯高速公路"
@@ -13670,8 +14005,8 @@
 #. <optional>
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:64 build/trans_presets.java:100
-#: build/trans_presets.java:120 build/trans_presets.java:140
-#: build/trans_presets.java:177 build/trans_presets.java:197
-#: build/trans_presets.java:1557 build/trans_presets.java:3146
+#: build/trans_presets.java:65 build/trans_presets.java:101
+#: build/trans_presets.java:121 build/trans_presets.java:141
+#: build/trans_presets.java:178 build/trans_presets.java:198
+#: build/trans_presets.java:1560 build/trans_presets.java:3158
 msgid "Reference"
 msgstr "道路編號"
@@ -13685,8 +14020,8 @@
 #. item "Streets/Secondary" combo "Layer"
 #. item "Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:68 build/trans_presets.java:85
-#: build/trans_presets.java:104 build/trans_presets.java:123
-#: build/trans_presets.java:144 build/trans_presets.java:160
-#: build/trans_presets.java:181 build/trans_presets.java:358
+#: build/trans_presets.java:69 build/trans_presets.java:86
+#: build/trans_presets.java:105 build/trans_presets.java:124
+#: build/trans_presets.java:145 build/trans_presets.java:161
+#: build/trans_presets.java:182 build/trans_presets.java:359
 msgid "Lanes"
 msgstr "車道數"
@@ -13703,15 +14038,15 @@
 #. item "Streets/Bridge" combo "Layer"
 #. item "Streets/Tunnel" combo "Layer"
-#: build/trans_presets.java:69 build/trans_presets.java:86
-#: build/trans_presets.java:105 build/trans_presets.java:124
-#: build/trans_presets.java:145 build/trans_presets.java:161
-#: build/trans_presets.java:182 build/trans_presets.java:201
-#: build/trans_presets.java:224 build/trans_presets.java:280
-#: build/trans_presets.java:313 build/trans_presets.java:334
-#: build/trans_presets.java:373 build/trans_presets.java:388
-#: build/trans_presets.java:412 build/trans_presets.java:431
-#: build/trans_presets.java:452 build/trans_presets.java:472
-#: build/trans_presets.java:510 build/trans_presets.java:666
-#: build/trans_presets.java:1307
+#: build/trans_presets.java:70 build/trans_presets.java:87
+#: build/trans_presets.java:106 build/trans_presets.java:125
+#: build/trans_presets.java:146 build/trans_presets.java:162
+#: build/trans_presets.java:183 build/trans_presets.java:202
+#: build/trans_presets.java:225 build/trans_presets.java:281
+#: build/trans_presets.java:314 build/trans_presets.java:335
+#: build/trans_presets.java:374 build/trans_presets.java:389
+#: build/trans_presets.java:413 build/trans_presets.java:432
+#: build/trans_presets.java:453 build/trans_presets.java:473
+#: build/trans_presets.java:511 build/trans_presets.java:667
+#: build/trans_presets.java:1310
 msgid "Max. speed (km/h)"
 msgstr "最高限速 (km/h)"
@@ -13748,16 +14083,16 @@
 #. item "Ways/Path" text "Name"
 #. item "Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:70 build/trans_presets.java:87
-#: build/trans_presets.java:106 build/trans_presets.java:125
-#: build/trans_presets.java:146 build/trans_presets.java:162
-#: build/trans_presets.java:183 build/trans_presets.java:202
-#: build/trans_presets.java:218 build/trans_presets.java:236
-#: build/trans_presets.java:254 build/trans_presets.java:273
-#: build/trans_presets.java:293 build/trans_presets.java:306
-#: build/trans_presets.java:320 build/trans_presets.java:352
-#: build/trans_presets.java:404 build/trans_presets.java:424
-#: build/trans_presets.java:444 build/trans_presets.java:464
-#: build/trans_presets.java:484 build/trans_presets.java:503
-#: build/trans_presets.java:659 build/trans_presets.java:1300
+#: build/trans_presets.java:71 build/trans_presets.java:88
+#: build/trans_presets.java:107 build/trans_presets.java:126
+#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:184 build/trans_presets.java:203
+#: build/trans_presets.java:219 build/trans_presets.java:237
+#: build/trans_presets.java:255 build/trans_presets.java:274
+#: build/trans_presets.java:294 build/trans_presets.java:307
+#: build/trans_presets.java:321 build/trans_presets.java:353
+#: build/trans_presets.java:405 build/trans_presets.java:425
+#: build/trans_presets.java:445 build/trans_presets.java:465
+#: build/trans_presets.java:485 build/trans_presets.java:504
+#: build/trans_presets.java:660 build/trans_presets.java:1303
 msgid "Oneway"
 msgstr "單行道"
@@ -13799,19 +14134,19 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:71 build/trans_presets.java:88
-#: build/trans_presets.java:108 build/trans_presets.java:127
-#: build/trans_presets.java:148 build/trans_presets.java:164
-#: build/trans_presets.java:184 build/trans_presets.java:203
-#: build/trans_presets.java:219 build/trans_presets.java:237
-#: build/trans_presets.java:255 build/trans_presets.java:274
-#: build/trans_presets.java:307 build/trans_presets.java:353
-#: build/trans_presets.java:362 build/trans_presets.java:405
-#: build/trans_presets.java:425 build/trans_presets.java:445
-#: build/trans_presets.java:465 build/trans_presets.java:485
-#: build/trans_presets.java:504 build/trans_presets.java:523
-#: build/trans_presets.java:544 build/trans_presets.java:565
-#: build/trans_presets.java:586 build/trans_presets.java:607
-#: build/trans_presets.java:628 build/trans_presets.java:660
-#: build/trans_presets.java:1301 build/trans_surveyor.java:12
+#: build/trans_presets.java:72 build/trans_presets.java:89
+#: build/trans_presets.java:109 build/trans_presets.java:128
+#: build/trans_presets.java:149 build/trans_presets.java:165
+#: build/trans_presets.java:185 build/trans_presets.java:204
+#: build/trans_presets.java:220 build/trans_presets.java:238
+#: build/trans_presets.java:256 build/trans_presets.java:275
+#: build/trans_presets.java:308 build/trans_presets.java:354
+#: build/trans_presets.java:363 build/trans_presets.java:406
+#: build/trans_presets.java:426 build/trans_presets.java:446
+#: build/trans_presets.java:466 build/trans_presets.java:486
+#: build/trans_presets.java:505 build/trans_presets.java:524
+#: build/trans_presets.java:545 build/trans_presets.java:566
+#: build/trans_presets.java:587 build/trans_presets.java:608
+#: build/trans_presets.java:629 build/trans_presets.java:661
+#: build/trans_presets.java:1304 build/trans_surveyor.java:12
 msgid "Bridge"
 msgstr "橋"
@@ -13847,19 +14182,19 @@
 #. item "Ways/Path" check "Bridge"
 #. item "Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:72 build/trans_presets.java:89
-#: build/trans_presets.java:109 build/trans_presets.java:128
-#: build/trans_presets.java:149 build/trans_presets.java:165
-#: build/trans_presets.java:185 build/trans_presets.java:204
-#: build/trans_presets.java:220 build/trans_presets.java:238
-#: build/trans_presets.java:256 build/trans_presets.java:275
-#: build/trans_presets.java:308 build/trans_presets.java:354
-#: build/trans_presets.java:378 build/trans_presets.java:406
-#: build/trans_presets.java:426 build/trans_presets.java:446
-#: build/trans_presets.java:466 build/trans_presets.java:486
-#: build/trans_presets.java:505 build/trans_presets.java:524
-#: build/trans_presets.java:545 build/trans_presets.java:566
-#: build/trans_presets.java:587 build/trans_presets.java:608
-#: build/trans_presets.java:629 build/trans_presets.java:661
-#: build/trans_presets.java:1302
+#: build/trans_presets.java:73 build/trans_presets.java:90
+#: build/trans_presets.java:110 build/trans_presets.java:129
+#: build/trans_presets.java:150 build/trans_presets.java:166
+#: build/trans_presets.java:186 build/trans_presets.java:205
+#: build/trans_presets.java:221 build/trans_presets.java:239
+#: build/trans_presets.java:257 build/trans_presets.java:276
+#: build/trans_presets.java:309 build/trans_presets.java:355
+#: build/trans_presets.java:379 build/trans_presets.java:407
+#: build/trans_presets.java:427 build/trans_presets.java:447
+#: build/trans_presets.java:467 build/trans_presets.java:487
+#: build/trans_presets.java:506 build/trans_presets.java:525
+#: build/trans_presets.java:546 build/trans_presets.java:567
+#: build/trans_presets.java:588 build/trans_presets.java:609
+#: build/trans_presets.java:630 build/trans_presets.java:662
+#: build/trans_presets.java:1305
 msgid "Tunnel"
 msgstr "隧道"
@@ -13893,18 +14228,18 @@
 #. item "Ways/Path" check "Tunnel"
 #. item "Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:73 build/trans_presets.java:90
-#: build/trans_presets.java:110 build/trans_presets.java:129
-#: build/trans_presets.java:150 build/trans_presets.java:166
-#: build/trans_presets.java:186 build/trans_presets.java:205
-#: build/trans_presets.java:221 build/trans_presets.java:239
-#: build/trans_presets.java:257 build/trans_presets.java:276
-#: build/trans_presets.java:309 build/trans_presets.java:355
-#: build/trans_presets.java:407 build/trans_presets.java:427
-#: build/trans_presets.java:447 build/trans_presets.java:467
-#: build/trans_presets.java:487 build/trans_presets.java:506
-#: build/trans_presets.java:525 build/trans_presets.java:546
-#: build/trans_presets.java:567 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:630
-#: build/trans_presets.java:662 build/trans_presets.java:1303
+#: build/trans_presets.java:74 build/trans_presets.java:91
+#: build/trans_presets.java:111 build/trans_presets.java:130
+#: build/trans_presets.java:151 build/trans_presets.java:167
+#: build/trans_presets.java:187 build/trans_presets.java:206
+#: build/trans_presets.java:222 build/trans_presets.java:240
+#: build/trans_presets.java:258 build/trans_presets.java:277
+#: build/trans_presets.java:310 build/trans_presets.java:356
+#: build/trans_presets.java:408 build/trans_presets.java:428
+#: build/trans_presets.java:448 build/trans_presets.java:468
+#: build/trans_presets.java:488 build/trans_presets.java:507
+#: build/trans_presets.java:526 build/trans_presets.java:547
+#: build/trans_presets.java:568 build/trans_presets.java:589
+#: build/trans_presets.java:610 build/trans_presets.java:631
+#: build/trans_presets.java:663 build/trans_presets.java:1306
 msgid "Cutting"
 msgstr "斷開"
@@ -13938,18 +14273,18 @@
 #. item "Ways/Path" check "Cutting"
 #. item "Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:74 build/trans_presets.java:91
-#: build/trans_presets.java:111 build/trans_presets.java:130
-#: build/trans_presets.java:151 build/trans_presets.java:167
-#: build/trans_presets.java:187 build/trans_presets.java:206
-#: build/trans_presets.java:222 build/trans_presets.java:240
-#: build/trans_presets.java:258 build/trans_presets.java:277
-#: build/trans_presets.java:310 build/trans_presets.java:356
-#: build/trans_presets.java:408 build/trans_presets.java:428
-#: build/trans_presets.java:448 build/trans_presets.java:468
-#: build/trans_presets.java:488 build/trans_presets.java:507
-#: build/trans_presets.java:526 build/trans_presets.java:547
-#: build/trans_presets.java:568 build/trans_presets.java:589
-#: build/trans_presets.java:610 build/trans_presets.java:631
-#: build/trans_presets.java:663 build/trans_presets.java:1304
+#: build/trans_presets.java:75 build/trans_presets.java:92
+#: build/trans_presets.java:112 build/trans_presets.java:131
+#: build/trans_presets.java:152 build/trans_presets.java:168
+#: build/trans_presets.java:188 build/trans_presets.java:207
+#: build/trans_presets.java:223 build/trans_presets.java:241
+#: build/trans_presets.java:259 build/trans_presets.java:278
+#: build/trans_presets.java:311 build/trans_presets.java:357
+#: build/trans_presets.java:409 build/trans_presets.java:429
+#: build/trans_presets.java:449 build/trans_presets.java:469
+#: build/trans_presets.java:489 build/trans_presets.java:508
+#: build/trans_presets.java:527 build/trans_presets.java:548
+#: build/trans_presets.java:569 build/trans_presets.java:590
+#: build/trans_presets.java:611 build/trans_presets.java:632
+#: build/trans_presets.java:664 build/trans_presets.java:1307
 msgid "Embankment"
 msgstr "堤防"
@@ -13957,5 +14292,5 @@
 #. item "Streets/Motorway" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:77
+#: build/trans_presets.java:78
 msgid "Motorway Link"
 msgstr "高速公路連絡道路"
@@ -13964,5 +14299,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=motorway_link" />
-#: build/trans_presets.java:80
+#: build/trans_presets.java:81
 msgid "Edit Motorway Link"
 msgstr "編輯高速公路連絡道路"
@@ -13970,5 +14305,5 @@
 #. item "Streets/Motorway Link" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:94
+#: build/trans_presets.java:95
 msgid "Trunk"
 msgstr "快速道路(Trunk)"
@@ -13977,5 +14312,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk" />
-#: build/trans_presets.java:97
+#: build/trans_presets.java:98
 msgid "Edit Trunk"
 msgstr "編輯快速道路"
@@ -13985,6 +14320,6 @@
 #. item "Streets/Primary" check "Oneway"
 #. item "Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:107 build/trans_presets.java:126
-#: build/trans_presets.java:147 build/trans_presets.java:163
+#: build/trans_presets.java:108 build/trans_presets.java:127
+#: build/trans_presets.java:148 build/trans_presets.java:164
 msgid "Motorroad"
 msgstr "汽車專用"
@@ -13992,5 +14327,5 @@
 #. item "Streets/Trunk" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:114
+#: build/trans_presets.java:115
 msgid "Trunk Link"
 msgstr "快速道路連絡道路"
@@ -13999,5 +14334,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=trunk_link"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=trunk_link"/>
-#: build/trans_presets.java:117
+#: build/trans_presets.java:118
 msgid "Edit Trunk Link"
 msgstr "編輯快速道路連絡道路"
@@ -14010,5 +14345,5 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:134 build/trans_surveyor.java:76
+#: build/trans_presets.java:135 build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "省道(Primary)"
@@ -14017,5 +14352,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=primary"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=primary" />
-#: build/trans_presets.java:137
+#: build/trans_presets.java:138
 msgid "Edit Primary Road"
 msgstr "編輯省道"
@@ -14023,10 +14358,10 @@
 #. item "Streets/Primary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:154
+#: build/trans_presets.java:155
 msgid "Primary Link"
 msgstr "省道連絡道路"
 
 #. item
-#: build/trans_presets.java:155
+#: build/trans_presets.java:156
 msgid "Edit Primary Link"
 msgstr "編輯省道連絡道路"
@@ -14038,5 +14373,5 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:170 build/trans_surveyor.java:80
+#: build/trans_presets.java:171 build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr "縣道(Secondary)"
@@ -14046,5 +14381,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=secondary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=secondary" />
-#: build/trans_presets.java:174
+#: build/trans_presets.java:175
 msgid "Edit Secondary Road"
 msgstr "編輯縣道"
@@ -14052,5 +14387,5 @@
 #. item "Streets/Secondary" check "Embankment"
 #. </optional>
-#: build/trans_presets.java:190
+#: build/trans_presets.java:191
 msgid "Tertiary"
 msgstr "鄉道(Tertiary)"
@@ -14060,5 +14395,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=tertiary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=tertiary" />
-#: build/trans_presets.java:194
+#: build/trans_presets.java:195
 msgid "Edit Tertiary Road"
 msgstr "編輯鄉道"
@@ -14070,5 +14405,5 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:209 build/trans_surveyor.java:84
+#: build/trans_presets.java:210 build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr "未分類(Unclassified)"
@@ -14078,5 +14413,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=unclassified"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=unclassified" />
-#: build/trans_presets.java:213
+#: build/trans_presets.java:214
 msgid "Edit Unclassified Road"
 msgstr "編輯未分類的道路"
@@ -14103,19 +14438,19 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:225 build/trans_presets.java:243
-#: build/trans_presets.java:261 build/trans_presets.java:281
-#: build/trans_presets.java:314 build/trans_presets.java:359
-#: build/trans_presets.java:375 build/trans_presets.java:389
-#: build/trans_presets.java:413 build/trans_presets.java:432
-#: build/trans_presets.java:453 build/trans_presets.java:473
-#: build/trans_presets.java:491 build/trans_presets.java:511
-#: build/trans_presets.java:532 build/trans_presets.java:553
-#: build/trans_presets.java:574 build/trans_presets.java:595
-#: build/trans_presets.java:616 build/trans_presets.java:637
-#: build/trans_presets.java:667 build/trans_presets.java:680
-#: build/trans_presets.java:693 build/trans_presets.java:706
-#: build/trans_presets.java:719 build/trans_presets.java:732
-#: build/trans_presets.java:745 build/trans_presets.java:1308
-#: build/trans_presets.java:1498 build/trans_presets.java:1540
+#: build/trans_presets.java:226 build/trans_presets.java:244
+#: build/trans_presets.java:262 build/trans_presets.java:282
+#: build/trans_presets.java:315 build/trans_presets.java:360
+#: build/trans_presets.java:376 build/trans_presets.java:390
+#: build/trans_presets.java:414 build/trans_presets.java:433
+#: build/trans_presets.java:454 build/trans_presets.java:474
+#: build/trans_presets.java:492 build/trans_presets.java:512
+#: build/trans_presets.java:533 build/trans_presets.java:554
+#: build/trans_presets.java:575 build/trans_presets.java:596
+#: build/trans_presets.java:617 build/trans_presets.java:638
+#: build/trans_presets.java:668 build/trans_presets.java:681
+#: build/trans_presets.java:694 build/trans_presets.java:707
+#: build/trans_presets.java:720 build/trans_presets.java:733
+#: build/trans_presets.java:746 build/trans_presets.java:1311
+#: build/trans_presets.java:1501 build/trans_presets.java:1543
 msgid "Width (meters)"
 msgstr "寬度 (米)"
@@ -14127,5 +14462,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:228 build/trans_surveyor.java:88
+#: build/trans_presets.java:229 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "居住的(Residential)"
@@ -14134,5 +14469,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=residential"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=residential" />
-#: build/trans_presets.java:231
+#: build/trans_presets.java:232
 msgid "Edit Residential Street"
 msgstr "編輯居住的街道"
@@ -14157,14 +14492,14 @@
 #. item "Ways/Path" combo "Layer"
 #. item "Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:611
-#: build/trans_presets.java:632 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:612
+#: build/trans_presets.java:633 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "Surface"
 msgstr "路面"
@@ -14185,53 +14520,53 @@
 #. item "Ways/Path" combo "Surface"
 #. item "Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paved"
 msgstr "有鋪面的"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "unpaved"
 msgstr "沒鋪面的"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "concrete"
 msgstr "水泥地"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
 msgid "metal"
 msgstr ""
@@ -14245,22 +14580,22 @@
 #. <condition k="natural" v="wood"/>
 #. <icon src="misc/landmark/trees.png"/>
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306 build/trans_presets.java:2434
-#: build/trans_style.java:3367
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309 build/trans_presets.java:2445
+#: build/trans_style.java:3375
 msgid "wood"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "paving_stones"
 msgstr ""
@@ -14268,77 +14603,77 @@
 #. item "Ways/Track Grade 2" combo "Surface"
 #. item "Ways/Track Grade 3" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:548 build/trans_presets.java:569
-#: build/trans_presets.java:590 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:549 build/trans_presets.java:570
+#: build/trans_presets.java:591 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "cobblestone"
 msgstr "石子路"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "gravel"
 msgstr "碎石路"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:665
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:666
+#: build/trans_presets.java:1309
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "grass"
 msgstr "草地"
 
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "sand"
 msgstr "沙地"
@@ -14346,13 +14681,13 @@
 #. item "Ways/Track Grade 4" combo "Surface"
 #. item "Ways/Track Grade 5" combo "Surface"
-#: build/trans_presets.java:242 build/trans_presets.java:260
-#: build/trans_presets.java:279 build/trans_presets.java:294
-#: build/trans_presets.java:312 build/trans_presets.java:410
-#: build/trans_presets.java:430 build/trans_presets.java:451
-#: build/trans_presets.java:471 build/trans_presets.java:490
-#: build/trans_presets.java:509 build/trans_presets.java:527
-#: build/trans_presets.java:569 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:632
-#: build/trans_presets.java:665 build/trans_presets.java:1306
+#: build/trans_presets.java:243 build/trans_presets.java:261
+#: build/trans_presets.java:280 build/trans_presets.java:295
+#: build/trans_presets.java:313 build/trans_presets.java:411
+#: build/trans_presets.java:431 build/trans_presets.java:452
+#: build/trans_presets.java:472 build/trans_presets.java:491
+#: build/trans_presets.java:510 build/trans_presets.java:528
+#: build/trans_presets.java:570 build/trans_presets.java:591
+#: build/trans_presets.java:612 build/trans_presets.java:633
+#: build/trans_presets.java:666 build/trans_presets.java:1309
 msgid "ground"
 msgstr "地面"
@@ -14360,5 +14695,5 @@
 #. item "Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:246
+#: build/trans_presets.java:247
 msgid "Living Street"
 msgstr "生活街道"
@@ -14367,5 +14702,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=living_street"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=living_street" />
-#: build/trans_presets.java:249
+#: build/trans_presets.java:250
 msgid "Edit Living Street"
 msgstr "編輯生活街道"
@@ -14373,5 +14708,5 @@
 #. item "Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:264
+#: build/trans_presets.java:265
 msgid "Service"
 msgstr "巷/弄(Service)"
@@ -14380,5 +14715,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=service"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=service" />
-#: build/trans_presets.java:267
+#: build/trans_presets.java:268
 msgid "Edit Serviceway"
 msgstr "編輯巷/弄"
@@ -14388,18 +14723,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "Serviceway type"
 msgstr "巷/弄道路類型"
 
 #. item "Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "alley"
 msgstr "巷/弄"
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "driveway"
 msgstr "車道"
 
-#: build/trans_presets.java:271
+#: build/trans_presets.java:272
 msgid "parking_aisle"
 msgstr "停車場通道"
@@ -14407,5 +14742,5 @@
 #. item "Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:284
+#: build/trans_presets.java:285
 msgid "Parking Aisle"
 msgstr "停車場通道"
@@ -14415,5 +14750,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:service=parking_aisle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:service=parking_aisle" />
-#: build/trans_presets.java:288
+#: build/trans_presets.java:289
 msgid "Edit Parking Aisle"
 msgstr "編輯停車場通道"
@@ -14421,5 +14756,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:298
+#: build/trans_presets.java:299
 msgid "Road (Unknown Type)"
 msgstr "道路（不明的類型）"
@@ -14428,5 +14763,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Edit Road of unknown type"
 msgstr "編輯不明類型的道路"
@@ -14435,20 +14770,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:318
+#: build/trans_presets.java:319
 msgid "Road Restrictions"
 msgstr "道路限制"
 
 #. item
-#: build/trans_presets.java:319
+#: build/trans_presets.java:320
 msgid "Edit Road Restrictions"
 msgstr "編輯道路限制"
 
 #. item "Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:321
+#: build/trans_presets.java:322
 msgid "Toll"
 msgstr "通行費"
 
 #. item "Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:322
+#: build/trans_presets.java:323
 msgid "No exit (cul-de-sac)"
 msgstr "沒有出口（死路）"
@@ -14461,8 +14796,8 @@
 #. item "Ways/Track Grade 4" combo "Layer"
 #. item "Ways/Track Grade 5" combo "Layer"
-#: build/trans_presets.java:323 build/trans_presets.java:529
-#: build/trans_presets.java:550 build/trans_presets.java:571
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:634
+#: build/trans_presets.java:324 build/trans_presets.java:530
+#: build/trans_presets.java:551 build/trans_presets.java:572
+#: build/trans_presets.java:593 build/trans_presets.java:614
+#: build/trans_presets.java:635
 msgid "Access"
 msgstr ""
@@ -14516,29 +14851,29 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1397
-#: build/trans_presets.java:1398 build/trans_presets.java:1399
-#: build/trans_presets.java:1763 build/trans_presets.java:1773
-#: build/trans_presets.java:2397 build/trans_presets.java:2433
-#: build/trans_presets.java:2442 build/trans_presets.java:2443
-#: build/trans_presets.java:2444 build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:1396
+#: build/trans_presets.java:1397 build/trans_presets.java:1400
+#: build/trans_presets.java:1401 build/trans_presets.java:1402
+#: build/trans_presets.java:1767 build/trans_presets.java:1777
+#: build/trans_presets.java:2408 build/trans_presets.java:2444
+#: build/trans_presets.java:2453 build/trans_presets.java:2454
+#: build/trans_presets.java:2455 build/trans_presets.java:2725
 msgid "yes"
 msgstr "是"
@@ -14551,40 +14886,40 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:212
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:212
 msgid "private"
 msgstr "私人的"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655
 msgid "designated"
 msgstr "已指定"
@@ -14597,19 +14932,19 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:219
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:219
 msgid "destination"
 msgstr "目的地"
@@ -14632,71 +14967,71 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_style.java:205
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_style.java:205
 msgid "permissive"
 msgstr ""
 
-#: build/trans_presets.java:323 build/trans_presets.java:327
-#: build/trans_presets.java:330 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636
+#: build/trans_presets.java:324 build/trans_presets.java:328
+#: build/trans_presets.java:331 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637
 msgid "agricultural"
 msgstr "農業的"
 
-#: build/trans_presets.java:323 build/trans_presets.java:324
-#: build/trans_presets.java:325 build/trans_presets.java:326
-#: build/trans_presets.java:327 build/trans_presets.java:328
-#: build/trans_presets.java:329 build/trans_presets.java:330
-#: build/trans_presets.java:331 build/trans_presets.java:332
-#: build/trans_presets.java:333 build/trans_presets.java:449
-#: build/trans_presets.java:469 build/trans_presets.java:529
-#: build/trans_presets.java:530 build/trans_presets.java:531
-#: build/trans_presets.java:550 build/trans_presets.java:551
-#: build/trans_presets.java:552 build/trans_presets.java:571
-#: build/trans_presets.java:572 build/trans_presets.java:573
-#: build/trans_presets.java:592 build/trans_presets.java:593
-#: build/trans_presets.java:594 build/trans_presets.java:613
-#: build/trans_presets.java:614 build/trans_presets.java:615
-#: build/trans_presets.java:634 build/trans_presets.java:635
-#: build/trans_presets.java:636 build/trans_presets.java:649
-#: build/trans_presets.java:650 build/trans_presets.java:651
-#: build/trans_presets.java:652 build/trans_presets.java:653
-#: build/trans_presets.java:654 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:1330
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1397 build/trans_presets.java:1398
-#: build/trans_presets.java:1399 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
-#: build/trans_presets.java:2433 build/trans_presets.java:2442
-#: build/trans_presets.java:2443 build/trans_presets.java:2444
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:324 build/trans_presets.java:325
+#: build/trans_presets.java:326 build/trans_presets.java:327
+#: build/trans_presets.java:328 build/trans_presets.java:329
+#: build/trans_presets.java:330 build/trans_presets.java:331
+#: build/trans_presets.java:332 build/trans_presets.java:333
+#: build/trans_presets.java:334 build/trans_presets.java:450
+#: build/trans_presets.java:470 build/trans_presets.java:530
+#: build/trans_presets.java:531 build/trans_presets.java:532
+#: build/trans_presets.java:551 build/trans_presets.java:552
+#: build/trans_presets.java:553 build/trans_presets.java:572
+#: build/trans_presets.java:573 build/trans_presets.java:574
+#: build/trans_presets.java:593 build/trans_presets.java:594
+#: build/trans_presets.java:595 build/trans_presets.java:614
+#: build/trans_presets.java:615 build/trans_presets.java:616
+#: build/trans_presets.java:635 build/trans_presets.java:636
+#: build/trans_presets.java:637 build/trans_presets.java:650
+#: build/trans_presets.java:651 build/trans_presets.java:652
+#: build/trans_presets.java:653 build/trans_presets.java:654
+#: build/trans_presets.java:655 build/trans_presets.java:774
+#: build/trans_presets.java:789 build/trans_presets.java:1333
+#: build/trans_presets.java:1396 build/trans_presets.java:1397
+#: build/trans_presets.java:1400 build/trans_presets.java:1401
+#: build/trans_presets.java:1402 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
+#: build/trans_presets.java:2444 build/trans_presets.java:2453
+#: build/trans_presets.java:2454 build/trans_presets.java:2455
+#: build/trans_presets.java:2725
 msgid "no"
 msgstr "否"
 
-#: build/trans_presets.java:326
+#: build/trans_presets.java:327
 msgid "Goods"
 msgstr "貨物"
 
-#: build/trans_presets.java:327
+#: build/trans_presets.java:328
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "大型車 (hgv)"
@@ -14711,10 +15046,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:328 build/trans_presets.java:651
-#: build/trans_presets.java:858 build/trans_presets.java:891
-#: build/trans_presets.java:913 build/trans_presets.java:950
-#: build/trans_presets.java:963 build/trans_presets.java:975
-#: build/trans_presets.java:987 build/trans_presets.java:999
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:329 build/trans_presets.java:652
+#: build/trans_presets.java:859 build/trans_presets.java:892
+#: build/trans_presets.java:914 build/trans_presets.java:951
+#: build/trans_presets.java:964 build/trans_presets.java:976
+#: build/trans_presets.java:988 build/trans_presets.java:1000
+#: build/trans_presets.java:1040
 msgid "Horse"
 msgstr "馬"
@@ -14730,13 +15065,13 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:329 build/trans_presets.java:530
-#: build/trans_presets.java:551 build/trans_presets.java:572
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:635 build/trans_presets.java:859
-#: build/trans_presets.java:877 build/trans_presets.java:892
-#: build/trans_presets.java:914 build/trans_presets.java:951
-#: build/trans_presets.java:964 build/trans_presets.java:976
-#: build/trans_presets.java:988 build/trans_presets.java:1000
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:330 build/trans_presets.java:531
+#: build/trans_presets.java:552 build/trans_presets.java:573
+#: build/trans_presets.java:594 build/trans_presets.java:615
+#: build/trans_presets.java:636 build/trans_presets.java:860
+#: build/trans_presets.java:878 build/trans_presets.java:893
+#: build/trans_presets.java:915 build/trans_presets.java:952
+#: build/trans_presets.java:965 build/trans_presets.java:977
+#: build/trans_presets.java:989 build/trans_presets.java:1001
+#: build/trans_presets.java:1041
 msgid "Motorcycle"
 msgstr "機車"
@@ -14751,30 +15086,30 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:330 build/trans_presets.java:531
-#: build/trans_presets.java:552 build/trans_presets.java:573
-#: build/trans_presets.java:594 build/trans_presets.java:615
-#: build/trans_presets.java:636 build/trans_presets.java:654
-#: build/trans_presets.java:878 build/trans_presets.java:893
-#: build/trans_presets.java:915 build/trans_presets.java:952
-#: build/trans_presets.java:965 build/trans_presets.java:977
-#: build/trans_presets.java:989 build/trans_presets.java:1001
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:331 build/trans_presets.java:532
+#: build/trans_presets.java:553 build/trans_presets.java:574
+#: build/trans_presets.java:595 build/trans_presets.java:616
+#: build/trans_presets.java:637 build/trans_presets.java:655
+#: build/trans_presets.java:879 build/trans_presets.java:894
+#: build/trans_presets.java:916 build/trans_presets.java:953
+#: build/trans_presets.java:966 build/trans_presets.java:978
+#: build/trans_presets.java:990 build/trans_presets.java:1002
+#: build/trans_presets.java:1042
 msgid "Motorcar"
 msgstr "汽車"
 
-#: build/trans_presets.java:331
+#: build/trans_presets.java:332
 msgid "Public Service Vehicles (psv)"
 msgstr "公共汽車 (psv)"
 
-#: build/trans_presets.java:332
+#: build/trans_presets.java:333
 msgid "Motorboat"
 msgstr "動力小船"
 
-#: build/trans_presets.java:333
+#: build/trans_presets.java:334
 msgid "Boat"
 msgstr "小船"
 
 #. item "Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:335
+#: build/trans_presets.java:336
 msgid "Min. speed (km/h)"
 msgstr "最低限速 (km/h)"
@@ -14782,25 +15117,25 @@
 #. item "Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:336 build/trans_presets.java:374
+#: build/trans_presets.java:337 build/trans_presets.java:375
 msgid "Max. weight (tonnes)"
 msgstr "總重限制（噸）"
 
 #. item "Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:337
+#: build/trans_presets.java:338
 msgid "Max. Height (meters)"
 msgstr "高度限制（米）"
 
 #. item "Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:338
+#: build/trans_presets.java:339
 msgid "Max. Width (meters)"
 msgstr "寬度限制（米）"
 
 #. item "Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:339
+#: build/trans_presets.java:340
 msgid "Max. Length (meters)"
 msgstr "長度限制（米）"
 
 #. item "Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:341
+#: build/trans_presets.java:342
 msgid "Roundabout"
 msgstr "圓環"
@@ -14811,5 +15146,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:346
+#: build/trans_presets.java:347
 msgid "Edit Junction"
 msgstr "編輯交叉點"
@@ -14831,9 +15166,9 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: build/trans_presets.java:349 build/trans_presets.java:648
-#: build/trans_presets.java:788 build/trans_presets.java:1135
-#: build/trans_presets.java:1392 build/trans_presets.java:2353
-#: build/trans_presets.java:2901 build/trans_presets.java:2911
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:350 build/trans_presets.java:649
+#: build/trans_presets.java:789 build/trans_presets.java:1137
+#: build/trans_presets.java:1395 build/trans_presets.java:2364
+#: build/trans_presets.java:2913 build/trans_presets.java:2923
+#: build/trans_presets.java:2932
 msgid "Type"
 msgstr "類型"
@@ -14853,10 +15188,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:547
+#: build/trans_presets.java:350 build/trans_style.java:547
 #: build/trans_style.java:555
 msgid "motorway"
 msgstr "高速公路"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "motorway_link"
 msgstr "高速公路連絡道路"
@@ -14878,10 +15213,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:563
+#: build/trans_presets.java:350 build/trans_style.java:563
 #: build/trans_style.java:571
 msgid "trunk"
 msgstr "快速道路"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "trunk_link"
 msgstr "快速道路連絡道路"
@@ -14903,10 +15238,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:579
+#: build/trans_presets.java:350 build/trans_style.java:579
 #: build/trans_style.java:587
 msgid "primary"
 msgstr "省道"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "primary_link"
 msgstr "省道連絡道路"
@@ -14928,5 +15263,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:349 build/trans_style.java:595
+#: build/trans_presets.java:350 build/trans_style.java:595
 #: build/trans_style.java:603
 msgid "secondary"
@@ -14941,9 +15276,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:349 build/trans_style.java:611
+#: build/trans_presets.java:350 build/trans_style.java:611
 msgid "tertiary"
 msgstr "鄉道"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "unclassified"
 msgstr "未分類的"
@@ -14957,9 +15292,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:349 build/trans_style.java:3143
+#: build/trans_presets.java:350 build/trans_style.java:3151
 msgid "residential"
 msgstr "居住的"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "living_street"
 msgstr "生活街道"
@@ -14989,10 +15324,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:349 build/trans_style.java:667
-#: build/trans_style.java:4244
+#: build/trans_presets.java:350 build/trans_style.java:667
+#: build/trans_style.java:4252
 msgid "service"
 msgstr "巷/弄"
 
-#: build/trans_presets.java:349
+#: build/trans_presets.java:350
 msgid "bus_guideway"
 msgstr "公車專用道"
@@ -15022,6 +15357,6 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:349 build/trans_style.java:877
-#: build/trans_style.java:3208 build/trans_style.java:3209
+#: build/trans_presets.java:350 build/trans_style.java:877
+#: build/trans_style.java:3216 build/trans_style.java:3217
 msgid "construction"
 msgstr "施工"
@@ -15032,10 +15367,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Edit Bridge"
 msgstr "編輯橋樑"
 
 #. item
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "Edit Tunnel"
 msgstr "編輯隧道"
@@ -15043,19 +15378,19 @@
 #. item "Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:393
+#: build/trans_presets.java:394
 msgid "Ways"
 msgstr "路徑"
 
 #. group "Ways"
-#: build/trans_presets.java:394
+#: build/trans_presets.java:395
 msgid "Construction"
 msgstr "施工"
 
 #. item
-#: build/trans_presets.java:395
+#: build/trans_presets.java:396
 msgid "Edit Highway Under Construction"
 msgstr "編輯施工中的公路"
 
-#: build/trans_presets.java:411
+#: build/trans_presets.java:412
 msgid "Junction"
 msgstr "交叉點"
@@ -15071,5 +15406,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:411 build/trans_style.java:895
+#: build/trans_presets.java:412 build/trans_style.java:895
 msgid "roundabout"
 msgstr "圓環"
@@ -15078,5 +15413,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:417
+#: build/trans_presets.java:418
 msgid "Bridleway"
 msgstr "馬道"
@@ -15084,5 +15419,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:419
+#: build/trans_presets.java:420
 msgid "Edit Bridleway"
 msgstr "編輯馬道"
@@ -15090,5 +15425,5 @@
 #. item "Ways/Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:435
+#: build/trans_presets.java:436
 msgid "Cycleway"
 msgstr "自行車道"
@@ -15098,10 +15433,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:439
+#: build/trans_presets.java:440
 msgid "Edit Cycleway"
 msgstr "編輯自行車道"
 
 #. item "Ways/Cycleway" check "Embankment"
-#: build/trans_presets.java:449
+#: build/trans_presets.java:450
 msgid "Pedestrians"
 msgstr ""
@@ -15109,5 +15444,5 @@
 #. item "Ways/Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:456
+#: build/trans_presets.java:457
 msgid "Footway"
 msgstr "人行步道"
@@ -15116,10 +15451,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:459
+#: build/trans_presets.java:460
 msgid "Edit Footway"
 msgstr "編輯人行步道"
 
 #. item "Ways/Footway" check "Embankment"
-#: build/trans_presets.java:469
+#: build/trans_presets.java:470
 msgid "Bikes"
 msgstr ""
@@ -15127,5 +15462,5 @@
 #. item "Ways/Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:476
+#: build/trans_presets.java:477
 msgid "Pedestrian"
 msgstr "徒步區"
@@ -15134,5 +15469,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=pedestrian"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=pedestrian" />
-#: build/trans_presets.java:479
+#: build/trans_presets.java:480
 msgid "Edit Pedestrian Street"
 msgstr "編輯徒步區街道"
@@ -15140,5 +15475,5 @@
 #. item "Ways/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:494
+#: build/trans_presets.java:495
 msgid "Steps"
 msgstr "階梯"
@@ -15148,5 +15483,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:498
+#: build/trans_presets.java:499
 msgid "Edit Flight of Steps"
 msgstr "編輯階梯"
@@ -15155,5 +15490,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:515
+#: build/trans_presets.java:516
 msgid "Track"
 msgstr "產業道路"
@@ -15162,5 +15497,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:518
+#: build/trans_presets.java:519
 msgid "Edit Track"
 msgstr "編輯產業道路"
@@ -15168,5 +15503,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:535
+#: build/trans_presets.java:536
 msgid "Track Grade 1"
 msgstr "產業道路等級 1"
@@ -15175,5 +15510,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:538
+#: build/trans_presets.java:539
 msgid "Edit Track of grade 1"
 msgstr "編輯產業道路等級 1"
@@ -15181,5 +15516,5 @@
 #. item "Ways/Track Grade 1" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:556
+#: build/trans_presets.java:557
 msgid "Track Grade 2"
 msgstr "產業道路等級 2"
@@ -15188,5 +15523,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:559
+#: build/trans_presets.java:560
 msgid "Edit Track of grade 2"
 msgstr "編輯產業道路等級 2"
@@ -15194,5 +15529,5 @@
 #. item "Ways/Track Grade 2" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:577
+#: build/trans_presets.java:578
 msgid "Track Grade 3"
 msgstr "產業道路等級 3"
@@ -15201,5 +15536,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:580
+#: build/trans_presets.java:581
 msgid "Edit Track of grade 3"
 msgstr "編輯產業道路等級 3"
@@ -15207,5 +15542,5 @@
 #. item "Ways/Track Grade 3" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:598
+#: build/trans_presets.java:599
 msgid "Track Grade 4"
 msgstr "產業道路等級 4"
@@ -15214,5 +15549,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:601
+#: build/trans_presets.java:602
 msgid "Edit Track of grade 4"
 msgstr "編輯產業道路等級 4"
@@ -15220,5 +15555,5 @@
 #. item "Ways/Track Grade 4" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:619
+#: build/trans_presets.java:620
 msgid "Track Grade 5"
 msgstr "產業道路等級 5"
@@ -15227,5 +15562,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:tracktype"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:tracktype" />
-#: build/trans_presets.java:622
+#: build/trans_presets.java:623
 msgid "Edit Track of grade 5"
 msgstr "編輯產業道路等級 5"
@@ -15234,5 +15569,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:641
+#: build/trans_presets.java:642
 msgid "Path"
 msgstr "路徑"
@@ -15241,13 +15576,13 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:644
+#: build/trans_presets.java:645
 msgid "Edit Path"
 msgstr "編輯小徑"
 
-#: build/trans_presets.java:652
+#: build/trans_presets.java:653
 msgid "Ski"
 msgstr "滑雪"
 
-#: build/trans_presets.java:653
+#: build/trans_presets.java:654
 msgid "Snowmobile"
 msgstr "雪上摩托車"
@@ -15257,6 +15592,6 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:670 build/trans_presets.java:1725
-#: build/trans_presets.java:1748
+#: build/trans_presets.java:671 build/trans_presets.java:1729
+#: build/trans_presets.java:1752
 msgid "Hiking"
 msgstr "健走"
@@ -15266,5 +15601,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:674
+#: build/trans_presets.java:675
 msgid "Edit Hiking"
 msgstr "編輯健走"
@@ -15272,5 +15607,5 @@
 #. item "Ways/Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:683
+#: build/trans_presets.java:684
 msgid "Mountain Hiking"
 msgstr "登山"
@@ -15280,5 +15615,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:687
+#: build/trans_presets.java:688
 msgid "Edit Mountain Hiking"
 msgstr "編輯登山健行"
@@ -15286,5 +15621,5 @@
 #. item "Ways/Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:696
+#: build/trans_presets.java:697
 msgid "Demanding Mountain Hiking"
 msgstr "較難的登山健行"
@@ -15294,5 +15629,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:700
+#: build/trans_presets.java:701
 msgid "Edit Demanding Mountain Hiking"
 msgstr "編輯較難的登山健行"
@@ -15300,5 +15635,5 @@
 #. item "Ways/Demanding Mountain Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:709
+#: build/trans_presets.java:710
 msgid "Alpine Hiking"
 msgstr "高山健行"
@@ -15308,5 +15643,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:713
+#: build/trans_presets.java:714
 msgid "Edit Alpine Hiking"
 msgstr "編輯高山健行"
@@ -15314,5 +15649,5 @@
 #. item "Ways/Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:723
 msgid "Demanding Alpine Hiking"
 msgstr "較難的高山健行"
@@ -15322,5 +15657,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:726
+#: build/trans_presets.java:727
 msgid "Edit Demanding Alpine Hiking"
 msgstr "編輯較難的高山健行"
@@ -15328,5 +15663,5 @@
 #. item "Ways/Demanding Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:735
+#: build/trans_presets.java:736
 msgid "Difficult Alpine Hiking"
 msgstr "艱難的高山健行"
@@ -15336,5 +15671,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sac_scale"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sac_scale" />
-#: build/trans_presets.java:739
+#: build/trans_presets.java:740
 msgid "Edit Difficult Alpine Hiking"
 msgstr "編輯艱難的高山健行"
@@ -15342,10 +15677,10 @@
 #. item "Ways/Difficult Alpine Hiking" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:749
+#: build/trans_presets.java:750
 msgid "Waypoints"
 msgstr "路標"
 
 #. group "Waypoints"
-#: build/trans_presets.java:750
+#: build/trans_presets.java:751
 msgid "Motorway Junction"
 msgstr "高速公路交流道"
@@ -15353,15 +15688,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:752
+#: build/trans_presets.java:753
 msgid "Edit Motorway Junction"
 msgstr "編輯高速公路交流道"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:757
 msgid "Number"
 msgstr "編號"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:758
+#: build/trans_presets.java:759
 msgid "Services"
 msgstr "休息站"
@@ -15369,5 +15704,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:761
 msgid "Edit Service Station"
 msgstr "編輯休息站"
@@ -15405,15 +15740,15 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:765 build/trans_presets.java:902
-#: build/trans_presets.java:1382 build/trans_presets.java:1406
-#: build/trans_presets.java:1413 build/trans_presets.java:1419
-#: build/trans_presets.java:1427 build/trans_presets.java:1434
-#: build/trans_presets.java:1761 build/trans_presets.java:1771
-#: build/trans_presets.java:2361 build/trans_presets.java:2368
-#: build/trans_presets.java:2384 build/trans_presets.java:2395
-#: build/trans_presets.java:2403 build/trans_presets.java:2410
-#: build/trans_presets.java:2464 build/trans_presets.java:2512
-#: build/trans_presets.java:2678 build/trans_presets.java:2693
-#: build/trans_presets.java:2732 build/trans_presets.java:3151
+#: build/trans_presets.java:766 build/trans_presets.java:903
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
+#: build/trans_presets.java:1416 build/trans_presets.java:1422
+#: build/trans_presets.java:1430 build/trans_presets.java:1437
+#: build/trans_presets.java:1765 build/trans_presets.java:1775
+#: build/trans_presets.java:2372 build/trans_presets.java:2379
+#: build/trans_presets.java:2395 build/trans_presets.java:2406
+#: build/trans_presets.java:2414 build/trans_presets.java:2421
+#: build/trans_presets.java:2475 build/trans_presets.java:2523
+#: build/trans_presets.java:2689 build/trans_presets.java:2704
+#: build/trans_presets.java:2743 build/trans_presets.java:3163
 msgid "Operator"
 msgstr "經營者"
@@ -15422,5 +15757,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:769
+#: build/trans_presets.java:770
 msgid "Traffic Signal"
 msgstr "交通號誌"
@@ -15430,5 +15765,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:773
+#: build/trans_presets.java:774
 msgid "Pedestrian crossing type"
 msgstr "行人穿越道類型"
@@ -15437,27 +15772,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "uncontrolled"
 msgstr "沒有號誌"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "traffic_signals"
 msgstr "交通號誌"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "island"
 msgstr "安全島"
 
-#: build/trans_presets.java:773 build/trans_presets.java:788
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:774 build/trans_presets.java:789
+#: build/trans_presets.java:1333
 msgid "unmarked"
 msgstr "未畫標記"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:774 build/trans_presets.java:790
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:775 build/trans_presets.java:791
+#: build/trans_presets.java:1334
 msgid "Cross on horseback"
 msgstr ""
@@ -15465,6 +15800,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:775 build/trans_presets.java:789
-#: build/trans_presets.java:1332
+#: build/trans_presets.java:776 build/trans_presets.java:790
+#: build/trans_presets.java:1335
 msgid "Cross by bicycle"
 msgstr "以自行車穿越"
@@ -15473,11 +15808,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:776 build/trans_presets.java:791
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:1336
 msgid "Crossing attendant"
 msgstr "有人陪同穿越"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:777
+#: build/trans_presets.java:778
 msgid "Crossing type name (UK)"
 msgstr "行人穿越道類型名稱 (英國)"
@@ -15485,30 +15820,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "zebra"
 msgstr "斑馬線"
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:777 build/trans_presets.java:792
+#: build/trans_presets.java:778 build/trans_presets.java:793
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:780
+#: build/trans_presets.java:781
 msgid "Stop"
 msgstr "禁止通行"
@@ -15516,5 +15851,5 @@
 #. item
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:783
+#: build/trans_presets.java:784
 msgid "Pedestrian Crossing"
 msgstr "行人穿越道"
@@ -15523,14 +15858,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:786
+#: build/trans_presets.java:787
 msgid "Edit Crossing"
 msgstr "編輯行人穿越道"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:792
+#: build/trans_presets.java:793
 msgid "Type name (UK)"
 msgstr "類型名稱 (英國)"
 
-#: build/trans_presets.java:794
+#: build/trans_presets.java:795
 msgid "Mini-roundabout"
 msgstr "小型圓環"
@@ -15541,14 +15876,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "Direction"
 msgstr "方向"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:799
+#: build/trans_presets.java:800
 msgid "clockwise"
 msgstr "順時針"
 
-#: build/trans_presets.java:801
+#: build/trans_presets.java:802
 msgid "Turning Circle"
 msgstr ""
@@ -15558,20 +15893,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:806
+#: build/trans_presets.java:807
 msgid "City Limit"
 msgstr "城市邊界"
 
 #. item
-#: build/trans_presets.java:807
+#: build/trans_presets.java:808
 msgid "Edit City Limit Sign"
 msgstr "編輯城市邊界標誌"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:812
+#: build/trans_presets.java:813
 msgid "Second Name"
 msgstr "第二名稱"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:814
+#: build/trans_presets.java:815
 msgid "Speed Camera"
 msgstr "測速照相"
@@ -15579,5 +15914,5 @@
 #. item
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:817
+#: build/trans_presets.java:818
 msgid "Emergency Phone"
 msgstr "緊急電話"
@@ -15585,5 +15920,5 @@
 #. item
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:820
+#: build/trans_presets.java:821
 msgid "Incline"
 msgstr "坡"
@@ -15591,5 +15926,5 @@
 #. item
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:823
+#: build/trans_presets.java:824
 msgid "Incline Steep"
 msgstr "險升/降坡"
@@ -15598,10 +15933,10 @@
 #. <key key="highway" value="incline_steep" />
 #. <separator/>
-#: build/trans_presets.java:827
+#: build/trans_presets.java:828
 msgid "Ford"
 msgstr "淺灘"
 
 #. item
-#: build/trans_presets.java:828
+#: build/trans_presets.java:829
 msgid "Edit Ford"
 msgstr "編輯淺灘"
@@ -15609,5 +15944,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:835
+#: build/trans_presets.java:836
 msgid "Mountain Pass"
 msgstr "鞍部"
@@ -15615,5 +15950,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:837
+#: build/trans_presets.java:838
 msgid "Edit Mountain Pass"
 msgstr "編輯鞍部"
@@ -15625,7 +15960,7 @@
 #. item "Places/Glacier" text "Name"
 #. item "Places/Volcano" text "Name"
-#: build/trans_presets.java:842 build/trans_presets.java:1600
-#: build/trans_presets.java:1745 build/trans_presets.java:2845
-#: build/trans_presets.java:2852 build/trans_presets.java:2859
+#: build/trans_presets.java:843 build/trans_presets.java:1604
+#: build/trans_presets.java:1749 build/trans_presets.java:2857
+#: build/trans_presets.java:2864 build/trans_presets.java:2871
 msgid "Elevation"
 msgstr "海拔"
@@ -15633,5 +15968,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:846
+#: build/trans_presets.java:847
 msgid "Barriers"
 msgstr "障礙物"
@@ -15639,5 +15974,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:849
+#: build/trans_presets.java:850
 msgid "Bollard"
 msgstr "車阻柱"
@@ -15645,5 +15980,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:852
 msgid "Edit Bollard"
 msgstr "編輯車阻柱"
@@ -15688,16 +16023,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:854 build/trans_presets.java:873
-#: build/trans_presets.java:887 build/trans_presets.java:909
-#: build/trans_presets.java:946 build/trans_presets.java:959
-#: build/trans_presets.java:971 build/trans_presets.java:983
-#: build/trans_presets.java:995 build/trans_presets.java:1007
-#: build/trans_presets.java:1017 build/trans_presets.java:1026
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:855 build/trans_presets.java:874
+#: build/trans_presets.java:888 build/trans_presets.java:910
+#: build/trans_presets.java:947 build/trans_presets.java:960
+#: build/trans_presets.java:972 build/trans_presets.java:984
+#: build/trans_presets.java:996 build/trans_presets.java:1008
+#: build/trans_presets.java:1018 build/trans_presets.java:1027
+#: build/trans_presets.java:1036
 msgid "Allowed traffic:"
 msgstr "允許通行方向："
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:861
+#: build/trans_presets.java:862
 msgid "Cycle Barrier"
 msgstr "自行車護欄"
@@ -15706,5 +16041,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:865
+#: build/trans_presets.java:866
 msgid "Block"
 msgstr "水泥護欄"
@@ -15712,5 +16047,5 @@
 #. item
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:868
+#: build/trans_presets.java:869
 msgid "Cattle Grid"
 msgstr "家畜柵欄"
@@ -15718,10 +16053,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:870
+#: build/trans_presets.java:871
 msgid "Edit Cattle Grid"
 msgstr "編輯家畜柵欄"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:880
+#: build/trans_presets.java:881
 msgid "Bus Trap"
 msgstr "公車專用道障礙"
@@ -15729,15 +16064,15 @@
 #. item
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:883
+#: build/trans_presets.java:884
 msgid "Spikes"
 msgstr "長釘"
 
 #. item
-#: build/trans_presets.java:884
+#: build/trans_presets.java:885
 msgid "Edit Spikes"
 msgstr "編輯長釘"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:896
 msgid "Toll Booth"
 msgstr "收費站"
@@ -15745,5 +16080,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:897
+#: build/trans_presets.java:898
 msgid "Edit Toll Booth"
 msgstr "編輯收費站"
@@ -15751,10 +16086,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:905
+#: build/trans_presets.java:906
 msgid "Border Control"
 msgstr "國境管控站"
 
 #. item
-#: build/trans_presets.java:906
+#: build/trans_presets.java:907
 msgid "Edit Border Control"
 msgstr "編輯國境管控站"
@@ -15764,5 +16099,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:920
+#: build/trans_presets.java:921
 msgid "Hedge"
 msgstr "籬笆"
@@ -15771,5 +16106,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:924
+#: build/trans_presets.java:925
 msgid "Fence"
 msgstr "欄柵"
@@ -15778,5 +16113,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
 #. <key key="barrier" value="fence" />
-#: build/trans_presets.java:928
+#: build/trans_presets.java:929
 msgid "Wall"
 msgstr "牆"
@@ -15784,5 +16119,5 @@
 #. item
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:931
+#: build/trans_presets.java:932
 msgid "City Wall"
 msgstr "城牆"
@@ -15791,5 +16126,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:935
+#: build/trans_presets.java:936
 msgid "Retaining Wall"
 msgstr "擋土牆"
@@ -15801,15 +16136,15 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:942
+#: build/trans_presets.java:943
 msgid "Entrance"
 msgstr "入口"
 
 #. item
-#: build/trans_presets.java:943
+#: build/trans_presets.java:944
 msgid "Edit Entrance"
 msgstr "編輯入口"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:954
+#: build/trans_presets.java:955
 msgid "Gate"
 msgstr "閘門"
@@ -15817,50 +16152,50 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:956
+#: build/trans_presets.java:957
 msgid "Edit Gate"
 msgstr "編輯閘門"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:967
+#: build/trans_presets.java:968
 msgid "Lift Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:968
+#: build/trans_presets.java:969
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:979
+#: build/trans_presets.java:980
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:980
+#: build/trans_presets.java:981
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:991
+#: build/trans_presets.java:992
 msgid "Bump Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:992
+#: build/trans_presets.java:993
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:1003
+#: build/trans_presets.java:1004
 msgid "Kissing Gate"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1004
+#: build/trans_presets.java:1005
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1013
 msgid "Stile"
 msgstr ""
@@ -15868,25 +16203,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:1014
+#: build/trans_presets.java:1015
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1023
 msgid "Turnstile"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1024
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1032
 msgid "Sally Port"
 msgstr "城門"
 
 #. item
-#: build/trans_presets.java:1032
+#: build/trans_presets.java:1033
 msgid "Edit Sally Port"
 msgstr "編輯城門"
@@ -15894,13 +16229,14 @@
 #. item "Barriers/Sally Port" check "Motorcar"
 #.
-#. <separator/>
+#. group "Water"
 #. item "Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:1046 build/trans_presets.java:1089
+#: build/trans_presets.java:1047 build/trans_presets.java:1048
+#: build/trans_presets.java:1091
 msgid "Water"
 msgstr "水域"
 
 #. group "Water"
-#: build/trans_presets.java:1047
+#: build/trans_presets.java:1049
 msgid "Spring"
 msgstr "泉"
@@ -15908,5 +16244,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:1049
+#: build/trans_presets.java:1051
 msgid "Edit Spring"
 msgstr "編輯泉"
@@ -15914,5 +16250,5 @@
 #. item "Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1054
+#: build/trans_presets.java:1056
 msgid "Drain"
 msgstr ""
@@ -15920,10 +16256,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:1056
+#: build/trans_presets.java:1058
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Drain" combo "Layer"
-#: build/trans_presets.java:1062
+#: build/trans_presets.java:1064
 msgid "Stream"
 msgstr "溪流"
@@ -15931,10 +16267,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:1064
+#: build/trans_presets.java:1066
 msgid "Edit Stream"
 msgstr "編輯溪流"
 
 #. item "Water/Stream" combo "Layer"
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1072
 msgid "Canal"
 msgstr "運河"
@@ -15942,10 +16278,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1074
 msgid "Edit Canal"
 msgstr "編輯運河"
 
 #. item "Water/Canal" combo "Layer"
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1080
 msgid "River"
 msgstr "河流"
@@ -15955,5 +16291,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1084
 msgid "Edit River"
 msgstr "編輯河流"
@@ -15961,15 +16297,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1093
 msgid "Edit Water"
 msgstr "編輯水域"
 
 #. item "Water/Water" text "Name"
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1097
 msgid "Land"
 msgstr "陸地"
 
 #. item
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1098
 msgid "Edit Land"
 msgstr "編輯陸地"
@@ -15977,15 +16313,15 @@
 #. item "Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1101
+#: build/trans_presets.java:1103
 msgid "Basin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1104
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Basin" text "Name"
-#: build/trans_presets.java:1107
+#: build/trans_presets.java:1109
 msgid "Reservoir"
 msgstr "貯水處"
@@ -15993,15 +16329,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1109
+#: build/trans_presets.java:1111
 msgid "Edit Reservoir Landuse"
 msgstr "編輯貯水處"
 
 #. item "Water/Reservoir" text "Name"
-#: build/trans_presets.java:1114
+#: build/trans_presets.java:1116
 msgid "Covered Reservoir"
 msgstr "有覆蓋的貯水處"
 
 #. item
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1117
 msgid "Edit Covered Reservoir"
 msgstr "編輯有覆蓋的貯水處"
@@ -16009,5 +16345,5 @@
 #. item "Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1120
+#: build/trans_presets.java:1122
 msgid "Riverbank"
 msgstr "河岸"
@@ -16016,10 +16352,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1125
 msgid "Edit Riverbank"
 msgstr "編輯河岸"
 
 #. item "Water/Riverbank" text "Name"
-#: build/trans_presets.java:1127
+#: build/trans_presets.java:1129
 msgid "Wetland"
 msgstr "溼地"
@@ -16030,14 +16366,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1134
 msgid "Edit Wetland"
 msgstr "編輯溼地"
 
 #. item "Water/Wetland" combo "Type"
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "swamp"
 msgstr "沼澤"
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "bog"
 msgstr "泥沼"
@@ -16051,35 +16387,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1135 build/trans_style.java:3384
+#: build/trans_presets.java:1137 build/trans_style.java:3392
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1135
+#: build/trans_presets.java:1137
 msgid "mangrove"
 msgstr "紅樹林"
 
-#: build/trans_presets.java:1137
+#: build/trans_presets.java:1139
 msgid "Mud"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1140
 msgid "Edit Mud"
 msgstr ""
 
 #. item "Water/Mud" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1144
 msgid "Beach"
 msgstr "海灘"
@@ -16087,20 +16423,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1144
+#: build/trans_presets.java:1146
 msgid "Edit Beach"
 msgstr "編輯海灘"
 
 #. item "Water/Beach" text "Name"
-#: build/trans_presets.java:1148
+#: build/trans_presets.java:1150
 msgid "Bay"
 msgstr "海灣"
 
 #. item
-#: build/trans_presets.java:1149
+#: build/trans_presets.java:1151
 msgid "Edit Bay"
 msgstr "編輯海灣"
 
 #. item "Water/Bay" text "Name"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1155
 msgid "Cliff"
 msgstr "斷崖"
@@ -16108,10 +16444,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1155
+#: build/trans_presets.java:1157
 msgid "Edit Cliff"
 msgstr "編輯斷崖"
 
 #. item "Water/Cliff" text "Name"
-#: build/trans_presets.java:1159
+#: build/trans_presets.java:1161
 msgid "Coastline"
 msgstr "海岸線"
@@ -16119,5 +16455,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1161
+#: build/trans_presets.java:1163
 msgid "Edit Coastline"
 msgstr "編輯海岸線"
@@ -16125,5 +16461,5 @@
 #. item "Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1166
+#: build/trans_presets.java:1168
 msgid "Ferry Route"
 msgstr "渡輪路線"
@@ -16131,5 +16467,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1170
 msgid "Edit Ferry"
 msgstr "編輯渡輪"
@@ -16138,5 +16474,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1176
+#: build/trans_presets.java:1178
 msgid "Boatyard"
 msgstr ""
@@ -16144,10 +16480,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:1180
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Boatyard" text "Name"
-#: build/trans_presets.java:1183
+#: build/trans_presets.java:1185
 msgid "Dock"
 msgstr "船塢"
@@ -16155,5 +16491,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1185
+#: build/trans_presets.java:1187
 msgid "Edit Dock"
 msgstr "編輯船塢"
@@ -16161,5 +16497,5 @@
 #. item "Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1193
 msgid "Dam"
 msgstr "水壩"
@@ -16167,15 +16503,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1195
 msgid "Edit Dam"
 msgstr "編輯水壩"
 
 #. item "Water/Dam" text "Name"
-#: build/trans_presets.java:1199
+#: build/trans_presets.java:1201
 msgid "Waterway Point"
 msgstr "水路點"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1200
+#: build/trans_presets.java:1202
 msgid "Lock Gate"
 msgstr "調節水門"
@@ -16184,5 +16520,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1206
 msgid "Weir"
 msgstr "堰"
@@ -16190,20 +16526,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:1208
 msgid "Edit Weir"
 msgstr "編輯堰"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1213
 msgid "Waterfall"
 msgstr "瀑布"
 
 #. item
-#: build/trans_presets.java:1212
+#: build/trans_presets.java:1214
 msgid "Edit Waterfall"
 msgstr "編輯瀑布"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1219
 msgid "Turning Point"
 msgstr ""
@@ -16212,15 +16548,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1221
+#: build/trans_presets.java:1223
 msgid "Marina"
 msgstr "碼頭"
 
 #. item
-#: build/trans_presets.java:1222
+#: build/trans_presets.java:1224
 msgid "Edit Marina"
 msgstr "編輯碼頭"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1226
+#: build/trans_presets.java:1228
 msgid "Pier"
 msgstr "渡頭"
@@ -16228,10 +16564,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1230
 msgid "Edit Pier"
 msgstr "編輯渡頭"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1232
+#: build/trans_presets.java:1234
 msgid "Ferry Terminal"
 msgstr "渡輪端點"
@@ -16239,10 +16575,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1236
 msgid "Edit Ferry Terminal"
 msgstr "編輯渡輪端點"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1238
+#: build/trans_presets.java:1240
 msgid "Slipway"
 msgstr "船臺"
@@ -16252,16 +16588,21 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1242
+#: build/trans_presets.java:1244
 msgid "Edit Slipway"
 msgstr "編輯造船臺"
 
 #. item "Waterway Point/Slipway" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1248
+#: build/trans_presets.java:1250
+#, fuzzy
+msgid "Transport"
+msgstr "大眾運輸"
+
+#. group "Transport"
+#: build/trans_presets.java:1251
 msgid "Railway"
 msgstr "鐵路"
 
 #. group "Railway"
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1252
 msgid "Rail"
 msgstr "軌"
@@ -16269,5 +16610,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1251
+#: build/trans_presets.java:1254
 msgid "Edit Rail"
 msgstr "編輯軌道"
@@ -16297,8 +16638,8 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "Optional Types"
 msgstr "選擇性的類型"
@@ -16312,35 +16653,35 @@
 #. item "Railway/Tram" combo "Optional Types"
 #. item "Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1254 build/trans_presets.java:1260
-#: build/trans_presets.java:1267 build/trans_presets.java:1273
-#: build/trans_presets.java:1279 build/trans_presets.java:1285
-#: build/trans_presets.java:1291 build/trans_presets.java:1316
+#: build/trans_presets.java:1257 build/trans_presets.java:1263
+#: build/trans_presets.java:1270 build/trans_presets.java:1276
+#: build/trans_presets.java:1282 build/trans_presets.java:1288
+#: build/trans_presets.java:1294 build/trans_presets.java:1319
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1256
+#: build/trans_presets.java:1259
 msgid "Narrow Gauge Rail"
 msgstr "窄軌"
 
 #. item
-#: build/trans_presets.java:1257
+#: build/trans_presets.java:1260
 msgid "Edit Narrow Gauge Rail"
 msgstr "編輯窄軌"
 
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1265
 msgid "Monorail"
 msgstr "單軌"
@@ -16348,45 +16689,45 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1267
 msgid "Edit Monorail"
 msgstr "編輯單軌"
 
-#: build/trans_presets.java:1269
+#: build/trans_presets.java:1272
 msgid "Preserved"
 msgstr "保留鐵路"
 
 #. item
-#: build/trans_presets.java:1270
+#: build/trans_presets.java:1273
 msgid "Edit Preserved Railway"
 msgstr "編輯保留的鐵路"
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1278
 msgid "Light Rail"
 msgstr "輕軌電車"
 
 #. item
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1279
 msgid "Edit Light Rail"
 msgstr "編輯輕軌電車"
 
-#: build/trans_presets.java:1281
+#: build/trans_presets.java:1284
 msgid "Subway"
 msgstr "地下鐵"
 
 #. item
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1285
 msgid "Edit Subway"
 msgstr "編輯地下鐵"
 
-#: build/trans_presets.java:1287
+#: build/trans_presets.java:1290
 msgid "Tram"
 msgstr "路面電車"
 
 #. item
-#: build/trans_presets.java:1288
+#: build/trans_presets.java:1291
 msgid "Edit Tram"
 msgstr "編輯路面電車"
 
-#: build/trans_presets.java:1293
+#: build/trans_presets.java:1296
 msgid "Bus Guideway"
 msgstr "導軌道巴士"
@@ -16394,5 +16735,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1295
+#: build/trans_presets.java:1298
 msgid "Edit Bus Guideway"
 msgstr "編輯導軌道巴士"
@@ -16401,14 +16742,14 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1315
 msgid "Disused Rail"
 msgstr "不使用的軌道"
 
 #. item
-#: build/trans_presets.java:1313
+#: build/trans_presets.java:1316
 msgid "Edit Disused Railway"
 msgstr "編輯不使用的鐵路"
 
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1321
 msgid "Abandoned Rail"
 msgstr "廢棄的軌道"
@@ -16417,5 +16758,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1325
 msgid "Level Crossing"
 msgstr "鐵路平交道"
@@ -16424,5 +16765,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1326
+#: build/trans_presets.java:1329
 msgid "Crossing"
 msgstr "平交道"
@@ -16432,5 +16773,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1333
 msgid "Crossing type"
 msgstr "平交道類型"
@@ -16438,5 +16779,5 @@
 #. item "Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1336
+#: build/trans_presets.java:1339
 msgid "Turntable"
 msgstr "調車轉盤"
@@ -16445,10 +16786,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1344
 msgid "Aerialway"
 msgstr "空中路線"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1345
 msgid "Chair Lift"
 msgstr "滑雪纜車"
@@ -16456,10 +16797,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1347
 msgid "Edit Chair Lift"
 msgstr "編輯滑雪纜車"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1351
 msgid "Drag Lift"
 msgstr ""
@@ -16467,10 +16808,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1353
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1357
 msgid "Cable Car"
 msgstr "纜車"
@@ -16478,10 +16819,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1356
+#: build/trans_presets.java:1359
 msgid "Edit Cable Car"
 msgstr "編輯纜車"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1360
+#: build/trans_presets.java:1363
 msgid "Gondola"
 msgstr ""
@@ -16489,5 +16830,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1365
 msgid "Edit Gondola"
 msgstr ""
@@ -16495,5 +16836,5 @@
 #. item "Aerialway/Gondola" text "Name"
 #. group "Public Transport"
-#: build/trans_presets.java:1366 build/trans_presets.java:1461
+#: build/trans_presets.java:1369 build/trans_presets.java:1464
 msgid "Station"
 msgstr "車站"
@@ -16504,10 +16845,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1368 build/trans_presets.java:1464
+#: build/trans_presets.java:1371 build/trans_presets.java:1467
 msgid "Edit Station"
 msgstr "編輯車站"
 
 #. group "Car"
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1378
 msgid "Fuel"
 msgstr "加油站"
@@ -16517,5 +16858,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1379
+#: build/trans_presets.java:1382
 msgid "Edit Fuel"
 msgstr "編輯加油站"
@@ -16573,32 +16914,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1671 build/trans_presets.java:1678
-#: build/trans_presets.java:1686 build/trans_presets.java:1699
-#: build/trans_presets.java:1713 build/trans_presets.java:1810
-#: build/trans_presets.java:1818 build/trans_presets.java:1909
-#: build/trans_presets.java:1915 build/trans_presets.java:2226
-#: build/trans_presets.java:2250 build/trans_presets.java:2465
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1703
+#: build/trans_presets.java:1717 build/trans_presets.java:1814
+#: build/trans_presets.java:1822 build/trans_presets.java:1919
+#: build/trans_presets.java:1925 build/trans_presets.java:2237
+#: build/trans_presets.java:2261 build/trans_presets.java:2476
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Opening Hours"
 msgstr ""
@@ -16657,91 +16998,91 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1383 build/trans_presets.java:1621
-#: build/trans_presets.java:1629 build/trans_presets.java:1636
-#: build/trans_presets.java:1643 build/trans_presets.java:1649
-#: build/trans_presets.java:1656 build/trans_presets.java:1663
-#: build/trans_presets.java:1678 build/trans_presets.java:1686
-#: build/trans_presets.java:1699 build/trans_presets.java:1713
-#: build/trans_presets.java:1810 build/trans_presets.java:1818
-#: build/trans_presets.java:1909 build/trans_presets.java:1915
-#: build/trans_presets.java:2226 build/trans_presets.java:2250
-#: build/trans_presets.java:2473 build/trans_presets.java:2479
-#: build/trans_presets.java:2486 build/trans_presets.java:2493
-#: build/trans_presets.java:2499 build/trans_presets.java:2505
-#: build/trans_presets.java:2527 build/trans_presets.java:2534
-#: build/trans_presets.java:2541 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2560
-#: build/trans_presets.java:2566 build/trans_presets.java:2572
-#: build/trans_presets.java:2578 build/trans_presets.java:2584
-#: build/trans_presets.java:2591 build/trans_presets.java:2598
-#: build/trans_presets.java:2605 build/trans_presets.java:2611
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2642 build/trans_presets.java:2649
-#: build/trans_presets.java:2656 build/trans_presets.java:2662
-#: build/trans_presets.java:2668 build/trans_presets.java:2679
-#: build/trans_presets.java:2687 build/trans_presets.java:2702
-#: build/trans_presets.java:2708 build/trans_presets.java:2716
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:1386 build/trans_presets.java:1625
+#: build/trans_presets.java:1633 build/trans_presets.java:1640
+#: build/trans_presets.java:1647 build/trans_presets.java:1653
+#: build/trans_presets.java:1660 build/trans_presets.java:1667
+#: build/trans_presets.java:1682 build/trans_presets.java:1690
+#: build/trans_presets.java:1703 build/trans_presets.java:1717
+#: build/trans_presets.java:1814 build/trans_presets.java:1822
+#: build/trans_presets.java:1919 build/trans_presets.java:1925
+#: build/trans_presets.java:2237 build/trans_presets.java:2261
+#: build/trans_presets.java:2484 build/trans_presets.java:2490
+#: build/trans_presets.java:2497 build/trans_presets.java:2504
+#: build/trans_presets.java:2510 build/trans_presets.java:2516
+#: build/trans_presets.java:2538 build/trans_presets.java:2545
+#: build/trans_presets.java:2552 build/trans_presets.java:2558
+#: build/trans_presets.java:2565 build/trans_presets.java:2571
+#: build/trans_presets.java:2577 build/trans_presets.java:2583
+#: build/trans_presets.java:2589 build/trans_presets.java:2595
+#: build/trans_presets.java:2602 build/trans_presets.java:2609
+#: build/trans_presets.java:2616 build/trans_presets.java:2622
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2653 build/trans_presets.java:2660
+#: build/trans_presets.java:2667 build/trans_presets.java:2673
+#: build/trans_presets.java:2679 build/trans_presets.java:2690
+#: build/trans_presets.java:2698 build/trans_presets.java:2713
+#: build/trans_presets.java:2719 build/trans_presets.java:2727
+#: build/trans_presets.java:2754
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
@@ -16756,5 +17097,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1385 build/trans_presets.java:1438
+#: build/trans_presets.java:1388 build/trans_presets.java:1441
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -16764,5 +17105,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1391
 msgid "Edit Parking"
 msgstr "編輯停車場"
@@ -16773,24 +17114,24 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1391 build/trans_presets.java:1762
-#: build/trans_presets.java:1772 build/trans_presets.java:2396
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:1394 build/trans_presets.java:1766
+#: build/trans_presets.java:1776 build/trans_presets.java:2407
+#: build/trans_presets.java:2524
 msgid "Reference number"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "multi-storey"
 msgstr "塔式"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "surface"
 msgstr "平面式"
 
-#: build/trans_presets.java:1392
+#: build/trans_presets.java:1395
 msgid "underground"
 msgstr "地下"
 
-#: build/trans_presets.java:1393
+#: build/trans_presets.java:1396
 msgid "Park and Ride"
 msgstr ""
@@ -16799,38 +17140,38 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1394 build/trans_presets.java:1763
-#: build/trans_presets.java:1773 build/trans_presets.java:2397
+#: build/trans_presets.java:1397 build/trans_presets.java:1767
+#: build/trans_presets.java:1777 build/trans_presets.java:2408
 msgid "Fee"
 msgstr "費用"
 
 #. <space />
-#: build/trans_presets.java:1396
+#: build/trans_presets.java:1399
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1400
 msgid "Spaces for Disabled"
 msgstr "殘障專用空間"
 
-#: build/trans_presets.java:1398
+#: build/trans_presets.java:1401
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1402
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1403
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1402
+#: build/trans_presets.java:1405
 msgid "Wash"
 msgstr "洗車場"
 
 #. item
-#: build/trans_presets.java:1403
+#: build/trans_presets.java:1406
 msgid "Edit Car Wash"
 msgstr "編輯"
@@ -16838,5 +17179,5 @@
 #. item "Car/Wash" text "Operator"
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1408 build/trans_presets.java:1452
+#: build/trans_presets.java:1411 build/trans_presets.java:1455
 msgid "Shop"
 msgstr "商店"
@@ -16844,15 +17185,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1413
 msgid "Edit Car Shop"
 msgstr "編輯汽車商店"
 
 #. item "Car/Shop" text "Operator"
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1418
 msgid "Repair"
 msgstr "修車場"
 
 #. item
-#: build/trans_presets.java:1416
+#: build/trans_presets.java:1419
 msgid "Edit Car Repair"
 msgstr "編輯修車場"
@@ -16860,5 +17201,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1421 build/trans_presets.java:1445
+#: build/trans_presets.java:1424 build/trans_presets.java:1448
 msgid "Rental"
 msgstr "租車"
@@ -16867,10 +17208,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1424
+#: build/trans_presets.java:1427
 msgid "Edit Car Rental"
 msgstr "編輯租車"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1432
 msgid "Sharing"
 msgstr ""
@@ -16878,5 +17219,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1434
 msgid "Edit Car Sharing"
 msgstr ""
@@ -16884,10 +17225,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1443
 msgid "Edit Bicycle Parking"
 msgstr "編輯自行車停車場"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1446
 msgid "Capacity"
 msgstr "容量"
@@ -16896,5 +17237,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1448
+#: build/trans_presets.java:1451
 msgid "Edit Bicycle Rental"
 msgstr "編輯自行車租用點"
@@ -16903,15 +17244,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1458
 msgid "Edit Bicycle Shop"
 msgstr "編輯自行車商店"
 
 #. item "Bicycle/Shop" text "Name"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1463
 msgid "Public Transport"
 msgstr "大眾運輸"
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:1472
 msgid "UIC-Reference"
 msgstr ""
@@ -16919,5 +17260,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1475
 msgid "Railway Halt"
 msgstr ""
@@ -16925,5 +17266,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1477
 msgid "Edit Halt"
 msgstr ""
@@ -16931,5 +17272,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1481
+#: build/trans_presets.java:1484
 msgid "Tram Stop"
 msgstr "路面電車停靠"
@@ -16938,5 +17279,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1484
+#: build/trans_presets.java:1487
 msgid "Edit Tram Stop"
 msgstr "編輯路面電車停靠"
@@ -16944,5 +17285,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1491
+#: build/trans_presets.java:1494
 msgid "Railway Platform"
 msgstr "鐵路月台"
@@ -16951,5 +17292,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1494
+#: build/trans_presets.java:1497
 msgid "Edit Railway Platform"
 msgstr "編輯鐵路月台"
@@ -16961,5 +17302,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1497 build/trans_presets.java:1539
+#: build/trans_presets.java:1500 build/trans_presets.java:1542
 msgid "Reference (track number)"
 msgstr ""
@@ -16967,10 +17308,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1499 build/trans_presets.java:1541
+#: build/trans_presets.java:1502 build/trans_presets.java:1544
 msgid "Area"
 msgstr "區域"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1501
+#: build/trans_presets.java:1504
 msgid "Subway Entrance"
 msgstr "地下鐵入口"
@@ -16979,10 +17320,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1504
+#: build/trans_presets.java:1507
 msgid "Edit Subway Entrance"
 msgstr "編輯地下鐵入口"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1509
+#: build/trans_presets.java:1512
 msgid "Wheelchair"
 msgstr ""
@@ -16991,5 +17332,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1517
 msgid "Bus Station"
 msgstr "公車車站"
@@ -16998,5 +17339,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1520
 msgid "Edit Bus Station"
 msgstr "編輯公車車站"
@@ -17004,5 +17345,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1526
 msgid "Bus Stop"
 msgstr "公車站牌"
@@ -17012,5 +17353,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1527
+#: build/trans_presets.java:1530
 msgid "Edit Bus Stop"
 msgstr "編輯公車站牌"
@@ -17019,6 +17360,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1532 build/trans_presets.java:1785
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:1535 build/trans_presets.java:1789
+#: build/trans_presets.java:2453
 msgid "Shelter"
 msgstr ""
@@ -17026,10 +17367,10 @@
 #. item "Public Transport/Bus Stop" check "Shelter"
 #. </optional>
-#: build/trans_presets.java:1535
+#: build/trans_presets.java:1538
 msgid "Bus Platform"
 msgstr "公車月台"
 
 #. item
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1539
 msgid "Edit Bus Platform"
 msgstr "編輯公車月台"
@@ -17037,5 +17378,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1547
 msgid "Taxi"
 msgstr "計程車"
@@ -17043,5 +17384,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1546
+#: build/trans_presets.java:1549
 msgid "Edit Taxi station"
 msgstr "編輯計程車招呼站"
@@ -17049,5 +17390,5 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1551
+#: build/trans_presets.java:1554
 msgid "Airport"
 msgstr "機場"
@@ -17055,15 +17396,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1556
 msgid "Edit Airport"
 msgstr "編輯機場"
 
 #. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1561
 msgid "IATA"
 msgstr ""
 
 #. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1559
+#: build/trans_presets.java:1562
 msgid "ICAO"
 msgstr ""
@@ -17071,6 +17412,11 @@
 #. item "Public Transport/Airport" text "ICAO"
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:1564
+#: build/trans_presets.java:1567
+#, fuzzy
+msgid "Travel"
+msgstr "碎石路"
+
+#. group "Travel"
+#: build/trans_presets.java:1568
 msgid "Accomodation"
 msgstr ""
@@ -17082,5 +17428,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1565 build/trans_surveyor.java:43
+#: build/trans_presets.java:1569 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "旅館"
@@ -17089,15 +17435,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:1568
+#: build/trans_presets.java:1572
 msgid "Edit Hotel"
 msgstr "編輯旅館"
 
 #. item "Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1575
 msgid "Stars"
 msgstr "星級"
 
 #. item "Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1577
 msgid "Motel"
 msgstr "汽車旅館"
@@ -17105,20 +17451,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1575
+#: build/trans_presets.java:1579
 msgid "Edit Motel"
 msgstr "編輯汽車旅館"
 
 #. item "Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1583
 msgid "Guest House"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1584
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1584
+#: build/trans_presets.java:1588
 msgid "Chalet"
 msgstr ""
@@ -17126,10 +17472,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1590
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1594
 msgid "Hostel"
 msgstr ""
@@ -17137,30 +17483,30 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1592
+#: build/trans_presets.java:1596
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1596
+#: build/trans_presets.java:1600
 msgid "Alpine Hut"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1601
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1606
 msgid "Caravan Site"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1603
+#: build/trans_presets.java:1607
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1607
+#: build/trans_presets.java:1611
 msgid "Camping Site"
 msgstr "露營區"
@@ -17168,10 +17514,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1609
+#: build/trans_presets.java:1613
 msgid "Edit Camping Site"
 msgstr "編輯露營區"
 
 #. item "Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1618
 msgid "Food+Drinks"
 msgstr "食物+飲料"
@@ -17182,5 +17528,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1615 build/trans_surveyor.java:47
+#: build/trans_presets.java:1619 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "餐廳"
@@ -17188,5 +17534,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1617
+#: build/trans_presets.java:1621
 msgid "Edit Restaurant"
 msgstr "編輯餐廳"
@@ -17194,5 +17540,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "Cuisine"
 msgstr "烹調風格"
@@ -17200,61 +17546,61 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "italian"
 msgstr "意大利文"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "chinese"
 msgstr "中文"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "pizza"
 msgstr "披薩"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "burger"
 msgstr "漢堡"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "greek"
 msgstr "希臘文"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "german"
 msgstr "德文"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "indian"
 msgstr "印度料理"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "regional"
 msgstr "地方料理"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "turkish"
 msgstr "土耳其料理"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "asian"
 msgstr "亞洲料理"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "thai"
 msgstr "泰文"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "mexican"
 msgstr "墨西哥料理"
 
-#: build/trans_presets.java:1620 build/trans_presets.java:1628
+#: build/trans_presets.java:1624 build/trans_presets.java:1632
 msgid "japanese"
 msgstr "日文"
 
-#: build/trans_presets.java:1623
+#: build/trans_presets.java:1627
 msgid "Fast Food"
 msgstr "速食"
@@ -17262,9 +17608,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1629
 msgid "Edit Fast Food Restaurant"
 msgstr "編輯速食餐廳"
 
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1635
 msgid "Cafe"
 msgstr "咖啡"
@@ -17272,9 +17618,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1633
+#: build/trans_presets.java:1637
 msgid "Edit Cafe"
 msgstr "編輯咖啡廳"
 
-#: build/trans_presets.java:1638
+#: build/trans_presets.java:1642
 msgid "Pub"
 msgstr "酒店"
@@ -17282,18 +17628,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1644
 msgid "Edit Pub"
 msgstr "編輯酒店"
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1649
 msgid "Biergarten"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1646
+#: build/trans_presets.java:1650
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1655
 msgid "Bar"
 msgstr "酒吧"
@@ -17301,9 +17647,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1657
 msgid "Edit Bar"
 msgstr "編輯酒吧"
 
-#: build/trans_presets.java:1658
+#: build/trans_presets.java:1662
 msgid "Nightclub"
 msgstr "夜店"
@@ -17311,24 +17657,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1664
 msgid "Edit Nightclub"
 msgstr "編輯夜店"
 
-#: build/trans_presets.java:1666
+#: build/trans_presets.java:1670
 msgid "Tourism"
 msgstr "旅遊相關"
 
 #. group "Tourism"
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1671
 msgid "Attraction"
 msgstr "吸引力點"
 
 #. item
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1672
 msgid "Edit Attraction"
 msgstr "編輯吸引力點"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1677
 msgid "Museum"
 msgstr "博物館"
@@ -17336,9 +17682,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1679
 msgid "Edit Museum"
 msgstr "編輯博物館"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1684
 msgid "Zoo"
 msgstr "動物園"
@@ -17347,9 +17693,9 @@
 #. <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:1683
+#: build/trans_presets.java:1687
 msgid "Edit Zoo"
 msgstr "編輯動物園"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1692
 msgid "Viewpoint"
 msgstr "景點"
@@ -17357,24 +17703,24 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1694
 msgid "Edit Viewpoint"
 msgstr "編輯景點"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1697
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1699
 msgid "Theme Park"
 msgstr "主題樂園"
 
 #. item
-#: build/trans_presets.java:1696
+#: build/trans_presets.java:1700
 msgid "Edit Theme Park"
 msgstr "編輯主題樂園"
 
-#: build/trans_presets.java:1701
+#: build/trans_presets.java:1705
 msgid "Artwork"
 msgstr "藝術工作"
@@ -17382,5 +17728,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1707
 msgid "Edit Artwork"
 msgstr "編輯藝術工作"
@@ -17388,19 +17734,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1708
+#: build/trans_presets.java:1712
 msgid "Information Office"
 msgstr "資訊服務處"
 
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1719
 msgid "Map"
 msgstr "地圖"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "topo"
 msgstr ""
@@ -17438,5 +17784,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1720 build/trans_style.java:619
+#: build/trans_presets.java:1724 build/trans_style.java:619
 #: build/trans_style.java:635 build/trans_style.java:651
 #: build/trans_style.java:659
@@ -17444,28 +17790,28 @@
 msgstr ""
 
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1724
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1721
+#: build/trans_presets.java:1725
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1722 build/trans_presets.java:1738
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1726 build/trans_presets.java:1742
+#: build/trans_presets.java:1786
 msgid "Closer Description"
 msgstr ""
@@ -17475,5 +17821,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1724 build/trans_presets.java:1747
+#: build/trans_presets.java:1728 build/trans_presets.java:1751
 msgid "Routes shown for:"
 msgstr ""
@@ -17481,6 +17827,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1726 build/trans_presets.java:1749
-#: build/trans_presets.java:1955
+#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1965
 msgid "Cycling"
 msgstr "自行車"
@@ -17488,5 +17834,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1727 build/trans_presets.java:1750
+#: build/trans_presets.java:1731 build/trans_presets.java:1754
 msgid "Mountainbiking"
 msgstr ""
@@ -17494,6 +17840,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1728 build/trans_presets.java:1751
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:1732 build/trans_presets.java:1755
+#: build/trans_presets.java:2019
 msgid "Skiing"
 msgstr "滑雪"
@@ -17501,5 +17847,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1729 build/trans_presets.java:1752
+#: build/trans_presets.java:1733 build/trans_presets.java:1756
 msgid "Riding"
 msgstr ""
@@ -17507,46 +17853,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1730 build/trans_presets.java:1753
+#: build/trans_presets.java:1734 build/trans_presets.java:1757
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1732
+#: build/trans_presets.java:1736
 msgid "Information Board"
 msgstr "資訊板"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "history"
 msgstr "歷史"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "nature"
 msgstr "自然"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "wildlife"
 msgstr "野生"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1741
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1740
+#: build/trans_presets.java:1744
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1759
 msgid "Information Terminal"
 msgstr ""
@@ -17554,29 +17900,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1760 build/trans_presets.java:1770
+#: build/trans_presets.java:1764 build/trans_presets.java:1774
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1769
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1775
+#: build/trans_presets.java:1779
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1776
+#: build/trans_presets.java:1780
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1778
+#: build/trans_presets.java:1782
 msgid "Other Information Points"
 msgstr "其他的資訊點"
 
 #. item
-#: build/trans_presets.java:1786
+#: build/trans_presets.java:1790
 msgid "Edit Shelter"
 msgstr ""
@@ -17584,25 +17930,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1789 build/trans_presets.java:1795
+#: build/trans_presets.java:1793 build/trans_presets.java:1799
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1791
+#: build/trans_presets.java:1795
 msgid "Picnic Site"
 msgstr "野餐區"
 
 #. item
-#: build/trans_presets.java:1792
+#: build/trans_presets.java:1796
 msgid "Edit Picnic Site"
 msgstr "編輯野餐區"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1802
 msgid "Historic Places"
 msgstr "歷史地區"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1799
+#: build/trans_presets.java:1803
 msgid "Castle"
 msgstr "城堡"
@@ -17611,19 +17957,19 @@
 #. <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:1802
+#: build/trans_presets.java:1806
 msgid "Edit Castle"
 msgstr "編輯城堡"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1806
+#: build/trans_presets.java:1810
 msgid "Ruins"
 msgstr "遺跡"
 
 #. item
-#: build/trans_presets.java:1807
+#: build/trans_presets.java:1811
 msgid "Edit Ruins"
 msgstr "編輯遺跡"
 
-#: build/trans_presets.java:1812
+#: build/trans_presets.java:1816
 msgid "Archaeological Site"
 msgstr "考古學地區"
@@ -17632,9 +17978,9 @@
 #. <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:1815
+#: build/trans_presets.java:1819
 msgid "Edit Archaeological Site"
 msgstr "編輯考古學地區"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1824
 msgid "Battlefield"
 msgstr "戰場"
@@ -17642,5 +17988,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1822
+#: build/trans_presets.java:1826
 msgid "Edit Battlefield"
 msgstr "編輯戰場"
@@ -17648,15 +17994,15 @@
 #. item "Historic Places/Battlefield" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1831
 msgid "Monument"
 msgstr "紀念建築"
 
 #. item
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1832
 msgid "Edit Monument"
 msgstr "編輯紀念建築"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1836
 msgid "Memorial"
 msgstr "紀念碑"
@@ -17664,45 +18010,57 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1838
 msgid "Edit Memorial"
 msgstr "編輯紀念碑"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1842
 msgid "Wayside Cross"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1843
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1843
+#: build/trans_presets.java:1847
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1848
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1849
+#: build/trans_presets.java:1852
+#, fuzzy
+msgid "Boundary Stone"
+msgstr "邊界"
+
+#. item
+#: build/trans_presets.java:1853
+#, fuzzy
+msgid "Edit Boundary Stone"
+msgstr "編輯公車站牌"
+
+#. item "Historic Places/Boundary Stone" text "Name"
+#: build/trans_presets.java:1858
 msgid "Leisure"
 msgstr "休閒"
 
 #. group "Leisure"
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1859
 msgid "Water Park"
 msgstr "水上樂園"
 
 #. item
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:1860
 msgid "Edit Water Park"
 msgstr "編輯水上樂園"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1864
 msgid "Playground"
 msgstr "運動場"
@@ -17710,31 +18068,35 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:1866
 msgid "Edit Playground"
 msgstr "編輯運動場"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1861
+#: build/trans_presets.java:1870
 msgid "Fishing"
 msgstr "釣魚"
 
 #. item
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1871
 msgid "Edit Fishing"
 msgstr "編輯釣魚場"
 
 #. item "Leisure/Fishing" text "Name"
-#. <separator/>
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:1877 build/trans_presets.java:2669
+msgid "Sports"
+msgstr "運動用品"
+
+#. group "Sports"
+#: build/trans_presets.java:1878
 msgid "Sport Facilities"
 msgstr "運動設施"
 
 #. group "Sport Facilities"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:1879
 msgid "Stadium"
 msgstr "競技場"
 
 #. item
-#: build/trans_presets.java:1870
+#: build/trans_presets.java:1880
 msgid "Edit Stadium"
 msgstr "編輯競技揚"
@@ -17748,6 +18110,6 @@
 #. item "Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1874 build/trans_presets.java:1883
-#: build/trans_presets.java:1892 build/trans_presets.java:1901
+#: build/trans_presets.java:1884 build/trans_presets.java:1893
+#: build/trans_presets.java:1902 build/trans_presets.java:1911
 msgid "select sport:"
 msgstr "選擇運動："
@@ -18139,30 +18501,30 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
-#: build/trans_style.java:3564 build/trans_style.java:3572
-#: build/trans_style.java:3580 build/trans_style.java:3588
-#: build/trans_style.java:3596 build/trans_style.java:3604
-#: build/trans_style.java:3612 build/trans_style.java:3620
-#: build/trans_style.java:3628 build/trans_style.java:3636
-#: build/trans_style.java:3644 build/trans_style.java:3652
-#: build/trans_style.java:3660 build/trans_style.java:3668
-#: build/trans_style.java:3676 build/trans_style.java:3684
-#: build/trans_style.java:3692 build/trans_style.java:3700
-#: build/trans_style.java:3708 build/trans_style.java:3716
-#: build/trans_style.java:3724 build/trans_style.java:3732
-#: build/trans_style.java:3740 build/trans_style.java:3748
-#: build/trans_style.java:3756 build/trans_style.java:3764
-#: build/trans_style.java:3772 build/trans_style.java:3780
-#: build/trans_style.java:3788 build/trans_style.java:3796
-#: build/trans_style.java:3804 build/trans_style.java:3812
-#: build/trans_style.java:3820 build/trans_style.java:3828
-#: build/trans_style.java:3836 build/trans_style.java:3844
-#: build/trans_style.java:3852 build/trans_style.java:3860
-#: build/trans_style.java:3868 build/trans_style.java:3876
-#: build/trans_style.java:3884 build/trans_style.java:3892
-#: build/trans_style.java:3900 build/trans_style.java:3908
-#: build/trans_style.java:3916 build/trans_style.java:3924
-#: build/trans_style.java:3932
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_style.java:3572 build/trans_style.java:3580
+#: build/trans_style.java:3588 build/trans_style.java:3596
+#: build/trans_style.java:3604 build/trans_style.java:3612
+#: build/trans_style.java:3620 build/trans_style.java:3628
+#: build/trans_style.java:3636 build/trans_style.java:3644
+#: build/trans_style.java:3652 build/trans_style.java:3660
+#: build/trans_style.java:3668 build/trans_style.java:3676
+#: build/trans_style.java:3684 build/trans_style.java:3692
+#: build/trans_style.java:3700 build/trans_style.java:3708
+#: build/trans_style.java:3716 build/trans_style.java:3724
+#: build/trans_style.java:3732 build/trans_style.java:3740
+#: build/trans_style.java:3748 build/trans_style.java:3756
+#: build/trans_style.java:3764 build/trans_style.java:3772
+#: build/trans_style.java:3780 build/trans_style.java:3788
+#: build/trans_style.java:3796 build/trans_style.java:3804
+#: build/trans_style.java:3812 build/trans_style.java:3820
+#: build/trans_style.java:3828 build/trans_style.java:3836
+#: build/trans_style.java:3844 build/trans_style.java:3852
+#: build/trans_style.java:3860 build/trans_style.java:3868
+#: build/trans_style.java:3876 build/trans_style.java:3884
+#: build/trans_style.java:3892 build/trans_style.java:3900
+#: build/trans_style.java:3908 build/trans_style.java:3916
+#: build/trans_style.java:3924 build/trans_style.java:3932
+#: build/trans_style.java:3940
 msgid "sport"
 msgstr "運動"
@@ -18172,225 +18534,225 @@
 #. item "Sport Facilities/Pitch" combo "sport"
 #. item "Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "multi"
 msgstr "多種"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "archery"
 msgstr "射箭"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "athletics"
 msgstr "田徑"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "australian_football"
 msgstr "澳洲足球"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "baseball"
 msgstr "棒球"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "basketball"
 msgstr "籃球"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "bowls"
 msgstr "保齡球"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "canoe"
 msgstr "獨木舟"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "climbing"
 msgstr "攀岩"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "croquet"
 msgstr "木球"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "cycling"
 msgstr "自行車"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "dog_racing"
 msgstr "賽狗"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "equestrian"
 msgstr "馬術"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "football"
 msgstr "美式足球"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "golf"
 msgstr "高爾夫"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "gymnastics"
 msgstr "體操"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "hockey"
 msgstr "曲棍球"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "horse_racing"
 msgstr "賽馬"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "motor"
 msgstr "摩托車"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "rugby"
 msgstr "橄欖球"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "shooting"
 msgstr "射擊"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "skiing"
 msgstr "滑雪"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "soccer"
 msgstr "足球"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "swimming"
 msgstr "游泳"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "table_tennis"
 msgstr "桌球"
 
-#: build/trans_presets.java:1876 build/trans_presets.java:1885
-#: build/trans_presets.java:1894 build/trans_presets.java:1903
+#: build/trans_presets.java:1886 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
 msgid "tennis"
 msgstr "網球"
 
-#: build/trans_presets.java:1878
+#: build/trans_presets.java:1888
 msgid "Sports Centre"
 msgstr "運動中心"
 
 #. item
-#: build/trans_presets.java:1879
+#: build/trans_presets.java:1889
 msgid "Edit Sports Centre"
 msgstr "編輯運動中心"
 
-#: build/trans_presets.java:1887
+#: build/trans_presets.java:1897
 msgid "Pitch"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1898
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1896
+#: build/trans_presets.java:1906
 msgid "Racetrack"
 msgstr "跑道"
 
 #. item
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:1907
 msgid "Edit Racetrack"
 msgstr "編輯跑道"
 
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:1915
 msgid "Golf Course"
 msgstr "高爾夫路線"
 
 #. item
-#: build/trans_presets.java:1906
+#: build/trans_presets.java:1916
 msgid "Edit Golf Course"
 msgstr "編輯高爾夫路線"
 
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:1921
 msgid "Miniature Golf"
 msgstr "迷你高爾夫"
 
 #. item
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1922
 msgid "Edit Miniature Golf"
 msgstr "編輯迷你高爾夫"
 
-#: build/trans_presets.java:1918
+#: build/trans_presets.java:1928
 msgid "Sport"
 msgstr "運動"
 
 #. group "Sport"
-#: build/trans_presets.java:1919
+#: build/trans_presets.java:1929
 msgid "Multi"
 msgstr "多種"
 
 #. item
-#: build/trans_presets.java:1920
+#: build/trans_presets.java:1930
 msgid "Edit Multi"
 msgstr "編輯多種"
@@ -18429,183 +18791,183 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "sports_centre"
 msgstr "運動中心"
 
-#: build/trans_presets.java:1923 build/trans_presets.java:1929
-#: build/trans_presets.java:1935 build/trans_presets.java:1941
-#: build/trans_presets.java:1947 build/trans_presets.java:1953
-#: build/trans_presets.java:1959 build/trans_presets.java:1965
-#: build/trans_presets.java:1971 build/trans_presets.java:1977
-#: build/trans_presets.java:1983 build/trans_presets.java:1989
-#: build/trans_presets.java:1995 build/trans_presets.java:2001
-#: build/trans_presets.java:2007 build/trans_presets.java:2016
-#: build/trans_presets.java:2023 build/trans_presets.java:2031
-#: build/trans_presets.java:2037 build/trans_presets.java:2043
-#: build/trans_presets.java:2049 build/trans_presets.java:2055
-#: build/trans_presets.java:2061 build/trans_presets.java:2067
-#: build/trans_presets.java:2073 build/trans_presets.java:2079
-#: build/trans_presets.java:2085 build/trans_presets.java:2091
-#: build/trans_presets.java:2097 build/trans_presets.java:2103
-#: build/trans_presets.java:2109 build/trans_presets.java:2115
-#: build/trans_presets.java:2121 build/trans_presets.java:2127
+#: build/trans_presets.java:1933 build/trans_presets.java:1939
+#: 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:2026
+#: build/trans_presets.java:2033 build/trans_presets.java:2041
+#: build/trans_presets.java:2047 build/trans_presets.java:2053
+#: build/trans_presets.java:2059 build/trans_presets.java:2065
+#: build/trans_presets.java:2071 build/trans_presets.java:2077
+#: build/trans_presets.java:2083 build/trans_presets.java:2089
+#: build/trans_presets.java:2095 build/trans_presets.java:2101
+#: build/trans_presets.java:2107 build/trans_presets.java:2113
+#: build/trans_presets.java:2119 build/trans_presets.java:2125
+#: build/trans_presets.java:2131 build/trans_presets.java:2137
 msgid "stadium"
 msgstr "競技揚"
 
-#: build/trans_presets.java:1925
+#: build/trans_presets.java:1935
 msgid "10pin"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1926
+#: build/trans_presets.java:1936
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1941
 msgid "Athletics"
 msgstr "田徑"
 
 #. item
-#: build/trans_presets.java:1932
+#: build/trans_presets.java:1942
 msgid "Edit Athletics"
 msgstr "編輯田徑"
 
-#: build/trans_presets.java:1937
+#: build/trans_presets.java:1947
 msgid "Archery"
 msgstr "射箭"
 
 #. item
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:1948
 msgid "Edit Archery"
 msgstr "編輯射箭"
 
-#: build/trans_presets.java:1943
+#: build/trans_presets.java:1953
 msgid "Climbing"
 msgstr "攀岩"
 
 #. item
-#: build/trans_presets.java:1944
+#: build/trans_presets.java:1954
 msgid "Edit Climbing"
 msgstr "編輯攀岩"
 
-#: build/trans_presets.java:1949
+#: build/trans_presets.java:1959
 msgid "Canoeing"
 msgstr "獨木舟"
 
 #. item
-#: build/trans_presets.java:1950
+#: build/trans_presets.java:1960
 msgid "Edit Canoeing"
 msgstr "編輯獨木舟"
 
 #. item
-#: build/trans_presets.java:1956
+#: build/trans_presets.java:1966
 msgid "Edit Cycling"
 msgstr "編輯自行車"
 
-#: build/trans_presets.java:1961
+#: build/trans_presets.java:1971
 msgid "Dog Racing"
 msgstr "賽狗"
 
 #. item
-#: build/trans_presets.java:1962
+#: build/trans_presets.java:1972
 msgid "Edit Dog Racing"
 msgstr "編輯賽狗"
 
-#: build/trans_presets.java:1967
+#: build/trans_presets.java:1977
 msgid "Equestrian"
 msgstr "馬術"
 
 #. item
-#: build/trans_presets.java:1968
+#: build/trans_presets.java:1978
 msgid "Edit Equestrian"
 msgstr "編輯馬術"
 
-#: build/trans_presets.java:1973
+#: build/trans_presets.java:1983
 msgid "Horse Racing"
 msgstr "賽馬"
 
 #. item
-#: build/trans_presets.java:1974
+#: build/trans_presets.java:1984
 msgid "Edit Horse Racing"
 msgstr "編輯賽馬"
 
-#: build/trans_presets.java:1979
+#: build/trans_presets.java:1989
 msgid "Gymnastics"
 msgstr "體操"
 
 #. item
-#: build/trans_presets.java:1980
+#: build/trans_presets.java:1990
 msgid "Edit Gymnastics"
 msgstr "編輯體操"
 
-#: build/trans_presets.java:1985
+#: build/trans_presets.java:1995
 msgid "Motor Sports"
 msgstr "摩托車運動"
 
 #. item
-#: build/trans_presets.java:1986
+#: build/trans_presets.java:1996
 msgid "Edit Motor Sports"
 msgstr "編輯摩托車運動"
 
-#: build/trans_presets.java:1991
+#: build/trans_presets.java:2001
 msgid "Skating"
 msgstr "溜冰"
 
 #. item
-#: build/trans_presets.java:1992
+#: build/trans_presets.java:2002
 msgid "Edit Skating"
 msgstr "編輯溜冰"
 
-#: build/trans_presets.java:1997
+#: build/trans_presets.java:2007
 msgid "Skateboard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:1998
+#: build/trans_presets.java:2008
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2003
+#: build/trans_presets.java:2013
 msgid "Swimming"
 msgstr "游泳"
 
 #. item
-#: build/trans_presets.java:2004
+#: build/trans_presets.java:2014
 msgid "Edit Swimming"
 msgstr "編輯游泳"
@@ -18613,56 +18975,56 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2011
+#: build/trans_presets.java:2021
 msgid "Edit Skiing"
 msgstr "編輯滑雪"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2024
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "Difficulty"
 msgstr "困難度"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "novice"
 msgstr "新手"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "easy"
 msgstr "容易"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "intermediate"
 msgstr "中級"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "advanced"
 msgstr "進階"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "expert"
 msgstr "專家"
 
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2025
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2018
+#: build/trans_presets.java:2028
 msgid "Shooting"
 msgstr "射擊"
@@ -18670,178 +19032,183 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2030
 msgid "Edit Shooting"
 msgstr "編輯射擊"
 
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2036
 msgid "Sport (Ball)"
 msgstr "運動（球類）"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2037
 msgid "Soccer"
 msgstr "足球"
 
 #. item
-#: build/trans_presets.java:2028
+#: build/trans_presets.java:2038
 msgid "Edit Soccer"
 msgstr "編輯足球"
 
-#: build/trans_presets.java:2033
+#: build/trans_presets.java:2043
 msgid "Football"
 msgstr "美式足球"
 
 #. item
-#: build/trans_presets.java:2034
+#: build/trans_presets.java:2044
 msgid "Edit Football"
 msgstr "編輯美式足球"
 
-#: build/trans_presets.java:2039
+#: build/trans_presets.java:2049
 msgid "Australian Football"
 msgstr "澳洲足球"
 
 #. item
-#: build/trans_presets.java:2040
+#: build/trans_presets.java:2050
 msgid "Edit Australian Football"
 msgstr "編輯澳洲足球"
 
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2055
 msgid "Baseball"
 msgstr "棒球"
 
 #. item
-#: build/trans_presets.java:2046
+#: build/trans_presets.java:2056
 msgid "Edit Baseball"
 msgstr "編輯棒球"
 
-#: build/trans_presets.java:2051
+#: build/trans_presets.java:2061
 msgid "Basketball"
 msgstr "籃球"
 
 #. item
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2062
 msgid "Edit Basketball"
 msgstr "編輯籃球"
 
-#: build/trans_presets.java:2057
+#: build/trans_presets.java:2067
 msgid "Golf"
 msgstr "高爾夫"
 
 #. item
-#: build/trans_presets.java:2058
+#: build/trans_presets.java:2068
 msgid "Edit Golf"
 msgstr "編輯高爾夫"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2071
 msgid "golf_course"
 msgstr "高爾夫路線"
 
-#: build/trans_presets.java:2063
+#: build/trans_presets.java:2073
 msgid "Boule"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2064
+#: build/trans_presets.java:2074
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2079
 msgid "Bowls"
 msgstr "保齡球"
 
 #. item
-#: build/trans_presets.java:2070
+#: build/trans_presets.java:2080
 msgid "Edit Bowls"
 msgstr "編輯保齡球"
 
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2085
 msgid "Cricket"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2076
+#: build/trans_presets.java:2086
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2091
 msgid "Cricket Nets"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2082
+#: build/trans_presets.java:2092
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2097
 msgid "Croquet"
 msgstr "木球"
 
 #. item
-#: build/trans_presets.java:2088
+#: build/trans_presets.java:2098
 msgid "Edit Croquet"
 msgstr "編輯木球"
 
-#: build/trans_presets.java:2093
+#: build/trans_presets.java:2103
 msgid "Hockey"
 msgstr "曲棍球"
 
 #. item
-#: build/trans_presets.java:2094
+#: build/trans_presets.java:2104
 msgid "Edit Hockey"
 msgstr "編曲棍球"
 
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2109
 msgid "Pelota"
 msgstr "回力球"
 
 #. item
-#: build/trans_presets.java:2100
+#: build/trans_presets.java:2110
 msgid "Edit Pelota"
 msgstr "編輯回力球"
 
-#: build/trans_presets.java:2105
+#: build/trans_presets.java:2115
 msgid "Racquet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2106
+#: build/trans_presets.java:2116
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2111
+#: build/trans_presets.java:2121
 msgid "Rugby"
 msgstr "橄欖球"
 
 #. item
-#: build/trans_presets.java:2112
+#: build/trans_presets.java:2122
 msgid "Edit Rugby"
 msgstr "編輯橄欖球"
 
-#: build/trans_presets.java:2117
+#: build/trans_presets.java:2127
 msgid "Table Tennis"
 msgstr "桌球"
 
 #. item
-#: build/trans_presets.java:2118
+#: build/trans_presets.java:2128
 msgid "Edit Table Tennis"
 msgstr "編輯桌球"
 
-#: build/trans_presets.java:2123
+#: build/trans_presets.java:2133
 msgid "Tennis"
 msgstr "網球"
 
 #. item
-#: build/trans_presets.java:2124
+#: build/trans_presets.java:2134
 msgid "Edit Tennis"
 msgstr "編輯網路"
 
-#. <separator/>
-#: build/trans_presets.java:2131
+#: build/trans_presets.java:2141
+#, fuzzy
+msgid "Man-Made"
+msgstr "人造物"
+
+#. group "Man-Made"
+#: build/trans_presets.java:2142
 msgid "Buildings"
 msgstr "建築物"
 
 #. group "Buildings"
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2143
 msgid "Building"
 msgstr "建築物"
@@ -18849,5 +19216,5 @@
 #. item
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2135
+#: build/trans_presets.java:2146
 msgid "Public Building"
 msgstr "公共建築"
@@ -18855,10 +19222,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2148
 msgid "Edit Public Building"
 msgstr "編輯公共建築"
 
 #. item "Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2152
 msgid "Town hall"
 msgstr "縣市政府/公所"
@@ -18866,10 +19233,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2154
 msgid "Edit Town hall"
 msgstr "編輯縣市政府/公所"
 
 #. item "Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2147
+#: build/trans_presets.java:2158
 msgid "Embassy"
 msgstr "大使館"
@@ -18877,10 +19244,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2149
+#: build/trans_presets.java:2160
 msgid "Edit Embassy"
 msgstr "編輯大使館"
 
 #. item "Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2153
+#: build/trans_presets.java:2164
 msgid "Courthouse"
 msgstr "法院"
@@ -18889,10 +19256,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:2156
+#: build/trans_presets.java:2167
 msgid "Edit Courthouse"
 msgstr "編輯法院"
 
 #. item "Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2171
 msgid "Prison"
 msgstr "監獄"
@@ -18901,10 +19268,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:2163
+#: build/trans_presets.java:2174
 msgid "Edit Prison"
 msgstr "編輯監獄"
 
 #. item "Buildings/Prison" text "Name"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2178
 msgid "Police"
 msgstr "警察局"
@@ -18914,10 +19281,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:2171
+#: build/trans_presets.java:2182
 msgid "Edit Police"
 msgstr "編輯警察局"
 
 #. item "Buildings/Police" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2186
 msgid "Fire Station"
 msgstr "消防隊"
@@ -18926,10 +19293,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:2178
+#: build/trans_presets.java:2189
 msgid "Edit Fire Station"
 msgstr "編輯消防隊"
 
 #. item "Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2193
 msgid "Post Office"
 msgstr "郵局"
@@ -18937,5 +19304,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2195
 msgid "Edit Post Office"
 msgstr "編輯郵局"
@@ -18943,15 +19310,15 @@
 #. item "Buildings/Post Office" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2189
+#: build/trans_presets.java:2200
 msgid "Kindergarten"
 msgstr "幼稚園"
 
 #. item
-#: build/trans_presets.java:2190
+#: build/trans_presets.java:2201
 msgid "Edit Kindergarten"
 msgstr "編輯幼稚園"
 
 #. item "Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2194
+#: build/trans_presets.java:2205
 msgid "School"
 msgstr "學校"
@@ -18959,10 +19326,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2196
+#: build/trans_presets.java:2207
 msgid "Edit School"
 msgstr "編輯學校"
 
 #. item "Buildings/School" text "Name"
-#: build/trans_presets.java:2200
+#: build/trans_presets.java:2211
 msgid "University"
 msgstr "大學"
@@ -18970,10 +19337,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2213
 msgid "Edit University"
 msgstr "編輯大學"
 
 #. item "Buildings/University" text "Name"
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2217
 msgid "College"
 msgstr "學院"
@@ -18981,5 +19348,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2208
+#: build/trans_presets.java:2219
 msgid "Edit College"
 msgstr "編輯學院"
@@ -18987,5 +19354,5 @@
 #. item "Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2224
 msgid "Cinema"
 msgstr "電影院"
@@ -18994,10 +19361,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:2216
+#: build/trans_presets.java:2227
 msgid "Edit Cinema"
 msgstr "編輯電影院"
 
 #. item "Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2220
+#: build/trans_presets.java:2231
 msgid "Library"
 msgstr "圖書館"
@@ -19006,9 +19373,9 @@
 #. <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:2223
+#: build/trans_presets.java:2234
 msgid "Edit Library"
 msgstr "編輯圖書館"
 
-#: build/trans_presets.java:2228
+#: build/trans_presets.java:2239
 msgid "Arts Centre"
 msgstr "美術館"
@@ -19016,10 +19383,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2241
 msgid "Edit Arts Centre"
 msgstr "編輯美術館"
 
 #. item "Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2245
 msgid "Theatre"
 msgstr "劇院"
@@ -19028,10 +19395,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:2237
+#: build/trans_presets.java:2248
 msgid "Edit Theatre"
 msgstr "編輯劇院"
 
 #. item "Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2241
+#: build/trans_presets.java:2252
 msgid "Place of Worship"
 msgstr "宗教儀式場所"
@@ -19041,5 +19408,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:2245
+#: build/trans_presets.java:2256
 msgid "Edit Place of Worship"
 msgstr "編輯宗教儀式場所"
@@ -19048,6 +19415,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "Religion"
 msgstr "宗教"
@@ -19056,66 +19423,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "bahai"
 msgstr "巴海大同教"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "buddhist"
 msgstr "佛教"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "christian"
 msgstr "基督教系"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "hindu"
 msgstr "印度教"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jain"
 msgstr "耆那教"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "jewish"
 msgstr "猶太教"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "muslim"
 msgstr "回教"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "sikh"
 msgstr "錫克教"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "taoist"
 msgstr "道教"
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2248 build/trans_presets.java:3032
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:2259 build/trans_presets.java:3044
+#: build/trans_presets.java:3053
 msgid "zoroastrian"
 msgstr "祆教"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "Denomination"
 msgstr "教派"
@@ -19124,81 +19491,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "anglican"
 msgstr "英國國教"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "baptist"
 msgstr "浸信會"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "catholic"
 msgstr "天主教"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "evangelical"
 msgstr "福音派教會"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "lutheran"
 msgstr "路德教派"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "methodist"
 msgstr "衛理公會教"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "mormon"
 msgstr "摩門教"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "orthodox"
 msgstr "東正教"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "pentecostal"
 msgstr "聖靈降臨教派"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "presbyterian"
 msgstr "長老派教會"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "protestant"
 msgstr "新教"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "quaker"
 msgstr "教友派"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "shia"
 msgstr "什葉派"
 
-#: build/trans_presets.java:2249 build/trans_presets.java:3033
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:2260 build/trans_presets.java:3045
+#: build/trans_presets.java:3054
 msgid "sunni"
 msgstr "遜尼派"
 
 #. <separator/>
-#: build/trans_presets.java:2253
+#: build/trans_presets.java:2264
 msgid "Addresses"
 msgstr ""
@@ -19207,5 +19574,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:2256
+#: build/trans_presets.java:2267
 msgid "Edit Address Information"
 msgstr ""
@@ -19213,5 +19580,5 @@
 #. item "Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2258
+#: build/trans_presets.java:2269
 msgid "House number"
 msgstr ""
@@ -19219,20 +19586,20 @@
 #. item "Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2271
 msgid "House name"
 msgstr ""
 
 #. item "Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2262
+#: build/trans_presets.java:2273
 msgid "City name"
 msgstr "城市名稱"
 
 #. item "Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2263
+#: build/trans_presets.java:2274
 msgid "Post code"
 msgstr "郵遞區號"
 
 #. item "Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2275
 msgid "Country code"
 msgstr "國碼"
@@ -19240,5 +19607,5 @@
 #. item "Buildings/Addresses" text "Country code"
 #. </optional>
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2278
 msgid "Address Interpolation"
 msgstr ""
@@ -19247,5 +19614,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:2270
+#: build/trans_presets.java:2281
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -19253,67 +19620,67 @@
 #. item "Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "Numbering scheme"
 msgstr "編號規則"
 
 #. item "Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "odd"
 msgstr "奇數"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "even"
 msgstr "偶數"
 
-#: build/trans_presets.java:2272
+#: build/trans_presets.java:2283
 msgid "alphabetic"
 msgstr "按字母順序"
 
-#: build/trans_presets.java:2275
+#: build/trans_presets.java:2286
 msgid "Man Made"
 msgstr "人造物"
 
 #. group "Man Made"
-#: build/trans_presets.java:2276
+#: build/trans_presets.java:2287
 msgid "Works"
 msgstr "作品"
 
 #. item
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2288
 msgid "Edit Works"
 msgstr "編輯作品"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2292
 msgid "Tower"
 msgstr "塔"
 
 #. item
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2293
 msgid "Edit Tower"
 msgstr "編輯塔"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2286
+#: build/trans_presets.java:2297
 msgid "Water Tower"
 msgstr "貯水塔"
 
 #. item
-#: build/trans_presets.java:2287
+#: build/trans_presets.java:2298
 msgid "Edit Water Tower"
 msgstr "編輯貯水塔"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2291
+#: build/trans_presets.java:2302
 msgid "Gasometer"
 msgstr "貯氣桶"
 
 #. item
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2303
 msgid "Edit Gasometer"
 msgstr "編輯貯氣桶"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2307
 msgid "Lighthouse"
 msgstr "燈塔"
@@ -19321,10 +19688,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2309
 msgid "Edit Lighthouse"
 msgstr "編輯燈塔"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2302
+#: build/trans_presets.java:2313
 msgid "Windmill"
 msgstr "風車"
@@ -19332,10 +19699,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2304
+#: build/trans_presets.java:2315
 msgid "Edit Windmill"
 msgstr "編輯風車"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2319
 msgid "Pipeline"
 msgstr "油管"
@@ -19343,10 +19710,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline" />
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2321
 msgid "Edit Pipeline"
 msgstr "編輯油管"
 
 #. item "Man Made/Pipeline" text "Name"
-#: build/trans_presets.java:2314
+#: build/trans_presets.java:2325
 msgid "Wastewater Plant"
 msgstr "汙水處理廠"
@@ -19356,10 +19723,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:2318
+#: build/trans_presets.java:2329
 msgid "Edit Wastewater Plant"
 msgstr "編輯汙水處理廠"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2322
+#: build/trans_presets.java:2333
 msgid "Crane"
 msgstr "起重機"
@@ -19367,10 +19734,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2324
+#: build/trans_presets.java:2335
 msgid "Edit Crane"
 msgstr "編輯起重機"
 
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2339
 msgid "Beacon"
 msgstr ""
@@ -19378,10 +19745,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2341
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:2345
 msgid "Survey Point"
 msgstr "測量點"
@@ -19389,10 +19756,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2347
 msgid "Edit Survey Point"
 msgstr "編輯測量點"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2340
+#: build/trans_presets.java:2351
 msgid "Surveillance"
 msgstr "監視"
@@ -19400,5 +19767,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2342
+#: build/trans_presets.java:2353
 msgid "Edit Surveillance Camera"
 msgstr "編輯監視攝影機"
@@ -19406,5 +19773,5 @@
 #. item "Man Made/Surveillance" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2347
+#: build/trans_presets.java:2358
 msgid "Power Generator"
 msgstr "發電廠"
@@ -19414,39 +19781,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:2351
+#: build/trans_presets.java:2362
 msgid "Edit Power Generator"
 msgstr "編輯發電廠"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "wind"
 msgstr "風力"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "hydro"
 msgstr "水力"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "fossil"
 msgstr "燃油"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "nuclear"
 msgstr "核能"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "coal"
 msgstr "燃媒"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "photovoltaic"
 msgstr "光電"
 
-#: build/trans_presets.java:2353
+#: build/trans_presets.java:2364
 msgid "gas"
 msgstr "天然氣"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2367
 msgid "Power Station"
 msgstr ""
@@ -19455,10 +19822,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:2359
+#: build/trans_presets.java:2370
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Operator"
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2374
 msgid "Power Sub Station"
 msgstr ""
@@ -19467,5 +19834,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:2366
+#: build/trans_presets.java:2377
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -19473,10 +19840,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2369 build/trans_presets.java:2385
+#: build/trans_presets.java:2380 build/trans_presets.java:2396
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2371
+#: build/trans_presets.java:2382
 msgid "Power Tower"
 msgstr "電塔"
@@ -19487,5 +19854,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:2376
+#: build/trans_presets.java:2387
 msgid "Edit Power Tower"
 msgstr "編輯電塔"
@@ -19493,5 +19860,5 @@
 #. item "Man Made/Power Tower" label "Edit Power Tower"
 #. <key key="power" value="tower" />
-#: build/trans_presets.java:2379
+#: build/trans_presets.java:2390
 msgid "Power Line"
 msgstr "電線"
@@ -19500,40 +19867,40 @@
 #. <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:2382
+#: build/trans_presets.java:2393
 msgid "Edit Power Line"
 msgstr "編輯電線"
 
 #. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2397
 msgid "Voltage"
 msgstr "電壓"
 
 #. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2398
 msgid "Amount of Wires"
 msgstr "線數"
 
 #. item "Man Made/Power Line" text "Amount of Wires"
-#: build/trans_presets.java:2390
+#: build/trans_presets.java:2401
 msgid "Amenities"
 msgstr "便利設施"
 
 #. group "Amenities"
-#: build/trans_presets.java:2391
+#: build/trans_presets.java:2402
 msgid "Toilets"
 msgstr "廁所"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2398 build/trans_presets.java:2514
+#: build/trans_presets.java:2409 build/trans_presets.java:2525
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2400
+#: build/trans_presets.java:2411
 msgid "Post Box"
 msgstr "郵筒"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2405
+#: build/trans_presets.java:2416
 msgid "Telephone"
 msgstr "電話"
@@ -19542,5 +19909,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:2408
+#: build/trans_presets.java:2419
 msgid "Edit Telephone"
 msgstr "編輯電話"
@@ -19548,5 +19915,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2411 build/trans_presets.java:2515
+#: build/trans_presets.java:2422 build/trans_presets.java:2526
 msgid "Coins"
 msgstr "硬幣"
@@ -19554,5 +19921,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2412 build/trans_presets.java:2516
+#: build/trans_presets.java:2423 build/trans_presets.java:2527
 msgid "Notes"
 msgstr ""
@@ -19560,5 +19927,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2413 build/trans_presets.java:2517
+#: build/trans_presets.java:2424 build/trans_presets.java:2528
 msgid "Electronic purses and Charge cards"
 msgstr "電子錢包或收費卡"
@@ -19566,5 +19933,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2414 build/trans_presets.java:2518
+#: build/trans_presets.java:2425 build/trans_presets.java:2529
 msgid "Debit cards"
 msgstr ""
@@ -19572,15 +19939,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2415 build/trans_presets.java:2519
+#: build/trans_presets.java:2426 build/trans_presets.java:2530
 msgid "Credit cards"
 msgstr "信用卡"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2416
+#: build/trans_presets.java:2427
 msgid "Telephone cards"
 msgstr "電話卡"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2429
 msgid "Recycling"
 msgstr "資源回收"
@@ -19589,5 +19956,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:2421
+#: build/trans_presets.java:2432
 msgid "Edit Recycling station"
 msgstr "資源回收站"
@@ -19595,35 +19962,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2434
 msgid "Batteries"
 msgstr "電池"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2435
 msgid "Cans"
 msgstr "瓶罐"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2436
 msgid "Clothes"
 msgstr "衣服"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2437
 msgid "Glass"
 msgstr "玻璃"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2438
 msgid "Paper"
 msgstr "紙張"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2439
 msgid "Scrap Metal"
 msgstr "廢金屬"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2441
 msgid "Bench"
 msgstr "長椅"
@@ -19632,40 +19999,33 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2433
-#, fuzzy
+#: build/trans_presets.java:2444
 msgid "Backrest"
-msgstr "返回"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "Material"
-msgstr "紀念碑"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2434
-#, fuzzy
+#: build/trans_presets.java:2445
 msgid "stone"
-msgstr "沒有"
-
-#: build/trans_presets.java:2434
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2445
 msgid "plastic"
-msgstr "基本"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "Colour"
-msgstr "顏色"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "black"
-msgstr "返回"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "brown"
-msgstr "下"
+msgstr ""
 
 #. color historic
@@ -19734,39 +20094,35 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2435 build/trans_style.java:3055
-#: build/trans_style.java:3063 build/trans_style.java:3071
-#: build/trans_style.java:3079 build/trans_style.java:3127
-#: build/trans_style.java:3135 build/trans_style.java:3233
-#: build/trans_style.java:3241
+#: build/trans_presets.java:2446 build/trans_style.java:3063
+#: build/trans_style.java:3071 build/trans_style.java:3079
+#: build/trans_style.java:3087 build/trans_style.java:3135
+#: build/trans_style.java:3143 build/trans_style.java:3241
+#: build/trans_style.java:3249
 msgid "green"
 msgstr ""
 
-#: build/trans_presets.java:2435
-#, fuzzy
+#: build/trans_presets.java:2446
 msgid "red"
-msgstr "結束"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "blue"
-msgstr "數值"
-
-#: build/trans_presets.java:2435
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2446
 msgid "white"
-msgstr "水域"
-
-#: build/trans_presets.java:2436
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:2447
 msgid "Amount of Seats"
-msgstr "線數"
+msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2438
+#: build/trans_presets.java:2449
 msgid "Hunting Stand"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2439
+#: build/trans_presets.java:2450
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -19775,30 +20131,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2441 build/trans_presets.java:2902
+#: build/trans_presets.java:2452 build/trans_presets.java:2914
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2452
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2443
+#: build/trans_presets.java:2454
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2455
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2446
+#: build/trans_presets.java:2457
 msgid "Fountain"
 msgstr "噴泉"
@@ -19807,10 +20163,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:2449
+#: build/trans_presets.java:2460
 msgid "Edit Fountain"
 msgstr "編輯噴泉"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2453
+#: build/trans_presets.java:2464
 msgid "Drinking Water"
 msgstr "飲水機"
@@ -19819,10 +20175,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:2456
+#: build/trans_presets.java:2467
 msgid "Edit Drinking Water"
 msgstr "編輯飲水機"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2460
+#: build/trans_presets.java:2471
 msgid "Baby Hatch"
 msgstr ""
@@ -19830,33 +20186,33 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2473
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2479
 msgid "Shops"
 msgstr "商店"
 
 #. group "Shops"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2480
 msgid "Supermarket"
 msgstr "超級市場"
 
 #. item
-#: build/trans_presets.java:2470
+#: build/trans_presets.java:2481
 msgid "Edit Supermarket"
 msgstr "編輯超級市場"
 
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2486
 msgid "Chemist"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2487
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2492
 msgid "Convenience Store"
 msgstr "便利商店"
@@ -19864,9 +20220,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2494
 msgid "Edit Convenience Store"
 msgstr "編輯便利商店"
 
-#: build/trans_presets.java:2488
+#: build/trans_presets.java:2499
 msgid "Kiosk"
 msgstr ""
@@ -19874,27 +20230,27 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2501
 msgid "Edit Kiosk"
 msgstr ""
 
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2506
 msgid "Book Store"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2496
+#: build/trans_presets.java:2507
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2512
 msgid "Travel Agency"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2513
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2507
+#: build/trans_presets.java:2518
 msgid "Vending machine"
 msgstr "自動販賣機"
@@ -19902,5 +20258,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2520
 msgid "Edit Vending machine"
 msgstr "編輯自動販賣機"
@@ -19908,88 +20264,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "Vending products"
 msgstr "販賣產品"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "food"
 msgstr "食物"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "drinks"
 msgstr "飲料"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "sweets"
 msgstr "甜點"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "cigarettes"
 msgstr "菸"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "photos"
 msgstr "相片"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "animal_food"
 msgstr "飼料"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "news_papers"
 msgstr "報紙"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "toys"
 msgstr "玩具"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "stamps"
 msgstr "郵票"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "SIM-cards"
 msgstr "SIM-卡"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "condoms"
 msgstr "保險套"
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2511
+#: build/trans_presets.java:2522
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2531
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2533
 msgid "Butcher"
 msgstr "肉類"
@@ -19997,9 +20353,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2535
 msgid "Edit Butcher"
 msgstr "編輯肉店"
 
-#: build/trans_presets.java:2529
+#: build/trans_presets.java:2540
 msgid "Baker"
 msgstr "麵包類"
@@ -20007,9 +20363,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2542
 msgid "Edit Baker"
 msgstr "編輯麵包店"
 
-#: build/trans_presets.java:2536
+#: build/trans_presets.java:2547
 msgid "Florist"
 msgstr "花類"
@@ -20017,18 +20373,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2549
 msgid "Edit Florist"
 msgstr "編輯花店"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2554
 msgid "Organic"
 msgstr "有機產品"
 
 #. item
-#: build/trans_presets.java:2544
+#: build/trans_presets.java:2555
 msgid "Edit Organic Shop"
 msgstr "編輯有機產品商店"
 
-#: build/trans_presets.java:2549
+#: build/trans_presets.java:2560
 msgid "Alcohol"
 msgstr "酒類"
@@ -20036,54 +20392,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2562
 msgid "Edit Alcohol Shop"
 msgstr "編輯賣酒的商店"
 
-#: build/trans_presets.java:2556
+#: build/trans_presets.java:2567
 msgid "Beverages"
 msgstr "飲料類"
 
 #. item
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2568
 msgid "Edit Beverages Shop"
 msgstr "編輯飲料店"
 
-#: build/trans_presets.java:2562
+#: build/trans_presets.java:2573
 msgid "Computer"
 msgstr "電腦類"
 
 #. item
-#: build/trans_presets.java:2563
+#: build/trans_presets.java:2574
 msgid "Edit Computer Shop"
 msgstr "編輯電腦商店"
 
-#: build/trans_presets.java:2568
+#: build/trans_presets.java:2579
 msgid "Electronics"
 msgstr "電子材料"
 
 #. item
-#: build/trans_presets.java:2569
+#: build/trans_presets.java:2580
 msgid "Edit Electronics Shop"
 msgstr "編輯電子材料行"
 
-#: build/trans_presets.java:2574
+#: build/trans_presets.java:2585
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item
-#: build/trans_presets.java:2575
+#: build/trans_presets.java:2586
 msgid "Edit Hifi Shop"
 msgstr "編輯 Hifi 音響店"
 
-#: build/trans_presets.java:2580
+#: build/trans_presets.java:2591
 msgid "Furniture"
 msgstr "傢俱類"
 
 #. item
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2592
 msgid "Edit Furniture Shop"
 msgstr "編輯傢俱店"
 
-#: build/trans_presets.java:2586
+#: build/trans_presets.java:2597
 msgid "Garden Centre"
 msgstr "園藝中心"
@@ -20091,9 +20447,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2599
 msgid "Edit Garden Centre"
 msgstr "編輯園藝中心"
 
-#: build/trans_presets.java:2593
+#: build/trans_presets.java:2604
 msgid "Hardware"
 msgstr ""
@@ -20101,9 +20457,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2595
+#: build/trans_presets.java:2606
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2600
+#: build/trans_presets.java:2611
 msgid "Do-it-yourself-store"
 msgstr "DIY 商店"
@@ -20111,54 +20467,54 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2613
 msgid "Edit Do-it-yourself-store"
 msgstr "編輯 DIY 商店"
 
-#: build/trans_presets.java:2607
+#: build/trans_presets.java:2618
 msgid "Stationery"
 msgstr "文具類"
 
 #. item
-#: build/trans_presets.java:2608
+#: build/trans_presets.java:2619
 msgid "Edit Stationery Shop"
 msgstr "編輯文具店"
 
-#: build/trans_presets.java:2613
+#: build/trans_presets.java:2624
 msgid "Hairdresser"
 msgstr "美髮類"
 
 #. item
-#: build/trans_presets.java:2614
+#: build/trans_presets.java:2625
 msgid "Edit Hairdresser"
 msgstr "編輯美髮店"
 
-#: build/trans_presets.java:2619
+#: build/trans_presets.java:2630
 msgid "Shoes"
 msgstr "鞋類"
 
 #. item
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2631
 msgid "Edit Shoe Shop"
 msgstr "編輯鞋店"
 
-#: build/trans_presets.java:2625
+#: build/trans_presets.java:2636
 msgid "Toys"
 msgstr "玩具類"
 
 #. item
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2637
 msgid "Edit Toy Shop"
 msgstr "編輯玩具店"
 
-#: build/trans_presets.java:2631
+#: build/trans_presets.java:2642
 msgid "Video"
 msgstr "影片類"
 
 #. item
-#: build/trans_presets.java:2632
+#: build/trans_presets.java:2643
 msgid "Edit Video Shop"
 msgstr "編輯影片類商店"
 
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2648
 msgid "Dry Cleaning"
 msgstr "乾洗類"
@@ -20166,9 +20522,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2650
 msgid "Edit Dry Cleaning"
 msgstr "編輯乾洗店"
 
-#: build/trans_presets.java:2644
+#: build/trans_presets.java:2655
 msgid "Laundry"
 msgstr "洗衣店"
@@ -20176,9 +20532,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2646
+#: build/trans_presets.java:2657
 msgid "Edit Laundry"
 msgstr "編輯洗衣店"
 
-#: build/trans_presets.java:2651
+#: build/trans_presets.java:2662
 msgid "Outdoor"
 msgstr "戶外用品"
@@ -20186,32 +20542,28 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2664
 msgid "Edit Outdoor Shop"
 msgstr "編輯戶外用品店"
 
-#: build/trans_presets.java:2658
-msgid "Sports"
-msgstr "運動用品"
-
-#. item
-#: build/trans_presets.java:2659
+#. item
+#: build/trans_presets.java:2670
 msgid "Edit Sports Shop"
 msgstr "編輯運動用品店"
 
-#: build/trans_presets.java:2664
+#: build/trans_presets.java:2675
 msgid "Optician"
 msgstr "眼鏡類"
 
 #. item
-#: build/trans_presets.java:2665
+#: build/trans_presets.java:2676
 msgid "Edit Optician"
 msgstr "編輯眼鏡行"
 
-#: build/trans_presets.java:2672
+#: build/trans_presets.java:2683
 msgid "Cash"
 msgstr "現金"
 
 #. group "Cash"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2684
 msgid "Bank"
 msgstr "銀行"
@@ -20219,14 +20571,14 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2675
+#: build/trans_presets.java:2686
 msgid "Edit Bank"
 msgstr "編輯銀行"
 
-#: build/trans_presets.java:2680 build/trans_presets.java:2689
+#: build/trans_presets.java:2691 build/trans_presets.java:2700
 msgid "Automated Teller Machine"
 msgstr "自動提款機(ATM)"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2682
+#: build/trans_presets.java:2693
 msgid "Money Exchange"
 msgstr ""
@@ -20234,5 +20586,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2684
+#: build/trans_presets.java:2695
 msgid "Edit Money Exchange"
 msgstr ""
@@ -20240,15 +20592,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2691
+#: build/trans_presets.java:2702
 msgid "Edit Automated Teller Machine"
 msgstr "編輯自動提款機"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2696
+#: build/trans_presets.java:2707
 msgid "Health"
 msgstr "健康"
 
 #. group "Health"
-#: build/trans_presets.java:2697
+#: build/trans_presets.java:2708
 msgid "Doctors"
 msgstr "醫師"
@@ -20256,18 +20608,18 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2710
 msgid "Edit Doctors"
 msgstr "編輯醫師"
 
-#: build/trans_presets.java:2704
+#: build/trans_presets.java:2715
 msgid "Dentist"
 msgstr "牙醫"
 
 #. item
-#: build/trans_presets.java:2705
+#: build/trans_presets.java:2716
 msgid "Edit Dentist"
 msgstr "編輯牙醫"
 
-#: build/trans_presets.java:2710
+#: build/trans_presets.java:2721
 msgid "Pharmacy"
 msgstr "藥局"
@@ -20275,5 +20627,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2723
 msgid "Edit Pharmacy"
 msgstr "編輯藥局"
@@ -20281,9 +20633,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2714
+#: build/trans_presets.java:2725
 msgid "Dispensing"
 msgstr "配藥"
 
-#: build/trans_presets.java:2718
+#: build/trans_presets.java:2729
 msgid "Hospital"
 msgstr "醫院"
@@ -20291,10 +20643,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2720
+#: build/trans_presets.java:2731
 msgid "Edit Hospital"
 msgstr "編輯醫院"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2724
+#: build/trans_presets.java:2735
 msgid "Emergency Access Point"
 msgstr ""
@@ -20303,5 +20655,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:2727
+#: build/trans_presets.java:2738
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -20310,20 +20662,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2730
+#: build/trans_presets.java:2741
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2731
+#: build/trans_presets.java:2742
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2744
 msgid "Phone Number"
 msgstr "電話號碼"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2734
+#: build/trans_presets.java:2745
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(使用國際碼，像是 +12-345-67890)"
@@ -20331,5 +20683,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2737
+#: build/trans_presets.java:2748
 msgid "Veterinary"
 msgstr "獸醫"
@@ -20338,55 +20690,59 @@
 #. <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:2740
+#: build/trans_presets.java:2751
 msgid "Edit Veterinary"
 msgstr "編輯獸醫"
 
+#: build/trans_presets.java:2758
+msgid "Geography"
+msgstr ""
+
 #. group "Places"
-#: build/trans_presets.java:2748
+#: build/trans_presets.java:2760
 msgid "Continent"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2761
 msgid "Edit Continent"
 msgstr ""
 
 #. item "Places/Continent" text "Name"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2766
 msgid "Country"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2755
+#: build/trans_presets.java:2767
 msgid "Edit Country"
 msgstr ""
 
 #. item "Places/Country" text "Name"
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2772
 msgid "State"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2773
 msgid "Edit State"
 msgstr ""
 
 #. item "Places/State" text "Name"
-#: build/trans_presets.java:2766
+#: build/trans_presets.java:2778
 msgid "Region"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2779
 msgid "Edit Region"
 msgstr ""
 
 #. item "Places/Region" text "Name"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2784
 msgid "County"
 msgstr "縣"
 
 #. item
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2785
 msgid "Edit County"
 msgstr "編輯縣"
@@ -20394,15 +20750,15 @@
 #. item "Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2779
+#: build/trans_presets.java:2791
 msgid "City"
 msgstr "市"
 
 #. item
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2792
 msgid "Edit City"
 msgstr "編輯市"
 
 #. item "Places/City" text "Name"
-#: build/trans_presets.java:2785
+#: build/trans_presets.java:2797
 msgid "Town"
 msgstr "鄉/鎮"
@@ -20410,10 +20766,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2787
+#: build/trans_presets.java:2799
 msgid "Edit Town"
 msgstr "編輯鄉/鎮"
 
 #. item "Places/Town" text "Name"
-#: build/trans_presets.java:2792
+#: build/trans_presets.java:2804
 msgid "Suburb"
 msgstr "郊區"
@@ -20421,25 +20777,25 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2806
 msgid "Edit Suburb"
 msgstr "編輯郊區"
 
 #. item "Places/Suburb" text "Name"
-#: build/trans_presets.java:2799
+#: build/trans_presets.java:2811
 msgid "Village"
 msgstr "村/里"
 
 #. item
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2812
 msgid "Edit Village"
 msgstr "編輯村/里"
 
 #. item "Places/Village" text "Name"
-#: build/trans_presets.java:2805
+#: build/trans_presets.java:2817
 msgid "Hamlet"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2818
 msgid "Edit Hamlet"
 msgstr ""
@@ -20447,5 +20803,5 @@
 #. item "Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2824
 msgid "Locality"
 msgstr ""
@@ -20453,10 +20809,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2814
+#: build/trans_presets.java:2826
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Places/Locality" text "Name"
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:2831
 msgid "Island"
 msgstr "島嶼"
@@ -20464,10 +20820,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2821
+#: build/trans_presets.java:2833
 msgid "Edit Island"
 msgstr "編輯島嶼"
 
 #. item "Places/Island" text "Name"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2838
 msgid "Islet"
 msgstr ""
@@ -20475,5 +20831,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2828
+#: build/trans_presets.java:2840
 msgid "Edit Islet"
 msgstr ""
@@ -20481,5 +20837,5 @@
 #. item "Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2834
+#: build/trans_presets.java:2846
 msgid "Cave Entrance"
 msgstr "洞窟入口"
@@ -20487,10 +20843,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:2848
 msgid "Edit Cave Entrance"
 msgstr "編輯洞窟入口"
 
 #. item "Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:2852
 msgid "Peak"
 msgstr "峰"
@@ -20498,10 +20854,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2842
+#: build/trans_presets.java:2854
 msgid "Edit Peak"
 msgstr "編輯山峰"
 
 #. item "Places/Peak" text "Elevation"
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:2859
 msgid "Glacier"
 msgstr "冰河"
@@ -20509,10 +20865,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2861
 msgid "Edit Glacier"
 msgstr "編輯冰河"
 
 #. item "Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2854
+#: build/trans_presets.java:2866
 msgid "Volcano"
 msgstr "火山"
@@ -20520,70 +20876,70 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2868
 msgid "Edit Volcano"
 msgstr "編輯火山"
 
 #. item "Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2874
 msgid "Boundaries"
 msgstr "邊界"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2863
+#: build/trans_presets.java:2875
 msgid "National"
 msgstr "國界"
 
 #. item
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2876
 msgid "Edit National Boundary"
 msgstr "編輯國界"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2881
 msgid "Administrative"
 msgstr "行政區"
 
 #. item
-#: build/trans_presets.java:2870
+#: build/trans_presets.java:2882
 msgid "Edit Administrative Boundary"
 msgstr "編輯行政區邊界"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2875
+#: build/trans_presets.java:2887
 msgid "Civil"
 msgstr "城市的"
 
 #. item
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2888
 msgid "Edit Civil Boundary"
 msgstr "編輯城市邊界"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2881
+#: build/trans_presets.java:2893
 msgid "Political"
 msgstr "政治的"
 
 #. item
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2894
 msgid "Edit Political Boundary"
 msgstr "編輯政治的邊界"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2887
+#: build/trans_presets.java:2899
 msgid "National park"
 msgstr "國家公園"
 
 #. item
-#: build/trans_presets.java:2888
+#: build/trans_presets.java:2900
 msgid "Edit National Park Boundary"
 msgstr "編輯國家公園"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2894
+#: build/trans_presets.java:2906
 msgid "Land use"
 msgstr "土地利用"
 
 #. group "Land use"
-#: build/trans_presets.java:2895
+#: build/trans_presets.java:2907
 msgid "Tree"
 msgstr "樹"
@@ -20592,15 +20948,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:2898
+#: build/trans_presets.java:2910
 msgid "Edit Tree"
 msgstr "編輯樹"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2915
 msgid "Botanical Name"
 msgstr "植物學名"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2917
 msgid "Wood"
 msgstr ""
@@ -20609,5 +20965,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:2908
+#: build/trans_presets.java:2920
 msgid "Edit Wood"
 msgstr ""
@@ -20615,17 +20971,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "coniferous"
 msgstr "松類"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "deciduous"
 msgstr "落葉類"
 
-#: build/trans_presets.java:2911 build/trans_presets.java:2920
+#: build/trans_presets.java:2923 build/trans_presets.java:2932
 msgid "mixed"
 msgstr "混合"
 
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2925
 msgid "Forest"
 msgstr "森林"
@@ -20634,14 +20990,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:2916
+#: build/trans_presets.java:2928
 msgid "Edit Forest Landuse"
 msgstr "編輯森林土地利用"
 
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:2934
 msgid "Nature Reserve"
 msgstr "自然保育"
 
 #. item
-#: build/trans_presets.java:2923
+#: build/trans_presets.java:2935
 msgid "Edit Nature Reserve"
 msgstr "編輯自然保育"
@@ -20649,25 +21005,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:2940
 msgid "Scree"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:2941
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2945
 msgid "Scrub"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:2946
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2938
+#: build/trans_presets.java:2950
 msgid "Fell"
 msgstr ""
@@ -20675,10 +21031,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2952
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:2956
 msgid "Heath"
 msgstr ""
@@ -20686,5 +21042,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2958
 msgid "Edit Heath"
 msgstr ""
@@ -20692,5 +21048,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:2963
 msgid "Farmyard"
 msgstr ""
@@ -20699,45 +21055,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:2954
+#: build/trans_presets.java:2966
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2971
 msgid "Farmland"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2960
+#: build/trans_presets.java:2972
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2977
 msgid "Meadow"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2966
+#: build/trans_presets.java:2978
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2983
 msgid "Vineyard"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2984
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:2989
 msgid "Allotments"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:2978
+#: build/trans_presets.java:2990
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -20745,25 +21101,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:2996
 msgid "Garden"
 msgstr "花園"
 
 #. item
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2997
 msgid "Edit Garden"
 msgstr "編輯花園"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3001
 msgid "Grass"
 msgstr "草地"
 
 #. item
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3002
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3007
 msgid "Village Green"
 msgstr ""
@@ -20771,10 +21127,10 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2997
+#: build/trans_presets.java:3009
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3014
 msgid "Common"
 msgstr ""
@@ -20782,20 +21138,20 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3004
+#: build/trans_presets.java:3016
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3020
 msgid "Park"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3009
+#: build/trans_presets.java:3021
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3013
+#: build/trans_presets.java:3025
 msgid "Recreation Ground"
 msgstr ""
@@ -20803,5 +21159,5 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3027
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -20809,15 +21165,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3033
 msgid "Residential area"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3022
+#: build/trans_presets.java:3034
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3039
 msgid "Graveyard"
 msgstr ""
@@ -20825,9 +21181,9 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3029
+#: build/trans_presets.java:3041
 msgid "Edit Graveyard"
 msgstr ""
 
-#: build/trans_presets.java:3035
+#: build/trans_presets.java:3047
 msgid "Cemetery"
 msgstr ""
@@ -20835,39 +21191,39 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3049
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:3044
+#: build/trans_presets.java:3056
 msgid "Retail"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3045
+#: build/trans_presets.java:3057
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3050
+#: build/trans_presets.java:3062
 msgid "Commercial"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3063
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3056
+#: build/trans_presets.java:3068
 msgid "Industrial"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3069
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3074
 msgid "Railway land"
 msgstr ""
@@ -20875,15 +21231,15 @@
 #. item
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3076
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3069
+#: build/trans_presets.java:3081
 msgid "Military"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3070
+#: build/trans_presets.java:3082
 msgid "Edit Military Landuse"
 msgstr ""
@@ -20891,55 +21247,55 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3076
+#: build/trans_presets.java:3088
 msgid "Construction area"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3077
+#: build/trans_presets.java:3089
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3082
+#: build/trans_presets.java:3094
 msgid "Brownfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3083
+#: build/trans_presets.java:3095
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3088
+#: build/trans_presets.java:3100
 msgid "Greenfield"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3089
+#: build/trans_presets.java:3101
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3094
+#: build/trans_presets.java:3106
 msgid "Landfill"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3095
+#: build/trans_presets.java:3107
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3100
+#: build/trans_presets.java:3112
 msgid "Quarry"
 msgstr ""
 
 #. item
-#: build/trans_presets.java:3101
+#: build/trans_presets.java:3113
 msgid "Edit Quarry Landuse"
 msgstr ""
 
 #. group "Relations"
-#: build/trans_presets.java:3110
+#: build/trans_presets.java:3122
 msgid "Multipolygon"
 msgstr ""
@@ -20949,5 +21305,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:3114
+#: build/trans_presets.java:3126
 msgid "Edit Multipolygon"
 msgstr ""
@@ -20956,10 +21312,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3120
+#: build/trans_presets.java:3132
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3133
 msgid "inner segment"
 msgstr ""
@@ -20967,5 +21323,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3124
+#: build/trans_presets.java:3136
 msgid "Turn restriction"
 msgstr ""
@@ -20974,5 +21330,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3139
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -20980,34 +21336,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3129
+#: build/trans_presets.java:3141
 msgid "only_straight_on"
 msgstr ""
@@ -21016,15 +21372,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3146
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3135
+#: build/trans_presets.java:3147
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3136
+#: build/trans_presets.java:3148
 msgid "to way"
 msgstr ""
@@ -21032,5 +21388,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3151
 msgid "Route"
 msgstr ""
@@ -21039,5 +21395,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3142
+#: build/trans_presets.java:3154
 msgid "Edit Route"
 msgstr ""
@@ -21045,5 +21401,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "Route type"
 msgstr ""
@@ -21115,5 +21471,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3144 build/trans_style.java:233
+#: build/trans_presets.java:3156 build/trans_style.java:233
 #: build/trans_style.java:683 build/trans_style.java:906
 #: build/trans_style.java:914 build/trans_style.java:922
@@ -21122,17 +21478,17 @@
 msgstr "單車"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "bus"
 msgstr "公車"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "road"
 msgstr "道路"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ferry"
 msgstr "渡輪"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "ski"
 msgstr ""
@@ -21185,5 +21541,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3144 build/trans_style.java:247
+#: build/trans_presets.java:3156 build/trans_style.java:247
 #: build/trans_style.java:691 build/trans_style.java:699
 #: build/trans_style.java:707 build/trans_style.java:708
@@ -21192,13 +21548,13 @@
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "hiking"
 msgstr "健行"
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3144
+#: build/trans_presets.java:3156
 msgid "detour"
 msgstr ""
@@ -21212,10 +21568,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3144 build/trans_style.java:1206
+#: build/trans_presets.java:3156 build/trans_style.java:1206
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3159
 msgid "Symbol description"
 msgstr ""
@@ -21223,31 +21579,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3150
+#: build/trans_presets.java:3162
 msgid "Network"
 msgstr "網路"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3152
+#: build/trans_presets.java:3164
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3165
 msgid "Color (hex)"
 msgstr ""
@@ -21256,30 +21612,30 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3156
+#: build/trans_presets.java:3168
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3157
+#: build/trans_presets.java:3169
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3158
+#: build/trans_presets.java:3170
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3171
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3172
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3161
+#: build/trans_presets.java:3173
 msgid "backward halt point"
 msgstr ""
@@ -21717,11 +22073,11 @@
 #: build/trans_style.java:627 build/trans_style.java:824
 #: build/trans_style.java:1156 build/trans_style.java:2472
-#: build/trans_style.java:3375 build/trans_style.java:3376
-#: build/trans_style.java:3946 build/trans_style.java:4254
-#: build/trans_style.java:4263 build/trans_style.java:4272
-#: build/trans_style.java:4281 build/trans_style.java:4290
-#: build/trans_style.java:4299 build/trans_style.java:4308
-#: build/trans_style.java:4309 build/trans_style.java:4318
-#: build/trans_style.java:4327
+#: build/trans_style.java:3383 build/trans_style.java:3384
+#: build/trans_style.java:3954 build/trans_style.java:4262
+#: build/trans_style.java:4271 build/trans_style.java:4280
+#: build/trans_style.java:4289 build/trans_style.java:4298
+#: build/trans_style.java:4307 build/trans_style.java:4316
+#: build/trans_style.java:4317 build/trans_style.java:4326
+#: build/trans_style.java:4335
 msgid "deprecated"
 msgstr ""
@@ -23745,5 +24101,5 @@
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
 #: build/trans_style.java:2069 build/trans_style.java:2077
-#: build/trans_style.java:3294
+#: build/trans_style.java:3302
 msgid "light_water"
 msgstr ""
@@ -24425,8 +24781,17 @@
 #. <condition k="historic" v="wayside_shrine"/>
 #. <icon annotate="true" src="religion/wayside_shrine.png"/>
+#. color historic
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <rule>
+#. <condition k="historic" v="boundary_stone"/>
+#. <icon annotate="true" src="historic/boundary_stone.png"/>
 #: build/trans_style.java:2990 build/trans_style.java:2998
 #: build/trans_style.java:3006 build/trans_style.java:3014
 #: build/trans_style.java:3022 build/trans_style.java:3030
 #: build/trans_style.java:3038 build/trans_style.java:3046
+#: build/trans_style.java:3054
 msgid "historic"
 msgstr ""
@@ -24440,5 +24805,5 @@
 #. <rule>
 #. <condition k="landuse" v="quarry"/>
-#: build/trans_style.java:3087
+#: build/trans_style.java:3095
 msgid "quarry"
 msgstr ""
@@ -24452,5 +24817,5 @@
 #. <rule>
 #. <condition k="landuse" v="landfill"/>
-#: build/trans_style.java:3095
+#: build/trans_style.java:3103
 msgid "landfill"
 msgstr ""
@@ -24472,5 +24837,5 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3103 build/trans_style.java:3111
+#: build/trans_style.java:3111 build/trans_style.java:3119
 msgid "basin"
 msgstr ""
@@ -24484,5 +24849,5 @@
 #. <rule>
 #. <condition k="landuse" v="forest"/>
-#: build/trans_style.java:3119
+#: build/trans_style.java:3127
 msgid "forest"
 msgstr ""
@@ -24496,5 +24861,5 @@
 #. <rule>
 #. <condition k="landuse" v="farmyard"/>
-#: build/trans_style.java:3151
+#: build/trans_style.java:3159
 msgid "farmyard"
 msgstr ""
@@ -24517,5 +24882,5 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3160 build/trans_style.java:3168
+#: build/trans_style.java:3168 build/trans_style.java:3176
 msgid "retail"
 msgstr ""
@@ -24529,5 +24894,5 @@
 #. <rule>
 #. <condition k="landuse" v="industrial"/>
-#: build/trans_style.java:3176
+#: build/trans_style.java:3184
 msgid "industrial"
 msgstr ""
@@ -24541,5 +24906,5 @@
 #. <rule>
 #. <condition k="landuse" v="brownfield"/>
-#: build/trans_style.java:3184
+#: build/trans_style.java:3192
 msgid "brownfield"
 msgstr ""
@@ -24553,5 +24918,5 @@
 #. <rule>
 #. <condition k="landuse" v="greenfield"/>
-#: build/trans_style.java:3192
+#: build/trans_style.java:3200
 msgid "greenfield"
 msgstr ""
@@ -24565,5 +24930,5 @@
 #. <rule>
 #. <condition k="landuse" v="railway"/>
-#: build/trans_style.java:3200
+#: build/trans_style.java:3208
 msgid "railland"
 msgstr ""
@@ -24620,7 +24985,7 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3217 build/trans_style.java:3252
-#: build/trans_style.java:3260 build/trans_style.java:3268
-#: build/trans_style.java:3276 build/trans_style.java:3284
+#: build/trans_style.java:3225 build/trans_style.java:3260
+#: build/trans_style.java:3268 build/trans_style.java:3276
+#: build/trans_style.java:3284 build/trans_style.java:3292
 msgid "military"
 msgstr ""
@@ -24634,5 +24999,5 @@
 #. <rule>
 #. <condition k="landuse" v="cemetery"/>
-#: build/trans_style.java:3225
+#: build/trans_style.java:3233
 msgid "cemetery"
 msgstr ""
@@ -24645,5 +25010,5 @@
 #. <rule>
 #. <condition k="natural" v="peak"/>
-#: build/trans_style.java:3301
+#: build/trans_style.java:3309
 msgid "peak"
 msgstr ""
@@ -24658,5 +25023,5 @@
 #. <condition k="natural" v="glacier"/>
 #. <icon annotate="true" src="misc/landmark/glacier_small.png"/>
-#: build/trans_style.java:3310
+#: build/trans_style.java:3318
 msgid "glacier"
 msgstr ""
@@ -24670,5 +25035,5 @@
 #. <condition k="natural" v="volcano"/>
 #. <icon annotate="true" src="misc/landmark/volcano_small.png"/>
-#: build/trans_style.java:3318
+#: build/trans_style.java:3326
 msgid "volcano"
 msgstr ""
@@ -24723,8 +25088,8 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3326 build/trans_style.java:3327
-#: build/trans_style.java:3335 build/trans_style.java:3351
-#: build/trans_style.java:3424 build/trans_style.java:3432
-#: build/trans_style.java:3440
+#: build/trans_style.java:3334 build/trans_style.java:3335
+#: build/trans_style.java:3343 build/trans_style.java:3359
+#: build/trans_style.java:3432 build/trans_style.java:3440
+#: build/trans_style.java:3448
 msgid "natural"
 msgstr ""
@@ -24738,5 +25103,5 @@
 #. <condition k="natural" v="scrub"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3343
+#: build/trans_style.java:3351
 msgid "scrub"
 msgstr ""
@@ -24750,5 +25115,5 @@
 #. <condition k="natural" v="heath"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3359
+#: build/trans_style.java:3367
 msgid "heath"
 msgstr ""
@@ -24762,5 +25127,5 @@
 #. <condition k="natural" v="mud"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3408
+#: build/trans_style.java:3416
 msgid "mud"
 msgstr ""
@@ -24774,5 +25139,5 @@
 #. <condition k="natural" v="beach"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3416
+#: build/trans_style.java:3424
 msgid "beach"
 msgstr ""
@@ -24850,8 +25215,8 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3456 build/trans_style.java:3464
-#: build/trans_style.java:3472 build/trans_style.java:3480
-#: build/trans_style.java:3488 build/trans_style.java:3496
-#: build/trans_style.java:3504 build/trans_style.java:3512
+#: build/trans_style.java:3464 build/trans_style.java:3472
+#: build/trans_style.java:3480 build/trans_style.java:3488
+#: build/trans_style.java:3496 build/trans_style.java:3504
+#: build/trans_style.java:3512 build/trans_style.java:3520
 msgid "route"
 msgstr ""
@@ -24899,7 +25264,7 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3522 build/trans_style.java:3530
-#: build/trans_style.java:3538 build/trans_style.java:3546
-#: build/trans_style.java:3554
+#: build/trans_style.java:3530 build/trans_style.java:3538
+#: build/trans_style.java:3546 build/trans_style.java:3554
+#: build/trans_style.java:3562
 msgid "boundary"
 msgstr ""
@@ -25049,11 +25414,11 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: build/trans_style.java:3994 build/trans_style.java:4002
-#: build/trans_style.java:4010 build/trans_style.java:4018
-#: build/trans_style.java:4026 build/trans_style.java:4034
-#: build/trans_style.java:4042 build/trans_style.java:4050
-#: build/trans_style.java:4058 build/trans_style.java:4066
-#: build/trans_style.java:4074 build/trans_style.java:4082
-#: build/trans_style.java:4090
+#: build/trans_style.java:4002 build/trans_style.java:4010
+#: build/trans_style.java:4018 build/trans_style.java:4026
+#: build/trans_style.java:4034 build/trans_style.java:4042
+#: build/trans_style.java:4050 build/trans_style.java:4058
+#: build/trans_style.java:4066 build/trans_style.java:4074
+#: build/trans_style.java:4082 build/trans_style.java:4090
+#: build/trans_style.java:4098
 msgid "place"
 msgstr ""
@@ -25101,6 +25466,6 @@
 #. <rule>
 #. <condition k="addr:interpolation" v="alphabetic"/>
-#: build/trans_style.java:4207 build/trans_style.java:4214
-#: build/trans_style.java:4221 build/trans_style.java:4228
+#: build/trans_style.java:4215 build/trans_style.java:4222
+#: build/trans_style.java:4229 build/trans_style.java:4236
 msgid "address"
 msgstr ""
@@ -25408,9 +25773,18 @@
 msgstr ""
 
+#~ msgid "- running version is {0}"
+#~ msgstr "- 執行的版本是 {0}"
+
+#~ msgid "unnamed"
+#~ msgstr "未命名的"
+
+#~ msgid "Hint: Some changes came from uploading new data to the server."
+#~ msgstr "提示：部分變更來自上傳到伺服器的新資料。"
+
+#~ msgid "Some of the nodes are (almost) in the line"
+#~ msgstr "節點中有部分(幾乎)在直線裡"
+
 #~ msgid "All the ways were empty"
 #~ msgstr "所有的路徑都是空的"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "是否合併有不同成員的節點？"
 
 #~ msgid "Merge Anyway"
@@ -25422,27 +25796,6 @@
 #~ msgstr "選取的節點有不同的關係成員。是否仍要合併它們？"
 
-#~ msgid "Unknown version"
-#~ msgstr "不明的版本"
-
-#~ msgid "Version number missing from OSM data"
-#~ msgstr "OSM 資料缺少版本編號"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "在非-路徑中發現 <nd> 元件。"
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "在非-關係中發現 <member> 元件。"
-
-#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
-#~ msgstr "關係 {1} 的成員 {0} 有未預期的「type」，得到 {2}。"
-
-#~ msgid "unnamed"
-#~ msgstr "未命名的"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr "提示：部分變更來自上傳到伺服器的新資料。"
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "節點中有部分(幾乎)在直線裡"
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "是否合併有不同成員的節點？"
 
 #~ msgid "Please select ways with almost right angles to orthogonalize."
@@ -25489,7 +25842,4 @@
 #~ msgstr "關係"
 
-#~ msgid "changesets"
-#~ msgstr "變更組合"
-
 #~ msgid "EPSG:4326"
 #~ msgstr "EPSG:4326"
@@ -25528,7 +25878,4 @@
 #~ msgstr "套用部分解決方案"
 
-#~ msgid "Delete Layer"
-#~ msgstr "刪除圖層"
-
 #~ msgid "Authors: {0}"
 #~ msgstr "作者：{0}"
@@ -25542,7 +25889,4 @@
 #~ msgid "Remove Selected"
 #~ msgstr "移陳選取的"
-
-#~ msgid "Add Selected"
-#~ msgstr "加入選取的"
 
 #~ msgid "Relation Editor: {0}"
@@ -25602,4 +25946,7 @@
 #~ msgstr "標籤預設組合來源"
 
+#~ msgid "Unknown version"
+#~ msgstr "不明的版本"
+
 #~ msgid "Invalid projection"
 #~ msgstr "無效的投影"
@@ -25616,4 +25963,10 @@
 #~ msgid "YAHOO (WebKit GTK)"
 #~ msgstr "YAHOO (WebKit GTK)"
+
+#~ msgid "Version number missing from OSM data"
+#~ msgstr "OSM 資料缺少版本編號"
+
+#~ msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
+#~ msgstr "關係 {1} 的成員 {0} 有未預期的「type」，得到 {2}。"
 
 #~ msgid ""
@@ -25622,4 +25975,10 @@
 #~ msgstr "無法移除此外掛程式。請告訴您取得 JOSM 地方的人們這個問題的情況。"
 
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "在非-路徑中發現 <nd> 元件。"
+
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "在非-關係中發現 <member> 元件。"
+
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr "忽略路徑，因為它包含不存在的節點：{0}\n"
